cvs commit: apache-1.3/src/main util_script.c
brian 98/05/28 16:14:12
Modified:src/main util_script.c
Log:
PR: 2294
Submitted by: W G Stoddard [EMAIL PROTECTED]
Reviewed by: Brian Behlendorf
The environment variables were not properly being passed to the spawned
process, now they are.
Revision ChangesPath
1.114 +37 -11apache-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.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- util_script.c 1998/05/28 11:32:44 1.113
+++ util_script.c 1998/05/28 23:14:11 1.114
@@ -711,7 +711,9 @@
int is_exe = 0;
STARTUPINFO si;
PROCESS_INFORMATION pi;
- char *pCommand;
+char *pCommand;
+char *pEnvBlock, *pNext;
+int iEnvBlockLen;
memset(si, 0, sizeof(si));
memset(pi, 0, sizeof(pi));
@@ -861,16 +863,40 @@
r-filename, , arguments, NULL);
}
}
-
- if (CreateProcess(NULL, pCommand, NULL, NULL, TRUE, 0, env, NULL, si,
pi)) {
- pid = pi.dwProcessId;
- /*
-* We must close the handles to the new process and its main thread
-* to prevent handle and memory leaks.
-*/
- CloseHandle(pi.hProcess);
- CloseHandle(pi.hThread);
- }
+
+/*
+ * Win32's CreateProcess call requires that the environment
+ * be passed in an environment block, a null terminated block of
+ * null terminated strings.
+ */
+
+i = 0;
+iEnvBlockLen = 1;
+while (env[i]) {
+iEnvBlockLen += strlen(env[i]) + 1;
+i++;
+}
+
+pEnvBlock = (char *)ap_pcalloc(r-pool,iEnvBlockLen);
+
+i = 0;
+pNext = pEnvBlock;
+while (env[i]) {
+strcpy(pNext, env[i]);
+pNext = pNext + strlen(pNext) + 1;
+i++;
+}
+
+if (CreateProcess(NULL, pCommand, NULL, NULL, TRUE, 0, pEnvBlock,
+ NULL, si, pi)) {
+pid = pi.dwProcessId;
+/*
+ * We must close the handles to the new process and its main
thread
+ * to prevent handle and memory leaks.
+ */
+CloseHandle(pi.hProcess);
+CloseHandle(pi.hThread);
+}
#if 0
if ((!r-args) || (!r-args[0]) || strchr(r-args, '=')) {
if (is_exe || is_binary) {
cvs commit: apache-1.3/src CHANGES
brian 98/05/28 16:23:04 Modified:src CHANGES Log: Comment my last two commits. Revision ChangesPath 1.870 +10 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.869 retrieving revision 1.870 diff -u -r1.869 -r1.870 --- CHANGES 1998/05/28 11:09:44 1.869 +++ CHANGES 1998/05/28 23:23:02 1.870 @@ -1,5 +1,14 @@ Changes with Apache 1.3b8 - + + *) Propagate environment to CGI scripts correctly in Win32. + [W G Stoddard [EMAIL PROTECTED]] PR#2294 + + *) Some symbol renaming: + ap_spawn_child_err became ap_spawn_child + ap_spawn_child_err_buff became ap_bspawn_child + spawn_child was obsoleted and moved to compat.h + [Brian Behlendorf] + *) 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
cvs commit: apache-1.3/src/main util_script.c
brian 98/05/28 16:26:41
Modified:src/main util_script.c
Log:
Submitted by: W G Stoddard [EMAIL PROTECTED]
Reviewed by: Dean Gaudet, Brian Behlendorf
Have NT properly set the directory for CGI scripts ( other spawned children)
Revision ChangesPath
1.115 +2 -1 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.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- util_script.c 1998/05/28 23:14:11 1.114
+++ util_script.c 1998/05/28 23:26:41 1.115
@@ -888,7 +888,8 @@
}
if (CreateProcess(NULL, pCommand, NULL, NULL, TRUE, 0, pEnvBlock,
- NULL, si, pi)) {
+ ap_make_dirstr_parent(r-pool, r-filename),
+ si, pi)) {
pid = pi.dwProcessId;
/*
* We must close the handles to the new process and its main
thread
cvs commit: apache-1.3/src CHANGES
brian 98/05/28 16:28:01 Modified:.STATUS src CHANGES Log: bookkeeping. Revision ChangesPath 1.408 +0 -2 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.407 retrieving revision 1.408 diff -u -r1.407 -r1.408 --- STATUS1998/05/28 17:53:06 1.407 +++ STATUS1998/05/28 23:27:55 1.408 @@ -17,8 +17,6 @@ for buffer overflow, someone should rewrite or verify they're safe -* CGI: chdir() needs to be reinstated for CGI. - * Win95: when authentication is required for directory /foobar/, direct access to /foobar/bletch is permitted. PR #2145 1.871 +4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.870 retrieving revision 1.871 diff -u -r1.870 -r1.871 --- CHANGES 1998/05/28 23:23:02 1.870 +++ CHANGES 1998/05/28 23:27:59 1.871 @@ -1,5 +1,9 @@ Changes with Apache 1.3b8 + *) Have NT properly set the directory for CGI scripts + ( other spawned children) + [W G Stoddard [EMAIL PROTECTED]] + *) Propagate environment to CGI scripts correctly in Win32. [W G Stoddard [EMAIL PROTECTED]] PR#2294
cvs commit: apache-1.3/src/include conf.h
dgaudet 98/05/28 16:59:40 Modified:src CHANGES src/main http_main.c src/include conf.h Log: PORT: QNX needed a #include sys/mman.h; and now it uses flock serialized accept to handle multiple sockets. PR: 2295, 2296 Submitted by: Rob Saccoccio [EMAIL PROTECTED] Revision ChangesPath 1.872 +4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.871 retrieving revision 1.872 diff -u -r1.871 -r1.872 --- CHANGES 1998/05/28 23:27:59 1.871 +++ CHANGES 1998/05/28 23:59:33 1.872 @@ -1,5 +1,9 @@ Changes with Apache 1.3b8 + *) PORT: QNX needed a #include sys/mman.h; and now it uses flock + serialized accept to handle multiple sockets. + [Rob Saccoccio [EMAIL PROTECTED]] PR#2295, 2296 + *) Have NT properly set the directory for CGI scripts ( other spawned children) [W G Stoddard [EMAIL PROTECTED]] 1.355 +1 -0 apache-1.3/src/main/http_main.c Index: http_main.c === RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v retrieving revision 1.354 retrieving revision 1.355 diff -u -r1.354 -r1.355 --- http_main.c 1998/05/21 04:07:21 1.354 +++ http_main.c 1998/05/28 23:59:35 1.355 @@ -1518,6 +1518,7 @@ } #elif defined(USE_POSIX_SCOREBOARD) +#include sys/mman.h /* * POSIX 1003.4 style * 1.211 +2 -0 apache-1.3/src/include/conf.h Index: conf.h === RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v retrieving revision 1.210 retrieving revision 1.211 diff -u -r1.210 -r1.211 --- conf.h1998/05/11 19:59:01 1.210 +++ conf.h1998/05/28 23:59:39 1.211 @@ -626,6 +626,8 @@ #include unix.h #define HAVE_MMAP 1 #define USE_POSIX_SCOREBOARD +#define USE_FLOCK_SERIALIZED_ACCEPT +#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT #define HAVE_SYSLOG 1 #elif defined(LYNXOS)
cvs commit: apache-1.3/src/main http_main.c
brian 98/05/28 17:16:03
Modified:src CHANGES
src/include conf.h httpd.h
src/main http_main.c
Log:
various OS/2 cleanups.
Revision ChangesPath
1.873 +2 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.872
retrieving revision 1.873
diff -u -r1.872 -r1.873
--- CHANGES 1998/05/28 23:59:33 1.872
+++ CHANGES 1998/05/29 00:15:51 1.873
@@ -1,5 +1,7 @@
Changes with Apache 1.3b8
+ *) Various OS/2 cleanups [Brian Havard [EMAIL PROTECTED]]
+
*) PORT: QNX needed a #include sys/mman.h; and now it uses flock
serialized accept to handle multiple sockets.
[Rob Saccoccio [EMAIL PROTECTED]] PR#2295, 2296
1.212 +1 -0 apache-1.3/src/include/conf.h
Index: conf.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- conf.h1998/05/28 23:59:39 1.211
+++ conf.h1998/05/29 00:15:56 1.212
@@ -679,6 +679,7 @@
#define MAXSOCKETS 4096
#define USE_OS2_SCOREBOARD
#define NO_RELIABLE_PIPED_LOGS
+#define HAVE_SYS_SELECT_H 1
#elif defined(__MACHTEN__)
typedef int rlim_t;
1.218 +3 -0 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.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- httpd.h 1998/05/28 19:57:07 1.217
+++ httpd.h 1998/05/29 00:15:56 1.218
@@ -887,6 +887,9 @@
API_EXPORT(int) ap_strcmp_match(const char *str, const char *exp);
API_EXPORT(int) ap_strcasecmp_match(const char *str, const char *exp);
API_EXPORT(char *) ap_uudecode(pool *, const char *);
+#ifdef __EMX__
+void os2pathname(char *path);
+#endif
API_EXPORT(char *) ap_pregsub(pool *p, const char *input, const char *source,
size_t nmatch, regmatch_t pmatch[]);
1.356 +1 -1 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- http_main.c 1998/05/28 23:59:35 1.355
+++ http_main.c 1998/05/29 00:15:59 1.356
@@ -189,6 +189,7 @@
#ifdef USE_OS2_SCOREBOARD
/* Add MMAP style functionality to OS/2 */
#define INCL_DOSMEMMGR
+#define INCL_DOSEXCEPTIONS
#include os2.h
#include umalloc.h
#include stdio.h
@@ -1485,7 +1486,6 @@
{
caddr_t m;
-char errstr[MAX_STRING_LEN];
int rc;
m = (caddr_t) create_shared_heap(\\SHAREMEM\\SCOREBOARD,
SCOREBOARD_SIZE);
cvs commit: apache-1.3/src/modules/standard mod_log_agent.c mod_log_config.c mod_log_referer.c mod_mime.c
brian 98/05/28 18:09:06
Modified:src CHANGES
src/modules/standard mod_log_agent.c mod_log_config.c
mod_log_referer.c mod_mime.c
Log:
PR: 1967
Usage of printf(stderr, ...) is now ap_log_error, which is more resiliant in
the face of certain failures.
Thanks to Ralf Dean for the hints.
Revision ChangesPath
1.874 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.873
retrieving revision 1.874
diff -u -r1.873 -r1.874
--- CHANGES 1998/05/29 00:15:51 1.873
+++ CHANGES 1998/05/29 01:08:57 1.874
@@ -1,5 +1,9 @@
Changes with Apache 1.3b8
+ *) Changes usage of perror/fprintf to stderr to more proper ap_log_error
+ in mod_mime, mod_log_referer, mod_log_agent, and mod_log_config.
+ [Brian Behlendorf]
+
*) Various OS/2 cleanups [Brian Havard [EMAIL PROTECTED]]
*) PORT: QNX needed a #include sys/mman.h; and now it uses flock
1.27 +2 -2 apache-1.3/src/modules/standard/mod_log_agent.c
Index: mod_log_agent.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_log_agent.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mod_log_agent.c 1998/05/19 23:48:36 1.26
+++ mod_log_agent.c 1998/05/29 01:09:03 1.27
@@ -125,8 +125,8 @@
}
else if (*cls-fname != '\0') {
if ((cls-agent_fd = ap_popenf(p, fname, xfer_flags, xfer_mode))
0) {
-perror(open);
-fprintf(stderr, httpd: could not open agent log file %s.\n,
fname);
+ap_log_error(APLOG_MARK, APLOG_ERR, s,
+ httpd: could not open agent log file %s.\n,
fname);
exit(1);
}
}
1.58 +2 -3 apache-1.3/src/modules/standard/mod_log_config.c
Index: mod_log_config.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_log_config.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- mod_log_config.c 1998/05/20 12:15:07 1.57
+++ mod_log_config.c 1998/05/29 01:09:04 1.58
@@ -916,9 +916,8 @@
else {
char *fname = ap_server_root_relative(p, cls-fname);
if ((cls-log_fd = ap_popenf(p, fname, xfer_flags, xfer_mode)) 0) {
-perror(open);
-fprintf(stderr, httpd: could not open transfer log file %s.\n,
-fname);
+ap_log_error(APLOG_MARK, APLOG_ERR, s,
+ httpd: could not open transfer log file %s.\n,
fname);
exit(1);
}
}
1.30 +4 -4 apache-1.3/src/modules/standard/mod_log_referer.c
Index: mod_log_referer.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_log_referer.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mod_log_referer.c 1998/05/20 22:54:01 1.29
+++ mod_log_referer.c 1998/05/29 01:09:04 1.30
@@ -142,10 +142,10 @@
}
else if (*cls-fname != '\0') {
if ((cls-referer_fd = ap_popenf(p, fname, xfer_flags, xfer_mode))
0) {
-perror(open);
-fprintf(stderr, httpd: could not open referer log file %s.\n,
fname);
-exit(1);
-}
+ ap_log_error(APLOG_MARK, APLOG_ERR, s,
+ httpd: could not open referer log file %s.\n,
fname);
+ exit(1);
+ }
}
}
1.40 +3 -3 apache-1.3/src/modules/standard/mod_mime.c
Index: mod_mime.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_mime.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- mod_mime.c1998/04/11 12:00:49 1.39
+++ mod_mime.c1998/05/29 01:09:04 1.40
@@ -66,6 +66,7 @@
#include httpd.h
#include http_config.h
+#include http_log.h
typedef struct {
table *forced_types;/* Additional AddTyped stuff */
@@ -215,9 +216,8 @@
types_confname = ap_server_root_relative(p, types_confname);
if (!(f = ap_pcfg_openfile(p, types_confname))) {
-perror(fopen);
-fprintf(stderr, httpd: could not open mime types file %s\n,
-types_confname);
+ap_log_error(APLOG_MARK, APLOG_ERR, s,
+ httpd: could not open mime types log file %s.\n,
types_confname);
exit(1);
}
cvs commit: apache-1.3/conf access.conf-dist access.conf-dist-win
brian 98/05/28 18:27:51 Modified:conf access.conf-dist access.conf-dist-win Log: Place a default configuration for the root dir which is very restrictive. Thanks to Dean for the hint. Revision ChangesPath 1.13 +14 -1 apache-1.3/conf/access.conf-dist Index: access.conf-dist === RCS file: /export/home/cvs/apache-1.3/conf/access.conf-dist,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- access.conf-dist 1997/08/19 23:00:22 1.12 +++ access.conf-dist 1998/05/29 01:27:49 1.13 @@ -10,6 +10,19 @@ # Originally by Rob McCool +# First, we configure the default to be a very restrictive set of +# permissions. + +Directory / +Options None +AllowOverride None +/Directory + +# Note that from this point forward you must specifically allow +# particular features to be enabled - so if something's not working as +# you might expect, make sure that you have specifically enabled it +# below. + # This should be changed to whatever you set DocumentRoot to. Directory @@ServerRoot@@/htdocs @@ -18,7 +31,7 @@ # Includes, FollowSymLinks, ExecCGI, or MultiViews. # Note that MultiViews must be named *explicitly* --- Options All -# doesn't give it to you (or at least, not yet). +# doesn't give it to you. Options Indexes FollowSymLinks 1.4 +13 -0 apache-1.3/conf/access.conf-dist-win Index: access.conf-dist-win === RCS file: /export/home/cvs/apache-1.3/conf/access.conf-dist-win,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- access.conf-dist-win 1997/10/25 19:10:09 1.3 +++ access.conf-dist-win 1998/05/29 01:27:50 1.4 @@ -15,6 +15,19 @@ # Originally by Rob McCool +# First, we configure the default to be a very restrictive set of +# permissions. + +Directory / +Options None +AllowOverride None +/Directory + +# Note that from this point forward you must specifically allow +# particular features to be enabled - so if something's not working as +# you might expect, make sure that you have specifically enabled it +# below. + # This should be changed to whatever you set DocumentRoot to. Directory @@ServerRoot@@/htdocs
cvs commit: apache-1.3/conf access.conf-dist-win
brian 98/05/28 18:31:32 Modified:conf access.conf-dist-win Log: Missed one. Revision ChangesPath 1.5 +1 -1 apache-1.3/conf/access.conf-dist-win Index: access.conf-dist-win === RCS file: /export/home/cvs/apache-1.3/conf/access.conf-dist-win,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- access.conf-dist-win 1998/05/29 01:27:50 1.4 +++ access.conf-dist-win 1998/05/29 01:31:32 1.5 @@ -36,7 +36,7 @@ # Includes, FollowSymLinks, ExecCGI, or MultiViews. # Note that MultiViews must be named *explicitly* --- Options All -# doesn't give it to you (or at least, not yet). +# doesn't give it to you. Options Indexes FollowSymLinks
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
rse 98/05/28 23:59:36
Modified:src/modules/standard mod_rewrite.c
Log:
Separate cosmetics from coming ap_log_error-patch.
Revision ChangesPath
1.111 +3 -3 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.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- mod_rewrite.c 1998/05/28 22:09:58 1.110
+++ mod_rewrite.c 1998/05/29 06:59:35 1.111
@@ -2896,7 +2896,7 @@
fprintf(stderr,
mod_rewrite: could not open reliable piped log for
RewriteLog\n);
-exit (1);
+exit(1);
}
conf-rewritelogfp = ap_piped_log_write_fd(pl);
}
@@ -3156,8 +3156,8 @@
fpin = NULL;
fpout = NULL;
rc = ap_spawn_child(p, rewritemap_program_child,
- (void *)map-datafile, kill_after_timeout,
- fpin, fpout, fperr);
+(void *)map-datafile, kill_after_timeout,
+fpin, fpout, fperr);
if (rc == 0 || fpin == NULL || fpout == NULL) {
perror(ap_spawn_child);
fprintf(stderr, mod_rewrite:
cvs commit: apache-site/mirrors mirrors.list index.html
brian 98/05/29 00:21:41 Modified:mirrors mirrors.list index.html Log: Australia update. Revision ChangesPath 1.45 +2 -2 apache-site/mirrors/mirrors.list Index: mirrors.list === RCS file: /export/home/cvs/apache-site/mirrors/mirrors.list,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- mirrors.list 1998/05/20 23:47:11 1.44 +++ mirrors.list 1998/05/29 07:21:39 1.45 @@ -1,6 +1,6 @@ http ar http://www.infoap.com.ar/apache/[EMAIL PROTECTED] http at http://gd.tuwien.ac.at/infosys/servers/http/apache/ [EMAIL PROTECTED] -http au http://Bond.edu.au/External/Misc/apache/[EMAIL PROTECTED] +http au http://mirror.aarnet.edu.au/apache [EMAIL PROTECTED] http au http://www.syd.dit.csiro.au/tools/apache/ [EMAIL PROTECTED] http be http://apache.belnet.be/[EMAIL PROTECTED] http be http://apache.digibel.be/ [EMAIL PROTECTED] @@ -107,7 +107,7 @@ http za http://apache.is.co.za/ [EMAIL PROTECTED] ftp ar ftp://ftp.infoap.com.ar/pub/apache/dist/ ftp at ftp://gd.tuwien.ac.at/pub/infosys/servers/http/apache/dist/ -ftp au ftp://Bond.edu.au/pub/apache/dist/ +ftp au ftp://mirror.aarnet.edu.au/pub/apache ftp be ftp://ftp.belnet.be/packages/apache/ ftp bg ftp://ftp.ntrl.net/pub/mirror/apache/ ftp br ftp://ftp.gns.com.br/pub/unix/apache/dist/ 1.33 +4 -4 apache-site/mirrors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/mirrors/index.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- index.html1998/05/20 23:47:13 1.32 +++ index.html1998/05/29 07:21:40 1.33 @@ -27,8 +27,8 @@ !-- [EMAIL PROTECTED] -- A HREF=http://gd.tuwien.ac.at/infosys/servers/http/apache/;at/A - !-- [EMAIL PROTECTED] -- -A HREF=http://Bond.edu.au/External/Misc/apache/;au/A - -!-- [EMAIL PROTECTED] -- +A HREF=http://mirror.aarnet.edu.au/apache;au/A - +!-- [EMAIL PROTECTED] -- A HREF=http://www.syd.dit.csiro.au/tools/apache/;au/A - !-- [EMAIL PROTECTED] -- A HREF=http://apache.belnet.be/;be/A - @@ -244,7 +244,7 @@ !-- -- A HREF=ftp://gd.tuwien.ac.at/pub/infosys/servers/http/apache/dist/;at/A - !-- -- -A HREF=ftp://Bond.edu.au/pub/apache/dist/;au/A - +A HREF=ftp://mirror.aarnet.edu.au/pub/apache;au/A - !-- -- A HREF=ftp://ftp.belnet.be/packages/apache/;be/A - !-- -- @@ -397,7 +397,7 @@ /STRONG /P -P ALIGN=CENTERSTRONGA HREF=../info/how-to-mirror.htmlHow do I become an Apache mirror site?/A/STRONG +P ALIGN=CENTERBA HREF=../info/how-to-mirror.htmlHow do I become an Apache mirror site?/A/B PHR
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c mod_rewrite.h
rse 98/05/29 01:32:41
Modified:src CHANGES
src/modules/standard mod_rewrite.c mod_rewrite.h
Log:
Change usage of perror()+fprintf(stderr,...) in mod_rewrite to more proper
ap_log_error() variants. Same Brian has done for the other modules, BTW.
Revision ChangesPath
1.876 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.875
retrieving revision 1.876
diff -u -r1.875 -r1.876
--- CHANGES 1998/05/29 07:59:55 1.875
+++ CHANGES 1998/05/29 08:32:36 1.876
@@ -1,5 +1,9 @@
Changes with Apache 1.3b8
+ *) Change usage of perror()+fprintf(stderr,...) in mod_rewrite to
+ more proper ap_log_error() variants.
+ [Ralf S. Engelschall]
+
*) Make sure the argument for the --add-module option to APACI's configure
script is of type [path/to/]mod_xxx.c because all calculations inside
configure and src/Configure depend on this.
1.112 +25 -43apache-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.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- mod_rewrite.c 1998/05/29 06:59:35 1.111
+++ mod_rewrite.c 1998/05/29 08:32:39 1.112
@@ -2892,10 +2892,9 @@
if (*conf-rewritelogfile == '|') {
if ((pl = ap_open_piped_log(p, conf-rewritelogfile+1)) == NULL) {
-perror(ap_open_piped_log);
-fprintf(stderr,
-mod_rewrite: could not open reliable piped log for
-RewriteLog\n);
+ap_log_error(APLOG_MARK, APLOG_ERR, s,
+ mod_rewrite: could not open reliable pipe
+ to RewriteLog filter %s, conf-rewritelogfile+1);
exit(1);
}
conf-rewritelogfp = ap_piped_log_write_fd(pl);
@@ -2903,10 +2902,9 @@
else if (*conf-rewritelogfile != '\0') {
if ((conf-rewritelogfp = ap_popenf(p, fname, rewritelog_flags,
rewritelog_mode)) 0) {
-perror(open);
-fprintf(stderr,
-mod_rewrite: could not open RewriteLog file %s.\n,
-fname);
+ap_log_error(APLOG_MARK, APLOG_ERR, s,
+ mod_rewrite: could not open RewriteLog
+ file %s, fname);
exit(1);
}
}
@@ -2980,9 +2978,9 @@
(unsigned long)(r-server), (unsigned long)r,
type, redir, level, str2);
-fd_lock(conf-rewritelogfp);
+fd_lock(r, conf-rewritelogfp);
write(conf-rewritelogfp, str3, strlen(str3));
-fd_unlock(conf-rewritelogfp);
+fd_unlock(r, conf-rewritelogfp);
va_end(ap);
return;
@@ -3042,9 +3040,9 @@
if ((conf-rewritelockfp = ap_popenf(p, conf-rewritelockfile,
O_WRONLY|O_CREAT,
REWRITELOCK_MODE)) 0) {
-perror(open);
-fprintf(stderr, mod_rewrite: Parent could not create RewriteLock
- file %s.\n, conf-rewritelockfile);
+ap_log_error(APLOG_MARK, APLOG_ERR, s,
+ mod_rewrite: Parent could not create RewriteLock
+ file %s, conf-rewritelockfile);
exit(1);
}
return;
@@ -3065,9 +3063,9 @@
if ((conf-rewritelockfp = ap_popenf(p, conf-rewritelockfile,
O_WRONLY,
REWRITELOCK_MODE)) 0) {
-perror(open);
-fprintf(stderr, mod_rewrite: Child could not open RewriteLock
- file %s.\n, conf-rewritelockfile);
+ap_log_error(APLOG_MARK, APLOG_ERR, s,
+ mod_rewrite: Child could not open RewriteLock
+ file %s, conf-rewritelockfile);
exit(1);
}
return;
@@ -3098,7 +3096,7 @@
conf = ap_get_module_config(r-server-module_config, rewrite_module);
if (conf-rewritelockfp != -1)
-fd_lock(conf-rewritelockfp);
+fd_lock(r, conf-rewritelockfp);
return;
}
@@ -3109,7 +3107,7 @@
conf = ap_get_module_config(r-server-module_config, rewrite_module);
if (conf-rewritelockfp != -1)
-fd_unlock(conf-rewritelockfp);
+fd_unlock(r, conf-rewritelockfp);
return;
}
@@ -3159,9 +3157,9 @@
(void *)map-datafile, kill_after_timeout,
fpin, fpout, fperr);
if (rc == 0 || fpin
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
rse 98/05/29 02:19:42
Modified:src/modules/standard mod_rewrite.c
Log:
Some indentation cosmetics because with the ap_ prefix some long lines moved.
Revision ChangesPath
1.113 +77 -76apache-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.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- mod_rewrite.c 1998/05/29 08:32:39 1.112
+++ mod_rewrite.c 1998/05/29 09:19:41 1.113
@@ -276,11 +276,11 @@
a-rewritelockfp = overrides-rewritelockfp != -1 ?
overrides-rewritelockfp : base-rewritelockfp;
a-rewritemaps = ap_append_arrays(p, overrides-rewritemaps,
- base-rewritemaps);
+ base-rewritemaps);
a-rewriteconds= ap_append_arrays(p, overrides-rewriteconds,
- base-rewriteconds);
+ base-rewriteconds);
a-rewriterules= ap_append_arrays(p, overrides-rewriterules,
- base-rewriterules);
+ base-rewriterules);
}
else {
/*
@@ -347,9 +347,9 @@
if (a-options OPTION_INHERIT) {
a-rewriteconds = ap_append_arrays(p, overrides-rewriteconds,
-base-rewriteconds);
+ base-rewriteconds);
a-rewriterules = ap_append_arrays(p, overrides-rewriterules,
-base-rewriterules);
+ base-rewriterules);
}
else {
a-rewriteconds = overrides-rewriteconds;
@@ -467,7 +467,7 @@
new-checkfile = ap_pstrcat(cmd-pool, a2+4, NDBM_FILE_SUFFIX, NULL);
#else
return ap_pstrdup(cmd-pool, RewriteMap: cannot use NDBM mapfile,
- because no NDBM support is compiled in);
+ because no NDBM support is compiled in);
#endif
}
else if (strncmp(a2, prg:, 4) == 0) {
@@ -485,7 +485,7 @@
new-func = rewrite_mapfunc_toupper;
else if (sconf-state == ENGINE_ENABLED)
return ap_pstrcat(cmd-pool, RewriteMap: internal map not
found:,
- a2+4, NULL);
+ a2+4, NULL);
}
else {
new-type = MAPTYPE_TXT;
@@ -498,7 +498,7 @@
if (new-checkfile (sconf-state == ENGINE_ENABLED)
(stat(new-checkfile, st) == -1))
return ap_pstrcat(cmd-pool, RewriteMap: map file or program not
found:,
- new-checkfile, NULL);
+ new-checkfile, NULL);
return NULL;
}
@@ -555,7 +555,7 @@
/* parse the argument line ourself */
if (parseargline(str, a1, a2, a3))
return ap_pstrcat(cmd-pool, RewriteCond: bad argument line ', str,
- '\n, NULL);
+ '\n, NULL);
/* arg1: the input string */
new-input = ap_pstrdup(cmd-pool, a1);
@@ -587,8 +587,8 @@
rc = ((regexp = ap_pregcomp(cmd-pool, cp, REG_EXTENDED)) == NULL);
if (rc)
return ap_pstrcat(cmd-pool,
- RewriteCond: cannot compile regular expression ',
a2,
- '\n, NULL);
+ RewriteCond: cannot compile regular expression ',
+ a2, '\n, NULL);
new-pattern = ap_pstrdup(cmd-pool, cp);
new-regexp = regexp;
@@ -685,7 +685,7 @@
/* parse the argument line ourself */
if (parseargline(str, a1, a2, a3))
return ap_pstrcat(cmd-pool, RewriteRule: bad argument line ', str,
- '\n, NULL);
+ '\n, NULL);
/* arg1: the pattern
* try to compile the regexp to test if is ok
@@ -698,8 +698,8 @@
}
if ((regexp = ap_pregcomp(cmd-pool, cp, REG_EXTENDED)) == NULL)
return ap_pstrcat(cmd-pool,
- RewriteRule: cannot compile regular expression ',
a1,
- '\n, NULL);
+ RewriteRule: cannot compile regular expression ',
+ a1, '\n, NULL);
new-pattern = ap_pstrdup(cmd-pool, cp);
new-regexp = regexp;
@@ -726,12 +726,12 @@
if (cmd-path == NULL) { /* is server command */
new-rewriteconds = sconf-rewriteconds;
sconf-rewriteconds = ap_make_array(cmd-pool, 2,
- sizeof(rewritecond_entry));
cvs commit: apache-1.3 STATUS
rse 98/05/29 02:27:22 Modified:.STATUS Log: Remember one more available patch for 1.3.1-dev. Revision ChangesPath 1.409 +7 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.408 retrieving revision 1.409 diff -u -r1.408 -r1.409 --- STATUS1998/05/28 23:27:55 1.408 +++ STATUS1998/05/29 09:27:21 1.409 @@ -71,6 +71,13 @@ See: http://www.engelschall.com/sw/apache/ [libshlib] Status (for 1.3.1-dev): Ralf +1 +* Ralf's EXTRA_DEPS to add extra dependecies to httpd target + This patch adds an EXTRA_DEPS configuration parameter which can be used + to add an extra Makefile dependency for the httpd target, for instance + to external third-party libraries, etc. + See: http://www.engelschall.com/sw/apache/ [extradeps] + Status (for 1.3.1-dev): Ralf +1, Marc +1 + In progress: * Ken's IndexFormat enhancement to mod_autoindex to allow
cvs commit: apache-1.3/htdocs/manual new_features_1_3.html
jim 98/05/29 05:07:06 Modified:htdocs/manual new_features_1_3.html Log: Some new-stuff notes Revision ChangesPath 1.66 +13 -6 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.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- new_features_1_3.html 1998/05/28 22:09:41 1.65 +++ new_features_1_3.html 1998/05/29 12:07:05 1.66 @@ -463,6 +463,14 @@ CODEap_spawn_child/CODE and CODEspawn_child_err_buff/CODE with simply CODEap_bspawn_child/CODE. +DTSTRONGCODEap_add_version_component()/CODE/STRONG +DDThis API function allows for modules to add their own additional +server tokens which are printed on the on the CODEServer:/CODE +header line. Previous 1.3beta versions had used a +CODESERVER_SUBVERSION/CODE compile-time CODE#define/CODE +to perform this function. Whether the tokens are actually displayed +is controlled by the new CODEServerTokens/CODE directive. + /DL PHR @@ -573,12 +581,11 @@ system in the server identity/STRONG/ABR DDA new directive, CODEServerTokens/CODE, allows the Webmaster to change the value of the CODEServer/CODE response header -field which is sent back to clients. The -CODEServerTokens/CODE directive controls whether the server -will include a non-specific note in the server identity about the -type of operating system on which the server is running as well as -included module information. As of Apache 1.3, this additional -information is included by default. +field which is sent back to clients. The CODEServerTokens/CODE +directive controls whether the server will include a non-specific +note in the server identity about the type of operating system on +which the server is running as well as included module information. +As of Apache 1.3, this additional information is included by default. /DL
cvs commit: apache-1.3/htdocs/manual/misc perf-bsd44.html
jim 98/05/29 08:33:20 Modified:htdocs/manual/misc perf-bsd44.html Log: Have people use sysctl to adjust somaxconn instead of the bogus and incorrect method we suggested before Revision ChangesPath 1.12 +21 -5 apache-1.3/htdocs/manual/misc/perf-bsd44.html Index: perf-bsd44.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/misc/perf-bsd44.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perf-bsd44.html 1998/05/20 20:21:30 1.11 +++ perf-bsd44.html 1998/05/29 15:33:19 1.12 @@ -112,7 +112,6 @@ # Network options. NMBCLUSTERS defines the number of mbuf clusters and # defaults to 256. This machine is a server that handles lots of traffic, # so we crank that value. -options SOMAXCONN=256 # max pending connects options NMBCLUSTERS=4096# mbuf clusters at 4096 # @@ -122,10 +121,6 @@ options OPEN_MAX=512# maximum fds (breaks RPC svcs) /PRE -SOMAXCONN is not derived from maxusers, so you'll always need to increase -that yourself. We used a value guaranteed to be larger than Apache's -default for the listen() of 128, currently. - P In many cases, NMBCLUSTERS must be set much larger than would appear @@ -160,6 +155,27 @@ files). If you've got a lot of other activity besides httpd on the same machine, you'll have to set NPROC higher still. In this example, the NPROC value derived from maxusers proved sufficient for our load. + +P + +To increase the size of the CODElisten()/CODE queue, you need to +adjust the value of SOMAXCONN. SOMAXCONN is not derived from maxusers, +so you'll always need to increase that yourself. We use a value guaranteed +to be larger than Apache's default for the listen() of 128, currently. +The actual value for SOMAXCONN is set in CODEsys/socket.h/CODE. +The best way to adjust this parameter is run-time, rather than changing +it in this header file and thus hardcoding a value in the kernel and +elsewhere. To do this, edit CODE/etc/rc.local/CODE and add the +following line: +PRE +/usr/sbin/sysctl -w kern.somaxconn=256 +/PRE + +P + +We used CODE256/CODE but you can tune it for your own setup. In +many cases, however, even the default value of CODE128/CODE (for +later versions of FreeBSD) is OK. P
cvs commit: apache-1.3/src/support Makefile.tmpl
randy 98/05/29 11:21:17
Modified:src ApacheCore.dsp ApacheCore.mak CHANGES
src/include util_md5.h
src/main Makefile.tmpl md5c.c
src/modules/proxy ApacheModuleProxy.mak Makefile.tmpl
proxy_cache.c proxy_util.c
src/os/win32 ApacheModuleDigest.mak
src/os/win32/installer apache.iwz
src/support Makefile.tmpl
Added: src/include ap_md5.h
Removed: src/include md5.h
Log:
Rename md5.h - ap_md5.h to avoid local conflicts.
Submitted by: Randy Terbush [EMAIL PROTECTED]
Reviewed by: Brian Behlendorf, Dirk-Willem van Gulik
Revision ChangesPath
1.27 +1 -1 apache-1.3/src/ApacheCore.dsp
Index: ApacheCore.dsp
===
RCS file: /export/home/cvs/apache-1.3/src/ApacheCore.dsp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ApacheCore.dsp1998/04/09 08:20:18 1.26
+++ ApacheCore.dsp1998/05/29 18:20:34 1.27
@@ -342,7 +342,7 @@
# End Source File
# Begin Source File
-SOURCE=.\include\md5.h
+SOURCE=.\include\ap_md5.h
# End Source File
# Begin Source File
1.37 +6 -6 apache-1.3/src/ApacheCore.mak
Index: ApacheCore.mak
===
RCS file: /export/home/cvs/apache-1.3/src/ApacheCore.mak,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ApacheCore.mak1998/04/09 08:20:18 1.36
+++ ApacheCore.mak1998/05/29 18:20:34 1.37
@@ -707,7 +707,7 @@
.\include\http_request.h\
.\include\http_vhost.h\
.\include\httpd.h\
- .\include\md5.h\
+ .\include\ap_md5.h\
.\include\rfc1413.h\
.\include\scoreboard.h\
.\include\util_md5.h\
@@ -745,7 +745,7 @@
.\include\http_request.h\
.\include\http_vhost.h\
.\include\httpd.h\
- .\include\md5.h\
+ .\include\ap_md5.h\
.\include\rfc1413.h\
.\include\scoreboard.h\
.\include\util_md5.h\
@@ -1090,7 +1090,7 @@
DEP_CPP_MD5C_=\
.\include\conf.h\
.\include\hsregex.h\
- .\include\md5.h\
+ .\include\ap_md5.h\
.\os\win32\os.h\
{$(INCLUDE)}sys\stat.h\
{$(INCLUDE)}sys\types.h\
@@ -1108,7 +1108,7 @@
DEP_CPP_MD5C_=\
.\include\conf.h\
.\include\hsregex.h\
- .\include\md5.h\
+ .\include\ap_md5.h\
.\os\win32\os.h\
@@ -2515,7 +2515,7 @@
.\include\conf.h\
.\include\hsregex.h\
.\include\httpd.h\
- .\include\md5.h\
+ .\include\ap_md5.h\
.\include\util_md5.h\
.\include\util_uri.h\
.\os\win32\os.h\
@@ -2542,7 +2542,7 @@
.\include\conf.h\
.\include\hsregex.h\
.\include\httpd.h\
- .\include\md5.h\
+ .\include\ap_md5.h\
.\include\util_md5.h\
.\include\util_uri.h\
.\os\win32\os.h\
1.877 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.876
retrieving revision 1.877
diff -u -r1.876 -r1.877
--- CHANGES 1998/05/29 08:32:36 1.876
+++ CHANGES 1998/05/29 18:20:34 1.877
@@ -1,5 +1,8 @@
Changes with Apache 1.3b8
+ *) Rename md5.h to ap_md5.h to avoid conflicts with native MD5 on
+ some systems. [Randy Terbush]
+
*) Change usage of perror()+fprintf(stderr,...) in mod_rewrite to
more proper ap_log_error() variants.
[Ralf S. Engelschall]
1.15 +1 -1 apache-1.3/src/include/util_md5.h
Index: util_md5.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/util_md5.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- util_md5.h1998/05/03 17:31:11 1.14
+++ util_md5.h1998/05/29 18:20:49 1.15
@@ -62,7 +62,7 @@
extern C {
#endif
-#include md5.h
+#include ap_md5.h
API_EXPORT(char *) ap_md5(pool *a, unsigned char *string);
API_EXPORT(char *) ap_md5contextTo64(pool *p, AP_MD5_CTX * context);
1.1 apache-1.3/src/include/ap_md5.h
Index: ap_md5.h
===
/*
* This is work is derived from material Copyright RSA Data Security, Inc.
*
* The RSA copyright statement and Licence for that original material is
* included below. This is followed by the Apache copyright statement and
* licence for the modifications made to that material.
*/
/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
rights reserved.
License to copy
cvs commit: apache-1.3/src/modules/standard Makefile.tmpl
rse 98/05/29 13:28:01 Modified:src/modules/standard Makefile.tmpl Log: Fix dependencies after Brian's ap_log_error() changes and the md5.h - ap_md5.h movement. The complete dependecy list is now correct, Brian. I've checked it. Revision ChangesPath 1.17 +4 -4 apache-1.3/src/modules/standard/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/Makefile.tmpl,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Makefile.tmpl 1998/05/10 13:04:35 1.16 +++ Makefile.tmpl 1998/05/29 20:28:01 1.17 @@ -71,7 +71,7 @@ $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ $(INCDIR)/http_config.h $(INCDIR)/http_core.h \ $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \ - $(INCDIR)/util_md5.h $(INCDIR)/md5.h + $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h mod_dir.o: mod_dir.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ $(OSDIR)/os.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ @@ -115,7 +115,7 @@ mod_log_agent.o: mod_log_agent.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h $(OSDIR)/os.h $(INCDIR)/alloc.h \ $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ - $(INCDIR)/http_config.h + $(INCDIR)/http_config.h $(INCDIR)/http_log.h mod_log_config.o: mod_log_config.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h $(OSDIR)/os.h $(INCDIR)/alloc.h \ $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ @@ -124,11 +124,11 @@ mod_log_referer.o: mod_log_referer.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h $(OSDIR)/os.h $(INCDIR)/alloc.h \ $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ - $(INCDIR)/http_config.h + $(INCDIR)/http_config.h $(INCDIR)/http_log.h mod_mime.o: mod_mime.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ $(OSDIR)/os.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ - $(INCDIR)/http_config.h + $(INCDIR)/http_config.h $(INCDIR)/http_log.h mod_mime_magic.o: mod_mime_magic.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h $(OSDIR)/os.h $(INCDIR)/alloc.h \ $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
cvs commit: apache-1.3 configure
rse 98/05/29 13:41:57 Modified:.configure Log: We use [ all the time and are not as paranoid as GNU Autoconf itself. Revision ChangesPath 1.29 +2 -2 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- configure 1998/05/29 07:59:59 1.28 +++ configure 1998/05/29 20:41:57 1.29 @@ -121,8 +121,8 @@ for dir in $PATH; do OIFS2=$IFS IFS=$DIFS for exe in perl5 perl miniperl; do -if test -f $dir/$exe; then -if test -x $dir/$exe; then +if [ -f $dir/$exe ]; then +if [ -x $dir/$exe ]; then PERL=$dir/$exe break 2 fi
cvs commit: apache-1.3/src CHANGES
rse 98/05/29 13:45:54
Modified:.configure
src CHANGES
Log:
Avoid problems with braindead Awks by additionally searching for gawk
and nawk in APACI's configure script.
Submitted by: Dave Dykstra [EMAIL PROTECTED] and Ralf S. Engelschall
Reviewed by: Ralf S. Engelschall
PR: 2319
Revision ChangesPath
1.30 +25 -3 apache-1.3/configure
Index: configure
===
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- configure 1998/05/29 20:41:57 1.29
+++ configure 1998/05/29 20:45:52 1.30
@@ -134,6 +134,28 @@
PERL=`echo $PERL | sed -e 's://:/:'`
##
+## look for the best Awk we can find because some
+## standard Awks are really braindead and cause
+## problems for our scripts under some platforms.
+##
+
+AWK=awk
+OIFS=$IFS IFS=':'
+for dir in $PATH; do
+OIFS2=$IFS IFS=$DIFS
+if [ -x $dir/nawk ]; then
+AWK=$dir/nawk
+break 2
+fi
+if [ -x $dir/gawk ]; then
+AWK=$dir/gawk
+break 2
+fi
+IFS=$OIFS2
+done
+IFS=$OIFS
+
+##
## determine default parameters
##
@@ -267,7 +289,7 @@
;;
--shadow)
# determine GNU platform triple
-gnutriple=`$aux/GuessOS | awk '{ printf(%s,$1); }' | sed -e
's:/:-:g'`
+gnutriple=`$aux/GuessOS | $AWK '{ printf(%s,$1); }' | sed -e
's:/:-:g'`
# create Makefile wrapper (the first time only)
if [ .`ls $top/src.* 2/dev/null` = . ]; then
if [ .$quiet = .no ]; then
@@ -277,7 +299,7 @@
echo ## Apache Makefile (shadow wrapper) Makefile
echo ## Makefile
echo Makefile
-echo GNUTRIPLE=\`$aux/GuessOS | awk '{
printf(\%s\,\$\$1); }' | sed -e 's:/:-:g'\` Makefile
+echo GNUTRIPLE=\`$aux/GuessOS | $AWK '{
printf(\%s\,\$\$1); }' | sed -e 's:/:-:g'\` Makefile
echo Makefile
echo all build install install-quiet clean distclean:
Makefile
echo@\$(MAKE) -f Makefile.\$(GNUTRIPLE) \$(MFLAGS)
\$@ Makefile
@@ -936,7 +958,7 @@
# split sedsubst into chunks of 50 commands
# to workaround limits in braindead seds
-files=`awk $sedsubst '
+files=`$AWK $sedsubst '
BEGIN { line=0; cnt=0; }
{
if (line % 50 == 0) {
1.878 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.877
retrieving revision 1.878
diff -u -r1.877 -r1.878
--- CHANGES 1998/05/29 18:20:34 1.877
+++ CHANGES 1998/05/29 20:45:53 1.878
@@ -1,5 +1,9 @@
Changes with Apache 1.3b8
+ *) Avoid problems with braindead Awks by additionally searching for gawk
+ and nawk in APACI's configure script.
+ [Dave Dykstra [EMAIL PROTECTED], Ralf S. Engelschall] PR#2319
+
*) Rename md5.h to ap_md5.h to avoid conflicts with native MD5 on
some systems. [Randy Terbush]
cvs commit: apache-1.3/htdocs/manual/mod mod_cgi.html
martin 98/05/29 13:49:29 Modified:htdocs/manual/mod mod_cgi.html Log: Correct the description of REMOTE_HOST and REMOTE_IDENT Revision ChangesPath 1.16 +8 -3 apache-1.3/htdocs/manual/mod/mod_cgi.html Index: mod_cgi.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_cgi.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -u -r1.15 -r1.16 --- mod_cgi.html 1998/05/20 14:12:54 1.15 +++ mod_cgi.html 1998/05/29 20:49:28 1.16 @@ -43,11 +43,16 @@ following provisions: DL DTREMOTE_HOST -DDThis will only be set if the server has not been compiled with -CODEMINIMAL_DNS/CODE. +DDThis will only be set if A HREF=core.html#hostnamelookupsCODEHostnameLookups/CODE/A +is set to CODEon/CODE (it is off by default), and if a reverse DNS +lookup of the accessing host's address indeed finds a host name. DTREMOTE_IDENT DDThis will only be set if -A HREF=core.html#identitycheckIdentityCheck/A is set to CODEon/CODE. +A HREF=core.html#identitycheckIdentityCheck/A is set to CODEon/CODE +and the accessing host supports the ident protocol. Note that the contents +of this variable cannot be relied upon because it can easily be faked, and if +there is a proxy between the client and the server, it is usually +totally useless. DTREMOTE_USER DDThis will only be set if the CGI script is subject to authentication. /DL
