1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-05 05:30:39 +03:00
Commit Graph

231 Commits

Author SHA1 Message Date
Ryan Bloom
c266de9029 Remove iol_socket.h. This file had one declaration, and it makes more
sense for that declaraion to move to ap_iol.h.  This also modifies all of
the files that include iol_socket.h to include ap_iol.h


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85934 13f79535-47bb-0310-9956-ffa450edef68
2000-07-29 16:24:15 +00:00
Jeff Trawick
d3bb567248 Use ap_note_subprocess() to register the mod_cgid daemon process for cleanup
so that it is killed at termination if it does not die when the parent gets
SIGTERM.  This change is to fix occasional problems where the process stays
around.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85917 13f79535-47bb-0310-9956-ffa450edef68
2000-07-28 18:15:21 +00:00
Ryan Bloom
22d9fbdec0 Move all APR functions related to strings to their own directory, and
create a new header for those functions.  This is the first step to
removing the apr/lib directory completely, and moving those files/functions
to descriptive directories.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85867 13f79535-47bb-0310-9956-ffa450edef68
2000-07-21 19:50:58 +00:00
Jeff Trawick
510681a27d Get mod_cgid.c to compile on OS/390 again. It needs unistd.h
for STDERR_FILENO.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85862 13f79535-47bb-0310-9956-ffa450edef68
2000-07-19 18:04:24 +00:00
Bill Stoddard
c4aeab10dc #ifdef APR_HAS_OTHER_CHILD to #if APR_HAS_OTHER_CHILD. Not tested.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85821 13f79535-47bb-0310-9956-ffa450edef68
2000-07-11 22:12:18 +00:00
Jeff Trawick
7952200e83 Drastically increase the listen backlog for mod_cgid's unix socket. It
was pretty easy to hit ECONNREFUSED errors when the backlog was 5.

The backlog can be customized at build time if required.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85787 13f79535-47bb-0310-9956-ffa450edef68
2000-07-07 15:20:35 +00:00
Ryan Bloom
51d0326577 Update mod_cgid to work with attach_iol_socket again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85772 13f79535-47bb-0310-9956-ffa450edef68
2000-07-05 23:43:40 +00:00
Ryan Bloom
114fb2e4ac Combine some common code. Before this, all platforms implemented their
own iol_sockets using APR.  This just combines all of that code to a
common file and moves that file to main.  I have tested this with all of
the Unix MPM's, but I am willing to bet I missed something (Makefiles) for
Windows, and possibly moving some code for OS/2 and BeOS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85732 13f79535-47bb-0310-9956-ffa450edef68
2000-06-30 18:08:13 +00:00
Greg Stein
02a2200fd8 blast the old names for the status codes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85686 13f79535-47bb-0310-9956-ffa450edef68
2000-06-24 17:34:11 +00:00
Jeff Trawick
ccdc88978f Use the new command-handler initializer macros in a few more modules,
cleaning up the resulting warnings.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85607 13f79535-47bb-0310-9956-ffa450edef68
2000-06-18 04:06:43 +00:00
Ryan Bloom
750d8cc03c Protect system header files with the appropriate macros.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85558 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 23:03:05 +00:00
Ryan Bloom
580852da85 Clean up a big chunk of ap_config.h. This basically stops ap_config.h from
including any files.  Because of this change, other files must include
their own headers.  I also cleaned up a couple of other bugs in some
modules because I had to compile them all.

I expect this to break multiple platforms, but this will be fixed over time.
The massive configure cleanup is almost done.  I will go through the files
one more time after this commit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85553 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 21:47:17 +00:00
Jeff Trawick
374f895ac3 Get mod_cgid compiling again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85549 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 20:42:11 +00:00
Jeff Trawick
0ecf437ac8 Fix a Solaris compilation problem with mod_cgid:
Use <sys/un.h> to get sockaddr_un.  Previously we declared it ourselves
for unknown reasons.  I am now able to compile on Linux (RH6.1), Solaris
8, and FreeBSD 3.4.  Also, I don't see a mention in UNP V1 (2e) of the
need to play tricks to get sockaddr_un.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85498 13f79535-47bb-0310-9956-ffa450edef68
2000-06-10 11:25:26 +00:00
Jeff Trawick
45df6f06a6 When mod_cgid is started as root, the cgi daemon now switches
to the configured User/Group (like other httpd processes)
instead of continuing as root.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85481 13f79535-47bb-0310-9956-ffa450edef68
2000-06-09 15:20:13 +00:00
Jeff Trawick
115d32c361 Fix a couple of bugs in mod_cgid:
The cgi arguments were sometimes mangled because no terminating '\0' was
added to the arg string passed to the cgi daemon.

