cvs commit: apache-devsite mmn.txt
martin 98/05/27 16:07:42 Modified:.mmn.txt Log: Add info about added 'error-notes' Revision ChangesPath 1.24 +6 -0 apache-devsite/mmn.txt Index: mmn.txt === RCS file: /home/cvs/apache-devsite/mmn.txt,v retrieving revision 1.23 retrieving revision 1.24 diff -u -u -r1.23 -r1.24 --- mmn.txt 1998/05/27 14:05:57 1.23 +++ mmn.txt 1998/05/27 23:07:41 1.24 @@ -60,3 +60,9 @@ 19980527 (1.3b8-dev) - renamed some more functions to ap_ prefix which were missed at the big renaming (because they are defines): is_default_port, default_port and http_method. +A new communication method for modules was added: +they can create customized error messages under the +error-notes key in the request_rec-notes table. +This string will be printed in place of the canned error +responses, and will be propagated to ErrorDocuments +or cgi scripts in the (REDIRECT_)ERROR_NOTES variable.
cvs commit: apache-1.3/src CHANGES
rse 98/05/28 02:41:26 Modified:.configure src CHANGES Log: Fix typo: priviledges - privileges Thanks to Ben for hint. Revision ChangesPath 1.27 +1 -1 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- configure 1998/05/27 14:57:37 1.26 +++ configure 1998/05/28 09:41:21 1.27 @@ -684,7 +684,7 @@ if [ .$suexec = .1 ]; then if [ .`id | grep root` = . ]; then echo + Warning: You enabled the suEXEC feature. Be aware that you need 12 -echo + root priviledges for this, at the latest at the installation step. 12 +echo + root privileges for this, at the latest at the installation step. 12 fi fi if [ .$PERL = .no-perl-on-this-system ]; then 1.867 +2 -2 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.866 retrieving revision 1.867 diff -u -r1.866 -r1.867 --- CHANGES 1998/05/27 22:55:50 1.866 +++ CHANGES 1998/05/28 09:41:23 1.867 @@ -15,9 +15,9 @@ *) [SECURITY] A possible buffer overflow in the ftp proxy was fixed. [Martin Kraemer] - *) Transform the configure message You need root priviledges for suEXEC + *) Transform the configure message You need root privileges for suEXEC from a fatal error into a (more friendly) warning because the building - (make) of Apache we can allow, of course. Root priviledges are needed + (make) of Apache we can allow, of course. Root privileges are needed only for the installation step (make install). So make sure the user is aware of this fact but let him proceed as long as he can. [Ralf S. Engelschall] PR#2288
cvs commit: apache-site bugdb.cgi
coar98/05/28 03:56:55
Modified:.bugdb.cgi
Log:
Enhance one of the canned messages.
Revision ChangesPath
1.31 +8 -3 apache-site/bugdb.cgi
Index: bugdb.cgi
===
RCS file: /export/home/cvs/apache-site/bugdb.cgi,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- bugdb.cgi 1998/05/27 03:29:45 1.30
+++ bugdb.cgi 1998/05/28 10:56:55 1.31
@@ -33,8 +33,11 @@
This Apache problem report has not been updated recently.\n .
Please reply to this message if you have any additional\n .
information about this issue, or if you have answers to\n .
-any questions that have been posed to you. If we don't\n .
-hear from you, this report will be closed.;
+any questions that have been posed to you. If there are\n .
+no outstanding questions, please consider this a request\n .
+to try to reproduce the problem with the latest software\n .
+release, if one has been made since last contact. If we\n .
+don't hear from you, this report will be closed.;
$CANNED_TEXT{Stale} =
[This is a standard response.]\n .
No response from submitter, assuming issue has been resolved.;
@@ -121,6 +124,8 @@
#next to the 'go directly to' option (saves mouse motion).
# 05/26/1998 Brian Behlendorf - force From field to default to @apache.org
#for editors without full domain names.
+# 05/28/1998 Ken Coar - Change the 'still alive?' standard response to
include
+#a request for retesting under the latest sotware.
#
### End Modification log
@@ -258,7 +263,7 @@
### Main menu
} elsif ($PATH_INFO eq ) {
main_menu();
-print HRSMALLVersion: 24 April 1998BRAuthors: ,
+print HRSMALLVersion: 28 May 1998BRAuthors: ,
A HREF=\http://alumni.caltech.edu/~dank/gnats.html\;Dan Kegel ,
and Huy Le/A, BR ,
with revamp work by ,
cvs commit: apache-1.3/src CHANGES
rse 98/05/28 03:57:57 Modified:src CHANGES Log: The entry for the last two changes to apxs.pl. Revision ChangesPath 1.868 +3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.867 retrieving revision 1.868 diff -u -r1.867 -r1.868 --- CHANGES 1998/05/28 09:41:23 1.867 +++ CHANGES 1998/05/28 10:57:56 1.868 @@ -1,5 +1,8 @@ Changes with Apache 1.3b8 + *) A few cosmetics and trivial enhancements to APXS to make the + generated Makefile more user friendly. [Ralf S. Engelschall] + *) Proxy Fix: The proxy special failure routine ap_proxyerror() was updated to use the normal apache error processing, thereby allowing proxy errors to be treated by ErrorDocument's as well. For this
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c mod_rewrite.h
rse 98/05/28 04:09:47
Modified:src CHANGES
src/modules/standard mod_rewrite.c mod_rewrite.h
Log:
Upgrade the child spawning code in mod_rewrite for the RewriteMap programs:
ap_spawn_child_err() is used and the Win32 case now uses CreateProcess()
instead of a low-level execl() (which caused problems in the past under
Win32).
Reviewed by: Ben Laurie
Revision ChangesPath
1.869 +6 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.868
retrieving revision 1.869
diff -u -r1.868 -r1.869
--- CHANGES 1998/05/28 10:57:56 1.868
+++ CHANGES 1998/05/28 11:09:44 1.869
@@ -1,4 +1,10 @@
Changes with Apache 1.3b8
+
+ *) Upgrade the child spawning code in mod_rewrite for the RewriteMap
+ programs: ap_spawn_child_err() is used and the Win32 case now uses
+ CreateProcess() instead of a low-level execl() (which caused problems in
+ the past under Win32).
+ [Ralf S. Engelschall]
*) A few cosmetics and trivial enhancements to APXS to make the
generated Makefile more user friendly. [Ralf S. Engelschall]
1.108 +40 -6 apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- mod_rewrite.c 1998/05/27 14:01:38 1.107
+++ mod_rewrite.c 1998/05/28 11:09:45 1.108
@@ -3127,6 +3127,7 @@
rewrite_server_conf *conf;
FILE *fpin;
FILE *fpout;
+FILE *fperr;
array_header *rewritemaps;
rewritemap_entry *entries;
rewritemap_entry *map;
@@ -3154,16 +3155,18 @@
continue;
fpin = NULL;
fpout = NULL;
-rc = spawn_child(p, rewritemap_program_child, (void *)map-datafile,
- kill_after_timeout, fpin, fpout);
+rc = ap_spawn_child_err(p, rewritemap_program_child,
+(void *)map-datafile, kill_after_timeout,
+fpin, fpout, fperr);
if (rc == 0 || fpin == NULL || fpout == NULL) {
-perror(spawn_child);
+perror(ap_spawn_child);
fprintf(stderr, mod_rewrite:
could not fork child for RewriteMap process\n);
exit(1);
}
map-fpin = fileno(fpin);
map-fpout = fileno(fpout);
+map-fperr = fileno(fperr);
}
return;
}
@@ -3173,17 +3176,48 @@
{
int child_pid = 1;
+/*
+ * Prepare for exec
+ */
ap_cleanup_for_exec();
#ifdef SIGHUP
signal(SIGHUP, SIG_IGN);
#endif
+
+/*
+ * Exec() the child program
+ */
#if defined(WIN32)
-child_pid = spawnl(_P_NOWAIT, SHELL_PATH, SHELL_PATH,
- /c, (char *)cmd, NULL);
+/* MS Windows */
+{
+char *pCommand;
+STARTUPINFO si;
+PROCESS_INFORMATION pi;
+
+pCommand = strcat(SHELL_PATH, /C , cmd, NULL);
+
+memset(si, 0, sizeof(si));
+memset(pi, 0, sizeof(pi));
+
+si.cb = sizeof(si);
+si.dwFlags = STARTF_USESHOWWINDOW | STARTF_USESTDHANDLES;
+si.wShowWindow = SW_HIDE;
+si.hStdInput = pinfo-hPipeInputRead;
+si.hStdOutput = pinfo-hPipeOutputWrite;
+si.hStdError = pinfo-hPipeErrorWrite;
+
+if (CreateProcess(NULL, pCommand, NULL, NULL, TRUE, 0,
+ environ, NULL, si, pi)) {
+CloseHandle(pi.hProcess);
+CloseHandle(pi.hThread);
+child_pid = pi.dwProcessId;
+}
+}
#elif defined(__EMX__)
-/* OS/2 needs a '/' */
+/* IBM OS/2 */
execl(SHELL_PATH, SHELL_PATH, /c, (char *)cmd, NULL);
#else
+/* Standard Unix */
execl(SHELL_PATH, SHELL_PATH, -c, (char *)cmd, NULL);
#endif
return(child_pid);
1.52 +1 -0 apache-1.3/src/modules/standard/mod_rewrite.h
Index: mod_rewrite.h
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- mod_rewrite.h 1998/05/20 15:34:27 1.51
+++ mod_rewrite.h 1998/05/28 11:09:46 1.52
@@ -252,6 +252,7 @@
int type;/* the type of the map */
int fpin;/* in file pointer for program maps */
int fpout; /* out file pointer for program maps */
+
cvs commit: apache-1.3/src/support logresolve.c
rse 98/05/28 04:23:14 Modified:src/support logresolve.c Log: The complete source tree passes gcc .. -Wnested-externs .. quietly except for this this support program. Make it pass -Wnested-externs, too. Revision ChangesPath 1.14 +4 -3 apache-1.3/src/support/logresolve.c Index: logresolve.c === RCS file: /export/home/cvs/apache-1.3/src/support/logresolve.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- logresolve.c 1998/05/02 11:15:15 1.13 +++ logresolve.c 1998/05/28 11:23:13 1.14 @@ -95,6 +95,10 @@ * statistics - obvious */ +#ifndef h_errno +extern int h_errno; /* some machines don't have this in their headers */ +#endif + /* largeste value for h_errno */ #define MAX_ERR (NO_ADDRESS) #define UNKNOWN_ERR (MAX_ERR+1) @@ -117,9 +121,6 @@ struct nsrec **current, *new; struct hostent *hostdata; char *name; -#ifndef h_errno -extern int h_errno; /* some machines don't have this in their headers */ -#endif current = nscache[((ipnum.s_addr + (ipnum.s_addr 8) + (ipnum.s_addr 16) + (ipnum.s_addr 24)) % BUCKETS)];
cvs commit: apache-1.3/src/main util_script.c
rse 98/05/28 04:32:44
Modified:src/include httpd.h
src/main util_script.c
Log:
Fix a few inconsistencies in using CMD.EXE vs. SHELL_PATH.
SHELL_PATH is defined for Unix, OS\2 and Windows so we can
use it also in util_script for all of them.
Revision ChangesPath
1.216 +2 -2 apache-1.3/src/include/httpd.h
Index: httpd.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- httpd.h 1998/05/27 14:01:31 1.215
+++ httpd.h 1998/05/28 11:32:43 1.216
@@ -231,10 +231,10 @@
#define DEFAULT_PATH /bin:/usr/bin:/usr/ucb:/usr/bsd:/usr/local/bin
#endif
-/* The path to the Bourne shell, for parsed docs */
+/* The path to the shell interpreter, for parsed docs */
#ifndef SHELL_PATH
#if defined(__EMX__) || defined(WIN32)
-/* Set default for OS/2 file system */
+/* Set default for OS/2 and Windows file system */
#define SHELL_PATH CMD.EXE
#else
#define SHELL_PATH /bin/sh
1.113 +6 -6 apache-1.3/src/main/util_script.c
Index: util_script.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/util_script.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- util_script.c 1998/05/25 17:58:17 1.112
+++ util_script.c 1998/05/28 11:32:44 1.113
@@ -670,7 +670,7 @@
else if (strstr(strupr(r-filename), .CMD) 0) {
/* Special case to allow use of REXX commands as scripts. */
os2pathname(r-filename);
- execl(CMD.EXE, CMD.EXE, /C, r-filename, NULL);
+ execl(SHELL_PATH, SHELL_PATH, /C, r-filename, NULL);
}
else {
execl(r-filename, argv0, NULL);
@@ -690,7 +690,7 @@
if (strstr(strupr(r-filename), .CMD) 0) {
/* Special case to allow use of REXX commands as scripts. */
os2pathname(r-filename);
- execv(CMD.EXE, create_argv_cmd(r-pool, argv0, r-args,
r-filename));
+ execv(SHELL_PATH, create_argv_cmd(r-pool, argv0, r-args,
r-filename));
}
else
execv(r-filename,
@@ -802,7 +802,7 @@
/* If not an executable or script, just execute it
* from a command prompt.
*/
- pCommand = ap_pstrcat(r-pool, CMD.EXE, /C ,
+ pCommand = ap_pstrcat(r-pool, SHELL_PATH, /C ,
r-filename, NULL);
}
}
@@ -857,7 +857,7 @@
r-filename, , arguments, NULL);
}
else {
- pCommand = ap_pstrcat(r-pool, CMD.EXE, /C ,
+ pCommand = ap_pstrcat(r-pool, SHELL_PATH, /C ,
r-filename, , arguments, NULL);
}
}
@@ -881,7 +881,7 @@
r-filename, NULL, env);
}
else {
- pid = spawnle(_P_NOWAIT, CMD.EXE, CMD.EXE, /C,
+ pid = spawnle(_P_NOWAIT, SHELL_PATH, SHELL_PATH, /C,
r-filename, NULL, env);
}
}
@@ -897,7 +897,7 @@
r-filename, r-args), env);
}
else {
- pid = spawnve(_P_NOWAIT, CMD.EXE,
+ pid = spawnve(_P_NOWAIT, SHELL_PATH,
create_argv_cmd(r-pool, argv0, r-args,
r-filename), env);
}
cvs commit: apache-1.3/src/modules README
rse 98/05/28 04:47:28 Modified:src/modules README Log: Be correct: mod_perl and mod_php3 already use their own subdirectory. Revision ChangesPath 1.2 +1 -3 apache-1.3/src/modules/README Index: README === RCS file: /export/home/cvs/apache-1.3/src/modules/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README1998/02/10 09:49:16 1.1 +++ README1998/05/28 11:47:28 1.2 @@ -19,8 +19,7 @@ extra/ - This is the directory for third-party modules, such as - mod_perl, mod_php, or mod_jserv. + This is the directory for third-party modules, such as mod_jserv. test/ @@ -32,5 +31,4 @@ This directory houses example modules, to help module authors figure their way around the Apache API and module concept. -
cvs commit: apache-1.3/htdocs/manual upgrading_to_1_3.html
coar98/05/28 04:50:55 Modified:htdocs/manual upgrading_to_1_3.html Log: Remove an errant reference to an un-featured feature. Submitted by: Chia-liang Kao [EMAIL PROTECTED] Revision ChangesPath 1.24 +3 -4 apache-1.3/htdocs/manual/upgrading_to_1_3.html Index: upgrading_to_1_3.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/upgrading_to_1_3.html,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- upgrading_to_1_3.html 1998/05/20 14:22:34 1.23 +++ upgrading_to_1_3.html 1998/05/28 11:50:54 1.24 @@ -42,10 +42,9 @@ when necessary. LIThe CODE-DSERVER_SUBVERSION=\string\/CODE compile-time option has - been replaced with the run-time - A HREF=mod/core.html#addversioncomponent - SAMPAddVersionComponent/SAMP/A - directive. + been replaced with the run-time API call + CODEap_add_version_component()/CODE. Compile-time modification of the + server identity by the configuration scripts is no longer supported. /LI LICODEmod_dir/CODE has been split into two pieces
cvs commit: apache-1.3/htdocs/manual/mod mod_setenvif.html
coar98/05/28 07:06:55 Modified:htdocs/manual/mod mod_setenvif.html Log: Make the evolution of the BrowserMatch* directives more clear. PR: 2147 Submitted by: Daniel Ryde [EMAIL PROTECTED] Revision ChangesPath 1.5 +4 -2 apache-1.3/htdocs/manual/mod/mod_setenvif.html Index: mod_setenvif.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_setenvif.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mod_setenvif.html 1998/05/20 14:12:59 1.4 +++ mod_setenvif.html 1998/05/28 14:06:54 1.5 @@ -84,7 +84,8 @@ A HREF=directive-dict.html#Compatibility REL=Help - STRONGCompatibility:/STRONG/A Apache 1.2 and above + STRONGCompatibility:/STRONG/A Apache 1.2 and above (in Apache 1.2 + this directive was found in the now-obsolete mod_browser module) /P P The BrowserMatch directive defines environment variables based on the @@ -185,7 +186,8 @@ A HREF=directive-dict.html#Compatibility REL=Help - STRONGCompatibility:/STRONG/A Apache 1.2 and above + STRONGCompatibility:/STRONG/A Apache 1.2 and above (in Apache 1.2 + this directive was found in the now-obsolete mod_browser module) /P P The SAMPBrowserMatchNoCase/SAMP directive is semantically identical to
cvs commit: apache-1.3/src/main http_core.c
jim 98/05/28 08:28:14 Modified:src/main http_core.c Log: Oops... it's called ServerTokens now Revision ChangesPath 1.203 +1 -1 apache-1.3/src/main/http_core.c Index: http_core.c === RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v retrieving revision 1.202 retrieving revision 1.203 diff -u -r1.202 -r1.203 --- http_core.c 1998/05/27 14:01:33 1.202 +++ http_core.c 1998/05/28 15:28:13 1.203 @@ -1873,7 +1873,7 @@ /* * Handle a request to include the server's OS platform in the Server - * response header field (the AddVersionPlatform directive). Unfortunately + * response header field (the ServerTokens directive). Unfortunately * this requires a new global in order to communicate the setting back to * http_main so it can insert the information in the right place in the * string.
cvs commit: apache-1.3/htdocs/manual sourcereorg.html
brian 98/05/28 10:53:11 Modified:.STATUS htdocs/manual sourcereorg.html Log: Added link to dso.html from sourcereorg.html for clarity. Also, Paul's windows.html recent update was excellent. Revision ChangesPath 1.407 +0 -5 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.406 retrieving revision 1.407 diff -u -r1.406 -r1.407 --- STATUS1998/05/28 17:41:16 1.406 +++ STATUS1998/05/28 17:53:06 1.407 @@ -24,11 +24,6 @@ Documentation that needs writing: -* Documentation for: - 1) htdocs/manual/sourcereorg.html and other files should mention - new mod_so capabilities. - 2) windows.html should be cleaned up. - * Need a document explaining mod_rewrite/UseCanonicalName off based virtualhosting. (If it exists already I can't find it easily.) 1.11 +9 -7 apache-1.3/htdocs/manual/sourcereorg.html Index: sourcereorg.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/sourcereorg.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sourcereorg.html 1998/04/11 12:27:50 1.10 +++ sourcereorg.html 1998/05/28 17:53:10 1.11 @@ -145,13 +145,15 @@ create a Makefile to build the module given a file containing the module's dependencies. /LI - LIFor building a third-party module STRONGoutside/STRONG - the Apache source tree the new CODEapxs/CODE support tool can be used - to compile the module into a dynamic shared object (DSO), install it into - the existing Apache installation and optionally activating it in the - Apache CODEhttpd.conf/CODE file. The only requirement is that Apache - has DSO-support for the used platform and the module CODEmod_so/CODE - was built into the server binary CODEhttpd/CODE. + LIFor building a third-party module STRONGoutside/STRONG the + Apache source tree the new CODEapxs/CODE support tool can be + used to compile the module into a A HREF=dso.htmldynamic + shared object (DSO)/A, install it into the existing Apache + installation and optionally activating it in the Apache + CODEhttpd.conf/CODE file. The only requirement is that + Apache has DSO-support for the used platform and the module + CODEA HREF=mod/mod_so.htmlmod_so/A/CODE was built into + the server binary CODEhttpd/CODE. /LI /UL
cvs commit: apache-1.3/src/main util.c
dgaudet 98/05/28 12:57:12
Modified:src/include httpd.h
src/main util.c
Log:
poolfile_t is a private implementation detail, don't put it in a public
structure.
Revision ChangesPath
1.217 +0 -6 apache-1.3/src/include/httpd.h
Index: httpd.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- httpd.h 1998/05/28 11:32:43 1.216
+++ httpd.h 1998/05/28 19:57:07 1.217
@@ -907,12 +907,6 @@
unsigned line_number;/* current line number, starting at 1 */
} configfile_t;
-/* Common structure that holds the file and pool for ap_pcfg_openfile */
-typedef struct {
-struct pool *pool;
-FILE *file;
-} poolfile_t;
-
/* Open a configfile_t as FILE, return open configfile_t struct pointer */
API_EXPORT(configfile_t *) ap_pcfg_openfile(pool *p, const char *name);
1.117 +6 -0 apache-1.3/src/main/util.c
Index: util.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- util.c1998/05/27 14:01:35 1.116
+++ util.c1998/05/28 19:57:11 1.117
@@ -706,6 +706,12 @@
return (cfp-close == NULL) ? 0 : cfp-close(cfp-param);
}
+/* Common structure that holds the file and pool for ap_pcfg_openfile */
+typedef struct {
+struct pool *pool;
+FILE *file;
+} poolfile_t;
+
static int cfg_close(void *param)
{
poolfile_t *cfp = (poolfile_t *) param;
cvs commit: apache-1.3/src/modules/standard mod_cgi.c mod_include.c mod_mime_magic.c mod_rewrite.c
brian 98/05/28 15:10:00 Modified:htdocs/manual new_features_1_3.html src/include alloc.h buff.h compat.h src/main alloc.c http_log.c src/modules/standard mod_cgi.c mod_include.c mod_mime_magic.c mod_rewrite.c Log: In the interests of some API cleanup: I converted all occurances of spawn_child to ap_spawn_child_err, and removed the spawn_child macro (actually moved it to compat.h) I then changed ap_spawn_child_err to simply ap_spawn_child, and ap_spawn_child_err_buff to ap_bspawn_child. These are all cosmetic and should not change functionality, but I think this will be of assistance to module authors trying to learn by examples we set in our code (lord help them!). Approved in concept by dgaudet rse. Revision ChangesPath 1.65 +8 -3 apache-1.3/htdocs/manual/new_features_1_3.html Index: new_features_1_3.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/new_features_1_3.html,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- new_features_1_3.html 1998/05/20 23:08:35 1.64 +++ new_features_1_3.html 1998/05/28 22:09:41 1.65 @@ -419,7 +419,7 @@ coming from the client). DTSTRONGCODEkill_only_once/CODE/STRONG -DDAn option to CODEspawn_child/CODE functions which prevents Apache +DDAn option to CODEap_spawn_child/CODE functions which prevents Apache from aggressively trying to kill off the child. DTSTRONGCODEalloc debugging code/CODE/STRONG @@ -453,11 +453,16 @@ A HREF=mod/core.html#usecanonicalnameUseCanonicalName/A directive when retrieving the server name and port for a request. -DTSTRONGChange to prototype for CODEap_spawn_child_err_buff/CODE and +DTSTRONGChange to prototype for CODEap_bspawn_child/CODE and CODEap_call_exec/CODE/STRONG DDAdded a CODEchild_info */CODE to CODEspawn/CODE function -(as passed to CODEap_spawn_child_err_buff/CODE) and to +(as passed to CODEap_bspawn_child/CODE) and to CODEap_call_exec/CODE to allow children to work correctly on Win32. +We also cleaned up the nomenclature a bit, replacing +CODEspawn_child_err/CODE with simply +CODEap_spawn_child/CODE and CODEspawn_child_err_buff/CODE +with simply CODEap_bspawn_child/CODE. + /DL PHR 1.59 +2 -3 apache-1.3/src/include/alloc.h Index: alloc.h === RCS file: /export/home/cvs/apache-1.3/src/include/alloc.h,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- alloc.h 1998/05/18 20:41:30 1.58 +++ alloc.h 1998/05/28 22:09:45 1.59 @@ -286,7 +286,7 @@ /* ... even child processes (which we may want to wait for, * or to kill outright, on unexpected termination). * - * spawn_child is a utility routine which handles an awful lot of + * ap_spawn_child is a utility routine which handles an awful lot of * the rigamarole associated with spawning a child --- it arranges * for pipes to the child's stdin and stdout, if desired (if not, * set the associated args to NULL). It takes as args a function @@ -304,11 +304,10 @@ typedef struct child_info child_info; API_EXPORT(void) ap_note_subprocess(pool *a, int pid, enum kill_conditions how); -API_EXPORT(int) ap_spawn_child_err(pool *, int (*)(void *, child_info *), +API_EXPORT(int) ap_spawn_child(pool *, int (*)(void *, child_info *), void *, enum kill_conditions, FILE **pipe_in, FILE **pipe_out, FILE **pipe_err); -#define spawn_child(p,f,v,k,in,out) ap_spawn_child_err(p,f,v,k,in,out,NULL) /* magic numbers --- min free bytes to consider a free pool block useable, * and the min amount to allocate if we have to go to malloc() */ 1.44 +1 -1 apache-1.3/src/include/buff.h Index: buff.h === RCS file: /export/home/cvs/apache-1.3/src/include/buff.h,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- buff.h1998/05/19 19:29:00 1.43 +++ buff.h1998/05/28 22:09:46 1.44 @@ -217,7 +217,7 @@ int dummy; #endif }; -API_EXPORT(int) ap_spawn_child_err_buff(pool *, int (*)(void *, child_info *), void *, +API_EXPORT(int) ap_bspawn_child(pool *, int (*)(void *, child_info *), void *, enum kill_conditions, BUFF **pipe_in, BUFF **pipe_out, BUFF **pipe_err); 1.10 +7 -2 apache-1.3/src/include/compat.h Index: compat.h
