cvs commit: apache-1.3 STATUS
martin 00/02/25 15:06:53 Modified:.STATUS Log: Binaries are there. Revision ChangesPath 1.812 +3 -3 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.811 retrieving revision 1.812 diff -u -r1.811 -r1.812 --- STATUS2000/02/25 19:06:23 1.811 +++ STATUS2000/02/25 23:06:52 1.812 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 2000/02/25 19:06:23 $] + Last modified at [$Date: 2000/02/25 23:06:52 $] Release: @@ -549,7 +549,7 @@ i386-unknown-netBSD-1.3.2 no Lars Eilebrecht, Randy Terbush i386-unknown-sco3 no Ben Laurie i386-unknown-sco5 no Ben Laurie - i386-siemens-sinix5.4 no Martin Kraemer + i386-siemens-sinix5.4 yes Martin Kraemer i386-dg-dgux5.4R2.01 no Randy Terbush x86-qnx-4.x no Randy Terbush x86-bsdos-3.x no Randy Terbush @@ -563,7 +563,7 @@ mips-sgi-irix5.3 no Mark Imbrianco, Randy Terbush mips-sgi-irix6.2 no Lars Eilebrecht, Randy Terbush mips-sgi-irix6.4 no Lars Eilebrecht - mips-siemens-reliantunix5.4 no Martin Kraemer + mips-siemens-reliantunix5.4 yes Martin Kraemer OS/2 yes Brian Havard powerpc-apple-rhapsody5.6 yes Wilfredo Sanchez rs6000-ibm-aix3.2.5 no Sameer Parekh
Re: cvs commit: apache-1.3/src/main util.c
On Wed, Feb 23, 2000 at 12:44:57PM -, [EMAIL PROTECTED] wrote: > Log: > Are we ready ?? +1 martin -- <[EMAIL PROTECTED]> | Fujitsu Siemens Fon: +49-89-636-46021, FAX: +49-89-636-41143 | 81730 Munich, Germany
cvs commit: apache-1.3/src/modules/standard mod_speling.c
martin 00/02/16 09:31:16
Modified:src/modules/standard mod_speling.c
Log:
Add missing HTML/URI encoding for the mod_speling result list
Revision ChangesPath
1.36 +5 -5 apache-1.3/src/modules/standard/mod_speling.c
Index: mod_speling.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_speling.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mod_speling.c 2000/01/12 15:23:25 1.35
+++ mod_speling.c 2000/02/16 17:31:16 1.36
@@ -455,7 +455,7 @@
*(const char **)ap_push_array(t) =
"The document name you requested (";
- *(const char **)ap_push_array(t) = r->uri;
+ *(const char **)ap_push_array(t) = ap_escape_html(sub_pool, r->uri);
*(const char **)ap_push_array(t) =
") could not be found on this server.\n"
"However, we found documents with names similar "
@@ -474,15 +474,15 @@
? r->parsed_uri.query : "",
NULL);
*(const char **)ap_push_array(v) = "\"";
- *(const char **)ap_push_array(v) = vuri;
+ *(const char **)ap_push_array(v) = ap_escape_uri(sub_pool,
vuri);
*(const char **)ap_push_array(v) = "\";\"";
*(const char **)ap_push_array(v) = reason;
*(const char **)ap_push_array(v) = "\"";
*(const char **)ap_push_array(t) = "";
- *(const char **)ap_push_array(t) = vuri;
+ *(const char **)ap_push_array(t) = ap_escape_html(sub_pool,
vuri);
*(const char **)ap_push_array(t) = " (";
*(const char **)ap_push_array(t) = reason;
*(const char **)ap_push_array(t) = ")\n";
@@ -509,7 +509,7 @@
*(const char **)ap_push_array(t) =
"Please consider informing the owner of the "
"referring page "
"about the broken link.\n";
}
cvs commit: apache-1.3/htdocs/manual/mod mod_include.html
martin 00/02/16 09:22:15 Modified:htdocs/manual/mod mod_include.html Log: make a note that the encoding="..." attribute must always PRECEDE the var="..." attribute Revision ChangesPath 1.25 +5 -3 apache-1.3/htdocs/manual/mod/mod_include.html Index: mod_include.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_include.html,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- mod_include.html 2000/02/02 20:43:16 1.24 +++ mod_include.html 2000/02/16 17:22:15 1.25 @@ -111,11 +111,13 @@ a paragraph of text). This can be changed by adding an encoding attribute, which will remain in effect until the next encoding attribute is encountered or the -element ends, whichever comes first. Note that only special +element ends, whichever comes first. Note that the +encoding attribute must precede the corresponding +var attribute to be effective, and that only special characters as defined in the ISO-8859-1 character encoding will be encoded. This encoding process may not have the desired result if -a different character encoding is in use. Apache 1.3.12 and above; previous -versions do no encoding. +a different character encoding is in use. +Apache 1.3.12 and above; previous versions do no encoding.
cvs commit: apache-1.3/src Configure
martin 00/02/05 17:27:24 Modified:src Configure Log: Improve DSO default for SINIX cc Revision ChangesPath 1.393 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.392 retrieving revision 1.393 diff -u -r1.392 -r1.393 --- Configure 2000/02/05 14:15:42 1.392 +++ Configure 2000/02/06 01:27:19 1.393 @@ -1226,7 +1226,7 @@ # Older SINIX machines must be linked as "shared core"-Apache case $CC in */gcc|gcc ) CFLAGS_SHLIB="-fpic" ;; - */cc|cc ) CFLAGS_SHLIB="-KPIC" ;; + *) CFLAGS_SHLIB="-KPIC" ;; esac LDFLAGS_SHLIB="-G" LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
cvs commit: apache-1.3/htdocs/manual/mod directives.html
martin 00/02/03 03:54:29 Modified:htdocs/manual/mod directives.html Log: Add missing references (they *WERE* in marc's first patch?!?!) Revision ChangesPath 1.62 +2 -0 apache-1.3/htdocs/manual/mod/directives.html Index: directives.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/directives.html,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- directives.html 2000/01/31 22:56:48 1.61 +++ directives.html 2000/02/03 11:54:28 1.62 @@ -31,6 +31,8 @@ AddAltByEncoding AddAltByType AddCharset +AddDefaultCharset +AddDefaultCharsetName AddDescription AddEncoding AddHandler
cvs commit: apache-2.0/src/include httpd.h
martin 00/01/31 16:06:16 Modified:src/include httpd.h Log: The 'canonical' name for this #define (as of Configure, ap_config_auto.h) is USE_HSREGEX Revision ChangesPath 1.23 +1 -1 apache-2.0/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-2.0/src/include/httpd.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- httpd.h 2000/01/21 01:25:25 1.22 +++ httpd.h 2000/02/01 00:06:14 1.23 @@ -949,7 +949,7 @@ API_EXPORT(char *) ap_uuencode(ap_context_t *p, char *string); /* Regexes */ -#ifdef AP_USE_HSREGEX +#ifdef USE_HSREGEX #include "hsregex.h" #else #include
cvs commit: apache-2.0 configure
martin 00/01/31 15:54:07 Modified:.configure Log: grep the right pattern Revision ChangesPath 1.9 +1 -1 apache-2.0/configure Index: configure === RCS file: /export/home/cvs/apache-2.0/configure,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- configure 1999/12/31 19:10:59 1.8 +++ configure 2000/01/31 23:54:04 1.9 @@ -118,7 +118,7 @@ ## if [ "x$quiet" = "xno" ]; then APV=`cat $src/include/httpd.h |\ - grep "#define SERVER_BASEVERSION" |\ + grep "#define AP_SERVER_BASEVERSION" |\ sed -e 's/^[^"]*"//' -e 's/".*$//' -e 's/^Apache\///'` echo "Configuring for Apache, Version $APV" fi
cvs commit: apache-1.3/htdocs index.html.pt
martin 00/01/31 15:23:32 Modified:htdocs index.html.pt Log: Hugo Ramos <[EMAIL PROTECTED]> contributes a portuguese version of the entry place (replacing the brazilian portuguese page we had before and which is now available as index.html.pt-br): Well.. I'm offering my contribution and here is the first page. This page should replace the current index.html.pt I hope to be very helpful about this. Portuguese admins will appreciate it for sure. Submitted by: Hugo Ramos <[EMAIL PROTECTED]> Revision ChangesPath 1.3 +39 -52apache-1.3/htdocs/index.html.pt Index: index.html.pt === RCS file: /export/home/cvs/apache-1.3/htdocs/index.html.pt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- index.html.pt 2000/01/30 19:59:38 1.2 +++ index.html.pt 2000/01/31 23:23:27 1.3 @@ -1,55 +1,42 @@ - - Pagina teste para a instalacao do Apache no Web Site - - - - - - Funcionou! O Apache Web Server esta instalado neste Web Site! - - - Se conseguir ver esta pagina, entao as pessoas que possuem este - dominio acabaram - de instalar o software http://www.apache.org/httpd";>Apache Web - server - com sucesso. Agora tem de adicionar o conteudo a esta directoria - e substituir esta pagina "placeholder", ou apontar o servidor para o - seu conteudo real. - - - - Se esta a ver esta pagina em vez do site que esperava, por favor - contacte o administrador do site envolvido. - (Tente enviar um e-mail para - <Webmaster@domain>.) - Apesar de neste site estar a - correr o software Apache e quase certo que nao tem - outra ligacao com o Grupo Apache, por isso por favor nao envie - e-mails acerca deste - site ou do seu conteudo para os autores do Apache. Se o fizer, a - sua mensagem vai ser - ignorada. - - - - O Apache documentation - foi incluido com esta distribuicao. - - - O Webmaster deste site e livre para utilizar a imagem abaixo num - Web server instalado com o Apache. Obrigado por utilizar o Apache! - - - - - + + Página de teste da instalação do Apache Web Server + + + + + + + Se está a ver esta página significa que a instalação + do http://www.apache.org/httpd";>Apache Web Server foi efectuada + com sucesso. Pode agora adicionar conteúdo a esta directoria e substituir + esta página. + + +Está a ver esta página em vez do website que + esperava? + + Esta página está neste momento activa porque o administrador + deste site alterou a configuração do web server. Por favor contacte + a pessoa responsável pela manutenção deste servidor. + A Fundação Apache Software (Apache Software Foundation), apesar + de ter produzido o web server que o administrador deste site está a usar, + não tem qualquer tipo de responsabilidade pela manutenção + deste nem pode ajudar a resolver problemas de configuração. + + + + A documentação foi incluída + juntamente com esta distribuição. + A imagem abaixo pode ser usada livremente em qualquer site presente num servidor + com o Apache Web Server instalado. Obrigado por usar o Apache Web Server! + +
cvs commit: apache-2.0/src/main http_log.c
martin 00/01/31 15:14:45
Modified:src/main http_log.c
Log:
Enforce a sensible permission on the httpd.pid file.
Submitted by: Frank Miller <[EMAIL PROTECTED]>
Reviewed by: Martin Kraemer
Revision ChangesPath
1.27 +10 -0 apache-2.0/src/main/http_log.c
Index: http_log.c
===
RCS file: /export/home/cvs/apache-2.0/src/main/http_log.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- http_log.c2000/01/19 01:15:06 1.26
+++ http_log.c2000/01/31 23:14:41 1.27
@@ -475,6 +475,9 @@
ap_finfo_t finfo;
static pid_t saved_pid = -1;
pid_t mypid;
+#ifndef WIN32
+mode_t u;
+#endif
if (!fname)
return;
@@ -496,6 +499,10 @@
);
}
+#ifndef WIN32
+u = umask(022);
+(void) umask(u | 022);
+#endif
if(ap_open(&pid_file, fname, APR_WRITE | APR_CREATE, APR_OS_DEFAULT, p)
!= APR_SUCCESS) {
perror("fopen");
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
@@ -503,6 +510,9 @@
ap_server_argv0, fname);
exit(1);
}
+#ifndef WIN32
+(void) umask(u);
+#endif
ap_fprintf(pid_file, "%ld\n", (long)mypid);
ap_close(pid_file);
saved_pid = mypid;
cvs commit: apache-1.3/src/main http_log.c
martin 00/01/31 14:24:29
Modified:src/main http_log.c
Log:
Enforce a sensible umask value, even when a stupid default was in effect.
(Noticed by Frank Miller, Patch by Martin Kraemer)
Submitted by: Frank Miller <[EMAIL PROTECTED]>
Reviewed by: Martin Kraemer
Revision ChangesPath
1.82 +10 -0 apache-1.3/src/main/http_log.c
Index: http_log.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_log.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- http_log.c1999/10/21 20:44:38 1.81
+++ http_log.c2000/01/31 22:24:07 1.82
@@ -498,6 +498,9 @@
struct stat finfo;
static pid_t saved_pid = -1;
pid_t mypid;
+#ifndef WIN32
+mode_t u;
+#endif
if (!fname)
return;
@@ -519,12 +522,19 @@
);
}
+#ifndef WIN32
+u = umask(022);
+(void) umask(u | 022);
+#endif
if(!(pid_file = fopen(fname, "w"))) {
perror("fopen");
fprintf(stderr, "%s: could not log pid to file %s\n",
ap_server_argv0, fname);
exit(1);
}
+#ifndef WIN32
+(void) umask(u);
+#endif
fprintf(pid_file, "%ld\n", (long)mypid);
fclose(pid_file);
saved_pid = mypid;
cvs commit: apache-1.3 STATUS
martin 00/01/26 07:38:58 Modified:.STATUS Log: Update binaries-table at bottom Revision ChangesPath 1.800 +25 -28apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.799 retrieving revision 1.800 diff -u -r1.799 -r1.800 --- STATUS2000/01/26 15:33:41 1.799 +++ STATUS2000/01/26 15:38:57 1.800 @@ -1,15 +1,12 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/26 15:33:41 $] + Last modified at [$Date: 2000/01/26 15:38:57 $] Release: 1.3.12-dev: In development 1.3.11: Tagged and rolled Jan. 19, 2000. Released and announced on the 21st. - PREBUILT BINARIES: - FreeBSD-2.2.8: Jim - mips-ReliantUNIX-5.4: Martin - i386-SINIX-5.4: Martin + PREBUILT BINARIES: see table at bottom 1.3.10: Not released. Pulled at "last minute" due to a build bug in the MPE port. @@ -534,55 +531,55 @@ cause instability - see PR#1729. -Binaries (1.3.9): +Binaries (1.3.11): Platform Avail. Volunteer -- alpha-dec-osf3.0 no Sameer Parekh - alpha-dec-osf4.0 yes Lars Eilebrecht, Ken Coar, Randy Terbush - alpha-whatever-linux2 yes Randy Terbush + alpha-dec-osf4.0 no Lars Eilebrecht, Ken Coar, Randy Terbush + alpha-whatever-linux2 no Randy Terbush armv4l-whatever-linux2no Rasmus Lerdorf - hppa1.1-hp-hpux-10.x yes Rob Hartill, Randy Terbush + hppa1.1-hp-hpux-10.x no Rob Hartill, Randy Terbush i386-slackware-linux(a.out) no Sameer Parekh i386-sun-solaris2.5 no Sameer Parekh - i386-sun-solaris2.6 yes Randy Terbush + i386-sun-solaris2.6 no Randy Terbush i386-sun-solaris2.7 no Cliff Skolnick - i386-unixware-svr4yes Sameer Parekh, Randy Terbush + i386-unixware-svr4no Sameer Parekh, Randy Terbush i386-unknown-freebsd2.1 no Andrew Wilson, Brian Tao - i386-unknown-freebsd2.2.8 no Jim Jagielski + i386-unknown-freebsd2.2.8 yes Jim Jagielski i386-whatever-freebsd3.0 no Ken Coar i386-whatever-freebsd3.0 no Dirk-Willem van Gulik i686-pc-freebsd3.1no Ralf S. Engelschall - i586-unknown-linux2 yes Ralf S. Engelschall, Lars Eilebrecht, Randy Terbush + i586-unknown-linux2 no Ralf S. Engelschall, Lars Eilebrecht, Randy Terbush i686-unknown-linux2 no Lars Eilebrecht - i686-whatever-linux2 yes Ken Coar, Randy Terbush + i686-whatever-linux2 no Ken Coar, Randy Terbush i386-unknown-linux(ELF) no Aram Mirzadeh, Michael Douglass - i386-unknown-netBSD-1.3.2 yes Lars Eilebrecht, Randy Terbush + i386-unknown-netBSD-1.3.2 no Lars Eilebrecht, Randy Terbush i386-unknown-sco3 no Ben Laurie i386-unknown-sco5 no Ben Laurie i386-siemens-sinix5.4 yes Martin Kraemer - i386-dg-dgux5.4R2.01 yes Randy Terbush - x86-qnx-4.x yes Randy Terbush - x86-bsdos-3.x yes Randy Terbush - x86-bsdos-4.x yes Randy Terbush - x86-openbsd-2.x yes Randy Terbush + i386-dg-dgux5.4R2.01 no Randy Terbush + x86-qnx-4.x no Randy Terbush + x86-bsdos-3.x no Randy Terbush + x86-bsdos-4.x no Randy Terbush + x86-openbsd-2.x no Randy Terbush m68k-apple-aux3.1.1 no Jim Jagielski m88k-dg-dgux5.4R2.01 no Sameer parekh m88k-next-nextno Rob Hartill mips-dec-ultrix4.4no Sameer Parekh - mips-unknown-linuxyes Lars Eilebrecht - mips-sgi-irix5.3 yes Mark Imbrianco, Randy Terbush - mips-sgi-irix6.2 yes Lars Eilebrecht, Randy Terbush + mips-unknown-linuxno Lars Eilebrecht + mips-sgi-irix5.3 no Mark Imbrianco, Randy Terbush + mips-sgi-irix6.2 no Lars Eilebrecht, Randy Terbush mips-sgi-irix6.4 no Lars Eilebrecht mips-siemens-reliantunix5.4 yes Martin Kraemer OS/2 yes Brian Havard powerpc-apple-rhapsody5.3 no Wilfredo Sanchez rs6000-ibm-aix3.2.5 no Sameer Parekh rs6000-ibm-aix4.1 no Lars Eilebrecht - rs6000-ibm-aix4.2
cvs commit: apache-site index.html
martin 00/01/26 07:34:45 Modified:.index.html Log: Weblint complained about this Revision ChangesPath 1.10 +2 -3 apache-site/index.html Index: index.html === RCS file: /home/cvs/apache-site/index.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- index.html2000/01/02 00:27:04 1.9 +++ index.html2000/01/26 15:34:44 1.10 @@ -15,7 +15,7 @@ http://www.apache.org/dyn/closer.cgi";>Mirrored - Worldwide + Worldwide @@ -30,12 +30,11 @@ -FAQ +FAQ News & Status Contributing Contact Info Credits - ASF Projects:
cvs commit: apache-1.3 STATUS
martin 00/01/26 07:33:42 Modified:.STATUS Log: intel-SINIX is Ok Revision ChangesPath 1.799 +2 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.798 retrieving revision 1.799 diff -u -r1.798 -r1.799 --- STATUS2000/01/25 13:21:03 1.798 +++ STATUS2000/01/26 15:33:41 1.799 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/25 13:21:03 $] + Last modified at [$Date: 2000/01/26 15:33:41 $] Release: @@ -9,6 +9,7 @@ PREBUILT BINARIES: FreeBSD-2.2.8: Jim mips-ReliantUNIX-5.4: Martin + i386-SINIX-5.4: Martin 1.3.10: Not released. Pulled at "last minute" due to a build bug in the MPE port.
cvs commit: apache-1.3 STATUS
martin 00/01/25 05:21:04 Modified:.STATUS Log: ReliantUNIX version is available Revision ChangesPath 1.798 +2 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.797 retrieving revision 1.798 diff -u -r1.797 -r1.798 --- STATUS2000/01/24 13:46:34 1.797 +++ STATUS2000/01/25 13:21:03 1.798 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/24 13:46:34 $] + Last modified at [$Date: 2000/01/25 13:21:03 $] Release: @@ -8,6 +8,7 @@ announced on the 21st. PREBUILT BINARIES: FreeBSD-2.2.8: Jim + mips-ReliantUNIX-5.4: Martin 1.3.10: Not released. Pulled at "last minute" due to a build bug in the MPE port.
cvs commit: apache-1.3/htdocs/manual/misc FAQ-I.html
martin 00/01/16 12:52:31 Modified:htdocs/manual/misc FAQ-I.html Log: At least add a pointer to Andrew Ford's cronolog utility, now that it's under the Ap.License Revision ChangesPath 1.4 +24 -1 apache-1.3/htdocs/manual/misc/FAQ-I.html Index: FAQ-I.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/misc/FAQ-I.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- FAQ-I.html1999/07/03 22:12:50 1.3 +++ FAQ-I.html2000/01/16 20:52:30 1.4 @@ -31,7 +31,7 @@ Apache Server Frequently Asked Questions - $Revision: 1.3 $ ($Date: 1999/07/03 22:12:50 $) + $Revision: 1.4 $ ($Date: 2000/01/16 20:52:30 $) The latest version of this FAQ is always available from the main @@ -82,6 +82,8 @@ Does Apache include a search engine? + How can I rotate my log files? + @@ -202,6 +204,27 @@ Apache include http://www.htdig.org/";>ht://Dig and http://sunsite.berkeley.edu/SWISH-E/";>SWISH-E. + + + + How can I rotate my log files? + + The simple answer: by piping the transfer log into an appropriate + log file rotation utility. + The longer answer: In the src/support/ directory, you will find a + utility called rotatelogs which can be used like this: + TransferLog "|/path/to/rotatelogs /path/to/logs/access_log 86400" + to enable daily rotation of the log files. + A more sophisticated solution of a logfile rotation utility is + available under the name cronolog from Andrew Ford's site at + http://www.ford-mason.co.uk/resources/cronolog/"; + >http://www.ford-mason.co.uk/resources/cronolog/. It can automatically + create logfile subdirectories based on time and date, and can have a + constant symlink point to the rotating logfiles. (As of version 1.6.1, + cronolog is available under the Apache License). + Use it like this: + CustomLog "|/path/to/cronolog --symlink=/usr/local/apache/logs/access_log /usr/local/apache/logs/%Y/%m/access_log" combined +
cvs commit: apache-1.3 STATUS
martin 00/01/11 08:21:26 Modified:.STATUS Log: Revision ChangesPath 1.785 +2 -2 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.784 retrieving revision 1.785 diff -u -r1.784 -r1.785 --- STATUS2000/01/11 15:22:12 1.784 +++ STATUS2000/01/11 16:21:24 1.785 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/11 15:22:12 $] + Last modified at [$Date: 2000/01/11 16:21:24 $] Release: @@ -74,7 +74,7 @@ * Ken's patch to allow for umask settings for suExec. Suggested by PR#4178. Message-ID: <[EMAIL PROTECTED]> -Status: Ken +1, Ryan +1, Jim +1 + Status: Ken +1, Ryan +1, Jim +1, Martin +1 * Andrew Ford's patch (1999/12/05) to add absolute times to mod_expires Message-ID: <[EMAIL PROTECTED]>
cvs commit: apache-1.3/src/main buff.c
martin 00/01/11 07:51:33 Modified:src CHANGES src/main buff.c Log: Thanks a lot to Dean for his chunked-code regression test! Sorry I found this so late, apparently browsers swallowed it. The trailing CRLF in the last chunk was not converted. Revision ChangesPath 1.1493+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1492 retrieving revision 1.1493 diff -u -r1.1492 -r1.1493 --- CHANGES 2000/01/11 14:22:59 1.1492 +++ CHANGES 2000/01/11 15:51:29 1.1493 @@ -1,5 +1,8 @@ Changes with Apache 1.3.10 + *) The end_chunk() code forgot to convert the trailing CRLF pair + from EBCDIC to ASCII. Fixed. [Martin Kraemer] + *) An Action set for a Location that didn't correspond to a file didn't work. Fixed. [Manoj Kasichainula, Ben Laurie] 1.94 +6 -4 apache-1.3/src/main/buff.c Index: buff.c === RCS file: /export/home/cvs/apache-1.3/src/main/buff.c,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- buff.c1999/12/09 12:05:03 1.93 +++ buff.c2000/01/11 15:51:32 1.94 @@ -542,14 +542,16 @@ } *strp++ = CR; *strp = LF; -#ifdef CHARSET_EBCDIC -/* Chunks are an HTTP/1.1 Protocol feature. They must ALWAYS be in ASCII */ -ebcdic2ascii(&fb->outbase[fb->outchunk], &fb->outbase[fb->outchunk], CHUNK_HEADER_SIZE); -#endif /*CHARSET_EBCDIC*/ /* tack on the trailing CRLF, we've reserved room for this */ fb->outbase[fb->outcnt++] = CR; fb->outbase[fb->outcnt++] = LF; + +#ifdef CHARSET_EBCDIC +/* Chunks are an HTTP/1.1 Protocol feature. They must ALWAYS be in ASCII */ +ebcdic2ascii(&fb->outbase[fb->outchunk], &fb->outbase[fb->outchunk], CHUNK_HEADER_SIZE); +ebcdic2ascii(&fb->outbase[fb->outcnt-2], &fb->outbase[fb->outcnt-2], 2); +#endif /*CHARSET_EBCDIC*/ fb->outchunk = -1; }
cvs commit: apache-1.3/src Configure
martin 00/01/10 02:39:51 Modified:src Configure Log: Improve compilation on RISC-based BS2000 mainframes by autodetecting the presence of MIPS CPUs (speed improvement 3..6-fold) Revision ChangesPath 1.384 +6 -0 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.383 retrieving revision 1.384 diff -u -r1.383 -r1.384 --- Configure 1999/12/20 14:50:55 1.383 +++ Configure 2000/01/10 10:39:46 1.384 @@ -1484,6 +1484,12 @@ fi ;; BS2000*-siemens-sysv4*) + # Activate RISC compilation if this is a SR2000 machine + # (test written by Thomas Dorner <[EMAIL PROTECTED]> + # for perl5 port): + if [ -n "`bs2cmd SHOW-SYSTEM-INFO | grep 'HSI-ATT.*TYPE.*SR'`" ]; then + CFLAGS="$CFLAGS -Krisc_4000" + fi # Depending on the BS2000 OS and compiler/crte release, # -lnsl may be available (or may be not). # In standard SVR4 systems, -lsocket relies on some symbols
cvs commit: apache-1.3/src/helpers GuessCodeset
martin 00/01/10 02:37:18
Modified:src/helpers GuessCodeset
Log:
Fix obvious bugs (awk would not exit; $AWK was ignored even if set;
noticed & fixed by Paul Gilmartin)
Submitted by: Paul Gilmartin <[EMAIL PROTECTED]>
Revision ChangesPath
1.3 +7 -1 apache-1.3/src/helpers/GuessCodeset
Index: GuessCodeset
===
RCS file: /export/home/cvs/apache-1.3/src/helpers/GuessCodeset,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GuessCodeset 1999/12/26 19:30:35 1.2
+++ GuessCodeset 2000/01/10 10:37:16 1.3
@@ -1,5 +1,11 @@
#!/bin/sh
-case `awk 'BEGIN
{printf("%c%c%c%c%c<->%c%c%c%c%c%c\n",97,115,99,105,105,133,130,131,132,137,131);}'`
in
+# This script tries to find out whether the native codeset of this machine
+# is ASCII or EBCDIC. On EBCDIC based machines, it is used to activate
+# the mod_ebcdic EBCDIC conversion module.
+#
+# Note: This script will break if you use an ebcdic cross-compiler!
+#
+case `${AWK-awk} 'BEGIN
{printf("%c%c%c%c%c<->%c%c%c%c%c%c\n",97,115,99,105,105,133,130,131,132,137,131);}'
/dev/null` in
ascii*) echo ASCII;;
*ebcdic)echo EBCDIC;;
*) echo >&2 "ERROR: Your platform codeset could not be detected
correctly."
cvs commit: apache-1.3/htdocs/manual/mod mod_imap.html mod_rewrite.html
martin 00/01/07 08:38:10 Modified:htdocs/manual/misc perf-tuning.html htdocs/manual windows.html htdocs/manual/mod mod_imap.html mod_rewrite.html Log: it's -> its Revision ChangesPath 1.18 +1 -1 apache-1.3/htdocs/manual/misc/perf-tuning.html Index: perf-tuning.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/misc/perf-tuning.html,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perf-tuning.html 1999/04/20 22:19:13 1.17 +++ perf-tuning.html 2000/01/07 16:38:01 1.18 @@ -17,7 +17,7 @@ Introduction Apache is a general webserver, which is designed to be correct first, and -fast second. Even so, it's performance is quite satisfactory. Most +fast second. Even so, its performance is quite satisfactory. Most sites have less than 10Mbits of outgoing bandwidth, which Apache can fill using only a low end Pentium-based webserver. In practice sites with more bandwidth require more than one machine to fill the bandwidth 1.31 +2 -2 apache-1.3/htdocs/manual/windows.html Index: windows.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/windows.html,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- windows.html 1999/07/22 17:50:59 1.30 +++ windows.html 2000/01/07 16:38:06 1.31 @@ -352,7 +352,7 @@ If you don't specify a configuration file name with -f or -n, Apache will use the file name compiled into the server, usually "conf/httpd.conf". Invoking Apache with the -V switch will display this value labeled as SERVER_CONFIG_FILE. -Apache will then determine it's ServerRoot by trying the following, in this order: +Apache will then determine its ServerRoot by trying the following, in this order: A ServerRoot directive via a -C switch. @@ -387,7 +387,7 @@ If you did not do a binary install then Apache will in some scenarios complain that about the missing registry key. This -warning can be ignored if it otherwise was able to find it's +warning can be ignored if it otherwise was able to find its configuration files. 1.14 +2 -2 apache-1.3/htdocs/manual/mod/mod_imap.html Index: mod_imap.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_imap.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mod_imap.html 1999/08/05 18:43:47 1.13 +++ mod_imap.html 2000/01/07 16:38:07 1.14 @@ -141,7 +141,7 @@ The ImapDefault directive sets the default default used in -the imagemap files. It's value is overridden by a default +the imagemap files. Its value is overridden by a default directive within the imagemap file. If not present, the default action is nocontent, which means that a 204 No Content is sent to the client. In this @@ -173,7 +173,7 @@ 1.1 and later. The ImapBase directive sets the default base used in -the imagemap files. It's value is overridden by a base +the imagemap files. Its value is overridden by a base directive within the imagemap file. If not present, the base defaults to http://servername/. 1.46 +1 -1 apache-1.3/htdocs/manual/mod/mod_rewrite.html Index: mod_rewrite.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_rewrite.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- mod_rewrite.html 1999/10/27 09:14:32 1.45 +++ mod_rewrite.html 2000/01/07 16:38:08 1.46 @@ -87,7 +87,7 @@ But all this functionality and flexibility has its drawback: complexity. So -don't expect to understand this module in it's whole in just one day. +don't expect to understand this module in its whole in just one day. This module was invented and originally written in April 1996
cvs commit: apache-1.3/src/os/tpf ebcdic.c ebcdic.h
martin 00/01/07 08:04:15
Modified:src README.EBCDIC
src/ap ap_md5c.c ap_sha1.c
src/os/bs2000 ebcdic.h
src/os/os390 ebcdic.h
src/os/tpf ebcdic.c ebcdic.h
Log:
This patch completes the simplification recently enabled by introduction
of the CRLF macro. ebcdic2ascii_strictly is renamed ebcdic2ascii;
os_toascii_strictly is renamed os_toascii. The former loose conversion
functions are removed, and references suitably changed.
This changes nothing on ASCII machines, but removes the kludge to have two
translation tables.
Submitted by: Paul Gilmartin <[EMAIL PROTECTED]>
Reviewed by:Martin Kraemer
Revision ChangesPath
1.6 +3 -4 apache-1.3/src/README.EBCDIC
Index: README.EBCDIC
===
RCS file: /export/home/cvs/apache-1.3/src/README.EBCDIC,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- README.EBCDIC 1998/10/01 18:25:09 1.5
+++ README.EBCDIC 2000/01/07 16:04:10 1.6
@@ -42,10 +42,9 @@
* This port therefore features a built-in protocol level conversion
for the server-internal strings (which the compiler translated to
- EBCDIC strings) and server-generated documents. The hard coded
- ASCII escapes \012 and \015 which are ubiquitious in the server
- code are an exception: they are not converted to ASCII a second
- time.
+ EBCDIC strings) and server-generated documents. This presumes that
+ hard coded ASCII escapes \012 and \015 will not exist in the server
+ code; rather coders will use the CRLF, CR, and LF macros.
* By examining the call hierarchy for the BUFF management routines,
I added an "ebcdic/ascii conversion layer" which would be crossed
1.33 +3 -3 apache-1.3/src/ap/ap_md5c.c
Index: ap_md5c.c
===
RCS file: /export/home/cvs/apache-1.3/src/ap/ap_md5c.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ap_md5c.c 1999/08/15 22:14:55 1.32
+++ ap_md5c.c 2000/01/07 16:04:11 1.33
@@ -232,12 +232,12 @@
memcpy(&context->buffer[idx], &input[i], inputLen - i);
#else /*CHARSET_EBCDIC*/
if (inputLen >= partLen) {
- ebcdic2ascii_strictly(&context->buffer[idx], input, partLen);
+ ebcdic2ascii(&context->buffer[idx], input, partLen);
MD5Transform(context->state, context->buffer);
for (i = partLen; i + 63 < inputLen; i += 64) {
unsigned char inp_tmp[64];
- ebcdic2ascii_strictly(inp_tmp, &input[i], 64);
+ ebcdic2ascii(inp_tmp, &input[i], 64);
MD5Transform(context->state, inp_tmp);
}
@@ -248,7 +248,7 @@
}
/* Buffer remaining input */
-ebcdic2ascii_strictly(&context->buffer[idx], &input[i], inputLen - i);
+ebcdic2ascii(&context->buffer[idx], &input[i], inputLen - i);
#endif /*CHARSET_EBCDIC*/
}
1.11 +3 -3 apache-1.3/src/ap/ap_sha1.c
Index: ap_sha1.c
===
RCS file: /export/home/cvs/apache-1.3/src/ap/ap_sha1.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ap_sha1.c 1999/08/15 21:55:09 1.10
+++ ap_sha1.c 2000/01/07 16:04:11 1.11
@@ -292,7 +292,7 @@
if (i > count) {
i = count;
}
- ebcdic2ascii_strictly(((AP_BYTE *) sha_info->data) + sha_info->local,
+ ebcdic2ascii(((AP_BYTE *) sha_info->data) + sha_info->local,
buffer, i);
count -= i;
buffer += i;
@@ -306,13 +306,13 @@
}
}
while (count >= SHA_BLOCKSIZE) {
- ebcdic2ascii_strictly((AP_BYTE *)sha_info->data, buffer, SHA_BLOCKSIZE);
+ ebcdic2ascii((AP_BYTE *)sha_info->data, buffer, SHA_BLOCKSIZE);
buffer += SHA_BLOCKSIZE;
count -= SHA_BLOCKSIZE;
maybe_byte_reverse(sha_info->data, SHA_BLOCKSIZE);
sha_transform(sha_info);
}
-ebcdic2ascii_strictly((AP_BYTE *)sha_info->data, buffer, count);
+ebcdic2ascii((AP_BYTE *)sha_info->data, buffer, count);
sha_info->local = count;
#else
ap_SHA1Update_binary(sha_info, (const unsigned char *) buf, count);
1.7 +1 -6 apache-1.3/src/os/bs2000/ebcdic.h
Index: ebcdic.h
===
RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/ebcdic.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ebcdic.h 1999/12/09 16:55:54 1.6
+++ ebcdic.h 2000/01/07 16:04:12 1.7
@@ -1,5 +1,5 @@
#ifndef AP_EBCDIC_H
cvs commit: apache-1.3/src/main http_protocol.c
martin 00/01/04 02:20:43
Modified:src/main http_protocol.c
Log:
Another place where we must force EBCDIC conversion to ON
Revision ChangesPath
1.285 +7 -0 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- http_protocol.c 1999/12/20 17:43:35 1.284
+++ http_protocol.c 2000/01/04 10:20:39 1.285
@@ -1686,6 +1686,9 @@
API_EXPORT(void) ap_finalize_request_protocol(request_rec *r)
{
if (r->chunked && !r->connection->aborted) {
+#ifdef CHARSET_EBCDIC
+ PUSH_EBCDIC_OUTPUTCONVERSION_STATE(r->connection->client, 1);
+#endif
/*
* Turn off chunked encoding --- we can only do this once.
*/
@@ -1697,6 +1700,10 @@
/* If we had footer "headers", we'd send them now */
ap_rputs(CRLF, r);
ap_kill_timeout(r);
+
+#ifdef CHARSET_EBCDIC
+ POP_EBCDIC_OUTPUTCONVERSION_STATE(r->connection->client);
+#endif /*CHARSET_EBCDIC*/
}
}
cvs commit: apache-1.3/src/helpers GuessCodeset
martin 99/12/26 11:30:35
Modified:src/helpers GuessCodeset
Log:
More sensible fallback default
Revision ChangesPath
1.2 +1 -6 apache-1.3/src/helpers/GuessCodeset
Index: GuessCodeset
===
RCS file: /export/home/cvs/apache-1.3/src/helpers/GuessCodeset,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GuessCodeset 1999/12/23 17:13:19 1.1
+++ GuessCodeset 1999/12/26 19:30:35 1.2
@@ -1,14 +1,9 @@
#!/bin/sh
-#a 0141 97 0x61
-#s 0163115 0x73
-#c 0143 99 0x63
-#i 0151105 0x69
-#i 0151105 0x69
case `awk 'BEGIN
{printf("%c%c%c%c%c<->%c%c%c%c%c%c\n",97,115,99,105,105,133,130,131,132,137,131);}'`
in
ascii*) echo ASCII;;
*ebcdic)echo EBCDIC;;
*) echo >&2 "ERROR: Your platform codeset could not be detected
correctly."
echo >&2 "Assuming ASCII. Please send an EMail to <[EMAIL
PROTECTED]>"
echo >&2 "describing the platform in use. Is your AWK broken?"
- ;;
+ echo ASCII;;
esac
cvs commit: apache-1.3/src/helpers GuessCodeset
martin 99/12/23 09:13:21
Added: src/helpers GuessCodeset
Log:
Simple EBCDIC vs. ASCII test script. I will integrate this into the
Configure function after release of 1.3.10. Don't worry, nothing will
change until then.
Merry Christmas to everyone!
Revision ChangesPath
1.1 apache-1.3/src/helpers/GuessCodeset
Index: GuessCodeset
===
#!/bin/sh
#a 0141 97 0x61
#s 0163115 0x73
#c 0143 99 0x63
#i 0151105 0x69
#i 0151105 0x69
case `awk 'BEGIN
{printf("%c%c%c%c%c<->%c%c%c%c%c%c\n",97,115,99,105,105,133,130,131,132,137,131);}'`
in
ascii*) echo ASCII;;
*ebcdic)echo EBCDIC;;
*) echo >&2 "ERROR: Your platform codeset could not be detected
correctly."
echo >&2 "Assuming ASCII. Please send an EMail to <[EMAIL
PROTECTED]>"
echo >&2 "describing the platform in use. Is your AWK broken?"
;;
esac
cvs commit: apache-1.3/src Configure
martin 99/12/20 06:50:57 Modified:src Configure Log: Add a default compiler switch Revision ChangesPath 1.383 +2 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.382 retrieving revision 1.383 diff -u -r1.382 -r1.383 --- Configure 1999/12/15 21:45:17 1.382 +++ Configure 1999/12/20 14:50:55 1.383 @@ -627,7 +627,8 @@ BS2000*-siemens-sysv4*) OS='BS2000' OSDIR='os/bs2000' - CC='c89 -XLLML -XLLMK -XL' + # If you are using a CPP before V3.0, delete the -Kno_integer_overflow flag + CC='c89 -XLLML -XLLMK -XL -Kno_integer_overflow' CFLAGS="$CFLAGS -DCHARSET_EBCDIC -DSVR4 -D_XPG_IV" DEF_WANTHSREGEX=yes DBM_LIB=""
cvs commit: apache-1.3 STATUS
martin 99/12/17 06:03:22
Modified:.STATUS
Log:
Sunny but cold.
mod_ebcdic will have three directives:
EBCDICConvert {On|Off}[={In|Out|InOut}] .ext [...]
EBCDICConvertByType {On|Off}[={In|Out|InOut}] mimetype/match [...]
EBCDICKludge{On|Off}
Revision ChangesPath
1.771 +8 -1 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.770
retrieving revision 1.771
diff -u -r1.770 -r1.771
--- STATUS1999/12/16 14:05:29 1.770
+++ STATUS1999/12/17 14:03:21 1.771
@@ -1,5 +1,5 @@
1.3 STATUS:
- Last modified at [$Date: 1999/12/16 14:05:29 $]
+ Last modified at [$Date: 1999/12/17 14:03:21 $]
Release:
@@ -192,6 +192,13 @@
Discussion in thread following message-ID below.
Message-ID: <[EMAIL PROTECTED]>
Status:
+
+* Martin Kraemer's mod_ebcdic.c: a new module which will contain the
+ ebcdic related stuff (common to all ebcdic based os's) and will
+ allow for flexible configuration of the conversion rules. That
+ will replace the current hardwired heuristics.
+ Message-Id: none yet
+ Status: first prototype running, to be posted to list soon.
Needs patch:
cvs commit: apache-1.3/src/helpers GuessOS
martin 99/12/17 05:52:03 Modified:src/helpers GuessOS Log: Fix GuessOS to correctly return "TPF" instead of "OS390" when compiling apache for TPF. Submitted by: Joe Moenich, Ovies Brabson <[EMAIL PROTECTED]> Revision ChangesPath 1.66 +14 -7 apache-1.3/src/helpers/GuessOS Index: GuessOS === RCS file: /export/home/cvs/apache-1.3/src/helpers/GuessOS,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- GuessOS 1999/12/09 17:19:40 1.65 +++ GuessOS 1999/12/17 13:52:00 1.66 @@ -12,6 +12,20 @@ # Be as similar to the output of config.guess/config.sub # as possible. +# Handle TPF before handling other OSes. This +# is being done because TPF is sometimes compiled +# on OS/390. When that is the case, if we don't +# handle TPF ahead of the other OSes, TPF will +# fall into the OS/390 case and this script would +# return an incorrect value for the platform. +# +# Apache is not compiled on the TPF platform +# therefore an environment variable is used +if [ "x$TPF" = "xYES" ]; then +echo "TPF" +exit 0 +fi + # First get uname entries that we use below MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown" @@ -295,13 +309,6 @@ if [ -d /usr/apollo ]; then echo "whatever-apollo-whatever" exit 0 -fi - -# Apache is not compiled on the TPF platform -# therefore an environment variable is used -if [ "x$TPF" = "xYES" ]; then -echo "TPF" -exit 0 fi # Now NeXT
cvs commit: apache-1.3/src/os/bs2000 os.c
martin 99/12/15 15:18:53
Modified:src/os/bs2000 os.c
Log:
As long as I still need The Hack (but I'm working on a better solution)
fix the multipart/ type to be treated as text. This doesn't help very much
because nobody parses the mime type (and sets the conversion) of the
individual parts, though.
Revision ChangesPath
1.13 +2 -1 apache-1.3/src/os/bs2000/os.c
Index: os.c
===
RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/os.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- os.c 1999/01/01 19:05:28 1.12
+++ os.c 1999/12/15 23:18:43 1.13
@@ -85,7 +85,8 @@
/* Conversion is applied to text/ files only, if ever. */
if (type && (strncasecmp(type, "text/", 5) == 0 ||
- strncasecmp(type, "message/", 8) == 0)) {
+ strncasecmp(type, "message/", 8) == 0 ||
+ strncasecmp(type, "multipart/", 10) == 0)) {
if (strncasecmp(type, ASCIITEXT_MAGIC_TYPE_PREFIX,
sizeof(ASCIITEXT_MAGIC_TYPE_PREFIX)-1) == 0)
r->content_type = ap_pstrcat(r->pool, "text/",
cvs commit: apache-1.3/src/modules/standard mod_log_config.c
martin 99/12/15 15:04:27
Modified:src CHANGES
htdocs/manual/mod mod_log_config.html
src/modules/standard mod_log_config.c
Log:
Peter Watkins writes:
In September, there was discussion of mod_log_config and some need to
break the client request "%r" into its separate components. A patch was
committed to the 1.3 dev tree that exposed the method and protocol
request members as "%m" and "%H". It was noted that "%m %U %H" was not
the same as "%r" because %U does not include query string information.
The attached patches add support for logging query string in such a way
that "%m %U%q %H" is the same as "%r". I would like to see this committed
to take care of the unfinished business begun with "%m" and "%H".
Thanks,
-Peter
PR: 5174
Submitted by: Peter Watkins <[EMAIL PROTECTED]>
Reviewed by: Martin Kraemer
Revision ChangesPath
1.1480+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1479
retrieving revision 1.1480
diff -u -r1.1479 -r1.1480
--- CHANGES 1999/12/15 22:13:22 1.1479
+++ CHANGES 1999/12/15 23:04:07 1.1480
@@ -1,5 +1,10 @@
Changes with Apache 1.3.10
+ *) Add %q logging format directive (logs "?" and the query string part
+ of a query, or the empty string if no query).
+ Can be used in combination with %m, %U and %H: "%m %U%q %H" is the
+ same as "%r". [Peter Watkins <[EMAIL PROTECTED]>]
+
*) Improve OS390 port to work on older system releases
[Paul Gilmartin <[EMAIL PROTECTED]>]
1.36 +9 -7 apache-1.3/htdocs/manual/mod/mod_log_config.html
Index: mod_log_config.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_log_config.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mod_log_config.html 1999/10/13 08:41:52 1.35
+++ mod_log_config.html 1999/12/15 23:04:19 1.36
@@ -121,24 +121,28 @@
by the values as follows:
+%...a: Remote IP-address
+%...A: Local IP-address
%...B: Bytes sent, excluding HTTP headers.
%...b: Bytes sent, excluding HTTP headers. In CLF format
i.e. a '-' rather than a 0 when no bytes are sent.
-%...f: Filename
%...{FOOBAR}e: The contents of the environment variable FOOBAR
+%...f: Filename
%...h: Remote host
-%...a: Remote IP-address
-%...A: Local IP-address
+%...HThe request protocol
%...{Foobar}i: The contents of Foobar: header line(s) in the request
sent to the server.
%...l: Remote logname (from identd, if supplied)
+%...mThe request method
%...{Foobar}n: The contents of note "Foobar" from another module.
%...{Foobar}o: The contents of Foobar: header line(s) in the reply.
%...p: The canonical Port of the server serving the request
%...P: The process ID of the child that serviced the request.
+%...qThe query string (prepended with a ? if a query string
exists,
+ otherwise an empty string)
%...r: First line of request
-%...s: Status. For requests that got internally redirected, this
-is status of the *original* request --- %...>s for the
last.
+%...s: Status. For requests that got internally redirected, this is
+the status of the *original* request --- %...>s for the
last.
%...t: Time, in common log format time format (standard english
format)
%...{format}t: The time, in the form given by format, which should
be in strftime(3) format. (potentially localised)
@@ -147,8 +151,6 @@
%...U: The URL path requested.
%...v: The canonical ServerName of the server serving the request.
%...V: The server name according to the UseCanonicalName setting.
-%...mThe request method
-%...HThe request protocol
The `...' can be nothing at all (e.g., "%h %u %r %s
%b"), or it can
1.80 +10 -1 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.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- mod_log_config.c 1999/09/27 20:38:46 1.79
+++ mod_log_con
cvs commit: apache-1.3/src/include ap_config.h
martin 99/12/15 14:13:40 Modified:src CHANGES src/include ap_config.h Log: Gil writes: A couple macros that Ms. Brabson :-) had relied on are not defined at OS/390 v1r2. This provides alternatives. I'm skeptical of the value of "#define NSIG SIGDUMP+1" -- it's scarcely a useful parameterization since future extensions to the OS are less likely to change the value of SIGDUMP than to add new SIG* codes with values higher than SIGDUMP. It might be better simply to unconditionally "#define NSIG 40 /* Present highest signal (SIGDUMP) +1*/" With these tweaks, httpd 1.3.10 compiles on OS/390 v1r2 and runs if invoked with "http -X". Curiously, on OS/390 v2r7, the same executable, compiled under v1r2 runs properly without the "-X". Submitted by: Paul Gilmartin <[EMAIL PROTECTED]> Reviewed by: Martin Kraemer Revision ChangesPath 1.1479+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1478 retrieving revision 1.1479 diff -u -r1.1478 -r1.1479 --- CHANGES 1999/12/09 18:10:24 1.1478 +++ CHANGES 1999/12/15 22:13:22 1.1479 @@ -1,4 +1,8 @@ Changes with Apache 1.3.10 + + *) Improve OS390 port to work on older system releases + [Paul Gilmartin <[EMAIL PROTECTED]>] + *) Enhance mod_mime with an AddCharset directive to properly handle that negotiation dimension. [Youichirou Koga <[EMAIL PROTECTED]>] 1.281 +7 -0 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /export/home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.280 retrieving revision 1.281 diff -u -r1.280 -r1.281 --- ap_config.h 1999/12/10 11:03:29 1.280 +++ ap_config.h 1999/12/15 22:13:33 1.281 @@ -957,7 +957,11 @@ #define USE_FCNTL_SERIALIZED_ACCEPT #define _POSIX_SOURCE #include +#ifdef SIGDUMP /* SIGDUMP is not defined by OS/390 v1r2 */ #define NSIG SIGDUMP+1 +#else +#define NSIG 40 +#endif #define JMP_BUF sigjmp_buf #define _XOPEN_SOURCE_EXTENDED 1 #define _OPEN_MSGQ_EXT @@ -1075,6 +1079,9 @@ #ifndef TPF #include #endif /* TPF */ +#if defined(OS390) && !defined(NO_ADDRESS) +#define NO_ADDRESS NO_DATA /* Not defined properly by OS/390 v1r2 */ +#endif #include #include #if !defined(MPE) && !defined(BEOS) && !defined(TPF)
cvs commit: apache-1.3/src/helpers TestCompile
martin 99/12/15 14:08:01 Modified:src/helpers TestCompile Log: Make sure that $(LIBS) appears *after* the input file name, to allow resolving of external symbols on all kinds of C compilers. Actually, even IBM's should be able to live with that (see the linking of the utilities in support/Makefile!). Reviewed by: Jim Jagielski Revision ChangesPath 1.37 +2 -2 apache-1.3/src/helpers/TestCompile Index: TestCompile === RCS file: /export/home/cvs/apache-1.3/src/helpers/TestCompile,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- TestCompile 1999/12/10 11:03:19 1.36 +++ TestCompile 1999/12/15 22:07:59 1.37 @@ -201,10 +201,10 @@ LDFLAGS=\$(LDFLAGS1) \$(EXTRA_LDFLAGS) dummy: - cd ..; \$(CC) \$(CFLAGS) \$(INCLUDES) \$(LDFLAGS) -o helpers/dummy $TLIB \$(LIBS) helpers/dummy.c + cd ..; \$(CC) \$(CFLAGS) \$(INCLUDES) \$(LDFLAGS) -o helpers/dummy helpers/dummy.c $TLIB \$(LIBS) testfunc: - cd ..; \$(CC) \$(CFLAGS) \$(INCLUDES) \$(LDFLAGS) -o helpers/testfunc $TLIB \$(LIBS) helpers/testfunc.c + cd ..; \$(CC) \$(CFLAGS) \$(INCLUDES) \$(LDFLAGS) -o helpers/testfunc helpers/testfunc.c $TLIB \$(LIBS) EOF # Now run that Makefile
cvs commit: apache-1.3/src Configure
martin 99/12/15 13:45:19
Modified:src Configure
Log:
Avoid spawning an extra subshell for every header file.
Protect the environment elsewhere by putting the whole
header loop in a subshell. Noticed by Ralf Engelschall
Revision ChangesPath
1.382 +4 -1 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -r1.381 -r1.382
--- Configure 1999/12/13 22:00:17 1.381
+++ Configure 1999/12/15 21:45:17 1.382
@@ -931,11 +931,13 @@
echo " + checking for system header files"
CHECK_FOR_HEADERS="dlfcn.h dl.h bstring.h crypt.h unistd.h sys/resource.h
sys/select.h sys/processor.h sys/param.h"
+(
+export CPP
for header in $CHECK_FOR_HEADERS; do
echo "" >>$AP_CONFIG_AUTO_H
echo "/* check: #include <$header> */" >>$AP_CONFIG_AUTO_H
name="`echo $header | sed -e 's:/:_:g' -e 's:\.:_:g' | tr '[a-z]'
'[A-Z]'`"
-( export CPP; ./helpers/checkheader.sh $header )
+./helpers/checkheader.sh $header
if [ $? -eq 0 ]; then
echo "#ifndef HAVE_${name}" >>$AP_CONFIG_AUTO_H
echo "#define HAVE_${name} 1" >>$AP_CONFIG_AUTO_H
@@ -946,6 +948,7 @@
echo "#endif" >>$AP_CONFIG_AUTO_H
fi
done
+)
# Special AIX 4.x support: need to check for sys/processor.h
cvs commit: apache-1.3/src Configure
martin 99/12/13 14:00:19
Modified:src Configure
Log:
Oops. Add missing quotes. Noticed by Mark Bixby.
Submitted by: Mark Bixby
Revision ChangesPath
1.381 +1 -1 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -r1.380 -r1.381
--- Configure 1999/12/13 14:33:26 1.380
+++ Configure 1999/12/13 22:00:17 1.381
@@ -907,7 +907,7 @@
##
TCPP=`egrep '^CPP=' Makefile.config | tail -1 | awk -F= '{print $2}'`
if [ "x$TCPP" != "x" ]; then
-CPP=`CPP=$TCPP; export CPP CC; ./helpers/findcpp.sh`
+CPP=`CPP="$TCPP"; export CPP CC; ./helpers/findcpp.sh`
else
CPP=`export CC; ./helpers/findcpp.sh`
fi
cvs commit: apache-1.3 STATUS
martin 99/12/13 08:44:43 Modified:.STATUS Log: I'm all for including IPv6 support, but it musn't break any of the previously supported platforms. Revision ChangesPath 1.768 +4 -2 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.767 retrieving revision 1.768 diff -u -r1.767 -r1.768 --- STATUS1999/12/13 13:52:53 1.767 +++ STATUS1999/12/13 16:44:42 1.768 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/12/13 13:52:53 $] + Last modified at [$Date: 1999/12/13 16:44:42 $] Release: @@ -140,7 +140,9 @@ Message-ID: <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> Status: Lars +1 (on concept), Dirkx +1 (tested), - Martin +1 (on concept) + Martin +1 (on concept, but patched apache does not + compile successfully on pre-IPv6-SVR4, + and possibly others) * Jim Patterson's patch to make mod_info work on Win32 Message-ID: PR#1442
cvs commit: apache-1.3/src Configure
martin 99/12/13 06:33:27
Modified:src Configure
Log:
Undo recent shell-env-workaround for MPE/iX. Use explicit "export" to
force variables into environment.
Revision ChangesPath
1.380 +3 -3 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -r1.379 -r1.380
--- Configure 1999/12/10 11:03:07 1.379
+++ Configure 1999/12/13 14:33:26 1.380
@@ -907,9 +907,9 @@
##
TCPP=`egrep '^CPP=' Makefile.config | tail -1 | awk -F= '{print $2}'`
if [ "x$TCPP" != "x" ]; then
-CPP=`env CC="$CC" CPP=$TCPP ./helpers/findcpp.sh`
+CPP=`CPP=$TCPP; export CPP CC; ./helpers/findcpp.sh`
else
-CPP=`env CC="$CC" ./helpers/findcpp.sh`
+CPP=`export CC; ./helpers/findcpp.sh`
fi
if [ "x$TCPP" = "x" ]; then
echo "CPP=$CPP" >> Makefile.config
@@ -935,7 +935,7 @@
echo "" >>$AP_CONFIG_AUTO_H
echo "/* check: #include <$header> */" >>$AP_CONFIG_AUTO_H
name="`echo $header | sed -e 's:/:_:g' -e 's:\.:_:g' | tr '[a-z]'
'[A-Z]'`"
-env CPP="$CPP" ./helpers/checkheader.sh $header
+( export CPP; ./helpers/checkheader.sh $header )
if [ $? -eq 0 ]; then
echo "#ifndef HAVE_${name}" >>$AP_CONFIG_AUTO_H
echo "#define HAVE_${name} 1" >>$AP_CONFIG_AUTO_H
cvs commit: apache-1.3/src/modules/standard mod_mime.c
martin 99/12/13 06:17:37
Modified:src/modules/standard mod_mime.c
Log:
Avoid *all* side effects of signed/unsigned char sign extensions.
(Probably unneccessary, but this tests only the single bit 7)
Revision ChangesPath
1.52 +1 -1 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.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- mod_mime.c1999/12/10 14:51:03 1.51
+++ mod_mime.c1999/12/13 14:17:37 1.52
@@ -73,7 +73,7 @@
* defined it's not always right for our needs. Roll our own that
* we can rely on.
*/
-#define ap_isascii(c) ((OS_ASC(c) & ~0177) != 0)
+#define ap_isascii(c) ((OS_ASC(c) & 0x80) == 0)
typedef struct handlers_info {
char *name;
cvs commit: apache-1.3 STATUS
martin 99/12/13 05:52:54 Modified:.STATUS Log: Update IPv6 Patch Revision ChangesPath 1.767 +5 -4 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.766 retrieving revision 1.767 diff -u -r1.766 -r1.767 --- STATUS1999/12/10 12:22:41 1.766 +++ STATUS1999/12/13 13:52:53 1.767 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/12/10 12:22:41 $] + Last modified at [$Date: 1999/12/13 13:52:53 $] Release: @@ -136,10 +136,11 @@ Status: Bill +1 (on concept), Lars +1 (on concept) * Jun-ichiro itojun Hagino's [PATCH] IPv6 enable patch - ftp://ftp.kame.net/pub/kame/misc/apache-134-v6-19990118.diff.gz -Message-ID: <[EMAIL PROTECTED]> + ftp://ftp.kame.net/pub/kame/misc/apache-139-v6-19991013a.diff.gz + Message-ID: <[EMAIL PROTECTED]>, + <[EMAIL PROTECTED]> Status: Lars +1 (on concept), Dirkx +1 (tested), - Martin +1 (on concept; the patch may need a little cleanup) + Martin +1 (on concept) * Jim Patterson's patch to make mod_info work on Win32 Message-ID: PR#1442
cvs commit: apache-1.3/src/os/os390 ebcdic.c ebcdic.h
martin 99/12/10 04:28:28
Modified:src/os/os390 ebcdic.c ebcdic.h
Log:
Under the assumption that the recent CRLF change makes the
*_strictly kludge no longer necessary, I removed that part
of ebcdic.[ch]. This is untested by me, so please tell me
if it breaks anything for you and I'll revert it.
Revision ChangesPath
1.2 +2 -51 apache-1.3/src/os/os390/ebcdic.c
Index: ebcdic.c
===
RCS file: /export/home/cvs/apache-1.3/src/os/os390/ebcdic.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ebcdic.c 1999/12/09 17:12:12 1.1
+++ ebcdic.c 1999/12/10 12:28:26 1.2
@@ -70,7 +70,7 @@
Bijective EBCDIC (character set IBM-1047) to US-ASCII table:
This table is bijective - there are no ambigous or duplicate characters.
*/
-const unsigned char os_toascii_strictly[256] = {
+const unsigned char os_toascii[256] = {
0x00, 0x01, 0x02, 0x03, 0x85, 0x09, 0x86, 0x7f, /* 00-0f: */
0x87, 0x8d, 0x8e, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* */
0x10, 0x11, 0x12, 0x13, 0x8f, 0x0a, 0x08, 0x97, /* 10-1f: */
@@ -105,49 +105,6 @@
0x38, 0x39, 0xb3, 0xdb, 0xdc, 0xd9, 0xda, 0x9f /* 0123456789.. */
};
-/*
-Server EBCDIC (character set IBM-1047) to US-ASCII table:
-This table is a copy of the os_toascii_strictly bijective table above.
-The only change is that hex 0a (\012 octal) is mapped to hex 0a
-(ASCII's line feed) instead of hex 8e. This is done because throughout
-Apache, protocol string definitions hardcode the linefeed as \012 (octal):
-"Content-Type: text/plain\015\012". Without this kludge all protocol
-string definitions would need to be changed from ...\012 to ...\025.
-*/
-const unsigned char os_toascii[256] = {
-0x00, 0x01, 0x02, 0x03, 0x85, 0x09, 0x86, 0x7f, /* 00-0f: */
-0x87, 0x8d, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* */
-0x10, 0x11, 0x12, 0x13, 0x8f, 0x0a, 0x08, 0x97, /* 10-1f: */
-0x18, 0x19, 0x9c, 0x9d, 0x1c, 0x1d, 0x1e, 0x1f, /* */
-0x80, 0x81, 0x82, 0x83, 0x84, 0x92, 0x17, 0x1b, /* 20-2f: */
-0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x05, 0x06, 0x07, /* */
-0x90, 0x91, 0x16, 0x93, 0x94, 0x95, 0x96, 0x04, /* 30-3f: */
-0x98, 0x99, 0x9a, 0x9b, 0x14, 0x15, 0x9e, 0x1a, /* */
-0x20, 0xa0, 0xe2, 0xe4, 0xe0, 0xe1, 0xe3, 0xe5, /* 40-4f: */
-0xe7, 0xf1, 0xa2, 0x2e, 0x3c, 0x28, 0x2b, 0x7c, /* ...<(+| */
-0x26, 0xe9, 0xea, 0xeb, 0xe8, 0xed, 0xee, 0xef, /* 50-5f: */
-0xec, 0xdf, 0x21, 0x24, 0x2a, 0x29, 0x3b, 0x5e, /* &.!$*);^ */
-0x2d, 0x2f, 0xc2, 0xc4, 0xc0, 0xc1, 0xc3, 0xc5, /* 60-6f: */
-0xc7, 0xd1, 0xa6, 0x2c, 0x25, 0x5f, 0x3e, 0x3f, /* -/.,%_>? */
-0xf8, 0xc9, 0xca, 0xcb, 0xc8, 0xcd, 0xce, 0xcf, /* 70-7f: */
-0xcc, 0x60, 0x3a, 0x23, 0x40, 0x27, 0x3d, 0x22, /* .`:#@'=" */
-0xd8, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 80-8f: */
-0x68, 0x69, 0xab, 0xbb, 0xf0, 0xfd, 0xfe, 0xb1, /* .abcdefghi.. */
-0xb0, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, /* 90-9f: */
-0x71, 0x72, 0xaa, 0xba, 0xe6, 0xb8, 0xc6, 0xa4, /* .jklmnopqr.. */
-0xb5, 0x7e, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, /* a0-af: */
-0x79, 0x7a, 0xa1, 0xbf, 0xd0, 0x5b, 0xde, 0xae, /* .~stuvwxyz...[.. */
-0xac, 0xa3, 0xa5, 0xb7, 0xa9, 0xa7, 0xb6, 0xbc, /* b0-bf: */
-0xbd, 0xbe, 0xdd, 0xa8, 0xaf, 0x5d, 0xb4, 0xd7, /* .].. */
-0x7b, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, /* c0-cf: */
-0x48, 0x49, 0xad, 0xf4, 0xf6, 0xf2, 0xf3, 0xf5, /* {ABCDEFGHI.. */
-0x7d, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, /* d0-df: */
-0x51, 0x52, 0xb9, 0xfb, 0xfc, 0xf9, 0xfa, 0xff, /* }JKLMNOPQR.. */
-0x5c, 0xf7, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, /* e0-ef: */
-0x59, 0x5a, 0xb2, 0xd4, 0xd6, 0xd2, 0xd3, 0xd5, /* \.STUVWXYZ.. */
-0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, /* f0-ff: */
-0x38, 0x39, 0xb3, 0xdb, 0xdc, 0xd9, 0xda, 0x9f /* 0123456789.. */
-};
/*
The US-ASCII to EBCDIC (character set IBM-1047) table:
@@ -200,14 +157,8 @@
while (count-- != 0) {
*udest++ = os_toascii[*usrce++];
}
-}
-void
-ebcdic2ascii_strictly(unsigned char *dest, const unsigned char *srce, size_t
count)
-{
-while (count-- != 0) {
-*dest++ = os_toascii_strictly[*srce++];
-}
}
+
void
ascii2ebcdic(void *dest, const void *srce, size_t count)
{
1.2 +4 -1 apache-1.3/src/os/os390/ebcdic.h
Index: ebcdic.h
=
cvs commit: apache-1.3 STATUS
martin 99/12/10 04:22:42 Modified:.STATUS Log: MPE patch committed Revision ChangesPath 1.766 +1 -5 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.765 retrieving revision 1.766 diff -u -r1.765 -r1.766 --- STATUS1999/12/09 23:26:29 1.765 +++ STATUS1999/12/10 12:22:41 1.766 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/12/09 23:26:29 $] + Last modified at [$Date: 1999/12/10 12:22:41 $] Release: @@ -176,10 +176,6 @@ Status: Greg +1, Martin +1 (on concept) In progress: - -* Mark Bixby's freshening up the MPE/iX port (DSO support) - Message-ID: <[EMAIL PROTECTED]> - Status: Martin +1 (untested) * Doug MacEachern's libapr - Generic Apache Request Library (Alpha) This package contains modules for manipulating client request data
cvs commit: apache-1.3/src/os/mpeix dlopen.c gettimeofday.c mpe_dl_stub.c os-inline.c os.c os.h Makefile.tmpl README
martin 99/12/10 03:04:03
Modified:.configure
src Configure
src/ap ap_getpass.c
src/helpers TestCompile install.sh
src/include ap_config.h
src/main http_main.c rfc1413.c
src/support ab.c
Added: src/os/mpeix dlopen.c gettimeofday.c mpe_dl_stub.c
os-inline.c os.c os.h Makefile.tmpl README
Log:
Freshen up the MPE port. MPE/iX now supports dynamic loading of modules.
Submitted by: Mark Bixby <[EMAIL PROTECTED]>
Reviewed by:Martin Kraemer
Revision ChangesPath
1.114 +3 -0 apache-1.3/configure
Index: configure
===
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- configure 1999/12/09 17:19:35 1.113
+++ configure 1999/12/10 11:03:00 1.114
@@ -355,6 +355,9 @@
set -- --with-layout="$default_layout" "$@"
fi
;;
+*MPE/iX* )
+ iflags_program="-m 755"
+ ;;
esac
##
1.379 +13 -6 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -r1.378 -r1.379
--- Configure 1999/12/09 17:19:30 1.378
+++ Configure 1999/12/10 11:03:07 1.379
@@ -278,10 +278,11 @@
DEF_WANTHSREGEX=yes
;;
*MPE/iX*)
- OS='MPE/iX'
+ export OS='MPE/iX'
+ OSDIR='os/mpeix'
CFLAGS="$CFLAGS -DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE"
- LIBS="$LIBS -lsocket -lsvipc"
- LDFLAGS="$LDFLAGS -Xlinker \"-WL,cap=ia,ba,ph,pm;nmstack=1024000\""
+ LIBS="$LIBS -lsocket -lsvipc -lcurses"
+ LDFLAGS="$LDFLAGS -Xlinker \"-WL,cap=ia,ba,ph;nmstack=1024000\""
CAT="/bin/cat" # built-in cat is badly broken for stdin redirection
;;
*-apple-aux3*)
@@ -906,9 +907,9 @@
##
TCPP=`egrep '^CPP=' Makefile.config | tail -1 | awk -F= '{print $2}'`
if [ "x$TCPP" != "x" ]; then
-CPP=`CC=$CC CPP=$TCPP ./helpers/findcpp.sh`
+CPP=`env CC="$CC" CPP=$TCPP ./helpers/findcpp.sh`
else
-CPP=`CC=$CC ./helpers/findcpp.sh`
+CPP=`env CC="$CC" ./helpers/findcpp.sh`
fi
if [ "x$TCPP" = "x" ]; then
echo "CPP=$CPP" >> Makefile.config
@@ -934,7 +935,7 @@
echo "" >>$AP_CONFIG_AUTO_H
echo "/* check: #include <$header> */" >>$AP_CONFIG_AUTO_H
name="`echo $header | sed -e 's:/:_:g' -e 's:\.:_:g' | tr '[a-z]'
'[A-Z]'`"
-CPP=$CPP ./helpers/checkheader.sh $header
+env CPP="$CPP" ./helpers/checkheader.sh $header
if [ $? -eq 0 ]; then
echo "#ifndef HAVE_${name}" >>$AP_CONFIG_AUTO_H
echo "#define HAVE_${name} 1" >>$AP_CONFIG_AUTO_H
@@ -1002,6 +1003,12 @@
SHARED_CORE_EP='lib$(TARGET).ep'
SHCORE_IMPLIB=''
case "$PLAT" in
+ *MPE/iX*)
+ LD_SHLIB=ld
+ LDFLAGS_SHLIB='-b -a archive'
+ LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
+ LIBS_SHLIB='$(OSDIR)/mpe_dl_stub.o'
+ ;;
*-linux1)
CFLAGS_SHLIB="-fpic"
LDFLAGS_SHLIB="-Bshareable"
1.3 +41 -14apache-1.3/src/ap/ap_getpass.c
Index: ap_getpass.c
===
RCS file: /export/home/cvs/apache-1.3/src/ap/ap_getpass.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ap_getpass.c 1999/10/21 20:44:09 1.2
+++ ap_getpass.c 1999/12/10 11:03:13 1.3
@@ -85,26 +85,53 @@
#define ERR_OVERFLOW 5
#ifdef MPE
-/*
- * MPE lacks getpass() and a way to suppress stdin echo. So for now, just
- * issue the prompt and read the results with echo. (Ugh).
- */
+#include
-static char *getpass(const char *prompt)
+char *
+getpass(const char *prompt)
{
-static char password[MAX_STRING_LEN];
+ static char buf[MAX_STRING_LEN+1]; /* null byte at end */
+ char*ptr;
+ sigset_tsig, sigsave;
+ struct termios term, termsave;
+ FILE*fp,*outfp;
+ int c;
-fputs(prompt, stderr);
-gets((char *) &password);
+if ((outfp = fp = fo
cvs commit: apache-1.3/src/os/mpeix - New directory
martin 99/12/10 02:56:20 apache-1.3/src/os/mpeix - New directory
cvs commit: apache-1.3/src/support Makefile.tmpl htdigest.c
martin 99/12/09 09:19:49 Modified:src CHANGES Configure Makefile.tmpl .INSTALL Makefile.tmpl configure src/helpers GuessOS TestCompile binbuild.sh src/include ap_config.h src/main http_main.c util_script.c src/support Makefile.tmpl htdigest.c Log: OS specific patches for IBM's OS/390. Submitted by: Ovies Brabson <[EMAIL PROTECTED]> Reviewed by:Martin Kraemer, Paul Gilmartin Revision ChangesPath 1.1477+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1476 retrieving revision 1.1477 diff -u -r1.1476 -r1.1477 --- CHANGES 1999/12/09 12:04:59 1.1476 +++ CHANGES 1999/12/09 17:19:28 1.1477 @@ -1,5 +1,8 @@ Changes with Apache 1.3.10 + *) OS: Added first cut at support for IBM's OS/390. + [Ovies Brabson <[EMAIL PROTECTED]>] + *) Replace all occurrences of "\012\015" by a macro CRLF. This makes the code (somewhat) more readable, and improves the portability to character sets other than ASCII (e.g., EBCDIC). 1.378 +13 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.377 retrieving revision 1.378 diff -u -r1.377 -r1.378 --- Configure 1999/12/07 12:19:48 1.377 +++ Configure 1999/12/09 17:19:30 1.378 @@ -783,6 +783,14 @@ CFLAGS="-D_TANDEM_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" CC='c89' ;; +*-IBM-OS390*) + OS='OS390' + OSDIR='os/os390' + CC='c89' + CFLAGS="$CFLAGS -DOS390 -DCHARSET_EBCDIC -D_ALL_SOURCE" + DEF_WANTHSREGEX=yes + LIBS="$LIBS" + ;; *) # default: Catch systems we don't know about OS='Unknown and unsupported OS' echo Sorry, but we cannot grok \"$PLAT\" @@ -830,6 +838,7 @@ echo >>Makefile.config "INCDIR=\$(SRCDIR)/include" echo >>Makefile.config "INCLUDES0=-I\$(OSDIR) -I\$(INCDIR)" echo >>Makefile.config "SHELL=$SHELL" +echo >>Makefile.config "OS=$OS" ## And adjust/override WANTHSREGEX as needed @@ -2237,7 +2246,10 @@ @for i in \$(MODULES) ""; do \\ if [ "x\$\$i" != "x" ]; then \\ echo "===> \$(SDP)modules/\$\$i"; \\ - (cd \$\$i && \$(MAKE) \$(MFLAGS_STATIC) SDP='\$(SDP)' CC='\$(CC)' AUX_CFLAGS='\$(CFLAGS)' RANLIB='\$(RANLIB)' \$@) || exit 1; \\ + case "x\$(OS)" in \\ + xOS390 | xTPF) (cd \$\$i && \$(MAKE) SDP='\$(SDP)' \$@) || exit 1;; \\ + *) (cd \$\$i && \$(MAKE) \$(MFLAGS_STATIC) SDP='\$(SDP)' CC='\$(CC)' AUX_CFLAGS='\$(CFLAGS)' RANLIB='\$(RANLIB)' \$@) || exit 1;; \\ + esac; \\ echo "<=== \$(SDP)modules/\$\$i"; \\ fi; \\ done 1.115 +4 -1 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- Makefile.tmpl 1999/08/19 08:54:14 1.114 +++ Makefile.tmpl 1999/12/09 17:19:31 1.115 @@ -63,7 +63,10 @@ subdirs: @for i in $(SUBDIRS); do \ echo "===> $(SDP)$$i"; \ - ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)') || exit 1; \ + case ".$(OS)" in \ + .OS390 | .TPF) ( cd $$i && $(MAKE) SDP='$(SDP)' ) || exit 1;; \ + *) ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)') || exit 1;; \ + esac; \ echo "<=== $(SDP)$$i"; \ done 1.61 +10 -0 apache-1.3/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- INSTALL 1999/08/29 10:17:07 1.60 +++
cvs commit: apache-1.3/src/os/os390 Makefile.tmpl README.os390 ebcdic.c ebcdic.h os-inline.c os.c os.h xebcdic.sh
martin 99/12/09 09:12:21 Added: src/os/os390 Makefile.tmpl README.os390 ebcdic.c ebcdic.h os-inline.c os.c os.h xebcdic.sh Log: OS specific files for supporting Apache on OS390 Submitted by: Ovies Brabson <[EMAIL PROTECTED]> Revision ChangesPath 1.1 apache-1.3/src/os/os390/Makefile.tmpl Index: Makefile.tmpl === CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS) LIBS=$(EXTRA_LIBS) $(LIBS1) INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES) LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) OBJS= os.o os-inline.o ebcdic.o LIB= libos.a all: $(LIB) $(LIB): $(OBJS) rm -f $@ ar cr $@ $(OBJS) $(RANLIB) $@ .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $< clean: rm -f $(OBJS) $(LIB) distclean: clean -rm -f Makefile # We really don't expect end users to use this rule. It works only with # gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after # using it. depend: cp Makefile.tmpl Makefile.tmpl.bak \ && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \ && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \ && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \ -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \ > Makefile.tmpl \ && rm Makefile.new $(OBJS): Makefile # DO NOT REMOVE ebcdic.o: ebcdic.c ebcdic.o: $(INCDIR)/ap_config.h ebcdic.o: $(INCDIR)/ap_mmn.h ebcdic.o: $(INCDIR)/ap_config_auto.h ebcdic.o: os.h ebcdic.o: $(INCDIR)/ap_ctype.h ebcdic.o: $(INCDIR)/hsregex.h ebcdic.o: ebcdic.h os-inline.o: os-inline.c os-inline.o: $(INCDIR)/ap_config.h os-inline.o: $(INCDIR)/ap_mmn.h os-inline.o: $(INCDIR)/ap_config_auto.h os-inline.o: os.h os-inline.o: $(INCDIR)/ap_ctype.h os-inline.o: $(INCDIR)/hsregex.h os.o: os.c os.o: $(INCDIR)/httpd.h os.o: $(INCDIR)/ap_config.h os.o: $(INCDIR)/ap_mmn.h os.o: $(INCDIR)/ap_config_auto.h os.o: os.h os.o: $(INCDIR)/ap_ctype.h os.o: $(INCDIR)/hsregex.h os.o: $(INCDIR)/alloc.h os.o: $(INCDIR)/buff.h os.o: $(INCDIR)/ap.h os.o: ebcdic.h os.o: $(INCDIR)/util_uri.h os.o: $(INCDIR)/http_core.h 1.1 apache-1.3/src/os/os390/README.os390 Index: README.os390 === README.os390 == This file describes how one extracts the apache source files from a compressed archive on one of the apache source code distribution web pages to an OS/390 system. OS/390 represents characters with the ebcdic code set. The files in the apache source trees on the web represent characters using the ascii code set. The procedure described here de-compresses the archive file and extracts the files from the archive while translating characters in the files from ascii to ebcdic. Once you download the compressed archive to an OS/390 system and follow this procedure, you will be ready to configure, compile, and install apache on your OS/390 system. This procedure assumes that you will download the apache tree using a browser on a workstation and then you will transfer the compressed archive from your workstation to an OS/390 system. You could probably just ftp the compressed archive to your OS/390 system ifyou like. If you download to a workstation as described here, it is assumed that the workstation has TCP/IP and FTP installed on it. It is also assumed that you have TCP/IP and FTP access from the workstation to the OS/390 system you want to put apache on. Procedure for extracting apache source to an OS/390 system: --- - From either www.apache.org/dist or from dev.apache.org/from-CVS/apache-version select one of the source trees with a file type of .tar.gz or .tar.Z and download it to your workstation. Ensure that the name of the downloaded file remains the same as the name of the file on the web page. - Also from the same web page download xebcdic.sh. - From your workstation ftp to the OS/390 system you would like to run apache on. - ftp os390-host-name - You'll be prompted for user id and password. - Once you've logged in successfully you'll get the ftp prompt. - FTP the .tar.gz file and xebcdic.sh files you downloaded to your workstation to the OS/390 system. The xebcdic.sh file must be ftp'ed in ascii mode. The apache compressed archive file must be ftp'ed in binary mode. - put xebcdic.sh - bin - put apache-compressed-archive-file-name - End your ftp connection. - bye or quit
cvs commit: apache-1.3/src/main rfc1413.c
martin 99/12/09 09:05:29
Modified:src/main rfc1413.c
Log:
EBCDIC: The buffer was passed incorrectly. Some compilers tolerated
that, but it was wrong anyway. Noticed by Ovies Brabson
Submitted by: Ovies Brabson <[EMAIL PROTECTED]>
Reviewed by:Martin Kraemer
Revision ChangesPath
1.32 +2 -2 apache-1.3/src/main/rfc1413.c
Index: rfc1413.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/rfc1413.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- rfc1413.c 1999/12/09 12:05:04 1.31
+++ rfc1413.c 1999/12/09 17:05:28 1.32
@@ -154,7 +154,7 @@
/* send query to server. Handle short write. */
#ifdef CHARSET_EBCDIC
-ebcdic2ascii(&buffer, &buffer, buflen);
+ebcdic2ascii(buffer, buffer, buflen);
#endif
i = 0;
while(i < strlen(buffer)) {
@@ -212,7 +212,7 @@
/* RFC1413_USERLEN = 512 */
#ifdef CHARSET_EBCDIC
-ascii2ebcdic(&buffer, &buffer, (size_t)i);
+ascii2ebcdic(buffer, buffer, (size_t)i);
#endif
if (sscanf(buffer, "%u , %u : USERID :%*[^:]:%512s", &rmt_port,
&our_port,
user) != 3 || ntohs(rmt_sin->sin_port) != rmt_port
cvs commit: apache-1.3/src/os/os390 - New directory
martin 99/12/09 09:04:27 apache-1.3/src/os/os390 - New directory
cvs commit: apache-1.3/src/os/bs2000 ebcdic.c ebcdic.h
martin 99/12/09 08:55:56
Modified:src/os/bs2000 ebcdic.c ebcdic.h
Log:
Take advantage of the new clean CRLF implementation.
The *ebcdic*_strictly() kludge is now no longer required.
Revision ChangesPath
1.13 +53 -132 apache-1.3/src/os/bs2000/ebcdic.c
Index: ebcdic.c
===
RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/ebcdic.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ebcdic.c 1999/12/09 12:10:12 1.12
+++ ebcdic.c 1999/12/09 16:55:54 1.13
@@ -62,133 +62,57 @@
/*
Initial Port for Apache-1.3 by <[EMAIL PROTECTED]>
-"BS2000 OSD" is a POSIX on a main frame. It is made by Siemens AG, Germany.
+"BS2000 OSD/POSIX" is a POSIX subsystem on a main frame. It is made
+by Fujitsu-Siemens Computers GmbH, Germany. The POSIX system has been
+derived from a regular SVR4 source and thus is very "compatible"
+to other unixes. In fact, it received the X/Open branding.
+
Within the POSIX subsystem, the same character set was chosen as in
-"native BS2000", namely EBCDIC.
+"native BS2000", namely EBCDIC. This requires conversions at various
+stages of the request and response processing.
-EBCDIC Table. (Yes, in EBCDIC, the letters 'a'..'z' are not contiguous!)
+EBCDIC Table. (In EBCDIC, the letters 'a'..'z' are not contiguous!)
This table is bijective, i.e. there are no ambigous or duplicate characters
-0000 01 02 03 85 09 86 7f 87 8d 8e 0b 0c 0d 0e 0f **
-1010 11 12 13 8f 0a 08 97 18 19 9c 9d 1c 1d 1e 1f **
-2080 81 82 83 84 92 17 1b 88 89 8a 8b 8c 05 06 07 **
-3090 91 16 93 94 95 96 04 98 99 9a 9b 14 15 9e 1a **
-4020 a0 e2 e4 e0 e1 e3 e5 e7 f1 60 2e 3c 28 2b 7c * .`.<(+|*
-5026 e9 ea eb e8 ed ee ef ec df 21 24 2a 29 3b 9f *&.!$*);.*
-602d 2f c2 c4 c0 c1 c3 c5 c7 d1 5e 2c 25 5f 3e 3f *-/^,%_>?*
-70f8 c9 ca cb c8 cd ce cf cc a8 3a 23 40 27 3d 22 *..:#@'="*
-80d8 61 62 63 64 65 66 67 68 69 ab bb f0 fd fe b1 *.abcdefghi..*
-90b0 6a 6b 6c 6d 6e 6f 70 71 72 aa ba e6 b8 c6 a4 *.jklmnopqr..*
-a0b5 af 73 74 75 76 77 78 79 7a a1 bf d0 dd de ae *..stuvwxyz..*
-b0a2 a3 a5 b7 a9 a7 b6 bc bd be ac 5b 5c 5d b4 d7 *...[\]..*
-c0f9 41 42 43 44 45 46 47 48 49 ad f4 f6 f2 f3 f5 *.ABCDEFGHI..*
-d0a6 4a 4b 4c 4d 4e 4f 50 51 52 b9 fb fc db fa ff *.JKLMNOPQR..*
-e0d9 f7 53 54 55 56 57 58 59 5a b2 d4 d6 d2 d3 d5 *..STUVWXYZ..*
-f030 31 32 33 34 35 36 37 38 39 b3 7b dc 7d da 7e *0123456789.{.}.~*
*/
-
-/* The bijective ebcdic-to-ascii table: */
-const unsigned char os_toascii_strictly[256] = {
-/*00*/ 0x00, 0x01, 0x02, 0x03, 0x85, 0x09, 0x86, 0x7f,
- 0x87, 0x8d, 0x8e, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /**/
-/*10*/ 0x10, 0x11, 0x12, 0x13, 0x8f, 0x0a, 0x08, 0x97,
- 0x18, 0x19, 0x9c, 0x9d, 0x1c, 0x1d, 0x1e, 0x1f, /**/
-/*20*/ 0x80, 0x81, 0x82, 0x83, 0x84, 0x92, 0x17, 0x1b,
- 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x05, 0x06, 0x07, /**/
-/*30*/ 0x90, 0x91, 0x16, 0x93, 0x94, 0x95, 0x96, 0x04,
- 0x98, 0x99, 0x9a, 0x9b, 0x14, 0x15, 0x9e, 0x1a, /**/
-/*40*/ 0x20, 0xa0, 0xe2, 0xe4, 0xe0, 0xe1, 0xe3, 0xe5,
- 0xe7, 0xf1, 0x60, 0x2e, 0x3c, 0x28, 0x2b, 0x7c, /* .`.<(+|*/
-/*50*/ 0x26, 0xe9, 0xea, 0xeb, 0xe8, 0xed, 0xee, 0xef,
- 0xec, 0xdf, 0x21, 0x24, 0x2a, 0x29, 0x3b, 0x9f, /*&.!$*);.*/
-/*60*/ 0x2d, 0x2f, 0xc2, 0xc4, 0xc0, 0xc1, 0xc3, 0xc5,
- 0xc7, 0xd1, 0x5e, 0x2c, 0x25, 0x5f, 0x3e, 0x3f, /*-/^,%_>?*/
-/*70*/ 0xf8, 0xc9, 0xca, 0xcb, 0xc8, 0xcd, 0xce, 0xcf,
- 0xcc, 0xa8, 0x3a, 0x23, 0x40, 0x27, 0x3d, 0x22, /*..:#@'="*/
-/*80*/ 0xd8, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
- 0x68, 0x69, 0xab, 0xbb, 0xf0, 0xfd, 0xfe, 0xb1, /*.abcdefghi..*/
-/*90*/ 0xb0, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70,
- 0x71, 0x72, 0xaa, 0xba, 0xe6, 0xb8, 0xc6, 0xa4, /*.jklmnopqr..*/
-/*a0*/ 0xb5, 0xaf, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
- 0x79, 0x7a, 0xa1, 0xbf, 0xd0, 0xdd, 0xde, 0xae, /*..stuvwxyz..*/
-/*b0*/ 0xa2, 0xa3, 0xa5, 0xb7, 0xa9, 0xa7, 0xb6, 0xbc,
- 0xbd, 0xbe, 0xac, 0x5b, 0x5c, 0x5d, 0xb4, 0xd7, /*...[\]..*/
-/*c0*/ 0xf9, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
- 0x48, 0x49, 0xad, 0xf4, 0xf6, 0xf2, 0xf3, 0xf5, /*.ABCDEFGHI..*/
-/*d0*/ 0xa6, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50,
- 0x51, 0x52, 0xb9, 0xfb, 0xfc, 0xdb, 0xfa, 0xff, /*.JKLMNOPQR..*/
-/*e0*/ 0xd9, 0xf7, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
cvs commit: apache-1.3 STATUS
martin 99/12/09 08:16:58 Modified:.STATUS Log: Cool but dry; Revision ChangesPath 1.762 +10 -15apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.761 retrieving revision 1.762 diff -u -r1.761 -r1.762 --- STATUS1999/12/08 17:18:34 1.761 +++ STATUS1999/12/09 16:16:57 1.762 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/12/08 17:18:34 $] + Last modified at [$Date: 1999/12/09 16:16:57 $] Release: @@ -44,18 +44,18 @@ Available Patches: * Youichirou Koga's patch to add AddCharset to mod_mime. Message-ID: <384E91DF.D92FABC2.Golux.Com> - Status: Ken +1 + Status: Ken +1, Martin +1(after minor fix) * Andrew Ford's patch (1999/12/05) to add absolute times to mod_expires Message-ID: <[EMAIL PROTECTED]> - Status: + Status: Martin +1 * Raymond S Brand's path to mod_autoindex to fix the header/readme include processing so the envariables are correct for the included documents. (Actually, there are two variants in the patch message, for two different ways of doing it.) Message-ID: <[EMAIL PROTECTED]> - Status: + Status: Martin +1(concept) * Jayaram's patch (10/27/99) to fix PR4856 PR: 4856 It is found that UnSetEnv directive fails to unset the @@ -80,7 +80,7 @@ extension in directory listings. This was NOT happening because the total filename was being compared with the file-extension. - Status: + Status: Martin +1(untested) * JJ Keijser's patch (99/10/06) to enable mod_info on Win32 PR#: PR2415, PR1442 @@ -94,7 +94,7 @@ - Add ConsoleCtrlHandler to catch Ctrl-C in the Apache console window - Make Apache shut down cleanly when run on Windows 95 (PR4125) PR#: PR2472, PR4125, PR1643 (suspended) and PR2208 (suspended). - Status: + Status: Martin +1(untested) * Paul Reder's patch to fix Allow/Deny (.htaccess parsing) in regex processing. @@ -127,7 +127,7 @@ * Brian Havard's patch to remove dependency of mod_auth_dbm on mod_auth. (PR#2598) Message-ID: <[EMAIL PROTECTED]> - Status: Lars +1 (on concept), Ken +1 (on concept) + Status: Lars +1 (on concept), Ken +1 (on concept), Martin +1(untested) * Aidan Cully's patch to allow assignment of 'ownership' of resources to either the server UID or the file's owner. @@ -180,14 +180,9 @@ In progress: -* Mark Bixby's freshening up the MPE/iX port (mostly APACI) - Message-ID: <[EMAIL PROTECTED]> -Status: Mark says: "...currently waiting for HP to fix two OS bugs. - A fix for siglongjmp() is available and has been tested - successfully by me, but has yet to be included in a - public patch. The likely cause of the "EINTR from - fopen()" bug has been identified, but analysis on how - to fix it continues." +* Mark Bixby's freshening up the MPE/iX port (DSO support) + Message-ID: <[EMAIL PROTECTED]> + Status: Martin +1 (untested) * Doug MacEachern's libapr - Generic Apache Request Library (Alpha) This package contains modules for manipulating client request data
cvs commit: apache-1.3/conf httpd.conf-dist httpd.conf-dist-win
martin 99/12/09 08:01:10 Modified:conf httpd.conf-dist httpd.conf-dist-win Log: Language definition to go with czech homepage Revision ChangesPath 1.51 +2 -1 apache-1.3/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /export/home/cvs/apache-1.3/conf/httpd.conf-dist,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- httpd.conf-dist 1999/11/18 10:08:26 1.50 +++ httpd.conf-dist 1999/12/09 16:01:09 1.51 @@ -646,7 +646,7 @@ # Danish (da) - Dutch (nl) - English (en) - Estonian (ee) # French (fr) - German (de) - Greek-Modern (el) # Italian (it) -Portugese (pt) - Luxembourgeois* (ltz) -# Spanish (es) - Swedish (sv) - Catalan (ca) +# Spanish (es) - Swedish (sv) - Catalan (ca) - Czech(cz) # AddLanguage da .dk AddLanguage nl .nl @@ -661,6 +661,7 @@ AddLanguage ca .ca AddLanguage es .es AddLanguage sv .se +AddLanguage cz .cz # LanguagePriority allows you to give precedence to some languages # in case of a tie during content negotiation. 1.30 +2 -1 apache-1.3/conf/httpd.conf-dist-win Index: httpd.conf-dist-win === RCS file: /export/home/cvs/apache-1.3/conf/httpd.conf-dist-win,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- httpd.conf-dist-win 1999/09/21 20:27:15 1.29 +++ httpd.conf-dist-win 1999/12/09 16:01:09 1.30 @@ -583,7 +583,7 @@ # Danish (da) - Dutch (nl) - English (en) - Estonian (ee) # French (fr) - German (de) - Greek-Modern (el) # Italian (it) -Portugese (pt) - Luxembourgeois* (ltz) -# Spanish (es) - Swedish (sv) - Catalan (ca) +# Spanish (es) - Swedish (sv) - Catalan (ca) - Czech(cz) # AddLanguage da .dk AddLanguage nl .nl @@ -598,6 +598,7 @@ AddLanguage ca .ca AddLanguage es .es AddLanguage sv .se +AddLanguage cz .cz # LanguagePriority allows you to give precedence to some languages # in case of a tie during content negotiation.
cvs commit: apache-1.3/htdocs index.html.cz
martin 99/12/09 07:56:35 Added: htdocs index.html.cz Log: Multiple Language Welcome Page - Czech translation (submitted Sep 1999) Submitted by: Honza Jirousek <[EMAIL PROTECTED]> The author writes: couple notes: 1) My Netscape Communicator 4.6 for Linux lists Czech language under code Czech(cs). I'm not sure what standards rule this, but it's quite likely wrong. Since the split of Czechoslovakia into two independent countries about 7 years ago, cz is an ISO code for Czech and sk for Slovak. Top level DNS domain cs (which caused so much trouble to mail users from computer science departments in US universities, who used to cut the domain part of local e-mail addreses short (e.g. [EMAIL PROTECTED]>[EMAIL PROTECTED]) and were surprised to get messages bounced by some Czechoslovakian mail servers) and other uses of the code cs should be deprecated by now. I assume, however, that this is of no significance to Apache, which handles thye country codes in httpd.conf only. 2) Note that while Slovak language uses the same character set as Czech and while it's a fairly close to Czech, it is not identical and this translation will not pass for a Slovak version of the page. Slovak users may likely use the language negotiation feature, though, and set the order "sk,cz,en" in their browsers. 3) There are two encoding for non-asci Czech characters. Supposed Internet standard is iso-8559-2, but most windows browsers use windows-1250 (and thus many Czech web pages are also created in this character set). Most browsers (on all platforms) can handle both encodings, but have to be told which one to use, as no good "default" can be assumed. One way is to configure Apache to send proper character set in HTTP headers (this has to be set locally based on website owner's preference), another is to include the character set in a META tag. I think the latter would work better for default welcome page and so I did in the page I'm sending. Honza Jirousek Revision ChangesPath 1.1 apache-1.3/htdocs/index.html.cz Index: index.html.cz === Testovací stránka instalace web serveru Apache Funguje to! Na tomto serveru bì¾í Apache! Pokud vidíte tuto zprávu, správce tohoto poèítaèe právì úspì¹nì nainstaloval http://www.apache.org/";>Apache web server. Teï je¹tì musí doplnit obsah a nahradit tuto standardní uvítací stránku, nebo pøesmìrovat server na skuteènou domovskou stránku. Pokud vidíte tuto zprávu místo oèekávané domovské stránky, kontaktujte, prosím, správce pøíslu¹ného web serveru. (Zkuste poslat e-mail na adresu <Webmaster@domain>.) Pøesto¾e tento server pou¾ívá program Apache, témìø jistì nemá nic spoleèného s Apache Group, proto prosím neposílejte e-maily o tomto serveru nebo jeho obsahu autorùm Apache. Pokud to udìláte, budeme va¹e zprávy ignorovat. Zde najdete dokumentaci Apache (anglicky) obsa¾enou v této distribuci. Následující logo mù¾e být pou¾ito bez omezení na web serveru s programem Apache. Dìkujeme za pou¾ití Apache!
cvs commit: apache-1.3/src/os/bs2000 bs2login.c ebcdic.c
martin 99/12/09 04:10:12
Modified:src/os/bs2000 bs2login.c ebcdic.c
Log:
First cut at using the CRLF macro changes of Gil's patch.
Next step is replacement of all xxx_strictly stuff by xxx
(and renaming the os_toascii_strictly[] table to os_toascii[])
Revision ChangesPath
1.13 +0 -1 apache-1.3/src/os/bs2000/bs2login.c
Index: bs2login.c
===
RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/bs2login.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bs2login.c1999/07/26 07:46:55 1.12
+++ bs2login.c1999/12/09 12:10:11 1.13
@@ -192,7 +192,6 @@
{
_rini_structinittask;
charusername[USER_LEN+1];
-int save_errno;
bs2_ForkTypetype = os_forktype();
/* We can be sure that no change to uid==0 is possible because of
1.12 +1 -1 apache-1.3/src/os/bs2000/ebcdic.c
Index: ebcdic.c
===
RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/ebcdic.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ebcdic.c 1999/11/24 17:12:19 1.11
+++ ebcdic.c 1999/12/09 12:10:12 1.12
@@ -235,7 +235,7 @@
const unsigned char *usrce = srce;
while (count-- != 0) {
-*udest++ = os_toascii[*usrce++];
+*udest++ = os_toascii_strictly[*usrce++];
}
}
void
cvs commit: apache-1.3/src/modules/proxy mod_proxy.h proxy_ftp.c
martin 99/12/09 04:05:11
Modified:src CHANGES
src/include httpd.h
src/main buff.c http_protocol.c rfc1413.c util_script.c
src/modules/proxy mod_proxy.h proxy_ftp.c
Log:
Replace all occurrences of "\012\015" by a macro CRLF. This makes
the code (somewhat) more readable, and improves the portability
to character sets other than ASCII (e.g., EBCDIC).
This patch results in no functional change whatsoever on ASCII machines,
but allows EBCDIC platforms to live without the ebcdic2ascii_strictly()
kludge.
Submitted by: Paul Gilmartin <[EMAIL PROTECTED]>
Reviewed by: Jim Jgielski, Martin Kraemer
Revision ChangesPath
1.1476+9 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1475
retrieving revision 1.1476
diff -u -r1.1475 -r1.1476
--- CHANGES 1999/12/09 05:20:52 1.1475
+++ CHANGES 1999/12/09 12:04:59 1.1476
@@ -1,5 +1,14 @@
Changes with Apache 1.3.10
+ *) Replace all occurrences of "\012\015" by a macro CRLF. This makes
+ the code (somewhat) more readable, and improves the portability
+ to character sets other than ASCII (e.g., EBCDIC).
+ This patch results in no functional change whatsoever on ASCII
+ machines, but allows EBCDIC platforms to live without the
+ ebcdic2ascii_strictly() kludge.
+ [Paul Gilmartin <[EMAIL PROTECTED]>, slightly modified
+ by Martin Kraemer]
+
*) more fixes to mod_auth_digest:
- better comparing of request-uri with uri parameter in Authorization
header
1.297 +4 -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.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- httpd.h 1999/10/21 20:44:18 1.296
+++ httpd.h 1999/12/09 12:05:02 1.297
@@ -599,6 +599,8 @@
#ifndef CHARSET_EBCDIC
#define LF 10
#define CR 13
+#define CRLF "\015\012"
+#define OS_ASC(c) (c)
#else /* CHARSET_EBCDIC */
#include "ebcdic.h"
/* OSD_POSIX uses the EBCDIC charset. The transition ASCII->EBCDIC is done in
@@ -610,6 +612,8 @@
*/
#define CR '\r'
#define LF '\n'
+#define CRLF "\r\n"
+#define OS_ASC(c) (os_toascii[c])
#endif /* CHARSET_EBCDIC */
/* Possible values for request_rec.read_body (set by handling module):
1.93 +14 -27apache-1.3/src/main/buff.c
Index: buff.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/buff.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- buff.c1999/12/08 23:02:34 1.92
+++ buff.c1999/12/09 12:05:03 1.93
@@ -540,16 +540,16 @@
*strp++ = ' ';
++i;
}
-*strp++ = '\015';
-*strp = '\012';
+*strp++ = CR;
+*strp = LF;
#ifdef CHARSET_EBCDIC
/* Chunks are an HTTP/1.1 Protocol feature. They must ALWAYS be in ASCII
*/
ebcdic2ascii(&fb->outbase[fb->outchunk], &fb->outbase[fb->outchunk],
CHUNK_HEADER_SIZE);
#endif /*CHARSET_EBCDIC*/
/* tack on the trailing CRLF, we've reserved room for this */
-fb->outbase[fb->outcnt++] = '\015';
-fb->outbase[fb->outcnt++] = '\012';
+fb->outbase[fb->outcnt++] = CR;
+fb->outbase[fb->outcnt++] = LF;
fb->outchunk = -1;
}
@@ -874,27 +874,15 @@
}
ch = fb->inptr[i++];
-#ifndef CHARSET_EBCDIC
- if (ch == '\012') { /* got LF */
- if (ct == 0)
- buff[ct++] = '\n';
-/* if just preceeded by CR, replace CR with LF */
- else if (buff[ct - 1] == '\015')
- buff[ct - 1] = '\n';
- else if (ct < n - 1)
- buff[ct++] = '\n';
- else
- i--;/* no room for LF */
- break;
- }
-#else /* an EBCDIC machine: do the same, but convert to EBCDIC on the fly: */
+#ifdef CHARSET_EBCDIC
if (fb->flags & B_ASCII2EBCDIC)
ch = os_toebcdic[(unsigned char)ch];
- if (ch == os_toebcdic['\012']) { /* got LF */
+#endif
+ if (ch == LF) { /* got LF */
if (ct == 0)
buff[ct++] = '\n';
/* if just preceeded by CR, replace CR with LF */
- else if (buff[ct - 1] == os_toebcdic['\015'])
+ else if (buff[ct - 1] == CR)
cvs commit: apache-1.3/src/include ap_config.h
martin 99/12/07 04:19:50 Modified:src Configure PORTING src/include ap_config.h Log: Autodetect the presence of the header; use it if available. This change results in fewer OS dependencies than the old (hardcoded) "#if defined() &&..." list Submitted by: Ovies Brabson <[EMAIL PROTECTED]> Reviewed by:Martin Kraemer Revision ChangesPath 1.377 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.376 retrieving revision 1.377 diff -u -r1.376 -r1.377 --- Configure 1999/11/30 15:52:00 1.376 +++ Configure 1999/12/07 12:19:48 1.377 @@ -920,7 +920,7 @@ echo "#define AP_CONFIG_AUTO_H" >>$AP_CONFIG_AUTO_H echo " + checking for system header files" -CHECK_FOR_HEADERS="dlfcn.h dl.h bstring.h crypt.h unistd.h sys/resource.h sys/select.h sys/processor.h" +CHECK_FOR_HEADERS="dlfcn.h dl.h bstring.h crypt.h unistd.h sys/resource.h sys/select.h sys/processor.h sys/param.h" for header in $CHECK_FOR_HEADERS; do echo "" >>$AP_CONFIG_AUTO_H echo "/* check: #include <$header> */" >>$AP_CONFIG_AUTO_H 1.34 +6 -0 apache-1.3/src/PORTING Index: PORTING === RCS file: /export/home/cvs/apache-1.3/src/PORTING,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- PORTING 1998/09/17 21:13:58 1.33 +++ PORTING 1999/12/07 12:19:48 1.34 @@ -200,6 +200,12 @@ functions are available as well. This is set automatically during the Configure process and stored in the src/include/ap_config_auto.h header file. + +HAVE_SYS_PARAM_H: + Defined if the OS has the header file. This is + set automatically during the Configure process and stored in the + src/include/ap_config_auto.h header file. + -- USE_*: 1.277 +4 -4 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /export/home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.276 retrieving revision 1.277 diff -u -r1.276 -r1.277 --- ap_config.h 1999/12/06 22:16:59 1.276 +++ ap_config.h 1999/12/07 12:19:50 1.277 @@ -116,10 +116,6 @@ #include "os.h" #endif -#if !defined(QNX) && !defined(MPE) && !defined(WIN32) && !defined(TPF) && !defined(NETWARE) -#include -#endif - /* Define one of these according to your system. */ #if defined(MINT) typedef int rlim_t; @@ -964,6 +960,10 @@ /* NEED_STRDUP is set on stupid systems that don't have strdup. */ #undef NEED_STRDUP #endif + +#ifdef HAVE_SYS_PARAM_H +#include +#endif /* HAVE_SYS_PARAM_H */ /* stuff marked API_EXPORT is part of the API, and intended for use * by modules
cvs commit: apache-1.3/src CHANGES
martin 99/12/06 14:34:08
Modified:src CHANGES
Log:
Forgot to mention Paul "gil" Gilmartin who persisted and bashed out all
the prototype bugs ("const char *" vs. "char * const" & the like)
Revision ChangesPath
1.1472+2 -2 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1471
retrieving revision 1.1472
diff -u -r1.1471 -r1.1472
--- CHANGES 1999/12/06 22:16:35 1.1471
+++ CHANGES 1999/12/06 22:33:57 1.1472
@@ -1,8 +1,8 @@
Changes with Apache 1.3.10
*) Fix various compile time warnings in hashbang_emul code which
- prevent successful compilation on OS/390
- [Ovies Brabson <[EMAIL PROTECTED]>]
+ prevent successful compilation on OS/390 [Ovies Brabson
+ <[EMAIL PROTECTED]>, Paul Gilmartin <[EMAIL PROTECTED]>]
*) EBCDIC: Fixed binary upload capability (plain and chunked) for
all methods using the ap_*_client_block() functions, most notably
cvs commit: apache-1.3/src/regex regcomp.c
martin 99/12/06 14:17:06
Modified:src CHANGES
src/ap ap_execve.c
src/include ap.h ap_config.h
src/regex regcomp.c
Log:
Fix various compile time warnings in hashbang_emul code which
prevent successful compilation on OS/390
Submitted by: Ovies Brabson <[EMAIL PROTECTED]>
Reviewed by: Martin Kraemer
Revision ChangesPath
1.1471+6 -2 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1470
retrieving revision 1.1471
diff -u -r1.1470 -r1.1471
--- CHANGES 1999/12/06 12:41:35 1.1470
+++ CHANGES 1999/12/06 22:16:35 1.1471
@@ -1,5 +1,9 @@
Changes with Apache 1.3.10
+ *) Fix various compile time warnings in hashbang_emul code which
+ prevent successful compilation on OS/390
+ [Ovies Brabson <[EMAIL PROTECTED]>]
+
*) EBCDIC: Fixed binary upload capability (plain and chunked) for
all methods using the ap_*_client_block() functions, most notably
POST and PUT. The functionality to switch input between protocol
@@ -27,8 +31,8 @@
PDF files could not be read by Acrobat Reader (which sends long
lists of byte ranges in each request) when the server was apache
on ebcdic machines.
- [Noted by Oliver Reh <[EMAIL PROTECTED]>, solved by
- Martin Kraemer]
+ [Noted by Oliver Reh <[EMAIL PROTECTED]>, solved by Martin
+ Kraemer, warnings fixed by Ovies Brabson <[EMAIL PROTECTED]>]
*) Add IndexOptions FoldersFirst to allow fancy-indexed directory
listings to have the subdirectories always listed at the top.
1.13 +10 -10apache-1.3/src/ap/ap_execve.c
Index: ap_execve.c
===
RCS file: /export/home/cvs/apache-1.3/src/ap/ap_execve.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ap_execve.c 1999/03/07 13:51:19 1.12
+++ ap_execve.c 1999/12/06 22:16:50 1.13
@@ -99,7 +99,7 @@
#undef execle
#undef execve
-static const char **hashbang(const char *filename, char **argv);
+static const char **hashbang(const char *filename, char * const *argv);
/* Historically, a list of arguments on the stack was often treated as
@@ -133,7 +133,7 @@
/* Pass two --- copy the argument strings into the result space */
va_start(adummy, argv0);
-argv[0] = argv0;
+argv[0] = (char *)argv0;
for (argc = 1; (argv[argc] = va_arg(adummy, char *)) != NULL; ++argc) {
continue;
}
@@ -149,7 +149,7 @@
/* Count number of entries in vector "args", including the trailing NULL
entry
*/
static int
-count_args(const char **args)
+count_args(char * const *args)
{
int i;
for (i = 0; args[i] != NULL; ++i) {
@@ -163,14 +163,14 @@
* We have to fiddle with the argv array to make it work on platforms
* which don't support the "hashbang" interpreter line by default.
*/
-int ap_execve(const char *filename, const char *argv[],
- const char *envp[])
+int ap_execve(const char *filename, char * const argv[],
+ char * const envp[])
{
-const char **script_argv;
+char **script_argv;
extern char **environ;
if (envp == NULL) {
- envp = (const char **) environ;
+ envp = (char * const *) environ;
}
/* Try to execute the file directly first: */
@@ -201,7 +201,7 @@
* Interpret the line following the #! as a command line
* in shell style.
*/
- if ((script_argv = hashbang(filename, argv)) != NULL) {
+ if ((script_argv = (char **)hashbang(filename, argv)) != NULL) {
/* new filename is the interpreter to call */
filename = script_argv[0];
@@ -257,7 +257,7 @@
*/
#define HACKBUFSZ 1024 /* Max chars in #! vector */
#define HACKVECSZ 128/* Max words in #! vector */
-static const char **hashbang(const char *filename, char **argv)
+static const char **hashbang(const char *filename, char * const *argv)
{
char lbuf[HACKBUFSZ];
char *sargv[HACKVECSZ];
@@ -347,7 +347,7 @@
}
++i;
- newargv = (char **) malloc((p - lbuf + 1)
+ newargv = (const char **) malloc((p - lbuf + 1)
+ (i + sargc + 1) * sizeof(*newargv));
if (newargv == NULL) {
fprintf(stderr, "Ouch! Out of memory in hashbang()!\n");
1.26 +1 -1 apache-1.3/src/include/ap.h
Index: ap.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/ap.h,v
ret
cvs commit: apache-1.3/src/main http_protocol.c
martin 99/12/06 04:41:42
Modified:src CHANGES
src/main http_protocol.c
Log:
EBCDIC: Fixed binary upload capability (plain and chunked) for
all methods using the ap_*_client_block() functions, most notably
POST and PUT. The functionality to switch input between protocol
parts (chunks) and (possibly binary) data had been missing all
the time, making chunked PUT impossible until now.
Hello TPF developers: I think these five lines in os/tpf/os.c
ought to be removed:
else{
if (r->method_number == M_PUT)
ap_bsetflag(r->connection->client, B_ASCII2EBCDIC, 0);
/* don't translate non-text files to EBCDIC */
}
Also, your change to Vincent's mod_put should be undone.
In a next step, I will try to make EBCDIC conversion completely
configurable. Any volunteers for helping (designing/implementing)?
Revision ChangesPath
1.1470+7 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1469
retrieving revision 1.1470
diff -u -r1.1469 -r1.1470
--- CHANGES 1999/12/04 11:43:12 1.1469
+++ CHANGES 1999/12/06 12:41:35 1.1470
@@ -1,5 +1,12 @@
Changes with Apache 1.3.10
+ *) EBCDIC: Fixed binary upload capability (plain and chunked) for
+ all methods using the ap_*_client_block() functions, most notably
+ POST and PUT. The functionality to switch input between protocol
+ parts (chunks) and (possibly binary) data had been missing all
+ the time, making chunked PUT impossible until now.
+ [Martin Kraemer]
+
*) Fixed a recently introduced off-by-one-character bug in
mod_rewrite's expansion of expression back-references.
[Cliff Woolley <[EMAIL PROTECTED]>] PR#4766 PR#5389
1.282 +78 -23apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -r1.281 -r1.282
--- http_protocol.c 1999/12/01 20:45:41 1.281
+++ http_protocol.c 1999/12/06 12:41:39 1.282
@@ -81,6 +81,27 @@
ap_bgetopt (r->connection->client, BO_BYTECT, &r->bytes_sent); \
} while (0)
+#ifdef CHARSET_EBCDIC
+/* Save & Restore the current conversion settings
+ * "input" means: ASCII -> EBCDIC (when reading MIME Headers and PUT/POST
data)
+ * "output" means: EBCDIC -> ASCII (when sending MIME Headers and Chunks)
+ */
+
+#define PUSH_EBCDIC_INPUTCONVERSION_STATE(_buff, _onoff) \
+int _convert_in = ap_bgetflag(_buff, B_ASCII2EBCDIC); \
+ap_bsetflag(_buff, B_ASCII2EBCDIC, _onoff);
+
+#define POP_EBCDIC_INPUTCONVERSION_STATE(_buff) \
+ap_bsetflag(_buff, B_ASCII2EBCDIC, _convert_in);
+
+#define PUSH_EBCDIC_OUTPUTCONVERSION_STATE(_buff, _onoff) \
+int _convert_out = ap_bgetflag(_buff, B_EBCDIC2ASCII); \
+ap_bsetflag(_buff, B_EBCDIC2ASCII, _onoff);
+
+#define POP_EBCDIC_OUTPUTCONVERSION_STATE(_buff) \
+ap_bsetflag(_buff, B_EBCDIC2ASCII, _convert_out);
+
+#endif /*CHARSET_EBCDIC*/
static int parse_byterange(char *range, long clength, long *start, long *end)
{
@@ -217,8 +238,7 @@
* set to ON (protocol strings MUST be converted)
* and reset to original setting before returning
*/
-int convert = ap_bgetflag(r->connection->client, B_EBCDIC2ASCII);
-ap_bsetflag(r->connection->client, B_EBCDIC2ASCII, 1);
+PUSH_EBCDIC_OUTPUTCONVERSION_STATE(r->connection->client, 1);
#endif /*CHARSET_EBCDIC*/
if (!**r_range) {
@@ -229,8 +249,7 @@
*tlength += 4 + strlen(r->boundary) + 4;
}
#ifdef CHARSET_EBCDIC
- if (!convert)
- ap_bsetflag(r->connection->client, B_EBCDIC2ASCII, convert);
+POP_EBCDIC_OUTPUTCONVERSION_STATE(r->connection->client);
#endif /*CHARSET_EBCDIC*/
return 0;
}
@@ -238,8 +257,7 @@
range = ap_getword(r->pool, r_range, ',');
if (!parse_byterange(range, r->clength, &range_start, &range_end)) {
#ifdef CHARSET_EBCDIC
- if (!convert)
- ap_bsetflag(r->connection->client, B_EBCDIC2ASCII, convert);
+POP_EBCDIC_OUTPUTCONVERSION_STATE(r->connection->client);
#endif /*CHARSET_EBCDIC*/
/* Skip this one */
return internal_byterange(realreq, tlength, r, r_range, offset,
@@ -269,8 +287,7 @@
*tlength += range_end - range_start + 1;
}
#ifdef CHARSET_EBCDIC
-if (!convert)
- ap_bsetflag(r->connection
cvs commit: apache-1.3 Makefile.tmpl
martin 99/12/02 13:00:25 Modified:.Makefile.tmpl Log: Oops. My recent change was a bit too hasty. Of course, the user may (and WILL, if he had apache-1.3.[0-9] before) have a file called index.html in his .../htdocs/ Accept the presence of either index.html or index.html.en as a clue for an existing htdocs tree. Revision ChangesPath 1.93 +1 -1 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- Makefile.tmpl 1999/12/01 21:21:21 1.92 +++ Makefile.tmpl 1999/12/02 21:00:19 1.93 @@ -441,7 +441,7 @@ # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" - [EMAIL PROTECTED] [ -f $(root)$(htdocsdir)/index.html.en ]; then \ + [EMAIL PROTECTED] [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ else \ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
cvs commit: apache-1.3 Makefile.tmpl
martin 99/12/01 13:21:23 Modified:.Makefile.tmpl Log: Fix htdocs/ overwrite test in "make install" rule: it was still testing for the presence of index.html, while it's been renamed to index.html.en a couple of weeks ago. Also, didn't we want to move /usr/local/apache/htdocs/manual/ out of the user's htdocs/ tree to /usr/local/apache/manual/ and Alias /manual/ to /usr/local/apache/manual/ ? And perhaps note the presence of the i18n versions of the entry page in the CHANGES file? [none of these are done in this commit] Revision ChangesPath 1.92 +1 -1 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- Makefile.tmpl 1999/11/18 09:54:36 1.91 +++ Makefile.tmpl 1999/12/01 21:21:21 1.92 @@ -441,7 +441,7 @@ # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" - [EMAIL PROTECTED] [ -f $(root)$(htdocsdir)/index.html ]; then \ + [EMAIL PROTECTED] [ -f $(root)$(htdocsdir)/index.html.en ]; then \ echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ else \ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
cvs commit: apache-1.3/src/main util.c
martin 99/12/01 12:55:08
Modified:src CHANGES
src/main util.c
Log:
EBCDIC: Escaped characters in c2x() were encoding the EBCDIC
representation of the special characters, not the latin1
representation. This would result in invalid URI references
for, e.g., filenames generated by mod_autoindex.c
(when they had special chars in them)
Revision ChangesPath
1.1467+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1466
retrieving revision 1.1467
diff -u -r1.1466 -r1.1467
--- CHANGES 1999/12/01 20:45:29 1.1466
+++ CHANGES 1999/12/01 20:54:55 1.1467
@@ -1,5 +1,10 @@
Changes with Apache 1.3.10
+ *) EBCDIC: Escaped characters were encoding the ebcdic representation
+ of the special characters, not the latin1 representation. This
+ would result in invalid URI's for, e.g., filenames (with special chars)
+ in mod_autoindex.c [Martin Kraemer]
+
*) EBCDIC: Fix Byte Ranges for EBCDIC platforms. The necessary switch
between implied conversion for protocol parts and configured
conversion for document data was missing. The effect of this was that
1.175 +3 -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.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- util.c1999/11/26 20:21:18 1.174
+++ util.c1999/12/01 20:55:03 1.175
@@ -1481,6 +1481,9 @@
static ap_inline unsigned char *c2x(unsigned what, unsigned char *where)
{
+#ifdef CHARSET_EBCDIC
+what = os_toascii[what];
+#endif /*CHARSET_EBCDIC*/
*where++ = '%';
*where++ = c2x_table[what >> 4];
*where++ = c2x_table[what & 0xf];
cvs commit: apache-1.3/src/main http_protocol.c
martin 99/12/01 12:45:47
Modified:src CHANGES
src/main http_protocol.c
Log:
EBCDIC: Fix Byte Ranges for EBCDIC platforms. The necessary switch
between implied conversion for protocol parts and configured
conversion for document data was missing. The effect of this was that
PDF files could not be read by Acrobat Reader (which sends long
lists of byte ranges in each request) when the server was apache
on ebcdic machines.
Submitted by: Oliver Reh <[EMAIL PROTECTED]>
Reviewed by: Martin Kraemer
Revision ChangesPath
1.1466+9 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1465
retrieving revision 1.1466
diff -u -r1.1465 -r1.1466
--- CHANGES 1999/12/01 20:33:58 1.1465
+++ CHANGES 1999/12/01 20:45:29 1.1466
@@ -1,5 +1,14 @@
Changes with Apache 1.3.10
+ *) EBCDIC: Fix Byte Ranges for EBCDIC platforms. The necessary switch
+ between implied conversion for protocol parts and configured
+ conversion for document data was missing. The effect of this was that
+ PDF files could not be read by Acrobat Reader (which sends long
+ lists of byte ranges in each request) when the server was apache
+ on ebcdic machines.
+ [Noted by Oliver Reh <[EMAIL PROTECTED]>, solved by
+ Martin Kraemer]
+
*) Add IndexOptions FoldersFirst to allow fancy-indexed directory
listings to have the subdirectories always listed at the top.
[Ken Coar]
1.281 +22 -1 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -r1.280 -r1.281
--- http_protocol.c 1999/11/05 15:41:03 1.280
+++ http_protocol.c 1999/12/01 20:45:41 1.281
@@ -212,6 +212,14 @@
{
long range_start, range_end;
char *range;
+#ifdef CHARSET_EBCDIC
+/* determine current setting of conversion flag,
+ * set to ON (protocol strings MUST be converted)
+ * and reset to original setting before returning
+ */
+int convert = ap_bgetflag(r->connection->client, B_EBCDIC2ASCII);
+ap_bsetflag(r->connection->client, B_EBCDIC2ASCII, 1);
+#endif /*CHARSET_EBCDIC*/
if (!**r_range) {
if (r->byterange > 1) {
@@ -220,14 +228,23 @@
else
*tlength += 4 + strlen(r->boundary) + 4;
}
+#ifdef CHARSET_EBCDIC
+ if (!convert)
+ ap_bsetflag(r->connection->client, B_EBCDIC2ASCII, convert);
+#endif /*CHARSET_EBCDIC*/
return 0;
}
range = ap_getword(r->pool, r_range, ',');
-if (!parse_byterange(range, r->clength, &range_start, &range_end))
+if (!parse_byterange(range, r->clength, &range_start, &range_end)) {
+#ifdef CHARSET_EBCDIC
+ if (!convert)
+ ap_bsetflag(r->connection->client, B_EBCDIC2ASCII, convert);
+#endif /*CHARSET_EBCDIC*/
/* Skip this one */
return internal_byterange(realreq, tlength, r, r_range, offset,
length);
+}
if (r->byterange > 1) {
const char *ct = r->content_type ? r->content_type :
ap_default_type(r);
@@ -251,6 +268,10 @@
else {
*tlength += range_end - range_start + 1;
}
+#ifdef CHARSET_EBCDIC
+if (!convert)
+ ap_bsetflag(r->connection->client, B_EBCDIC2ASCII, convert);
+#endif /*CHARSET_EBCDIC*/
return 1;
}
cvs commit: apache-1.3/src/main buff.c
martin 99/12/01 12:24:58 Modified:src CHANGES src/main buff.c Log: On BS2000, currently the send() call has slightly better performance than write(), and it doesn't have a maximum transfer size of 16kB. Revision ChangesPath 1.1464+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1463 retrieving revision 1.1464 diff -u -r1.1463 -r1.1464 --- CHANGES 1999/11/30 15:51:59 1.1463 +++ CHANGES 1999/12/01 20:24:50 1.1464 @@ -1,5 +1,9 @@ Changes with Apache 1.3.10 + *) BS2000: Use send() instead of write() in the core buff routines + for better performance and fewer restrictions (max. transfer size) + [Martin Kraemer] + *) If the compiler sanity check fails, force the verbose output for TestCompile so people can have a clue what the problem is. [Jim Jagielski] 1.91 +11 -0 apache-1.3/src/main/buff.c Index: buff.c === RCS file: /export/home/cvs/apache-1.3/src/main/buff.c,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- buff.c1999/10/22 05:10:06 1.90 +++ buff.c1999/12/01 20:24:56 1.91 @@ -319,6 +319,17 @@ #if defined (B_SFIO) rv = sfwrite(fb->sf_out, buf, nbyte); #else +#ifdef _OSD_POSIX +/* Sorry, but this is a hack: On BS2000, currently the send() call + * has slightly better performance, and it doesn't have a maximum + * transfer size of 16kB per write. Both write() and writev() + * currently have such a limit and therefore don't work + * too well with MMAP files. + */ + if (fb->flags & B_SOCKET) + rv = send(fb->fd, buf, nbyte, 0); + else +#endif rv = write(fb->fd, buf, nbyte); #endif
cvs commit: apache-1.3/src/main util.c
martin 99/11/26 12:21:19
Modified:src/main util.c
Log:
BS2000 has setgroups(), so the 'real' initgroups() emulation can be used.
Revision ChangesPath
1.174 +2 -2 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.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- util.c1999/10/21 20:44:44 1.173
+++ util.c1999/11/26 20:21:18 1.174
@@ -1469,7 +1469,7 @@
/* c2x takes an unsigned, and expects the caller has guaranteed that
* 0 <= what < 256... which usually means that you have to cast to
- * unsigned char first, because (unsigned)(char)(x) fist goes through
+ * unsigned char first, because (unsigned)(char)(x) first goes through
* signed extension to an int before the unsigned cast.
*
* The reason for this assumption is to assist gcc code generation --
@@ -1746,7 +1746,7 @@
#ifdef NEED_INITGROUPS
int initgroups(const char *name, gid_t basegid)
{
-#if defined(QNX) || defined(MPE) || defined(BEOS) || defined(_OSD_POSIX) ||
defined(TPF) || defined(__TANDEM) || defined(NETWARE)
+#if defined(QNX) || defined(MPE) || defined(BEOS) || defined(TPF) ||
defined(__TANDEM) || defined(NETWARE)
/* QNX, MPE and BeOS do not appear to support supplementary groups. */
return 0;
#else /* ndef QNX */
cvs commit: apache-1.3/src CHANGES
martin 99/11/25 02:49:37 Modified:src CHANGES Log: Describe EBCDIC hsregex changes Revision ChangesPath 1.1445+5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1444 retrieving revision 1.1445 diff -u -r1.1444 -r1.1445 --- CHANGES 1999/11/17 02:24:59 1.1444 +++ CHANGES 1999/11/25 10:49:32 1.1445 @@ -1,5 +1,10 @@ Changes with Apache 1.3.10 + *) EBCDIC: fix the hsregex package to correctly deal with [a-zA-Z] type + character ranges (the alphabet is non-contiguous in EBCDIC) and with + the special [:cntrl:] range (the control character class is determined + dynamically at run time). [Martin Kraemer] + *) Add --with-port option to APACI. [Ian Kallen <[EMAIL PROTECTED]>] *) Fixed QUERY_STRING handling for `RewriteRule ... [P]'
cvs commit: apache-1.3/src/regex regcomp.c
martin 99/11/24 14:31:10
Modified:src/regex regcomp.c
Log:
This patch fixes the some of the bogosity in regular expressions
on EBCDIC based machines: a character range [a-z] would match much more
than only the islower() characters because in the EBCDIC charset there
are "holes in the contiguity" between a-i, j-r and s-z.
This patch fixes [-] and [-]
ranges by only regarding alphabetic characters between the lower and
upper bound. (Any other range definition remains unchanged.)
Revision ChangesPath
1.10 +37 -0 apache-1.3/src/regex/regcomp.c
Index: regcomp.c
===
RCS file: /export/home/cvs/apache-1.3/src/regex/regcomp.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- regcomp.c 1998/09/15 19:47:45 1.9
+++ regcomp.c 1999/11/24 22:31:08 1.10
@@ -100,7 +100,30 @@
#else
#define GOODFLAGS(f)((f)&~REG_DUMP)
#endif
+#ifdef CHARSET_EBCDIC /* Added for Apache by <[EMAIL PROTECTED]> */
+ static int initialized = 0;
+ if (!initialized) {
+ unsigned ch, idx = 0;
+ static unsigned char ctlchars_ebcdic[256+1];
+
+ for (ch = 1; ch <= 0xFF; ++ch) {
+ if (ap_iscntrl(ch)) {
+ ctlchars_ebcdic[idx++] = ch;
+ }
+ }
+ ctlchars_ebcdic[idx++] = '\0'; /* redundant */
+
+ for (idx=0; idx < sizeof(cclasses) / sizeof(cclasses[0]);
++idx) {
+ if (strcmp(cclasses[idx].name, "cntrl") == 0) {
+ cclasses[idx].chars = ctlchars_ebcdic;
+ break;
+ }
+ }
+ initialized = 1;
+ }
+#endif /*CHARSET_EBCDIC*/
+
cflags = GOODFLAGS(cflags);
if ((cflags®_EXTENDED) && (cflags®_NOSPEC))
return(REG_INVARG);
@@ -708,8 +731,22 @@
finish = start;
/* xxx what about signed chars here... */
REQUIRE(start <= finish, REG_ERANGE);
+#ifndef CHARSET_EBCDIC
for (i = start; i <= finish; i++)
CHadd(cs, i);
+#else /* Added for Apache by <[EMAIL PROTECTED]> */
+ /* Special provision for character ranges [a-zA-Z], */
+ /* which are non-contiguous in EBCDIC: */
+ if ((ap_isupper(start) && ap_isupper(finish)) ||
+ (ap_islower(start) && ap_islower(finish))) {
+ for (i = start; i <= finish; i++)
+ if (ap_isalpha(i))
+ CHadd(cs, i);
+ } else {
+ for (i = start; i <= finish; i++)
+ CHadd(cs, i);
+ }
+#endif /*CHARSET_EBCDIC*/
break;
}
}
cvs commit: apache-1.3/src/os/bs2000 ebcdic.c ebcdic.h
martin 99/11/24 09:12:42
Modified:src/os/bs2000 ebcdic.c ebcdic.h
Log:
Adapt the more generic interface introduced by IBM's TPF port
Revision ChangesPath
1.11 +38 -29apache-1.3/src/os/bs2000/ebcdic.c
Index: ebcdic.c
===
RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/ebcdic.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ebcdic.c 1999/01/01 19:05:27 1.10
+++ ebcdic.c 1999/11/24 17:12:19 1.11
@@ -60,7 +60,7 @@
#include "ap_config.h"
#include "ebcdic.h"
/*
-Initial Port for Apache-1.3 by <[EMAIL PROTECTED]>
+ Initial Port for Apache-1.3 by <[EMAIL PROTECTED]>
"BS2000 OSD" is a POSIX on a main frame. It is made by Siemens AG, Germany.
Within the POSIX subsystem, the same character set was chosen as in
@@ -191,37 +191,37 @@
*/
const unsigned char os_toebcdic[256] = {
/*00*/ 0x00, 0x01, 0x02, 0x03, 0x37, 0x2d, 0x2e, 0x2f,
- 0x16, 0x05, 0x15, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /**/
+0x16, 0x05, 0x15, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /**/
/*10*/ 0x10, 0x11, 0x12, 0x13, 0x3c, 0x3d, 0x32, 0x26,
- 0x18, 0x19, 0x3f, 0x27, 0x1c, 0x1d, 0x1e, 0x1f, /**/
+0x18, 0x19, 0x3f, 0x27, 0x1c, 0x1d, 0x1e, 0x1f, /**/
/*20*/ 0x40, 0x5a, 0x7f, 0x7b, 0x5b, 0x6c, 0x50, 0x7d,
- 0x4d, 0x5d, 0x5c, 0x4e, 0x6b, 0x60, 0x4b, 0x61, /* !"#$%&'()*+,-./ */
+0x4d, 0x5d, 0x5c, 0x4e, 0x6b, 0x60, 0x4b, 0x61, /* !"#$%&'()*+,-./
*/
/*30*/ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
- 0xf8, 0xf9, 0x7a, 0x5e, 0x4c, 0x7e, 0x6e, 0x6f, /*0123456789:;<=>?*/
+0xf8, 0xf9, 0x7a, 0x5e, 0x4c, 0x7e, 0x6e, 0x6f, /*0123456789:;<=>?*/
/*40*/ 0x7c, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
- 0xc8, 0xc9, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, /[EMAIL PROTECTED]/
+0xc8, 0xc9, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, /[EMAIL PROTECTED]/
/*50*/ 0xd7, 0xd8, 0xd9, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6,
- 0xe7, 0xe8, 0xe9, 0xbb, 0xbc, 0xbd, 0x6a, 0x6d, /*PQRSTUVWXYZ[\]^_*/
+0xe7, 0xe8, 0xe9, 0xbb, 0xbc, 0xbd, 0x6a, 0x6d, /*PQRSTUVWXYZ[\]^_*/
/*60*/ 0x4a, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
- 0x88, 0x89, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, /*`abcdefghijklmno*/
+0x88, 0x89, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, /*`abcdefghijklmno*/
/*70*/ 0x97, 0x98, 0x99, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6,
- 0xa7, 0xa8, 0xa9, 0xfb, 0x4f, 0xfd, 0xff, 0x07, /*pqrstuvwxyz{|}~.*/
+0xa7, 0xa8, 0xa9, 0xfb, 0x4f, 0xfd, 0xff, 0x07, /*pqrstuvwxyz{|}~.*/
/*80*/ 0x20, 0x21, 0x22, 0x23, 0x24, 0x04, 0x06, 0x08,
- 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x09, 0x0a, 0x14, /**/
+0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x09, 0x0a, 0x14, /**/
/*90*/ 0x30, 0x31, 0x25, 0x33, 0x34, 0x35, 0x36, 0x17,
- 0x38, 0x39, 0x3a, 0x3b, 0x1a, 0x1b, 0x3e, 0x5f, /**/
+0x38, 0x39, 0x3a, 0x3b, 0x1a, 0x1b, 0x3e, 0x5f, /**/
/*a0*/ 0x41, 0xaa, 0xb0, 0xb1, 0x9f, 0xb2, 0xd0, 0xb5,
- 0x79, 0xb4, 0x9a, 0x8a, 0xba, 0xca, 0xaf, 0xa1, /**/
+0x79, 0xb4, 0x9a, 0x8a, 0xba, 0xca, 0xaf, 0xa1, /**/
/*b0*/ 0x90, 0x8f, 0xea, 0xfa, 0xbe, 0xa0, 0xb6, 0xb3,
- 0x9d, 0xda, 0x9b, 0x8b, 0xb7, 0xb8, 0xb9, 0xab, /**/
+0x9d, 0xda, 0x9b, 0x8b, 0xb7, 0xb8, 0xb9, 0xab, /**/
/*c0*/ 0x64, 0x65, 0x62, 0x66, 0x63, 0x67, 0x9e, 0x68,
- 0x74, 0x71, 0x72, 0x73, 0x78, 0x75, 0x76, 0x77, /**/
+0x74, 0x71, 0x72, 0x73, 0x78, 0x75, 0x76, 0x77, /**/
/*d0*/ 0xac, 0x69, 0xed, 0xee, 0xeb, 0xef, 0xec, 0xbf,
- 0x80, 0xe0, 0xfe, 0xdd, 0xfc, 0xad, 0xae, 0x59, /**/
+0x80, 0xe0, 0xfe, 0xdd, 0xfc, 0xad, 0xae, 0x59, /**/
/*e0*/ 0x44, 0x45, 0x42, 0x46, 0x43, 0x47, 0x9c, 0x48,
- 0x54, 0x51, 0x52, 0x53, 0x58, 0x55, 0x56, 0x57, /**/
+0x54, 0x51, 0x52, 0x53, 0x58, 0x55, 0x56, 0x57, /**/
/*f0*/ 0x8c, 0x49, 0xcd, 0xce, 0xcb, 0xcf, 0xcc, 0xe1,
- 0x70, 0xc0, 0xde, 0xdb, 0xdc, 0x8d, 0x8e, 0xdf /**/
+0x70, 0xc0, 0xde, 0xdb, 0xdc, 0x8d, 0x8e, 0xdf /**/
};
/* Translate a memory block from EBCDIC (host charset) to ASCII (net charset)
@@ -229,24 +229,33 @@
* should not overlap.
*/
void
-ebcdic2ascii(unsigned char *dest, const unsigned char *srce, size_t count)
+ebcdic2ascii(void *dest, const void *srce, size_t count)
{
- while (count-- != 0) {
- *dest++ = os_toascii[*srce++];
- }
+unsigned char *udest = dest;
+
cvs commit: apache-2.0/src/main http_main.c
martin 99/11/21 14:10:24 Modified:src/main http_main.c Log: Use APR's getopt Revision ChangesPath 1.21 +1 -0 apache-2.0/src/main/http_main.c Index: http_main.c === RCS file: /export/home/cvs/apache-2.0/src/main/http_main.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- http_main.c 1999/11/18 23:07:21 1.20 +++ http_main.c 1999/11/21 22:10:22 1.21 @@ -61,6 +61,7 @@ #include "http_log.h" #include "http_config.h" #include "util_uri.h" +#include "apr_getopt.h" #include "ap_mpm.h" const char *ap_server_argv0;
cvs commit: apache-2.0/src/lib/apr/test testargs.c ab_apr.c
martin 99/11/20 14:05:28
Modified:src/lib/apr/misc/beos misc.h
src/lib/apr/misc/os2 misc.h
src/lib/apr/misc/unix misc.h
src/lib/apr/misc/win32 misc.h
src/lib/apr/test testargs.c ab_apr.c
Added: src/lib/apr/include apr_getopt.h
Log:
Under Linux, I always got a
"libc.so.6: Warning: definition of 'optarg' overriding common
libapr(getopt.o): warning: common is here"
To make matters cleaner, I added an apr_getopt.h to go with the
various copies of getopt.c in the os subdirectories. In this header,
I renamed all getopt-API functions to "apr_". This avoids
name clashes with system libraries.
Revision ChangesPath
1.4 +1 -0 apache-2.0/src/lib/apr/misc/beos/misc.h
Index: misc.h
===
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/misc/beos/misc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- misc.h1999/10/08 11:29:54 1.3
+++ misc.h1999/11/20 22:05:07 1.4
@@ -59,6 +59,7 @@
#include "apr_general.h"
#include "apr_file_io.h"
#include "apr_errno.h"
+#include "apr_getopt.h"
typedef struct datastruct {
void *data;
1.3 +1 -0 apache-2.0/src/lib/apr/misc/os2/misc.h
Index: misc.h
===
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/misc/os2/misc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- misc.h1999/08/27 16:25:50 1.2
+++ misc.h1999/11/20 22:05:14 1.3
@@ -59,6 +59,7 @@
#include "apr_general.h"
#include "apr_file_io.h"
#include "apr_errno.h"
+#include "apr_getopt.h"
struct context_t {
struct ap_pool_t *pool;
1.4 +1 -0 apache-2.0/src/lib/apr/misc/unix/misc.h
Index: misc.h
===
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/misc/unix/misc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- misc.h1999/09/14 13:37:23 1.3
+++ misc.h1999/11/20 22:05:17 1.4
@@ -59,6 +59,7 @@
#include "apr_general.h"
#include "apr_file_io.h"
#include "apr_errno.h"
+#include "apr_getopt.h"
typedef struct datastruct {
void *data;
1.4 +1 -0 apache-2.0/src/lib/apr/misc/win32/misc.h
Index: misc.h
===
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/misc/win32/misc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- misc.h1999/09/22 13:29:28 1.3
+++ misc.h1999/11/20 22:05:19 1.4
@@ -59,6 +59,7 @@
#include "apr_general.h"
#include "apr_file_io.h"
#include "apr_errno.h"
+#include "apr_getopt.h"
typedef struct datastruct {
void *data;
1.1 apache-2.0/src/lib/apr/include/apr_getopt.h
Index: apr_getopt.h
===
/*
* Copyright (c) 1999 The Apache Group. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. All advertising materials mentioning features or use of this
*software must display the following acknowledgment:
*"This product includes software developed by the Apache Group
*for use in the Apache HTTP server project (http://www.apache.org/)."
*
* 4. The names "Apache Server" and "Apache Group" must not be used to
*endorse or promote products derived from this software without
*prior written permission. For written permission, please contact
*[EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
*nor may "Apache" appear in their names without prior written
*permission of the Apache Group.
*
* 6. Redistributions of any form whatsoever must retain the following
*acknowledgment:
*"This product includes software develope
cvs commit: apache-1.3/htdocs index.html.en
martin 99/11/20 13:29:40 Modified:htdocs index.html.en Log: Center the logo more reliably Revision ChangesPath 1.4 +1 -2 apache-1.3/htdocs/index.html.en Index: index.html.en === RCS file: /export/home/cvs/apache-1.3/htdocs/index.html.en,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- index.html.en 1999/11/02 12:18:17 1.3 +++ index.html.en 1999/11/20 21:29:40 1.4 @@ -33,7 +33,6 @@ You are free to use the image below on an Apache-powered web server. Thanks for using Apache! - - +
cvs commit: apache-2.0/src/modules/standard Makefile.tmpl
martin 99/11/20 13:12:59 Modified:src/modules/standard Makefile.tmpl Log: Update on dependencies Revision ChangesPath 1.9 +57 -27apache-2.0/src/modules/standard/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-2.0/src/modules/standard/Makefile.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile.tmpl 1999/11/17 21:39:41 1.8 +++ Makefile.tmpl 1999/11/20 21:12:58 1.9 @@ -31,8 +31,8 @@ ../../lib/apr/include/apr_win.h \ ../../lib/apr/include/apr_network_io.h \ ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ - $(INCDIR)/http_main.h $(INCDIR)/http_log.h \ - $(INCDIR)/util_script.h + ../../lib/apr/include/apr_mmap.h $(INCDIR)/http_main.h \ + $(INCDIR)/http_log.h $(INCDIR)/util_script.h mod_alias.o: mod_alias.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ @@ -57,8 +57,9 @@ ../../lib/apr/include/apr_win.h \ ../../lib/apr/include/apr_network_io.h \ ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ - $(INCDIR)/http_log.h $(INCDIR)/util_script.h \ - $(INCDIR)/http_main.h $(INCDIR)/http_request.h + ../../lib/apr/include/apr_mmap.h $(INCDIR)/http_log.h \ + $(INCDIR)/util_script.h $(INCDIR)/http_main.h \ + $(INCDIR)/http_request.h mod_auth.o: mod_auth.c ../../lib/apr/include/apr_md5.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ @@ -75,7 +76,7 @@ ../../lib/apr/include/apr_win.h \ ../../lib/apr/include/apr_network_io.h \ ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ - $(INCDIR)/http_request.h + ../../lib/apr/include/apr_mmap.h $(INCDIR)/http_request.h mod_auth_anon.o: mod_auth_anon.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ @@ -92,7 +93,7 @@ ../../lib/apr/include/apr_win.h \ ../../lib/apr/include/apr_network_io.h \ ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ - $(INCDIR)/http_request.h + ../../lib/apr/include/apr_mmap.h $(INCDIR)/http_request.h mod_auth_db.o: mod_auth_db.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ @@ -108,7 +109,8 @@ ../../lib/apr/include/apr_thread_proc.h \ ../../lib/apr/include/apr_win.h \ ../../lib/apr/include/apr_network_io.h \ - ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h + ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ + ../../lib/apr/include/apr_mmap.h mod_auth_dbm.o: mod_auth_dbm.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ @@ -124,7 +126,8 @@ ../../lib/apr/include/apr_thread_proc.h \ ../../lib/apr/include/apr_win.h \ ../../lib/apr/include/apr_network_io.h \ - ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h + ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ + ../../lib/apr/include/apr_mmap.h mod_auth_digest.o: mod_auth_digest.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ @@ -142,8 +145,8 @@ ../../lib/apr/include/apr_win.h \ ../../lib/apr/include/apr_network_io.h \ ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ - $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \ - $(INCDIR)/ap_sha1.h + ../../lib/apr/include/apr_mmap.h $(INCDIR)/util_md5.h \ + $(INCDIR)/ap_md5.h $(INCDIR)/ap_sha1.h mod_autoindex.o: mod_autoindex.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ @@ -160,8 +163,9 @@ ../../lib/apr/include/apr_win.h \ ../../lib/apr/include/apr_network_io.h \ ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ - $(INCDIR)/http_log.h $(INCDIR)/http_main.h \ - $(INCDIR)/util_script.h $(INCDIR)/fnmatch.h + ../../lib/apr/include/apr_mmap.h $(INCDIR)/http_log.h \ + $(INCDIR)/http_main.h $(INCDIR)/util_script.h \ + /usr/include/fnmatch.h mod_cern_meta.o: mod_cern_meta.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ @@ -188,8 +192,29 @@ ../../lib/apr/include/apr_win.h \ ../../lib/apr/include/apr_network_io.h \ ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ + ../../lib/apr/include/apr_mmap.h $(INCDIR)/http_main.h \ + $(INCDIR)/http_log.h $(INCDIR)/util_script.h \ + $(INCDIR)/http_conf_globals.h +mod_cgid.o: mod_cgid.c ../../lib/apr/include/apr_lib.h \ + ../../lib/apr/include/apr_general.h \ + ../../lib/apr
cvs commit: apache-2.0/src/main Makefile.tmpl
martin 99/11/20 13:04:46 Modified:src/main Makefile.tmpl Log: Update on dependencies Revision ChangesPath 1.9 +23 -16apache-2.0/src/main/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-2.0/src/main/Makefile.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile.tmpl 1999/11/17 21:39:25 1.8 +++ Makefile.tmpl 1999/11/20 21:04:45 1.9 @@ -102,7 +102,8 @@ $(INCDIR)/http_protocol.h ../lib/apr/include/apr_portable.h \ ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \ ../lib/apr/include/apr_lock.h ../lib/apr/include/apr_time.h \ - $(INCDIR)/ap_mpm.h $(INCDIR)/mpm_status.h $(INCDIR)/http_config.h \ + ../lib/apr/include/apr_mmap.h $(INCDIR)/ap_mpm.h \ + $(INCDIR)/mpm_status.h $(INCDIR)/http_config.h \ $(INCDIR)/http_vhost.h http_core.o: http_core.c ../lib/apr/include/apr_lib.h \ ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ @@ -115,10 +116,11 @@ $(INCDIR)/http_protocol.h ../lib/apr/include/apr_portable.h \ ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \ ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \ - ../lib/apr/include/apr_time.h $(INCDIR)/http_request.h \ - $(INCDIR)/http_vhost.h $(INCDIR)/http_main.h $(INCDIR)/http_log.h \ - $(INCDIR)/rfc1413.h $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \ - $(INCDIR)/fnmatch.h $(INCDIR)/http_connection.h + ../lib/apr/include/apr_time.h ../lib/apr/include/apr_mmap.h \ + $(INCDIR)/http_request.h $(INCDIR)/http_vhost.h \ + $(INCDIR)/http_main.h $(INCDIR)/http_log.h $(INCDIR)/rfc1413.h \ + $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h /usr/include/fnmatch.h \ + $(INCDIR)/http_connection.h http_log.o: http_log.c ../lib/apr/include/apr_lib.h \ ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_file_io.h \ @@ -139,8 +141,9 @@ ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ - $(INCDIR)/http_main.h $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \ - $(INCDIR)/ap_mpm.h ../lib/expat-lite/xmlparse.h + $(INCDIR)/http_main.h $(INCDIR)/http_log.h $(INCDIR)/http_config.h \ + $(INCDIR)/ap_hooks.h $(INCDIR)/ap_mpm.h \ + ../lib/expat-lite/xmlparse.h http_protocol.o: http_protocol.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ @@ -153,9 +156,10 @@ $(INCDIR)/http_protocol.h ../lib/apr/include/apr_portable.h \ ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \ ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \ - ../lib/apr/include/apr_time.h $(INCDIR)/http_main.h \ - $(INCDIR)/http_request.h $(INCDIR)/http_vhost.h \ - $(INCDIR)/http_log.h $(INCDIR)/util_date.h $(INCDIR)/mpm_status.h + ../lib/apr/include/apr_time.h ../lib/apr/include/apr_mmap.h \ + $(INCDIR)/http_main.h $(INCDIR)/http_request.h \ + $(INCDIR)/http_vhost.h $(INCDIR)/http_log.h $(INCDIR)/util_date.h \ + $(INCDIR)/mpm_status.h http_request.o: http_request.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ @@ -169,8 +173,8 @@ $(INCDIR)/http_protocol.h ../lib/apr/include/apr_portable.h \ ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \ ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \ - ../lib/apr/include/apr_time.h $(INCDIR)/http_log.h \ - $(INCDIR)/http_main.h $(INCDIR)/fnmatch.h + ../lib/apr/include/apr_time.h ../lib/apr/include/apr_mmap.h \ + $(INCDIR)/http_log.h $(INCDIR)/http_main.h /usr/include/fnmatch.h http_vhost.o: http_vhost.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ @@ -183,7 +187,8 @@ ../lib/apr/include/apr_portable.h \ ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \ ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \ - ../lib/apr/include/apr_time.h $(INCDIR)/http_core.h + ../lib/apr/include/apr_time.h ../lib/apr/include/apr_mmap.h \ + $(INCDIR)/http_core.h iol_file.o: iol_file.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ @@ -222,7 +227,8 @@ ../lib/apr/include/apr_portable.h \ ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \ ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \ - ../lib/apr/include/apr_time.h
cvs commit: apache-1.3/conf httpd.conf-dist
martin 99/11/18 02:08:34 Modified:conf httpd.conf-dist Log: Fix typo Revision ChangesPath 1.50 +1 -1 apache-1.3/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /export/home/cvs/apache-1.3/conf/httpd.conf-dist,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- httpd.conf-dist 1999/09/21 20:27:11 1.49 +++ httpd.conf-dist 1999/11/18 10:08:26 1.50 @@ -341,7 +341,7 @@ #Order allow,deny #Allow from all # -# +# #Order deny,allow #Deny from all #
cvs commit: apache-2.0 Makefile.tmpl
martin 99/11/18 01:57:36 Modified:.Makefile.tmpl Log: Make sure that even group names like '#-1' aren't reated as comments Revision ChangesPath 1.2 +1 -1 apache-2.0/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-2.0/Makefile.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.tmpl 1999/08/24 05:33:36 1.1 +++ Makefile.tmpl 1999/11/18 09:57:35 1.2 @@ -267,7 +267,7 @@ echo "chown $(conf_user) $(root)$(proxycachedir)"; \ chown $(conf_user) $(root)$(proxycachedir); \ echo "chgrp $(conf_group) $(root)$(proxycachedir)"; \ - chgrp $(conf_group) $(root)$(proxycachedir); \ + chgrp "$(conf_group)" $(root)$(proxycachedir); \ fi @echo "<=== [mktree]"
cvs commit: apache-1.3 Makefile.tmpl
martin 99/11/18 01:54:39 Modified:.Makefile.tmpl Log: Make sure even group names like "#-1" aren't treated as comments by the shell. Revision ChangesPath 1.91 +1 -1 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- Makefile.tmpl 1999/08/27 11:26:12 1.90 +++ Makefile.tmpl 1999/11/18 09:54:36 1.91 @@ -267,7 +267,7 @@ echo "chown $(conf_user) $(root)$(proxycachedir)"; \ chown $(conf_user) $(root)$(proxycachedir); \ echo "chgrp $(conf_group) $(root)$(proxycachedir)"; \ - chgrp $(conf_group) $(root)$(proxycachedir); \ + chgrp "$(conf_group)" $(root)$(proxycachedir); \ fi @echo "<=== [mktree]"
cvs commit: apache-1.3/src/main http_main.c
martin 99/10/29 00:48:00 Modified:src/main http_main.c Log: This got lost in the NETWARE commit Revision ChangesPath 1.480 +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.479 retrieving revision 1.480 diff -u -r1.479 -r1.480 --- http_main.c 1999/10/21 20:44:41 1.479 +++ http_main.c 1999/10/29 07:47:57 1.480 @@ -1024,7 +1024,7 @@ #endif /* On some architectures it's safe to do unserialized accept()s in the single - * ' case. But it's never safe to do it in the case where there's + * Listen case. But it's never safe to do it in the case where there's * multiple Listen statements. Define SINGLE_LISTEN_UNSERIALIZED_ACCEPT * when it's safe in the single Listen case. */
cvs commit: apache-1.3/src/support ab.c
martin 99/10/27 15:38:56
Modified:src/support ab.c
Log:
Backport of the BEOS additions for the apache 2.0 branch
Revision ChangesPath
1.36 +21 -6 apache-1.3/src/support/ab.c
Index: ab.c
===
RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ab.c 1999/10/27 22:30:16 1.35
+++ ab.c 1999/10/27 22:38:53 1.36
@@ -224,6 +224,16 @@
fd_set readbits, writebits; /* bits for select */
struct sockaddr_in server; /* server addr structure */
+#ifndef BEOS
+#define ab_close(s) close(s)
+#define ab_read(a,b,c) read(a,b,c)
+#define ab_write(a,b,c) write(a,b,c)
+#else
+#define ab_close(s) closesocket(s)
+#define ab_read(a,b,c) recv(a,b,c,0)
+#define ab_write(a,b,c) send(a,b,c,0)
+#endif
+
/* - */
/* simple little function to perror and exit */
@@ -262,9 +272,9 @@
}
writev(c->fd,out, outcnt);
#else
-write(c->fd,request,reqlen);
+ab_write(c->fd,request,reqlen);
if (posting>0) {
-write(c->fd,postdata,postlen);
+ab_write(c->fd,postdata,postlen);
totalposted += (reqlen + postlen);
}
#endif
@@ -281,7 +291,11 @@
static void nonblock(int fd)
{
int i = 1;
+#ifdef BEOS
+setsockopt(fd, SOL_SOCKET, SO_NONBLOCK, &i, sizeof(i));
+#else
ioctl(fd, FIONBIO, &i);
+#endif
}
/* - */
@@ -526,7 +540,7 @@
return;
}
else {
- close(c->fd);
+ ab_close(c->fd);
err_conn++;
if (bad++ > 10) {
err("\nTest aborted after 10 failures\n\n");
@@ -571,7 +585,7 @@
}
}
-close(c->fd);
+ab_close(c->fd);
FD_CLR(c->fd, &readbits);
FD_CLR(c->fd, &writebits);
@@ -589,8 +603,9 @@
int r;
char *part;
char respcode[4];/* 3 digits and null */
+
+r = ab_read(c->fd, buffer, sizeof(buffer));
-r = read(c->fd, buffer, sizeof(buffer));
if (r == 0 || (r < 0 && errno != EAGAIN)) {
good++;
close_connection(c);
@@ -636,7 +651,7 @@
return;
else {
/* header is in invalid or too big - close connection */
- close(c->fd);
+ ab_close(c->fd);
if (bad++ > 10) {
err("\nTest aborted after 10 failures\n\n");
}
@@ -867,14 +882,14 @@
static void copyright(void)
{
if (!use_html) {
- printf("This is ApacheBench, Version %s\n", VERSION " <$Revision: 1.35
$> apache-1.3");
+ printf("This is ApacheBench, Version %s\n", VERSION " <$Revision: 1.36
$> apache-1.3");
printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd,
http://www.zeustech.net/\n";);
printf("Copyright (c) 1998-1999 The Apache Group,
http://www.apache.org/\n";);
printf("\n");
}
else {
printf("\n");
- printf(" This is ApacheBench, Version %s <%s>
apache-1.3\n", VERSION, "$Revision: 1.35 $");
+ printf(" This is ApacheBench, Version %s <%s>
apache-1.3\n", VERSION, "$Revision: 1.36 $");
printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd,
http://www.zeustech.net/\n");
printf(" Copyright (c) 1998-1999 The Apache Group,
http://www.apache.org/\n");
printf("\n\n");
cvs commit: apache-2.0/src/support ab.c
martin 99/10/27 15:36:20
Modified:src/support ab.c
Log:
Add CVS Revision number to ab.c to allow for detecting changes
which were not marked by a version number update. Additionally,
display base repository name (apache-2.0)
Also, merge revision 1.34 of the 1.3 branch:
Made sure ApacheBench (ab) performs no more requests than
specified on command line (option -n).
Submitted by: Jim Cox <[EMAIL PROTECTED]>
Reviewed by: Ralf S. Engelschall
PR: 4839
Revision ChangesPath
1.5 +5 -4 apache-2.0/src/support/ab.c
Index: ab.c
===
RCS file: /export/home/cvs/apache-2.0/src/support/ab.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ab.c 1999/10/11 20:25:07 1.4
+++ ab.c 1999/10/27 22:36:20 1.5
@@ -97,7 +97,7 @@
* only an issue for loopback usage
*/
-#define VERSION "1.3b"
+#define VERSION "1.3c"
/* */
@@ -550,7 +550,8 @@
}
/* connected first time */
-write_request(c);
+c->state = STATE_CONNECTING;
+FD_SET(c->fd, &writebits);
}
/* - */
@@ -881,14 +882,14 @@
static void copyright(void)
{
if (!use_html) {
- printf("This is ApacheBench, Version %s\n", VERSION);
+ printf("This is ApacheBench, Version %s\n", VERSION " <$Revision: 1.5
$> apache-2.0");
printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd,
http://www.zeustech.net/\n";);
printf("Copyright (c) 1998-1999 The Apache Group,
http://www.apache.org/\n";);
printf("\n");
}
else {
printf("\n");
- printf(" This is ApacheBench, Version %s\n", VERSION);
+ printf(" This is ApacheBench, Version %s <%s>
apache-2.0\n", VERSION, "$Revision: 1.5 $");
printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd,
http://www.zeustech.net/\n");
printf(" Copyright (c) 1998-1999 The Apache Group,
http://www.apache.org/\n");
printf("\n\n");
cvs commit: apache-1.3/src/support ab.c
martin 99/10/27 15:30:19
Modified:src/support ab.c
Log:
Add CVS Revision number to ab.c to allow for detecting changes
which were not marked by a version number update. Additionally,
display base repository name (apache-1.3)
Revision ChangesPath
1.35 +3 -3 apache-1.3/src/support/ab.c
Index: ab.c
===
RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ab.c 1999/10/27 07:12:44 1.34
+++ ab.c 1999/10/27 22:30:16 1.35
@@ -97,7 +97,7 @@
* only an issue for loopback usage
*/
-#define VERSION "1.3b"
+#define VERSION "1.3c"
/* */
@@ -867,14 +867,14 @@
static void copyright(void)
{
if (!use_html) {
- printf("This is ApacheBench, Version %s\n", VERSION);
+ printf("This is ApacheBench, Version %s\n", VERSION " <$Revision: 1.35
$> apache-1.3");
printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd,
http://www.zeustech.net/\n";);
printf("Copyright (c) 1998-1999 The Apache Group,
http://www.apache.org/\n";);
printf("\n");
}
else {
printf("\n");
- printf(" This is ApacheBench, Version %s\n", VERSION);
+ printf(" This is ApacheBench, Version %s <%s>
apache-1.3\n", VERSION, "$Revision: 1.35 $");
printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd,
http://www.zeustech.net/\n");
printf(" Copyright (c) 1998-1999 The Apache Group,
http://www.apache.org/\n");
printf("\n\n");
cvs commit: apache-2.0/src/main http_log.c
martin 99/10/23 14:27:39
Modified:src/main http_log.c
Log:
Be on the safe side
Revision ChangesPath
1.14 +1 -1 apache-2.0/src/main/http_log.c
Index: http_log.c
===
RCS file: /export/home/cvs/apache-2.0/src/main/http_log.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- http_log.c1999/10/20 12:49:55 1.13
+++ http_log.c1999/10/23 21:27:38 1.14
@@ -409,7 +409,7 @@
"%s(%d): ", file, line);
}
#endif /* TPF */
-if (r) {
+if (r && r->connection) {
/* XXX: TODO: add a method of selecting whether logged client
* addresses are in dotted quad or resolved form... dotted
* quad is the most secure, which is why I'm implementing it
cvs commit: apache-2.0/src/lib/apr/file_io/unix dir.c
martin 99/10/23 14:23:20
Modified:src/lib/apr/file_io/unix dir.c
Log:
The readdir_r() function in Linux does return with a zero return
even when end-of-file was reached and dir->entry was set to NULL.
Handle this situation graefully and "fake" an EOF condition.
(This modification was required to get mod_speling running).
Revision ChangesPath
1.13 +12 -2 apache-2.0/src/lib/apr/file_io/unix/dir.c
Index: dir.c
===
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/file_io/unix/dir.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dir.c 1999/10/23 20:15:16 1.12
+++ dir.c 1999/10/23 21:23:20 1.13
@@ -124,8 +124,13 @@
*/
ap_status_t ap_readdir(struct dir_t *thedir)
{
-#if APR_HAS_THREADS && _POSIX_THREAD_SAFE_FUNCTIONS
-return readdir_r(thedir->dirstruct, thedir->entry, &thedir->entry);
+#if APR_HAS_THREADS && _POSIX_THREAD_SAFE_FUNCTIONS
+ap_status_t ret;
+ret = readdir_r(thedir->dirstruct, thedir->entry, &thedir->entry);
+/* Avoid the Linux problem where at end-of-directory thedir->entry
+ * is set to NULL, but ret = APR_SUCCESS.
+ */
+return (ret == APR_SUCCESS && thedir->entry == NULL) ? APR_ENOENT : ret;
#else
thedir->entry = readdir(thedir->dirstruct);
@@ -288,6 +293,11 @@
*/
ap_status_t ap_get_dir_filename(char **new, struct dir_t *thedir)
{
+/* Detect End-Of-File */
+if (thedir == NULL || thedir->entry == NULL) {
+ *new = NULL;
+ return APR_ENOENT;
+}
(*new) = ap_pstrdup(thedir->cntxt, thedir->entry->d_name);
return APR_SUCCESS;
}
cvs commit: apache-2.0/src/modules/standard mod_speling.c
martin 99/10/23 14:20:17
Modified:src CHANGES
src/modules/standard mod_speling.c
Log:
mod_speling runs in 2.0-dev now: a bug in (linux?) readdir_r handling and
interface adaption to APR functions did it. [Martin Kraemer]
Revision ChangesPath
1.12 +3 -0 apache-2.0/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-2.0/src/CHANGES,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CHANGES 1999/10/13 02:41:06 1.11
+++ CHANGES 1999/10/23 21:20:15 1.12
@@ -1,5 +1,8 @@
Changes with Apache 2.0-dev
+ *) mod_speling runs in 2.0-dev now: a bug in readdir_r handling and
+ interface adaption to APR functions did it. [Martin Kraemer]
+
*) Support DSOs properly on 32-bit HP-UX 11.0
[Dilip Khandekar <[EMAIL PROTECTED]>]
1.6 +10 -15apache-2.0/src/modules/standard/mod_speling.c
Index: mod_speling.c
===
RCS file: /export/home/cvs/apache-2.0/src/modules/standard/mod_speling.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_speling.c 1999/10/22 15:50:12 1.5
+++ mod_speling.c 1999/10/23 21:20:16 1.6
@@ -61,7 +61,6 @@
#include "http_config.h"
#include "http_log.h"
#include "apr_file_io.h"
-#include "../../lib/apr/misc/unix/misc.h"
/* mod_speling.c - by Alexei Kosut <[EMAIL PROTECTED]> June, 1996
*
@@ -229,7 +228,7 @@
static int check_speling(request_rec *r)
{
spconfig *cfg;
-char *good, *bad, *postgood, *url;
+char *good, *bad, *postgood, *url, *fname;
int filoc, dotloc, urlen, pglen;
ap_array_header_t *candidates = NULL;
ap_dir_t *dir;
@@ -302,17 +301,14 @@
dotloc = strlen(bad);
}
-while (ap_readdir(dir) == APR_SUCCESS) {
+/* NOTE: ap_get_dir_filename() fills fname with a ap_palloc()ed copy
+ * of the found directory name already. We don't need to copy it.
+ * @@@: Copying *ALL* found file names is wasted energy (and memory)!
+ */
+while (ap_readdir(dir) == APR_SUCCESS &&
+ap_get_dir_filename(&fname, dir) == APR_SUCCESS) {
sp_reason q;
- char *fname;
-ap_status_t ok;
-
-ok = ap_get_dir_filename(&fname, dir);
-/*@@*/
-ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_INFO, APR_SUCCESS,
- r, __FILE__": Check_Speling `%s' in `%s'", r->filename, good,
ok==APR_SUCCESS ? fname : "ERROR");
-/*@@*/
/*
* If we end up with a "fixed" URL which is identical to the
* requested one, we must have found a broken symlink or some such.
@@ -331,7 +327,7 @@
misspelled_file *sp_new;
sp_new = (misspelled_file *) ap_push_array(candidates);
-sp_new->name = ap_pstrdup(r->pool, fname);
+sp_new->name = fname;
sp_new->quality = SP_MISCAPITALIZED;
}
@@ -343,7 +339,7 @@
misspelled_file *sp_new;
sp_new = (misspelled_file *) ap_push_array(candidates);
-sp_new->name = ap_pstrdup(r->pool, fname);
+sp_new->name = fname;
sp_new->quality = q;
}
@@ -389,13 +385,12 @@
misspelled_file *sp_new;
sp_new = (misspelled_file *) ap_push_array(candidates);
-sp_new->name = ap_pstrdup(r->pool, fname);
+sp_new->name = fname;
sp_new->quality = SP_VERYDIFFERENT;
}
#endif
}
}
-
ap_closedir(dir);
if (candidates->nelts != 0) {
cvs commit: apache-2.0/src/lib/apr/include apr_portable.h
martin 99/10/23 13:15:18
Modified:src/lib/apr/file_io/unix dir.c
src/lib/apr/file_io/win32 dir.c
src/lib/apr/include apr_portable.h
Log:
Fix interface of ap_get_os_dir(): it previously modified a local
pointer without returning anything sensible.
Also, in ap_readdir() I modified a questionable use of an
uninitialized variable (save_errno) which could result in
an endless loop returning APR_SUCCESS when in fact EOF was reached.
Revision ChangesPath
1.12 +6 -7 apache-2.0/src/lib/apr/file_io/unix/dir.c
Index: dir.c
===
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/file_io/unix/dir.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dir.c 1999/10/21 13:15:55 1.11
+++ dir.c 1999/10/23 20:15:16 1.12
@@ -127,13 +127,12 @@
#if APR_HAS_THREADS && _POSIX_THREAD_SAFE_FUNCTIONS
return readdir_r(thedir->dirstruct, thedir->entry, &thedir->entry);
#else
-int save_errno;
-ap_status_t status;
thedir->entry = readdir(thedir->dirstruct);
if (thedir->entry == NULL) {
-if (errno == save_errno) {
-return APR_SUCCESS;
+/* If NULL was returned, this can NEVER be a success. Can it?! */
+if (errno == APR_SUCCESS) {
+return APR_ENOENT;
}
return errno;
}
@@ -294,17 +293,17 @@
}
/* ***APRDOC
- * ap_status_t ap_get_os_dir(ap_os_dir_t *, ap_dir_t *)
+ * ap_status_t ap_get_os_dir(ap_os_dir_t **, ap_dir_t *)
*convert the dir from apr type to os specific type.
* arg 1) The apr dir to convert.
* arg 2) The os specific dir we are converting to
*/
-ap_status_t ap_get_os_dir(ap_os_dir_t *thedir, struct dir_t *dir)
+ap_status_t ap_get_os_dir(ap_os_dir_t **thedir, struct dir_t *dir)
{
if (dir == NULL) {
return APR_ENODIR;
}
-thedir = dir->dirstruct;
+*thedir = dir->dirstruct;
return APR_SUCCESS;
}
1.6 +2 -2 apache-2.0/src/lib/apr/file_io/win32/dir.c
Index: dir.c
===
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/file_io/win32/dir.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dir.c 1999/10/12 06:14:43 1.5
+++ dir.c 1999/10/23 20:15:17 1.6
@@ -210,12 +210,12 @@
return APR_SUCCESS;
}
-ap_status_t ap_get_os_dir(ap_os_dir_t *thedir, struct dir_t *dir)
+ap_status_t ap_get_os_dir(ap_os_dir_t **thedir, struct dir_t *dir)
{
if (dir == NULL) {
return APR_ENODIR;
}
-thedir = dir->dirhand;
+*thedir = dir->dirhand;
return APR_SUCCESS;
}
1.12 +1 -1 apache-2.0/src/lib/apr/include/apr_portable.h
Index: apr_portable.h
===
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/include/apr_portable.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- apr_portable.h1999/10/22 22:30:41 1.11
+++ apr_portable.h1999/10/23 20:15:18 1.12
@@ -187,7 +187,7 @@
#endif
ap_status_t ap_get_os_file(ap_os_file_t *, ap_file_t *);
-ap_status_t ap_get_os_dir(ap_os_dir_t *, ap_dir_t *);
+ap_status_t ap_get_os_dir(ap_os_dir_t **, ap_dir_t *);
ap_status_t ap_get_os_sock(ap_os_sock_t *, ap_socket_t *);
ap_status_t ap_get_os_lock(ap_os_lock_t *, ap_lock_t *);
ap_status_t ap_get_os_proc(ap_os_proc_t *, ap_proc_t *);
cvs commit: apache-site/info apache_books.html
martin 99/10/22 14:09:17 Modified:info apache_books.html Log: Minor fix Revision ChangesPath 1.16 +2 -2 apache-site/info/apache_books.html Index: apache_books.html === RCS file: /export/home/cvs/apache-site/info/apache_books.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- apache_books.html 1999/10/22 21:05:13 1.15 +++ apache_books.html 1999/10/22 21:09:08 1.16 @@ -91,11 +91,11 @@ http://www.dpunkt.de/webserver_betreiben/"; - >Webserver betreiben + >Webserver betreiben -- HTTP und Apache Author: Jacob Schröder, Martin Müller -Published by: dpunkt Verlag heidelberg, Germany +Published by: dpunkt Verlag, Heidelberg, Germany ISBN: 3-932588-00-2
cvs commit: apache-site/info apache_books.html
martin 99/10/22 14:05:15 Modified:info apache_books.html Log: Oops! I didn't mean to *replace* this entry, I wanted to COPY it. Revert lost book. Revision ChangesPath 1.15 +15 -0 apache-site/info/apache_books.html Index: apache_books.html === RCS file: /home/cvs/apache-site/info/apache_books.html,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- apache_books.html 1999/10/22 16:07:35 1.14 +++ apache_books.html 1999/10/22 21:05:13 1.15 @@ -29,6 +29,21 @@ + http://www.idgbooks.com/cgi/fill_out_template.pl?idgbook:0-7645-3306-1:book-idg"; + >Apache Server Administrators Handbook + + Author: Mohammed J. Kabir + +Published by: IDG Books Worldwide + +ISBN: 0-7645-3306-1 + +Language: English + + + + + http://www.coriolis.com/bookstore/bookdetail.cfm?id=1576104680"; >Apache Server Commentary
cvs commit: apache-site/info apache_books.html
martin 99/10/22 09:07:35 Modified:info apache_books.html Log: Added german book "Webserver betreiben" (even about current 1.3.9!) Revision ChangesPath 1.14 +15 -15apache-site/info/apache_books.html Index: apache_books.html === RCS file: /home/cvs/apache-site/info/apache_books.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- apache_books.html 1999/06/07 23:09:45 1.13 +++ apache_books.html 1999/10/22 16:07:35 1.14 @@ -29,21 +29,6 @@ - http://www.idgbooks.com/cgi/fill_out_template.pl?idgbook:0-7645-3306-1:book-idg"; - >Apache Server Administrators Handbook - - Author: Mohammed J. Kabir - -Published by: IDG Books Worldwide - -ISBN: 0-7645-3306-1 - -Language: English - - - - - http://www.coriolis.com/bookstore/bookdetail.cfm?id=1576104680"; >Apache Server Commentary @@ -85,6 +70,21 @@ Language: English Note: Includes CD-ROM + + + + + + http://www.dpunkt.de/webserver_betreiben/"; + >Webserver betreiben + + Author: Jacob Schröder, Martin Müller + +Published by: dpunkt Verlag heidelberg, Germany + +ISBN: 3-932588-00-2 + +Language: German
cvs commit: apache-2.0/src/modules/standard mod_auth_anon.c mod_auth_db.c mod_auth_dbm.c mod_auth_digest.c mod_cern_meta.c mod_digest.c mod_expires.c mod_include.c mod_info.c mod_mime_magic.c mod_rewrite.c
martin 99/10/22 09:01:32
Modified:src/modules/standard mod_auth_anon.c mod_auth_db.c
mod_auth_dbm.c mod_auth_digest.c mod_cern_meta.c
mod_digest.c mod_expires.c mod_include.c mod_info.c
mod_mime_magic.c mod_rewrite.c
Log:
I am not claiming that the modules work now, but at least the parameter lists
are prepared for the updated ap_log_rerror() format. BTW: What is
APLOG_NOERROR
for now that we have an explicit error code? This is still WIP!
Revision ChangesPath
1.6 +2 -2 apache-2.0/src/modules/standard/mod_auth_anon.c
Index: mod_auth_anon.c
===
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_anon.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_auth_anon.c 1999/10/11 22:39:47 1.5
+++ mod_auth_anon.c 1999/10/22 16:01:24 1.6
@@ -251,7 +251,7 @@
|| ((strpbrk("@", sent_pw) != NULL)
&& (strpbrk(".", sent_pw) != NULL {
if (sec->auth_anon_logemail && ap_is_initial_req(r)) {
- ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, r,
+ ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, APR_SUCCESS, r,
"Anonymous: Passwd <%s> Accepted",
sent_pw ? sent_pw : "\'none\'");
}
@@ -259,7 +259,7 @@
}
else {
if (sec->auth_anon_authoritative) {
- ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
+ ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, APR_SUCCESS, r,
"Anonymous: Authoritative, Passwd <%s> not accepted",
sent_pw ? sent_pw : "\'none\'");
return AUTH_REQUIRED;
1.5 +5 -5 apache-2.0/src/modules/standard/mod_auth_db.c
Index: mod_auth_db.c
===
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_db.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_auth_db.c 1999/10/11 22:39:48 1.4
+++ mod_auth_db.c 1999/10/22 16:01:24 1.5
@@ -166,7 +166,7 @@
#else
if (!(f = dbopen(auth_dbpwfile, O_RDONLY, 0664, DB_HASH, NULL))) {
#endif
- ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, errno, r,
"could not open db auth file: %s", auth_dbpwfile);
return NULL;
}
@@ -237,7 +237,7 @@
if (!(real_pw = get_db_pw(r, r->user, sec->auth_dbpwfile))) {
if (!(sec->auth_dbauthoritative))
return DECLINED;
- ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
+ ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
"DB user %s not found: %s", r->user, r->filename);
ap_note_basic_auth_failure(r);
return AUTH_REQUIRED;
@@ -249,7 +249,7 @@
}
invalid_pw = ap_validate_password(sent_pw, real_pw);
if (invalid_pw != NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
+ ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
"DB user %s: authentication failure for \"%s\": %s",
r->user, r->uri, invalid_pw);
ap_note_basic_auth_failure(r);
@@ -295,7 +295,7 @@
if (!(groups = get_db_grp(r, user, sec->auth_dbgrpfile))) {
if (!(sec->auth_dbauthoritative))
return DECLINED;
- ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
+ ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
"user %s not in DB group file %s: %s",
user, sec->auth_dbgrpfile, r->filename);
ap_note_basic_auth_failure(r);
@@ -311,7 +311,7 @@
return OK;
}
}
- ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
+ ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
"user %s not in right group: %s", user, r->filename);
ap_note_basic_auth_failure(r);
return AUTH_REQUIRED;
1.5 +5 -5 apache-2.0/src/modules/standard/mod_auth_dbm.c
Index: mod_auth_dbm.c
===
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_dbm.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_auth_dbm.c1999/10/11 22:39:48 1.4
+++ mod_auth_dbm.c1999/10/22 16:01:24 1.5
@@ -159,7 +159,7 @@
cvs commit: apache-site index.html
martin 99/10/22 08:54:32 Modified:.index.html Log: Finish removal of the Systems'99 link because the fair has just finished. Revision ChangesPath 1.6 +0 -5 apache-site/index.html Index: index.html === RCS file: /home/cvs/apache-site/index.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- index.html1999/10/18 23:13:52 1.5 +++ index.html1999/10/22 15:54:31 1.6 @@ -67,11 +67,6 @@ - -See - us at Systems 99 in Munich, Germany - Apache HTTP Server Y2K Readiness Statement
cvs commit: apache-2.0/src/modules/standard mod_speling.c
martin 99/10/22 08:50:14
Modified:src/modules/standard mod_speling.c
Log:
**WARNING** DO NOT USE YET - interim state
This module now compiles, but it appears to loop. I'm currently on the
Systems'99 trade fair and will continue work on the module after returning
home.
Pool types have been adapted to ap_context_t; ap_popendir() has been
replaced by the new ap_opendir() APR function.
Revision ChangesPath
1.5 +41 -23apache-2.0/src/modules/standard/mod_speling.c
Index: mod_speling.c
===
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_speling.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_speling.c 1999/09/23 19:29:13 1.4
+++ mod_speling.c 1999/10/22 15:50:12 1.5
@@ -60,6 +60,8 @@
#include "http_core.h"
#include "http_config.h"
#include "http_log.h"
+#include "apr_file_io.h"
+#include "../../lib/apr/misc/unix/misc.h"
/* mod_speling.c - by Alexei Kosut <[EMAIL PROTECTED]> June, 1996
*
@@ -229,9 +231,8 @@
spconfig *cfg;
char *good, *bad, *postgood, *url;
int filoc, dotloc, urlen, pglen;
-DIR *dirp;
-struct DIR_TYPE *dir_entry;
ap_array_header_t *candidates = NULL;
+ap_dir_t *dir;
cfg = ap_get_module_config(r->per_dir_config, &speling_module);
if (!cfg->enabled) {
@@ -289,8 +290,8 @@
url = ap_pstrndup(r->pool, r->uri, (urlen - pglen));
/* Now open the directory and do ourselves a check... */
-dirp = ap_popendir(r->pool, good);
-if (dirp == NULL) { /* Oops, not a directory... */
+if (ap_opendir(&dir, good, r->pool) != APR_SUCCESS) {
+/* Oops, not a directory... */
return DECLINED;
}
@@ -301,40 +302,51 @@
dotloc = strlen(bad);
}
-while ((dir_entry = readdir(dirp)) != NULL) {
+while (ap_readdir(dir) == APR_SUCCESS) {
sp_reason q;
+ char *fname;
+ap_status_t ok;
+ok = ap_get_dir_filename(&fname, dir);
+
+/*@@*/
+ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_INFO, APR_SUCCESS,
+ r, __FILE__": Check_Speling `%s' in `%s'", r->filename, good,
ok==APR_SUCCESS ? fname : "ERROR");
+/*@@*/
/*
* If we end up with a "fixed" URL which is identical to the
* requested one, we must have found a broken symlink or some such.
* Do _not_ try to redirect this, it causes a loop!
*/
-if (strcmp(bad, dir_entry->d_name) == 0) {
-ap_pclosedir(r->pool, dirp);
+if (strcmp(bad, fname) == 0) {
+ap_closedir(dir);
return OK;
}
+
/*
* miscapitalization errors are checked first (like, e.g., lower case
* file, upper case request)
*/
-else if (strcasecmp(bad, dir_entry->d_name) == 0) {
+else if (strcasecmp(bad, fname) == 0) {
misspelled_file *sp_new;
sp_new = (misspelled_file *) ap_push_array(candidates);
-sp_new->name = ap_pstrdup(r->pool, dir_entry->d_name);
+sp_new->name = ap_pstrdup(r->pool, fname);
sp_new->quality = SP_MISCAPITALIZED;
}
+
/*
* simple typing errors are checked next (like, e.g.,
* missing/extra/transposed char)
*/
-else if ((q = spdist(bad, dir_entry->d_name)) != SP_VERYDIFFERENT) {
+else if ((q = spdist(bad, fname)) != SP_VERYDIFFERENT) {
misspelled_file *sp_new;
sp_new = (misspelled_file *) ap_push_array(candidates);
-sp_new->name = ap_pstrdup(r->pool, dir_entry->d_name);
+sp_new->name = ap_pstrdup(r->pool, fname);
sp_new->quality = q;
}
+
/*
* The spdist() should have found the majority of the misspelled
* requests. It is of questionable use to continue looking for
@@ -367,24 +379,25 @@
* (e.g. foo.gif and foo.html) This code will pick the first one
* it finds. Better than a Not Found, though.
*/
-int entloc = ap_ind(dir_entry->d_name, '.');
+int entloc = ap_ind(fname, '.');
if (entloc == -1) {
-entloc = strlen(dir_entry->d_name);
+entloc = strlen(fname);
}
if ((dotloc == entloc)
-&& !strncasecmp(bad, dir_entry->d_name, dotloc)) {
+&& !strncasecmp(bad, fname, dotl
cvs commit: apache-site/systems99 index.html systems-hall-a3.gif systems-logo.jpg systems99.gif
martin 99/10/22 02:59:38 Removed: systems99 index.html systems-hall-a3.gif systems-logo.jpg systems99.gif Log: Last day of Systems'99 -- prepare deletion of Systems'99 directory
cvs commit: apache-site/contributors index.html
martin 99/10/22 02:56:09 Modified:contributors index.html Log: Fix my company name (it's Fujitsu-Siemens Computers now) Revision ChangesPath 1.78 +2 -2 apache-site/contributors/index.html Index: index.html === RCS file: /home/cvs/apache-site/contributors/index.html,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- index.html1999/10/11 04:20:33 1.77 +++ index.html1999/10/22 09:56:06 1.78 @@ -386,8 +386,8 @@ Name: Martin Kraemer -Email: Martin.Kraemer@mch.sni.de -Organization: Siemens AG +Email: Martin.Kraemer@mchp.siemens.de +Organization: http://www.fujitsu-siemens.com/";>Fujitsu-Siemens Computers Occupation: Software Development Engineer Location: Munich, Germany Comments: I like portable code that's easily understood.
cvs commit: apache-1.3/src/main http_main.c
martin 99/10/11 16:08:23 Modified:src/main http_main.c Log: Pull in httpd.h to get the prototype for ap_validate_password() for SHARED_CORE variants Revision ChangesPath 1.478 +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.477 retrieving revision 1.478 diff -u -r1.477 -r1.478 --- http_main.c 1999/09/20 20:46:59 1.477 +++ http_main.c 1999/10/11 23:08:19 1.478 @@ -6623,6 +6623,7 @@ #endif /* ndef SHARED_CORE_BOOTSTRAP */ #ifndef SHARED_CORE_BOOTSTRAP +#include "httpd.h" /* * Force ap_validate_password() into the image so that modules like * mod_auth can use it even if they're dynamically loaded.
cvs commit: apache-1.3/src/main http_config.c
martin 99/10/11 16:05:16
Modified:src/main http_config.c
Log:
When we run out of memory, there's *no way* to continue successfully. Exit.
Revision ChangesPath
1.148 +1 -0 apache-1.3/src/main/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_config.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- http_config.c 1999/08/27 23:38:10 1.147
+++ http_config.c 1999/10/11 23:05:15 1.148
@@ -698,6 +698,7 @@
sizeof(module *)*(total_modules+DYNAMIC_MODULE_LIMIT+1));
if (ap_loaded_modules == NULL) {
fprintf(stderr, "Ouch! Out of memory in
ap_setup_prelinked_modules()!\n");
+ exit(1);
}
for (m = ap_preloaded_modules, m2 = ap_loaded_modules; *m != NULL; )
*m2++ = *m++;
cvs commit: apache-1.3/src/include ap.h
martin 99/10/11 16:04:14 Modified:src/include ap.h Log: typo Revision ChangesPath 1.25 +1 -1 apache-1.3/src/include/ap.h Index: ap.h === RCS file: /export/home/cvs/apache-1.3/src/include/ap.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- ap.h 1999/08/12 18:06:20 1.24 +++ ap.h 1999/10/11 23:04:13 1.25 @@ -180,7 +180,7 @@ API_EXPORT(int) ap_base64decode_binary(unsigned char * plain_dst, const char *coded_src); /* Password validation, as used in AuthType Basic which is able to cope - * (based on the prexix) with the SHA1, Apache's internal MD5 and (depending + * (based on the prefix) with the SHA1, Apache's internal MD5 and (depending * on your platform either plain or crypt(3) passwords. */ API_EXPORT(char *) ap_validate_password(const char *passwd, const char *hash);
cvs commit: apache-2.0/src/main listen.c
martin 99/10/11 15:54:31
Modified:src/main listen.c
Log:
I cannot solve this right now. But this variable sure was uninitialized
Revision ChangesPath
1.14 +2 -0 apache-2.0/src/main/listen.c
Index: listen.c
===
RCS file: /export/home/cvs/apache-2.0/src/main/listen.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- listen.c 1999/10/10 20:35:01 1.13
+++ listen.c 1999/10/11 22:54:29 1.14
@@ -74,6 +74,8 @@
char addr[512];
ap_status_t stat;
+ap_cpystrn(addr, "[EMAIL PROTECTED]/listen.c:make_sock():
inet_ntoa(server->sin_addr)]", sizeof addr);
+
stat = ap_setsocketopt(s, APR_SO_REUSEADDR, one);
if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
ap_log_error(APLOG_MARK, APLOG_CRIT, NULL,
cvs commit: apache-2.0/src/test time-sem.c
martin 99/10/11 15:40:20
Modified:src/ap ap_getpass.c
src/lib/apr/lib apr_pools.c apr_tables.c
src/lib/apr/locks/unix crossproc.c
src/modules/example mod_example.c
src/modules/mpm/dexter acceptlock.c
src/modules/mpm/mpmt_pthread acceptlock.c
src/modules/mpm/prefork prefork.c
src/modules/mpm/spmt_os2 spmt_os2.c
src/modules/proxy proxy_ftp.c proxy_util.c
src/modules/standard mod_asis.c mod_auth.c mod_auth_anon.c
mod_auth_db.c mod_auth_dbm.c mod_autoindex.c
mod_imap.c mod_info.c mod_mime_magic.c
mod_negotiation.c mod_rewrite.c mod_so.c
src/os/win32/installer/installdll install.c
src/os/win32 mod_dll.c mod_isapi.c registry.c
src/test time-sem.c
Log:
Remove most of the annoying "re ap_context_t mplement" mis-replacements
by what I think is their real meaning. Guys, I didn't verify all of this,
please have a close look at my "fixes". Thanks.
Revision ChangesPath
1.3 +1 -1 apache-2.0/src/ap/ap_getpass.c
Index: ap_getpass.c
===
RCS file: /export/home/cvs/apache-2.0/src/ap/ap_getpass.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ap_getpass.c 1999/08/31 05:32:07 1.2
+++ ap_getpass.c 1999/10/11 22:39:35 1.3
@@ -106,7 +106,7 @@
#ifdef WIN32
/*
- * Windows lacks getpass(). So we'll re ap_context_t mplement it here.
+ * Windows lacks getpass(). So we'll reimplement it here.
*/
static char *getpass(const char *prompt)
1.17 +4 -4 apache-2.0/src/lib/apr/lib/apr_pools.c
Index: apr_pools.c
===
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/lib/apr_pools.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- apr_pools.c 1999/10/11 15:31:48 1.16
+++ apr_pools.c 1999/10/11 22:39:36 1.17
@@ -117,7 +117,7 @@
/*
* Pool debugging support: This is intended to detect cases where the
- * wrong ap_context_t is used when assigning data to an object in another
pool.
+ * wrong pool is used when assigning data to an object in another pool.
* In particular, it causes the table_{set,add,merge}n routines to check
* that their arguments are safe for the ap_table_t they're being placed in.
* It currently only works with the unix multiprocess model, but could
@@ -460,7 +460,7 @@
static ap_pool_t *permanent_pool;
-/* Each ap_context_t structure is allocated in the start of its own first
block,
+/* Each pool structure is allocated in the start of its own first block,
* so we need to know how many bytes that is (once properly aligned...).
* This also means that when a pool's sub-pool is destroyed, the storage
* associated with it is *completely* gone, so we have to make sure it
@@ -653,7 +653,7 @@
(((unsigned long)(ptr) - (unsigned long)(lo)) \
< (unsigned long)(hi) - (unsigned long)(lo))
-/* Find the ap_context_t that ts belongs to, return NULL if it doesn't
+/* Find the pool that ts belongs to, return NULL if it doesn't
* belong to any pool.
*/
API_EXPORT(ap_pool_t *) ap_find_pool(const void *ts)
@@ -990,7 +990,7 @@
ps->blok = nblok;
ps->got_a_new_block = 1;
/* note that we've deliberately not linked the new block onto
- * the ap_context_t yet... because we may need to flush again later, and
+ * the pool yet... because we may need to flush again later, and
* we'd have to spend more effort trying to unlink the block.
*/
return 0;
1.4 +10 -10apache-2.0/src/lib/apr/lib/apr_tables.c
Index: apr_tables.c
===
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/lib/apr_tables.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apr_tables.c 1999/08/31 05:32:36 1.3
+++ apr_tables.c 1999/10/11 22:39:36 1.4
@@ -315,7 +315,7 @@
* have a life span at least as long as p
*/
if (!ap_pool_is_ancestor(t->a.pool, p)) {
- fprintf(stderr, "copy_table: t's ap_context_t is not an ancestor of
p\n");
+ fprintf(stderr, "copy_table: t's pool is not an ancestor of p\n");
abort();
}
#endif
@@ -392,11 +392,11 @@
#ifdef POOL_DEBUG
{
if (!ap_pool_is_ancestor(ap_find_pool(key), t->a.pool)) {
- fprintf(stderr, "table_set: key not in ancestor ap_context_t of
t\n");
+ fprint
cvs commit: apache-2.0/src/main http_connection.c http_core.c http_main.c http_protocol.c http_request.c util_date.c util_script.c
martin 99/10/11 15:07:40
Modified:src/main http_connection.c http_core.c http_main.c
http_protocol.c http_request.c util_date.c
util_script.c
Log:
Fix typos
Revision ChangesPath
1.20 +1 -1 apache-2.0/src/main/http_connection.c
Index: http_connection.c
===
RCS file: /export/home/cvs/apache-2.0/src/main/http_connection.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- http_connection.c 1999/08/31 05:32:56 1.19
+++ http_connection.c 1999/10/11 22:07:21 1.20
@@ -72,7 +72,7 @@
IMPLEMENT_HOOK_VOID(pre_connection,(conn_rec *c),(c))
IMPLEMENT_HOOK_RUN_FIRST(int,process_connection,(conn_rec *c),(c),DECLINED)
-/* TODO: re ap_context_t mplement the lingering close stuff */
+/* TODO: reimplement the lingering close stuff */
#define NO_LINGCLOSE
/*
1.17 +1 -1 apache-2.0/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache-2.0/src/main/http_core.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- http_core.c 1999/10/06 23:04:08 1.16
+++ http_core.c 1999/10/11 22:07:22 1.17
@@ -2110,7 +2110,7 @@
return err;
}
-/* TODO: re ap_context_t mplement the server token stuff. */
+/* TODO: reimplement the server token stuff. */
#if 0
if (!strcasecmp(arg, "OS")) {
ap_server_tokens = SrvTk_OS;
1.16 +2 -2 apache-2.0/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache-2.0/src/main/http_main.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- http_main.c 1999/10/07 21:48:30 1.15
+++ http_main.c 1999/10/11 22:07:23 1.16
@@ -156,7 +156,7 @@
printf(" -D SHARED_CORE\n");
#endif
-/* This list displays the compiled ap_context_t n default paths: */
+/* This list displays the compiled in default paths: */
#ifdef HTTPD_ROOT
printf(" -D HTTPD_ROOT=\"" HTTPD_ROOT "\"\n");
#endif
@@ -253,7 +253,7 @@
fprintf(stderr, " -v : show version number\n");
fprintf(stderr, " -V : show compile settings\n");
fprintf(stderr, " -h : list available command line
options (this page)\n");
-fprintf(stderr, " -l : list compiled ap_context_t n
modules\n");
+fprintf(stderr, " -l : list compiled in modules\n");
fprintf(stderr, " -L : list available configuration
directives\n");
/* TODOC: -S has been replaced by '-t -D DUMP_VHOSTS' */
/* fprintf(stderr, " -S : show parsed settings (currently
only vhost settings)\n"); */
1.19 +3 -3 apache-2.0/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apache-2.0/src/main/http_protocol.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- http_protocol.c 1999/10/05 05:14:43 1.18
+++ http_protocol.c 1999/10/11 22:07:25 1.19
@@ -795,7 +795,7 @@
* read(). B_SAFEREAD ensures that the BUFF layer flushes if it will
* have to block during a read.
*/
-/* TODO: re ap_context_t mplement SAFEREAD external to BUFF using a
layer */
+/* TODO: reimplement SAFEREAD external to BUFF using a layer */
/* //ap_bsetflag(conn->client, B_SAFEREAD, 1); */
ap_bflush(conn->client);
while ((len = getline(l, sizeof(l), conn->client, 0)) <= 0) {
@@ -1533,7 +1533,7 @@
ap_table_do((int (*)(void *, const char *, const char
*))uniq_field_values,
(void *) varies, r->headers_out, "Vary", NULL);
-/* If we found any, replace old Vary fields with unique ap_context_t
fied value */
+/* If we found any, replace old Vary fields with unique-ified value */
if (varies->nelts > 0) {
ap_table_setn(r->headers_out, "Vary",
@@ -2057,7 +2057,7 @@
}
-/* TODO: re ap_context_t mplement ap_send_fb */
+/* TODO: reimplement ap_send_fb */
#if 0
/*
* Send the body of a response to the client.
1.7 +1 -1 apache-2.0/src/main/http_request.c
Index: http_request.c
===
RCS file: /export/home/cvs/apache-2.0/src/main/http_request.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u
cvs commit: apache-2.0/src/main http_config.c
martin 99/10/11 14:54:43
Modified:src/main http_config.c
Log:
Typo
Revision ChangesPath
1.14 +2 -2 apache-2.0/src/main/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apache-2.0/src/main/http_config.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- http_config.c 1999/10/07 20:47:52 1.13
+++ http_config.c 1999/10/11 21:54:40 1.14
@@ -488,7 +488,7 @@
*
* Notes: 1. ap_add_module() would already complain if no more space
*exists for adding a dynamically loaded module
- * 2. ap_add_module() accepts double ap_context_t nclusion, so
we have
+ * 2. ap_add_module() accepts double inclusion, so we have
*to accept this, too.
*/
for (m = ap_loaded_modules; *m != NULL; m++)
@@ -1424,7 +1424,7 @@
{
int n;
-printf("Compiled ap_context_t n modules:\n");
+printf("Compiled in modules:\n");
for (n = 0; ap_loaded_modules[n]; ++n)
printf(" %s\n", ap_loaded_modules[n]->name);
}
cvs commit: apache-1.3/src/modules/proxy mod_proxy.h mod_proxy.c
martin 99/10/11 14:33:37
Modified:src CHANGES
src/modules/proxy mod_proxy.h mod_proxy.c
Log:
Graham submitted a patch which fixes a problem with the proxy
configuration where globally set configuration options were
overridden inside virtual hosts.
Also, ProxyReceiveBufferSize default values were left uninitialised.
Submitted by: Graham Leggett <[EMAIL PROTECTED]>
Reviewed by: Martin Kraemer
Revision ChangesPath
1.1436+7 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1435
retrieving revision 1.1436
diff -u -r1.1435 -r1.1436
--- CHANGES 1999/09/27 20:38:32 1.1435
+++ CHANGES 1999/10/11 21:33:30 1.1436
@@ -1,5 +1,12 @@
Changes with Apache 1.3.10
+ *) Fix problem with proxy configuration where globally set configuration
+ options were overridden inside virtual hosts.
+ [Graham Leggett <[EMAIL PROTECTED]>]
+
+ *) Fix ProxyReceiveBufferSize where default value was left uninitialised.
+ [Graham Leggett <[EMAIL PROTECTED]>]
+
*) Added a CLF '-' respecting %B to the log format.
Suggested by Ragnar Kjørstad [dirkx]
1.44 +11 -0 apache-1.3/src/modules/proxy/mod_proxy.h
Index: mod_proxy.h
===
RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/mod_proxy.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- mod_proxy.h 1999/02/07 20:48:31 1.43
+++ mod_proxy.h 1999/10/11 21:33:34 1.44
@@ -193,13 +193,21 @@
struct cache_conf {
const char *root;/* the location of the cache directory
*/
off_t space; /* Maximum cache size (in 1024 bytes) */
+char space_set;
time_t maxexpire;/* Maximum time to keep cached files in
secs */
+char maxexpire_set;
time_t defaultexpire;/* default time to keep cached file in secs */
+char defaultexpire_set;
double lmfactor; /* factor for estimating expires date */
+char lmfactor_set;
time_t gcinterval; /* garbage collection interval, in
seconds */
+char gcinterval_set;
int dirlevels; /* Number of levels of subdirectories */
+char dirlevels_set;
int dirlength; /* Length of subdirectory names */
+char dirlength_set;
float cache_completion; /* Force cache completion after this point */
+char cache_completion_set;
};
typedef struct {
@@ -213,13 +221,16 @@
array_header *allowed_connect_ports;
char *domain;/* domain name to use in absence of a domain
name in the request */
int req; /* true if proxy requests are enabled */
+char req_set;
enum {
via_off,
via_on,
via_block,
via_full
} viaopt; /* how to deal with proxy Via: headers */
+char viaopt_set;
size_t recv_buffer_size;
+char recv_buffer_size_set;
} proxy_server_conf;
struct hdr_entry {
1.66 +60 -1 apache-1.3/src/modules/proxy/mod_proxy.c
Index: mod_proxy.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/mod_proxy.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- mod_proxy.c 1999/03/10 17:42:46 1.65
+++ mod_proxy.c 1999/10/11 21:33:35 1.66
@@ -417,22 +417,69 @@
ps->allowed_connect_ports = ap_make_array(p, 10, sizeof(int));
ps->domain = NULL;
ps->viaopt = via_off; /* initially backward compatible with 1.3.1 */
+ps->viaopt_set = 0; /* 0 means default */
ps->req = 0;
+ps->req_set = 0;
+ps->recv_buffer_size = 0; /* this default was left unset for some reason
*/
+ps->recv_buffer_size_set = 0;
ps->cache.root = NULL;
ps->cache.space = DEFAULT_CACHE_SPACE;
+ps->cache.space_set = 0;
ps->cache.maxexpire = DEFAULT_CACHE_MAXEXPIRE;
+ps->cache.maxexpire_set = 0;
ps->cache.defaultexpire = DEFAULT_CACHE_EXPIRE;
+ps->cache.defaultexpire_set = 0;
ps->cache.lmfactor = DEFAULT_CACHE_LMFACTOR;
+ps->cache.lmfactor_set = 0;
ps->cache.gcinterval = -1;
+ps->cache.gcinterval_set = 0;
/* at these levels, the cache can have 2^18 directories (256,000) */
ps->cache.dirlevels = 3;
+ps->cache.dirlevels_set = 0;
ps->cache.dirlength = 1;
+ps->cache.dirlength_set = 0;
ps->cache.cache_completion = DEFAULT_CACHE_COMPLETION;
+ps->cache.ca
cvs commit: apache-2.0/src/modules/mpm/dexter dexter.c
martin 99/10/07 15:21:09
Modified:src/modules/mpm/dexter dexter.c
Log:
This module wouldn't even compile:
the parameter list of setup_listeners() was wrong
Revision ChangesPath
1.41 +1 -1 apache-2.0/src/modules/mpm/dexter/dexter.c
Index: dexter.c
===
RCS file: /export/home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- dexter.c 1999/10/07 20:48:09 1.40
+++ dexter.c 1999/10/07 22:21:04 1.41
@@ -681,7 +681,7 @@
}
}
-static int setup_listeners(ap_context_t *p, server_rec *s)
+static int setup_listeners(server_rec *s)
{
ap_listen_rec *lr;
int num_listeners = 0;
cvs commit: apache-2.0/src/lib/apr/misc/unix start.c
martin 99/10/07 14:58:31 Modified:src/lib/apr/misc/unix start.c Log: Warning: even with HAVE_PTHREAD_SIGMASK defined, no pthread function should be called for the prefork mpm Revision ChangesPath 1.9 +3 -0 apache-2.0/src/lib/apr/misc/unix/start.c Index: start.c === RCS file: /export/home/cvs/apache-2.0/src/lib/apr/misc/unix/start.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- start.c 1999/10/04 16:37:01 1.8 +++ start.c 1999/10/07 21:58:29 1.9 @@ -203,6 +203,9 @@ sigset_t sigset; sigfillset(&sigset); +/*@@@ FIXME: This should *NOT* be called for the prefork MPM, + * even if HAVE_PTHREAD_SIGMASK is defined MnKr + */ pthread_sigmask(SIG_BLOCK, &sigset, NULL); #endif return APR_SUCCESS;
cvs commit: apache-2.0/src/support ab.c
martin 99/10/07 14:53:47
Modified:src/support ab.c
Log:
Re-sync to most up-to-date ab.c version 1.3b
Revision ChangesPath
1.3 +27 -15apache-2.0/src/support/ab.c
Index: ab.c
===
RCS file: /export/home/cvs/apache-2.0/src/support/ab.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ab.c 1999/08/31 05:35:38 1.2
+++ ab.c 1999/10/07 21:53:46 1.3
@@ -80,7 +80,7 @@
**- Enhanced by Dean Gaudet <[EMAIL PROTECTED]>, November 1997
**- Cleaned up by Ralf S. Engelschall <[EMAIL PROTECTED]>, March 1998
**- POST and verbosity by Kurt Sussman <[EMAIL PROTECTED]>, August
1998
- **- HTML ap_table_t output added by David N. Welton <[EMAIL
PROTECTED]>, January 1999
+ **- HTML table output added by David N. Welton <[EMAIL PROTECTED]>,
January 1999
**- Added Cookie, Arbitrary header and auth support. <[EMAIL
PROTECTED]>, April 199
**
*/
@@ -97,7 +97,7 @@
* only an issue for loopback usage
*/
-#define VERSION "1.3a"
+#define VERSION "1.3b"
/* */
@@ -254,7 +254,7 @@
out[0].iov_base = request;
out[0].iov_len = reqlen;
-if (posting) {
+if (posting>0) {
out[1].iov_base = postdata;
out[1].iov_len = postlen;
outcnt = 2;
@@ -263,7 +263,7 @@
writev(c->fd,out, outcnt);
#else
write(c->fd,request,reqlen);
-if (posting) {
+if (posting>0) {
write(c->fd,postdata,postlen);
totalposted += (reqlen + postlen);
}
@@ -331,7 +331,7 @@
if (keepalive)
printf("Keep-Alive requests:%d\n", doneka);
printf("Total transferred: %d bytes\n", totalread);
-if (posting)
+if (posting>0)
printf("Total POSTed: %d\n", totalposted);
printf("HTML transferred: %d bytes\n", totalbread);
@@ -340,7 +340,7 @@
printf("Requests per second:%.2f\n", 1000 * (float) (done) /
timetaken);
printf("Transfer rate: %.2f kb/s received\n",
(float) (totalread) / timetaken);
- if (posting) {
+ if (posting>0) {
printf("%.2f kb/s sent\n",
(float) (totalposted) / timetaken);
printf("%.2f kb/s total\n",
@@ -429,7 +429,7 @@
printf("Total transferred:"
"%d bytes\n",
trstring, tdstring, tdstring, totalread);
-if (posting)
+if (posting>0)
printf("Total POSTed:"
"%d\n",
trstring, tdstring, tdstring, totalposted);
@@ -445,7 +445,7 @@
printf("Transfer rate:"
"%.2f kb/s received\n",
trstring, tdstring, tdstring, (float) (totalread) / timetaken);
- if (posting) {
+ if (posting>0) {
printf(" "
"%.2f kb/s sent\n",
trstring, tdstring, tdstring,
@@ -703,7 +703,8 @@
totalbread += r;
}
-if (c->keepalive && (c->bread >= c->length)) {
+/* cater for the case where we're using keepalives and doing HEAD
requests */
+if (c->keepalive && ((c->bread >= c->length) || (posting < 0))) {
/* finished a keep-alive connection */
good++;
doneka++;
@@ -769,13 +770,14 @@
FD_ZERO(&writebits);
/* setup request */
-if (!posting) {
- sprintf(request, "GET %s HTTP/1.0\r\n"
+if (posting <= 0) {
+ sprintf(request, "%s %s HTTP/1.0\r\n"
"User-Agent: ApacheBench/%s\r\n"
"%s" "%s" "%s"
"Host: %s\r\n"
"Accept: */*\r\n"
- "\r\n" "%s",
+ "%s" "\r\n",
+ (posting == 0) ? "GET" : "HEAD",
path,
VERSION,
keepalive ? "Connection: Keep-Alive\r\n" : "",
@@ -890,7 +892,8 @@
fprintf(stderr, "-T content-type Content-type header for POSTing\n");
fprintf(stderr, "-v verbosityHow much troubleshooting info to
print\n");
fprintf(stderr, "-w Print out results in HTML
tables\n");
-fprintf(stderr, "-x attributes String to insert as ap_table_t
attributes\n");
+fprintf(stderr, &qu
