cvs commit: apachen/src/regex Makefile.tmpl .cvsignore mkh Makefile
dgaudet 97/11/05 04:48:26 Modified:src .cvsignore CHANGES Configure Makefile.tmpl src/main conf.h http_core.c http_main.c src/modules/proxy proxy_cache.c src/regex .cvsignore mkh Added: src/helpers PrintPathOS2 src/os/emx .cvsignore Makefile.tmpl os-inline.c os.c os.h src/regex Makefile.tmpl Removed: src/regex Makefile Log: OS/2 update. It should now be possible to compile OS/2 from the same sources as Unix. Submitted by: Brian Havard <[EMAIL PROTECTED]> Reviewed by: Dean Gaudet, Paul Sutton, Jim Jagielski Revision ChangesPath 1.10 +1 -0 apachen/src/.cvsignore Index: .cvsignore === RCS file: /export/home/cvs/apachen/src/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore1997/08/25 02:12:26 1.9 +++ .cvsignore1997/11/05 12:48:10 1.10 @@ -1,3 +1,4 @@ +Makefile *.dsw *.mdp *.ncb 1.486 +3 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.485 retrieving revision 1.486 diff -u -r1.485 -r1.486 --- CHANGES 1997/11/05 11:23:21 1.485 +++ CHANGES 1997/11/05 12:48:11 1.486 @@ -1,5 +1,8 @@ Changes with Apache 1.3b3 + *) OS/2 Port updated; it should be possible to build OS/2 from the same + sources as Unix now. [Brian Havard <[EMAIL PROTECTED]>] + *) Fix a year formatting bug in mod_usertrack. [Paul Eggert <[EMAIL PROTECTED]>] PR#1342 1.168 +12 -8 apachen/src/Configure Index: Configure === RCS file: /export/home/cvs/apachen/src/Configure,v retrieving revision 1.167 retrieving revision 1.168 diff -u -r1.167 -r1.168 --- Configure 1997/11/05 01:04:52 1.167 +++ Configure 1997/11/05 12:48:12 1.168 @@ -161,7 +161,10 @@ DBM_LIB="-ldbm" DB_LIB="-ldb" SHELL="/bin/sh" -if ./helpers/PrintPath -s ranlib; then +TARGET="httpd" +PRINTPATH=PrintPath + +if ./helpers/$PRINTPATH -s ranlib; then RANLIB="ranlib" else RANLIB="true" @@ -235,8 +238,11 @@ DEF_WANTHSREGEX=yes OS='EMX OS/2' CFLAGS="$CFLAGS -Zbsd-signals -Zbin-files -DTCPIPV4 -g" - LIBS="$LIBS -lsocket -llibufc -lbsd" + LIBS="$LIBS -lsocket -lufc -lbsd" DBM_LIB="-lgdbm" + TARGET=httpd.exe + SHELL=sh + PRINTPATH=PrintPathOS2 ;; *-hi-hiux) OS='HI-UX' @@ -595,7 +601,7 @@ for compilers in "gcc" "cc" "acc" "c89" do lookedfor="$lookedfor $compilers" - if ./helpers/PrintPath -s $compilers; then + if ./helpers/$PRINTPATH -s $compilers; then COMPILER="$compilers" break fi @@ -990,6 +996,7 @@ echo "SHELL=$SHELL">> Makefile.config echo "OSDIR=$OSDIR">> Makefile.config echo "SUBDIRS=$SUBDIRS">> Makefile.config +echo "TARGET=$TARGET" >> Makefile.config echo >> Makefile.config echo " End of Configure created section ">> Makefile.config @@ -1022,7 +1029,7 @@ # # directories to create makefiles in # -MAKEDIRS="support main $OSDIR" +MAKEDIRS="support main regex $OSDIR" for dir in $MAKEDIRS ; do echo Creating Makefile in $dir cat Makefile.config $dir/Makefile.tmpl > $dir/Makefile @@ -1037,10 +1044,7 @@ default: all all clean :: - for i in \$(MODULES); do \\ - (cd \$\$i; \\ - \$(MAKE) CC='\$(CC)' AUX_CFLAGS='\$(CFLAGS)' RANLIB='\$(RANLIB)' \$@) || exit 1;\\ - done + for i in \$(MODULES); do (cd \$\$i; \$(MAKE) CC='\$(CC)' AUX_CFLAGS='\$(CFLAGS)' RANLIB='\$(RANLIB)' \$@) || exit 1; done EOF 1.70 +4 -4 apachen/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apachen/src/Makefile.tmpl,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- Makefile.tmpl 1997/10/15 20:30:02 1.69 +++ Makefile.tmpl 1997/11/05 12:48:13 1.70 @@ -17,7 +17,7 @@ .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $< -all: @@Configuration@@ httpd +all: @@Configuration@@ $(TARGET) @@Configuration@@: Configuration.tmpl @echo "@@Configuration@@ older than Configuration.tmpl, or doesn't exist." @@ -26,11 +26,11 @@ @echo "If not, you will at least have to touch @@Configuration@@." @false -httpd: subdirs modules.o +$(TARGET): subdirs modules.o rm -f buildmark.c echo 'const char SERVER_BUILT[] = "'`date`'";' > buildmark.c $(CC) -c $(CF
cvs commit: apache/src mod_negotiation.c
dgaudet 97/11/05 03:48:31
Modified:src Tag: APACHE_1_2_X mod_negotiation.c
Log:
Fix undefined C behaviour.
Submitted by: Ben Laurie
Reviewed by: Dean Gaudet, Ralf Engelschall
Revision ChangesPath
No revision
No revision
1.40.2.3 +3 -2 apache/src/mod_negotiation.c
Index: mod_negotiation.c
===
RCS file: /export/home/cvs/apache/src/mod_negotiation.c,v
retrieving revision 1.40.2.2
retrieving revision 1.40.2.3
diff -u -r1.40.2.2 -r1.40.2.3
--- mod_negotiation.c 1997/07/19 08:17:16 1.40.2.2
+++ mod_negotiation.c 1997/11/05 11:48:30 1.40.2.3
@@ -623,8 +623,9 @@
{
char *cp = header;
-while (*cp && *cp != ':')
-*cp++ = tolower(*cp);
+for ( ; *cp && *cp != ':' ; ++cp) {
+*cp = tolower(*cp);
+}
if (!*cp) {
log_reason ("Syntax error in type map --- no ':'", r->filename, r);
cvs commit: apache/src CHANGES mod_include.c
dgaudet 97/11/05 03:46:23 Modified:src Tag: APACHE_1_2_X CHANGES mod_include.c Log: fix bogus uninitialized data for && and || PR: 1139 Submitted by: Brian Slesinsky <[EMAIL PROTECTED]> Reviewed by: Dean Gaudet, Roy Fielding, Ralf Engelschall Revision ChangesPath No revision No revision 1.286.2.59 +3 -0 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.286.2.58 retrieving revision 1.286.2.59 diff -u -r1.286.2.58 -r1.286.2.59 --- CHANGES 1997/11/05 11:43:13 1.286.2.58 +++ CHANGES 1997/11/05 11:46:20 1.286.2.59 @@ -1,5 +1,8 @@ Changes with Apache 1.2.5 + *) mod_include used uninitialized data for some uses of && and ||. + [Brian Slesinsky <[EMAIL PROTECTED]>] PR#1139 + *) mod_imap should decline all non-GET methods. [Jay Bloodworth <[EMAIL PROTECTED]>] 1.33.2.7 +2 -0 apache/src/mod_include.c Index: mod_include.c === RCS file: /export/home/cvs/apache/src/mod_include.c,v retrieving revision 1.33.2.6 retrieving revision 1.33.2.7 diff -u -r1.33.2.6 -r1.33.2.7 --- mod_include.c 1997/11/05 11:40:13 1.33.2.6 +++ mod_include.c 1997/11/05 11:46:21 1.33.2.7 @@ -1334,6 +1334,7 @@ strncpy(current->left->token.value, buffer, MAX_STRING_LEN-1); current->left->token.value[MAX_STRING_LEN-1] = '\0'; + current->left->value = (current->token.value[0] != '\0'); current->left->done = 1; break; default: @@ -1349,6 +1350,7 @@ strncpy(current->right->token.value, buffer, MAX_STRING_LEN-1); current->right->token.value[MAX_STRING_LEN-1] = '\0'; + current->right->value = (current->token.value[0] != '\0'); current->right->done = 1; break; default:
cvs commit: apache/src CHANGES mod_imap.c
dgaudet 97/11/05 03:43:15 Modified:src Tag: APACHE_1_2_X CHANGES mod_imap.c Log: mod_imap should DECLINE non-GET methods. Submitted by: Jay Bloodworth <[EMAIL PROTECTED]> Reviewed by: Brian Behlendorf, Dean Gaudet, Ralf Engelschall Revision ChangesPath No revision No revision 1.286.2.58 +3 -0 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.286.2.57 retrieving revision 1.286.2.58 diff -u -r1.286.2.57 -r1.286.2.58 --- CHANGES 1997/11/05 11:40:12 1.286.2.57 +++ CHANGES 1997/11/05 11:43:13 1.286.2.58 @@ -1,5 +1,8 @@ Changes with Apache 1.2.5 + *) mod_imap should decline all non-GET methods. + [Jay Bloodworth <[EMAIL PROTECTED]>] + *) suexec.c wouldn't build without -DLOG_EXEC. [Jason A. Dour] *) mod_userdir was modifying r->finfo in cases where it wasn't setting 1.21.2.2 +5 -1 apache/src/mod_imap.c Index: mod_imap.c === RCS file: /export/home/cvs/apache/src/mod_imap.c,v retrieving revision 1.21.2.1 retrieving revision 1.21.2.2 diff -u -r1.21.2.1 -r1.21.2.2 --- mod_imap.c1997/08/01 08:48:17 1.21.2.1 +++ mod_imap.c1997/11/05 11:43:14 1.21.2.2 @@ -633,7 +633,11 @@ char *imap_base = icr->imap_base ? icr->imap_base : IMAP_BASE_DEFAULT; - FILE *imap = pfopen(r->pool, r->filename, "r"); + FILE *imap; + + if (r->method_number != M_GET) return DECLINED; + + imap = pfopen(r->pool, r->filename, "r"); if ( ! imap ) return NOT_FOUND;
cvs commit: apache/src CHANGES mod_include.c
dgaudet 97/11/05 03:40:14
Modified:src Tag: APACHE_1_2_X CHANGES mod_include.c
Log:
mod_include did not properly handle all possible redirects from sub-reqs.
Submitted by: Ken Coar
Reviewed by: Dean Gaudet, Roy Fielding, Ralf Engelschall
Revision ChangesPath
No revision
No revision
1.286.2.57 +3 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.286.2.56
retrieving revision 1.286.2.57
diff -u -r1.286.2.56 -r1.286.2.57
--- CHANGES 1997/11/05 11:38:51 1.286.2.56
+++ CHANGES 1997/11/05 11:40:12 1.286.2.57
@@ -6,6 +6,9 @@
r->filename. Since those two are meant to be in sync with each other
this is a bug. ["Paul B. Henson" <[EMAIL PROTECTED]>]
+ *) mod_include did not properly handle all possible redirects from sub-
+ requests. [Ken Coar]
+
*) Inetd mode (which is buggy) uses timeouts without having setup the
jmpbuffer. [Dean Gaudet] PR#1064
1.33.2.6 +3 -1 apache/src/mod_include.c
Index: mod_include.c
===
RCS file: /export/home/cvs/apache/src/mod_include.c,v
retrieving revision 1.33.2.5
retrieving revision 1.33.2.6
diff -u -r1.33.2.5 -r1.33.2.6
--- mod_include.c 1997/07/31 08:50:02 1.33.2.5
+++ mod_include.c 1997/11/05 11:40:13 1.33.2.6
@@ -494,6 +494,7 @@
int include_cgi(char *s, request_rec *r)
{
request_rec *rr = sub_req_lookup_uri (s, r);
+int rr_status;
if (rr->status != 200) return -1;
@@ -515,7 +516,8 @@
/* Run it. */
-if (run_sub_req (rr) == REDIRECT) {
+rr_status = run_sub_req(rr);
+if (is_HTTP_REDIRECT(rr_status)) {
char *location = table_get (rr->headers_out, "Location");
location = escape_html(rr->pool, location);
rvputs(r,"", location, "", NULL);
cvs commit: apache/src CHANGES mod_userdir.c
dgaudet 97/11/05 03:38:53
Modified:src Tag: APACHE_1_2_X CHANGES mod_userdir.c
Log:
mod_userdir overwrites r->finfo in cases where it does not also
update r->filename. These two are meant to be in sync, so this
is a bug.
Reviewed by: Dean Gaudet, Roy Fielding, Ralf Engelschall
Revision ChangesPath
No revision
No revision
1.286.2.56 +4 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.286.2.55
retrieving revision 1.286.2.56
diff -u -r1.286.2.55 -r1.286.2.56
--- CHANGES 1997/09/26 03:11:22 1.286.2.55
+++ CHANGES 1997/11/05 11:38:51 1.286.2.56
@@ -2,6 +2,10 @@
*) suexec.c wouldn't build without -DLOG_EXEC. [Jason A. Dour]
+ *) mod_userdir was modifying r->finfo in cases where it wasn't setting
+ r->filename. Since those two are meant to be in sync with each other
+ this is a bug. ["Paul B. Henson" <[EMAIL PROTECTED]>]
+
*) Inetd mode (which is buggy) uses timeouts without having setup the
jmpbuffer. [Dean Gaudet] PR#1064
1.14.2.1 +3 -1 apache/src/mod_userdir.c
Index: mod_userdir.c
===
RCS file: /export/home/cvs/apache/src/mod_userdir.c,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- mod_userdir.c 1997/03/07 14:15:44 1.14
+++ mod_userdir.c 1997/11/05 11:38:52 1.14.2.1
@@ -114,6 +114,7 @@
char *name = r->uri;
const char *w, *dname, *redirect;
char *x = NULL;
+struct stat statbuf;
if (userdirs == NULL || !strcasecmp(userdirs, "disabled") ||
(name[0] != '/') || (name[1] != '~')) {
@@ -182,8 +183,9 @@
in the hope that some handler might handle it. This can be used, for
example, to run a CGI script for the user.
*/
- if (filename && (!*userdirs || stat(filename, &r->finfo) != -1)) {
+ if (filename && (!*userdirs || stat(filename, &statbuf) != -1)) {
r->filename = pstrcat(r->pool, filename, dname, NULL);
+ r->finfo = statbuf;
return OK;
}
}
cvs commit: apachen/conf srm.conf-dist srm.conf-dist-win
dgaudet 97/11/05 03:32:38 Modified:conf srm.conf-dist srm.conf-dist-win Log: Add PHP3's mime-types as an example. Submitted by: Rasmus Lerdorf Reviewed by: Dean Gaudet, Paul Sutton Revision ChangesPath 1.17 +5 -0 apachen/conf/srm.conf-dist Index: srm.conf-dist === RCS file: /export/home/cvs/apachen/conf/srm.conf-dist,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- srm.conf-dist 1997/08/19 23:00:23 1.16 +++ srm.conf-dist 1997/11/05 11:32:36 1.17 @@ -149,6 +149,11 @@ # make certain files to be certain types. # Format: AddType type/subtype ext1 +# For example, the PHP3 module (not part of the Apache distribution) +# will typically use: +#AddType application/x-httpd-php3 .phtml +#AddType application/x-httpd-php3-source .phps + # AddHandler allows you to map certain file extensions to "handlers", # actions unrelated to filetype. These can be either built into the server # or added with the Action command (see below) 1.5 +5 -0 apachen/conf/srm.conf-dist-win Index: srm.conf-dist-win === RCS file: /export/home/cvs/apachen/conf/srm.conf-dist-win,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- srm.conf-dist-win 1997/10/25 19:10:10 1.4 +++ srm.conf-dist-win 1997/11/05 11:32:37 1.5 @@ -153,6 +153,11 @@ # make certain files to be certain types. # Format: AddType type/subtype ext1 +# For example, the PHP3 module (not part of the Apache distribution) +# will typically use: +#AddType application/x-httpd-php3 .phtml +#AddType application/x-httpd-php3-source .phps + # AddHandler allows you to map certain file extensions to "handlers", # actions unrelated to filetype. These can be either built into the server # or added with the Action command (see below)
cvs commit: apachen/src/modules/standard mod_usertrack.c
dgaudet 97/11/05 03:23:24 Modified:src CHANGES src/modules/standard mod_usertrack.c Log: Fix a year 2100+ formatting problem with mod_usertrack. PR: 1342 Submitted by: Paul Eggert <[EMAIL PROTECTED]> Reviewed by: Dean Gaudet, Marc Slemko, Martin Kraemer Revision ChangesPath 1.485 +3 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.484 retrieving revision 1.485 diff -u -r1.484 -r1.485 --- CHANGES 1997/11/03 10:11:39 1.484 +++ CHANGES 1997/11/05 11:23:21 1.485 @@ -1,5 +1,8 @@ Changes with Apache 1.3b3 + *) Fix a year formatting bug in mod_usertrack. + [Paul Eggert <[EMAIL PROTECTED]>] PR#1342 + *) A mild SIGTERM/SIGALRM race condition was eliminated. [Dean Gaudet] PR#1211 1.21 +1 -1 apachen/src/modules/standard/mod_usertrack.c Index: mod_usertrack.c === RCS file: /export/home/cvs/apachen/src/modules/standard/mod_usertrack.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- mod_usertrack.c 1997/10/22 20:30:31 1.20 +++ mod_usertrack.c 1997/11/05 11:23:23 1.21 @@ -194,7 +194,7 @@ "%s%s; path=/; expires=%s, %.2d-%s-%.2d %.2d:%.2d:%.2d GMT", COOKIE_NAME, cookiebuf, days[tms->tm_wday], tms->tm_mday, month_names[tms->tm_mon], - (tms->tm_year >= 100) ? tms->tm_year - 100 : tms->tm_year, + tms->tm_year % 100, tms->tm_hour, tms->tm_min, tms->tm_sec); } else
cvs commit: apache-site/mirrors index.html mirrors.list
mjc 97/11/05 01:14:26 Modified:mirrors index.html mirrors.list Log: change ukweb mirror listing Revision ChangesPath 1.21 +2 -2 apache-site/mirrors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/mirrors/index.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- index.html1997/11/05 08:50:59 1.20 +++ index.html1997/11/05 09:14:24 1.21 @@ -199,8 +199,8 @@ http://www.hensa.ac.uk/mirrors/apache/";>ac.uk - -http://www.ukweb.com/apache/";>co.uk - - +http://www.eu.c2.net/apache/";>co.uk - + http://www2.idiscover.co.uk/apache/";>co.uk - http://www.domino.org/apache/";>co.uk - 1.34 +1 -1 apache-site/mirrors/mirrors.list Index: mirrors.list === RCS file: /export/home/cvs/apache-site/mirrors/mirrors.list,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- mirrors.list 1997/11/05 08:50:59 1.33 +++ mirrors.list 1997/11/05 09:14:25 1.34 @@ -87,7 +87,7 @@ http ua http://www.apache.carrier.kiev.ua/ [EMAIL PROTECTED] http ac.uk http://sunsite.doc.ic.ac.uk/packages/apache/[EMAIL PROTECTED] http ac.uk http://www.hensa.ac.uk/mirrors/apache/ [EMAIL PROTECTED] -http co.uk http://www.ukweb.com/apache/[EMAIL PROTECTED] +http co.uk http://www.eu.c2.net/apache/[EMAIL PROTECTED] http co.uk http://www2.idiscover.co.uk/apache/ [EMAIL PROTECTED] http co.uk http://www.domino.org/apache/ ? http co.uk http://www.gbnet.net/apache/[EMAIL PROTECTED]
cvs commit: apache-site/mirrors mirrors.list index.html
brian 97/11/05 00:51:01 Modified:mirrors mirrors.list index.html Log: change of .si listing. Revision ChangesPath 1.33 +1 -1 apache-site/mirrors/mirrors.list Index: mirrors.list === RCS file: /export/home/cvs/apache-site/mirrors/mirrors.list,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- mirrors.list 1997/11/04 17:41:41 1.32 +++ mirrors.list 1997/11/05 08:50:59 1.33 @@ -73,7 +73,7 @@ http se http://www.unit.liu.se/apache/ [EMAIL PROTECTED] http se http://apache.dc.luth.se/ [EMAIL PROTECTED] http se http://www.apache.nis.sll.se/ [EMAIL PROTECTED] -http si http://www.kabi.si/apache/ [EMAIL PROTECTED] +http si http://apache.siol.net/ http sk http://sunsite.uakom.sk/apache/ [EMAIL PROTECTED] http sk http://www.alla.sk/apache/ [EMAIL PROTECTED] http su http://www.sai.msu.su/apache/ oleg@sai.msu.su 1.20 +2 -2 apache-site/mirrors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/mirrors/index.html,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- index.html1997/11/04 17:41:41 1.19 +++ index.html1997/11/05 08:50:59 1.20 @@ -173,8 +173,8 @@ http://www.apache.nis.sll.se/";>se - -http://www.kabi.si/apache/";>si - - +http://apache.siol.net/";>si - + http://sunsite.uakom.sk/apache/";>sk - http://www.alla.sk/apache/";>sk -
cvs commit: apachen/src Configure
jim 97/11/04 17:04:54 Modified:src Configure Log: Old shells don't understand '!' Revision ChangesPath 1.167 +6 -2 apachen/src/Configure Index: Configure === RCS file: /export/home/cvs/apachen/src/Configure,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- Configure 1997/11/03 04:33:17 1.166 +++ Configure 1997/11/05 01:04:52 1.167 @@ -104,9 +104,12 @@ # and issue a notice about it. # -test ! -d /usr/local/etc/httpd/ \ - || if ! egrep '^EXTRA_CFLAGS.*HTTPD_ROOT' $file >/dev/null +if [ -d /usr/local/etc/httpd/ ] +then +if egrep '^EXTRA_CFLAGS.*HTTPD_ROOT' $file >/dev/null then + : +else echo " | Please note that the default httpd root directory has changed" echo " | from '/usr/local/etc/httpd/' to '/usr/local/apache/.'" echo " | You may add '-DHTTPD_ROOT=\\\"/usr/local/etc/httpd\\\"' to EXTRA_CFLAGS" @@ -114,6 +117,7 @@ echo " | httpd with the option '-d /usr/local/etc/httpd' if you still" echo " | want to use the old root directory for your server." fi +fi # Start creating the Makefile. We add some comments and