The len parm to accept() was not initialized, leading sometimes to an
endless loop of failed accept() calls on OS/390 and anywhere else that
failed the call if the len was negative.

Tweaks: Add some traces for failed socket calls at cgi daemon setup time
(most of which I hit while playing around).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85452 13f79535-47bb-0310-9956-ffa450edef68
2000-06-06 22:22:52 +00:00
Jeff Trawick
d60f2177b9 cleanup to cgid_init():
axe unused var cgid_server_conf
  fix type of pid
  don't create the socket as a file here; it doesn't help anything


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85429 13f79535-47bb-0310-9956-ffa450edef68
2000-06-05 22:28:07 +00:00
Jeff Trawick
fefab2bc49 mod_cgid:
fix parmlist to ap_open() so that we can open the ScriptLog file o.k.

in log_script(), don't do anything with script_err parm if it is NULL
(for mod_cgid, it is always NULL; rather than simply ripping out such
logic I kept it in case somebody wants to factor out common parts of
mod_cgi.c and mod_cgid.c later)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85405 13f79535-47bb-0310-9956-ffa450edef68
2000-06-04 19:46:22 +00:00
Jeff Trawick
43c2b45f38 EBCDIC: Rearrange calls to ap_checkconv() so that most handlers
won't need to call it.
Submitted by:	Greg Ames, Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85397 13f79535-47bb-0310-9956-ffa450edef68
2000-06-03 22:41:01 +00:00
William A. Rowe Jr
da493b8be1 PR:
Obtained from:
Submitted by:
Reviewed by:

  Reverse out all _EXPORT_VAR changes back to their original _VAR_EXPORT
  names for linkage (API_, CORE_, and MODULE_).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85318 13f79535-47bb-0310-9956-ffa450edef68
2000-05-27 22:40:44 +00:00
William A. Rowe Jr
86e2a18f2a This patch corrects the issues from the AP_EXPORT and linkage
specification arguments to the ap_hooks.h declarations.  As with
  the APR_ and AP_ patches, API_VAR_EXPORT becomes API_EXPORT_VAR,
  and MODULE_VAR_EXPORT becomes MODULE_EXPORT_VAR.

  I will be happy to revert the inclusion of ap_config.h from 
  httpd.h if this bothers anyone.  More individual modules need
  to be patched if we do so.

  The API_EXPORTs all moved into central storage in the ap_config.h
  header.  Without WIN32 or API_STATIC compile time declarations, 
  these macros remain no-ops.

  This patch also moves the following data from http_main to http_config:

    const char *ap_server_argv0;
    const char *ap_server_root;
    ap_array_header_t *ap_server_pre_read_config;
    ap_array_header_t *ap_server_post_read_config;
    ap_array_header_t *ap_server_config_defines;

  And the following variables had already moved into ap_hooks.c:

    ap_pool_t *g_pHookPool;  (initialized now in http_config)
    int g_bDebugHooks;                   (out of http_config)
    const char *g_szCurrentHookName;     (out of http_config)

  The changes to http_main.c are in preparation for that module to
  move out to a seperate .exe for win32.  Other platforms will be
  unaffected, outside of these changes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85309 13f79535-47bb-0310-9956-ffa450edef68
2000-05-27 05:28:02 +00:00
Greg Stein
c361eb1a65 fixes some compilation errors (macros, function params, etc). also shifts
the time when ap_destroy_pool() is called. it used to be called too
    soon, which caused a core dump on the second CGI request.

Submitted by: Paul J. Reder <rederpj@raleigh.ibm.com>
Reviewed by: Greg Stein


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85308 13f79535-47bb-0310-9956-ffa450edef68
2000-05-27 00:48:49 +00:00
Ryan Bloom
8c385f0dbd Make reliable piped logs work on 2.0.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85136 13f79535-47bb-0310-9956-ffa450edef68
2000-05-04 04:02:37 +00:00
Doug MacEachern
6644b34387 add AP_ prefix to *HOOK* macros
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85045 13f79535-47bb-0310-9956-ffa450edef68
2000-04-26 07:14:39 +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
Jeff Trawick
98730c630f stop relying on a macro to map signal() to ap_signal(); call
ap_signal() directly


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84916 13f79535-47bb-0310-9956-ffa450edef68
2000-04-05 02:09:44 +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
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
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
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
9ca05a3a51 Initial version of CGI Daemon module. This module needs to be tested more
thoroughly and cleanup up a bit, but it does execute CGI's currently.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84137 13f79535-47bb-0310-9956-ffa450edef68
1999-11-19 20:22:51 +00:00