1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-06 16:49:32 +03:00
Commit Graph

186 Commits

Author SHA1 Message Date
Ryan Bloom
07f387cc5a Add logic to timeout CGI scripts properly. This requires that APR pipes
can be timed out.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84986 13f79535-47bb-0310-9956-ffa450edef68
2000-04-18 00:08:30 +00:00
Ryan Bloom
de3a77dc01 Change ap_context_t to ap_pool_t. This compiles, runs, and serves pages
on Linux, but probably breaks somewhere.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84963 13f79535-47bb-0310-9956-ffa450edef68
2000-04-14 15:59:20 +00:00
Ryan Bloom
db9d037c36 Make the server work without asking for buffered file I/O. This removes
all APR_BUFFERED flags from the server, and it fixes a minor bug in the
ungetchar patch (I forgot a file when comitting).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84933 13f79535-47bb-0310-9956-ffa450edef68
2000-04-06 23:53:59 +00:00
Roy T. Fielding
2bee4ad19d Update to Apache Software License version 1.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84879 13f79535-47bb-0310-9956-ffa450edef68
2000-03-31 09:05:25 +00:00
Ryan Bloom
63f93a6504 Backout layered I/O changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84842 13f79535-47bb-0310-9956-ffa450edef68
2000-03-27 16:22:30 +00:00
Ryan Bloom
6a4d775449 Enabled layered I/O. Docs are forthcoming.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84837 13f79535-47bb-0310-9956-ffa450edef68
2000-03-25 15:00:10 +00:00
Ryan Bloom
b1c26f031a Fix all the License issues. Including:
s/Apache Group/Apache Software Foundation/
s/1999/2000/
s/Sascha's license/ASF license


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84725 13f79535-47bb-0310-9956-ffa450edef68
2000-03-10 00:07:37 +00:00
Ryan Bloom
74bb38f449 Add a test program for pipes. Add support for non-buffered CGI's to mod_cgi.
This still doesn't terminate CGI's after a time limit, that's the next step.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84687 13f79535-47bb-0310-9956-ffa450edef68
2000-03-01 16:21:21 +00:00
Bill Stoddard
6461b73f21 Set up return codes correctly in the failure case.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84617 13f79535-47bb-0310-9956-ffa450edef68
2000-02-13 00:39:04 +00:00
Ryan Bloom
505fa49a3a Manoj has been pushing for this for a while, but I've been too dense
to understand that he was right.  :-)  Basically, this makes the modules
use ap_config to test for header file inclusion.  This method is not to
be used for larger modules that run autoconf theirselves.  Including
ap_config is only valid for modules which rely on Apache to do their
configuration.  Currently, this is only the core modules.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84497 13f79535-47bb-0310-9956-ffa450edef68
2000-01-19 02:42:17 +00:00
Ryan Bloom
70a4fae036 This is a huge change to the configure system. Basically, this name space
protects most, if not all, of the Apache macros.   This has been tested on
Linux using all of the Unix MPM's.  The biggest push was that Apache's
httpd.h header file can no longer include the ap_config.h file.  Most of the
other files include this themselves now.
Submitted by:	Ryan Bloom and Manoj Kasichainula


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84492 13f79535-47bb-0310-9956-ffa450edef68
2000-01-18 23:41:56 +00:00
Brian Havard
0df3ec32ca Rework ap_finfo_t to split the file type out of the protection field.
I've taken a stab at the unix implementation but tested only on OS/2.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84416 13f79535-47bb-0310-9956-ffa450edef68
2000-01-10 15:35:51 +00:00
dgaudet
faff1f01dd time overhaul:
- ap_time_t is a 64-bit scalar, microseconds since epoch
- ap_exploded_time_t corresponds to struct tm with a few extras

probably broken on anything except linux.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84413 13f79535-47bb-0310-9956-ffa450edef68
2000-01-09 05:18:31 +00:00
Ryan Bloom
8f26ac7df4 Separate the stat structure from the file structure and use ap_stat and
ap_getfileinfo in apache.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84397 13f79535-47bb-0310-9956-ffa450edef68
2000-01-06 14:43:41 +00:00
Ryan Bloom
528afcc4d6 Initialize all ap_file_t's to NULL. This allows ap_open and ap_stat to
work together without causing memory leaks.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84393 13f79535-47bb-0310-9956-ffa450edef68
2000-01-04 19:01:04 +00:00
Ryan Bloom
bea42aaa36 Make CGI's work correctly in Apache 2.0. APR wants the first element in the
argument list to be the program name.  This is exactly what POSIX requires,
and what Windows wants, but Apache 1.3 would create the arg list, and then
have another function squeeze the program name in later.  This patch fixes
that by having mod_cgi put the program name the correct place.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84293 13f79535-47bb-0310-9956-ffa450edef68
1999-12-14 20:37:58 +00:00
Ryan Bloom
0d022946bc Get rid of more platform dependant code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84288 13f79535-47bb-0310-9956-ffa450edef68
1999-12-13 20:52:28 +00:00
Ryan Bloom
b259c85053 We may not always want to make the pipes between processes non-blocking.
This patch allows us to set if both sides of the pipes are nonblocking,
both sides are blocking, just the parent side blocks, or just the child
side blocks for all three of the pipes created during create_process.  I
have also modified Apache to take advantage of this change.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84215 13f79535-47bb-0310-9956-ffa450edef68
1999-12-02 18:36:39 +00:00
Manoj Kasichainula
2c5ab99008 Undo the ap_bgets errno patch. It will return status with ap_berror().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84076 13f79535-47bb-0310-9956-ffa450edef68
1999-10-31 09:02:55 +00:00
Manoj Kasichainula
9056dc8abc An errnoless interface for ap_bgets
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84075 13f79535-47bb-0310-9956-ffa450edef68
1999-10-30 08:05:10 +00:00
Manoj Kasichainula
b73b1bf345 ap_bwrite now exports an errnoless interface.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84074 13f79535-47bb-0310-9956-ffa450edef68
1999-10-30 05:25:32 +00:00
Brian Havard
010eb1291c Make args to CGIs work.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84033 13f79535-47bb-0310-9956-ffa450edef68
1999-10-25 12:45:39 +00:00
Ryan Bloom
b1889e8425 Fix mod_cgi so it works on Unix systems. We need to be VERY careful
about calling ap_cleanups_for_exec now.  There is really no reason to call
this from outside of APR, unless you are specifically doing a fork/exec.
If you use ap_create_process, it will call ap_cleanups_for_exec for you
in the right spot now.  Also cleaned up some of the code because it helped
with debugging.  We need better error messages in mod_cgi now.
iCVS:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84009 13f79535-47bb-0310-9956-ffa450edef68
1999-10-20 18:28:04 +00:00
Brian Havard
3c6a4c71fd Apply ap_log_error() errno parameter addition to a few more files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84008 13f79535-47bb-0310-9956-ffa450edef68
1999-10-20 15:15:41 +00:00
Bill Stoddard
1118174782 A couple of arg swaps on ap_open
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83999 13f79535-47bb-0310-9956-ffa450edef68
1999-10-17 15:26:07 +00:00
Bill Stoddard
97ba63a260 Fix argv list generation bug.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83997 13f79535-47bb-0310-9956-ffa450edef68
1999-10-15 00:05:01 +00:00
Bill Stoddard
512a32027d Still does not work reliably, but it's closer to being right.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83993 13f79535-47bb-0310-9956-ffa450edef68
1999-10-14 13:51:41 +00:00
Bill Stoddard
c24df1204a Need to pass in just the directory, not including the filename. Note that CGI
arguments are being completely ignored. suexec needs to be handled, the CGI arguments
need to be canonicalized (e.g., quote args containing spaces, etc.) and ScriptInterpreterSource
needs reimplementing. Whew!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83978 13f79535-47bb-0310-9956-ffa450edef68
1999-10-12 19:19:29 +00:00
Bill Stoddard
312ea662f0 Fix bug interpreting cgi_child return code. Do some clean-up.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83977 13f79535-47bb-0310-9956-ffa450edef68
1999-10-12 14:45:57 +00:00
Manoj Kasichainula
2792406eac Fix function arguments to respect APR's New World Order.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83975 13f79535-47bb-0310-9956-ffa450edef68
1999-10-12 04:06:58 +00:00
Bill Stoddard
15be4a2322 First cut at migrating mod_cgi over to APR. Still needs some work to make it Win32 friendly (use named pipes, etc.)
Submitted by: Paul Reder
Reviewed by: Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83965 13f79535-47bb-0310-9956-ffa450edef68
1999-10-11 20:44:28 +00:00
Ryan Bloom
c37f14ddf3 Changed pools to contexts. Tested with prefork and pthread mpm's. I'll
check this out tomorrow and make sure everything was checked in correctly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83852 13f79535-47bb-0310-9956-ffa450edef68
1999-08-31 05:35:52 +00:00
Roy T. Fielding
f971d0d40f Remove support for ap_suexec_enabled
Submitted by:	Dean Gaudet


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83790 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 17:25:09 +00:00
Roy T. Fielding
dc349534f3 Remove timeouts as part of pthreads changes.
Submitted by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83788 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 17:17:22 +00:00
Roy T. Fielding
e3978962f9 Start to implement module-defined hooks that are a) fast and b) typesafe.
Replace pre_connection module call with a register_hook call and
implement pre_connection as a hook. The intent is that these hooks will
be extended to allow Apache to be multi-protocol, and also to allow the
calling order to be specified on a per-hook/per-module basis.  [Ben Laurie]

Port a bunch of modules to the new module structure.
["Michael H. Voase" <mvoase@midcoast.com.au>]

Submitted by:	Ben Laurie


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83770 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 14:18:40 +00:00
Roy T. Fielding
e3e87d34a0 Apache 1.3.9 baseline for the Apache 2.0 repository.
Obtained from: Apache 1.3.9 (minus unused files), tag APACHE_1_3_9
Submitted by: Apache Group


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83751 13f79535-47bb-0310-9956-ffa450edef68
1999-08-24 06:55:44 +00:00