cvs commit: apache-1.3/src/support htpasswd.1
coar00/02/18 08:12:42 Modified:src/support htpasswd.1 Log: Fix some typos and make the portability of the MD5 algorithm a little more clear. Revision ChangesPath 1.13 +17 -5 apache-1.3/src/support/htpasswd.1 Index: htpasswd.1 === RCS file: /home/cvs/apache-1.3/src/support/htpasswd.1,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- htpasswd.11999/08/02 10:13:48 1.12 +++ htpasswd.12000/02/18 16:12:41 1.13 @@ -1,5 +1,5 @@ -.TH htpasswd 1 February 1997 -.\ Copyright (c) 1997-1999 The Apache Group. All rights reserved. +.TH htpasswd 1 February 2000 +.\ Copyright (c) 1997-2000 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 @@ -61,6 +61,12 @@ ] [ .B \-m +| +.B \-d +| +.B \-s +| +.B \-p ] .I passwdfile .I username @@ -72,9 +78,12 @@ ] [ .B \-m +| .B \-d -.B \-p +| .B \-s +| +.B \-p ] .I passwdfile .I username @@ -123,7 +132,10 @@ Create the \fIpasswdfile\fP. If \fIpasswdfile\fP already exists, it is rewritten and truncated. .IP \-m -Use MD5 encryption for passwords. On Windows and TPF, this is the default. +Use Apache's modified MD5 algorithm for passwords. Passwords encrypted +with this algorithm are transportable to any platform (Windows, Unix, +BeOS, et cetera) running Apache 1.3.9 or later. On Windows and TPF, +this flag is the default. .IP \-d Use crypt() encryption for passwords. The default on all platforms but Windows and TPF. Though possibly supported by @@ -137,7 +149,7 @@ .IP \-p Use plaintext passwords. Though .B htpasswd -will support creation on all platofrms, the +will support creation on all platforms, the .B httpd deamon will only accept plain text passwords on Windows and TPF. .IP \fB\fIpasswdfile\fP
cvs commit: apache-1.3 STATUS
coar00/02/17 08:50:24 Modified:.STATUS Log: Remove this patch from consideration at the request of the author. Revision ChangesPath 1.805 +1 -11 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.804 retrieving revision 1.805 diff -u -r1.804 -r1.805 --- STATUS2000/02/16 19:56:02 1.804 +++ STATUS2000/02/17 16:50:23 1.805 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 2000/02/16 19:56:02 $] + Last modified at [$Date: 2000/02/17 16:50:23 $] Release: @@ -32,16 +32,6 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: -* Cliff Woolley suggests the following patch to fix a problem - with using mod_status and mod_vhost_alias. At issue is the - fact that because mod_vhost_alias does not create actual - vhost structures, the server-name reported in mod_status - is incorrect. The patch reverts to the old behavior of - storing the server-name of the request as a string in - scoreboard. -Message-ID: [EMAIL PROTECTED] - Status: Jim -0 - * long pathnames with many components and no AllowOverride None Workaround is to define Directory / with AllowOverride None, which is something all sites should do in any case.
cvs commit: apache-site related_projects.html
coar00/02/11 12:03:38 Modified:.related_projects.html Log: Add the StWeb and ActiveScripting 'projects'. Well, they're related at least. Revision ChangesPath 1.48 +45 -11apache-site/related_projects.html Index: related_projects.html === RCS file: /home/cvs/apache-site/related_projects.html,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- related_projects.html 2000/02/09 00:04:57 1.47 +++ related_projects.html 2000/02/11 20:03:35 1.48 @@ -22,6 +22,7 @@ H3Non-Commercial Projects/H3 UL +lia href=#activescriptingActiveScripting for Apache/a/li LIA HREF=#apacheaspApache::ASP/A LIA HREF=#apachesslApache-SSL/A LIA HREF=#modsslApache Interface to OpenSSL (mod_ssl)/A @@ -49,12 +50,23 @@ LIA HREF=#matriceMatrice W3/A LIA HREF=#redhatRed Hat Secure Server/a LIA HREF=#strongholdStronghold/A -LIA HREF=#tenonWebTen, a MacOS port of Apache/A +lia href=#stwebStWeb -- Stratos Web and Application Server/a/li LIA HREF=#vfaVision For Apache/A +LIA HREF=#tenonWebTen, a MacOS port of Apache/A /UL HR +h3a name=activescripting + href=http://www.activescripting.org/html/projects.html; +ActiveScripting for Apache/a/h3 +p +The ActiveScripting for Apache project provides an open alternative to the +use of Active Server Pages (ASP) for the Apache Web server on the Windows +platform. +/p +HR + h3a name=apacheasp href=http://www.nodeworks.com/asp;Apache::ASP/a/h3 p The Apache::ASP project is a Perl-native port of Active Server Pages (ASP) @@ -321,16 +333,25 @@ /BLOCKQUOTE HR -H3A NAME=tenonWebTen, a MacOS port of Apache/A/H3 - -WebTen is a commercial Apache-derivative webserver for Power Macs. -WebTen has been extended with a browser-based interface and Squid -cacheing. It supports standard Macintosh-style plug-ins and CGIs and -includes SSL, DNS, FTP, and NFS. - -BLOCKQUOTE -For more information visit -A HREF=http://www.tenon.com/products/webten/;Tenon's web site/A. +h3a name=stwebStWeb -- Stratos Web and Application Server/a/h3 +p +StWeb is an easy-to-use, cross platform, Internet/Intranet development +and deployment system for development and maintenance of web-enabled +applications. +/p +p +The main component of the system is the Stratos Web Application Server - +an Apache based HTTP server integrated with Stratos application server. +StWeb is platform and database independent. It runs on all major +hardware and operating systems and can be used with most of popular +database servers. Application once developed, can be deployed on any of +the supported systems (write once, use anywhere ). +The Personal Edition of StWeb is free and is available for download +from the StWeb site. +/p +blockquote +For more information visit StWeb home at +lt;a href=http://www.stweb.org/;http://www.stweb.org//agt;. /BLOCKQUOTE HR @@ -343,6 +364,19 @@ BLOCKQUOTE For more information visit A HREF=http://www.focus-array.com/;The Focus Array's web site/A. +/BLOCKQUOTE + +HR +H3A NAME=tenonWebTen, a MacOS port of Apache/A/H3 + +WebTen is a commercial Apache-derivative webserver for Power Macs. +WebTen has been extended with a browser-based interface and Squid +cacheing. It supports standard Macintosh-style plug-ins and CGIs and +includes SSL, DNS, FTP, and NFS. + +BLOCKQUOTE +For more information visit +A HREF=http://www.tenon.com/products/webten/;Tenon's web site/A. /BLOCKQUOTE HR
cvs commit: apache-1.3/htdocs/manual/misc FAQ-I.html
coar00/02/11 14:11:35 Modified:htdocs/manual/misc FAQ-I.html Log: Add another module capable of doing footers. Submitted by: Brian Aker [EMAIL PROTECTED] Reviewed by: Ken Coar Revision ChangesPath 1.5 +2 -2 apache-1.3/htdocs/manual/misc/FAQ-I.html Index: FAQ-I.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/FAQ-I.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- FAQ-I.html2000/01/16 20:52:30 1.4 +++ FAQ-I.html2000/02/11 22:11:33 1.5 @@ -31,7 +31,7 @@ !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P - $Revision: 1.4 $ ($Date: 2000/01/16 20:52:30 $) + $Revision: 1.5 $ ($Date: 2000/02/11 22:11:33 $) /P P The latest version of this FAQ is always available from the main @@ -188,7 +188,7 @@ several third party modules available through the A HREF=http://modules.apache.org/;Apache Module Registry/A which will add footers to documents. These include mod_trailer, PHP - (SAMPphp3_auto_append_file/SAMP), and mod_perl + (SAMPphp3_auto_append_file/SAMP), mod_layout, and mod_perl (SAMPApache::Sandwich/SAMP). /P HR
cvs commit: apache-site related_projects.html
coar00/02/08 13:05:54 Modified:.related_projects.html Log: Add the Apache::ASP project. Submitted by: Joshua Chamas [EMAIL PROTECTED] Reviewed by: Ken Coar Revision ChangesPath 1.46 +9 -0 apache-site/related_projects.html Index: related_projects.html === RCS file: /home/cvs/apache-site/related_projects.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- related_projects.html 2000/01/29 00:18:34 1.45 +++ related_projects.html 2000/02/08 21:05:52 1.46 @@ -22,6 +22,7 @@ H3Non-Commercial Projects/H3 UL +LIA HREF=#apacheaspApache::ASP/A LIA HREF=#apachesslApache-SSL/A LIA HREF=#modsslApache Interface to OpenSSL (mod_ssl)/A LIA HREF=#moduleregApache Module Registry/A @@ -52,6 +53,14 @@ /UL HR + +h3a name=apacheasp href=http://www.nodeworks.com/asp;Apache::ASP/a/h3 +p +The Apache::ASP project is a Perl-native port of Active Server Pages (ASP) +to Apache that runs under a href=http://perl.apache.org/;mod_perl/a, +and provides an open alternative to Chili!Soft's ASP for Unix. +/p +hr H3A NAME=apachessl HREF=http://www.apache-ssl.org/;Apache-SSL/A/H3
cvs commit: apache-1.3/htdocs/manual/misc FAQ-B.html
coar00/01/30 07:47:43 Modified:htdocs/manual/misc FAQ-B.html Log: This really *is* a FAQ.. Revision ChangesPath 1.3 +40 -1 apache-1.3/htdocs/manual/misc/FAQ-B.html Index: FAQ-B.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/FAQ-B.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- FAQ-B.html1999/08/19 21:52:01 1.2 +++ FAQ-B.html2000/01/30 15:47:42 1.3 @@ -31,7 +31,7 @@ !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P - $Revision: 1.2 $ ($Date: 1999/08/19 21:52:01 $) + $Revision: 1.3 $ ($Date: 2000/01/30 15:47:42 $) /P P The latest version of this FAQ is always available from the main @@ -91,6 +91,7 @@ /LI LIA HREF=#regexWhat are regular expressions?/A /LI + lia href=#binariesWhy isn't there a binary for my platform?/a/li /OL /LI !--#endif -- @@ -397,6 +398,44 @@ /P HR /LI + + lia name=binaries + bWhy isn't there a binary for my platform?/b/a + p + The developers make sure that the software builds and works + correctly on the platforms available to them; this does + inot/i necessarily mean that iyour/i platform + is one of them. In addition, the Apache HTTP server project + is primarily source oriented, meaning that distributing + valid and buildable source code is the purpose of a release, + not making sure that there is a binary package for all of the + supported platforms. + /p + p + If you don't see a kit for your platform listed in the + binary distribution area + (lt;URL:a href=http://www.apache.org/dist/binaries/; +http://www.apache.org/dist/binaries//agt;), + it means either that the platform isn't available to any of + the developers, or that they just haven't gotten around to + preparing a binary for it. As this is a voluntary project, + they are under no obligation to do so. Users are encouraged + and expected to build the software themselves. + /p + p + The sole exception to these practices is the Windows package. + Unlike most Unix and Unix-like platforms, Windows systems + do not come with a bundled software development environment, + so we ido/i prepare binary kits for Windows when we make + a release. Again, however, it's a voluntary thing and only + a limited number of the developers have the capability to build + the InstallShield package, so the Windows release may lag + somewhat behind the source release. This lag should be + no more than a few days at most. + /p + hr + /li + /OL !--#endif -- !--#if expr=$STANDALONE --
cvs commit: apache-1.3/htdocs index.html.ja.jis index.html.po.iso-pl index.html.pt-br
coar00/01/30 08:18:35 Modified:conf httpd.conf-dist Added: htdocs index.html.ja.jis index.html.po.iso-pl index.html.pt-br Log: Add welcome-page translations in Polish and Japanese, and give the Brazilian Portuguese version the correct extension. Submitted by: mihau [EMAIL PROTECTED], Makoto MATSUSHITA [EMAIL PROTECTED] Reviewed by: Ken Coar Revision ChangesPath 1.54 +9 -3 apache-1.3/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- httpd.conf-dist 2000/01/26 23:05:04 1.53 +++ httpd.conf-dist 2000/01/30 16:18:34 1.54 @@ -657,7 +657,7 @@ # # Note 2: The example entries below illustrate that in quite # some cases the two character 'Language' abbriviation is not -# identical to the two character 'Country' code for it's country, +# identical to the two character 'Country' code for its country, # E.g. 'Danmark/dk' versus 'Danish/da'. # # Note 3: In the case of 'ltz' we violate the RFC by using a three char @@ -666,8 +666,9 @@ # # Danish (da) - Dutch (nl) - English (en) - Estonian (ee) # French (fr) - German (de) - Greek-Modern (el) -# Italian (it) -Portugese (pt) - Luxembourgeois* (ltz) +# Italian (it) - Portugese (pt) - Luxembourgeois* (ltz) # Spanish (es) - Swedish (sv) - Catalan (ca) - Czech(cz) +# Polish (pl) - Brazilian Portuguese (pt-br) - Japanese (ja) # AddLanguage da .dk AddLanguage nl .nl @@ -677,7 +678,12 @@ AddLanguage de .de AddLanguage el .el AddLanguage it .it +AddLanguage ja .ja +AddCharset ISO-2022-JP .jis +AddLanguage pl .po +AddCharset ISO-8859-2 .iso-pl AddLanguage pt .pt +AddLanguage pt-br .pt-br AddLanguage ltz .lu AddLanguage ca .ca AddLanguage es .es @@ -691,7 +697,7 @@ # more or less alphabetized them here. You probably want to change this. # IfModule mod_negotiation.c -LanguagePriority en da nl et fr de el it pt ltz ca es sv +LanguagePriority en da nl et fr de el it ja pl pt pt-br ltz ca es sv /IfModule # 1.1 apache-1.3/htdocs/index.html.ja.jis Index: index.html.ja.jis === !doctype html public -//W3C//DTD HTML 4.0 Transitional//EN http://www.w3.org/TR/REC-html40/loose.dtd; html head meta http-equiv=Content-Type content=text/html; charset=ISO-2022-JP titleApache $B%$%s%9%H!%k;~$N%F%9%H%Z!%8(B/title /head !-- Background white, links blue (unvisited), navy (visited), red (active) -- body bgcolor=#ff text=#00 link=#ff vlink=#80 alink=#ff p $B$b$7$3$N%Z!%8$,FI$a$?$N$G$$l$P!(Ba href=http://www.apache.org/httpd;Apache $B%%'%V%5!%P(B/a$B$N%$%s%9%H!%k$,$3$N7W;;5!$GL5;v$K=*N;$7$?$3$H$r0UL#$7$^$9!#$$J$?$O!$3$N%G%#%l%/%H%j$KJ8=q$r2C$($?$j!$3$N%Z!%8$rCV$-$+$($k$3$H$,$G$-$^$9!#(B /p hr width=50% size=8 h2 align=center$B$$J$?$NM=A[$KH?$7$F!$3$N%Z!%8$,8+$($F$$$k$G$7$g$$+(B?/h2 p $B$3$N%Z!%8$O!%5%$%H4IM}T$,$3$N(B web $B%5![EMAIL PROTECTED]($F$$$^$9!#(B strong$B$3$N%5![EMAIL PROTECTED];}$C$F$$$kJ}$KOMm$r$H$C$F(B/strong$B$/[EMAIL PROTECTED]T$,MxMQ$7$F$$$k(B web $B%5!%P$r3+H/$7$?(B The Apache Software Foundation $B$O!$3$N%5%$%H$N(B web $B%5!%P$N4IM}$H$O4X78$,$J$/!%5![EMAIL PROTECTED];$s!#(B /p hr width=50% size=8 p Apache $B$K4X$9$k(BA HREF=manual/index.html$BJ8=q(B/A $B$O!$3$N(B web $B%5!%PG[I[J*$NCf$K4^$^$l$F$$$^$9!#(B /p p $B0J2$N2hA|$O!(BApache $B$rMxMQ$7$F$$$k(B web $B%5!%P$G+M3$K;H$$3$H$,$G$-$^$9!#(BApache [EMAIL PROTECTED]$$j$,$H$$4$6$$$^$9(B! /p div align=center img src=apache_pb.gif alt= /div /body /html 1.1 apache-1.3/htdocs/index.html.po.iso-pl Index: index.html.po.iso-pl === !doctype html public -//w3c//dtd html 3.2 final//en html head titleStrona kontrolna dla instalacji Apache na tej stronie/title meta http-equiv=Content-Type content=text/html; charset=iso-8859-2 !-- translated by mihau, [EMAIL PROTECTED] | mihau PRODUCTIONS - http://www.mihau.de/ on january 29th 2000 -- /head !-- Background white, links blue (unvisited), navy (visited), red (active) -- body bgcolor=#ff text=#00 link=#ff vlink=#80 alink=#ff h1 align=center Uda³o siê! Serwer Apache jest zainstalowany na tej stronie! /h1 p Je¶li widzisz t± stronê to znaczy ¿e w³a¶æiciel
cvs commit: apache-site related_projects.html
coar00/01/21 13:22:46 Modified:.related_projects.html Log: Add another 'relation.' Submitted by: Bob Beck [EMAIL PROTECTED] Reviewed by: Ken Coar Revision ChangesPath 1.43 +14 -0 apache-site/related_projects.html Index: related_projects.html === RCS file: /home/cvs/apache-site/related_projects.html,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- related_projects.html 1999/10/26 06:37:09 1.42 +++ related_projects.html 2000/01/21 21:22:42 1.43 @@ -40,6 +40,7 @@ UL LIA HREF=#apacheweekApache Week/A (free weekly newsletter) +lia href=#tcsApache/Stronghold for Trusted Solaris/a/li LIA HREF=#ravenCovalent Raven SSL module/A LIA HREF=#ibmIBM HTTP Server powered by Apache/A LIA HREF=#matriceMatrice W3/A @@ -101,6 +102,19 @@ purposes for free. PHR +H3A NAME=tcs HREF=http://www.tcs-sec.com/; +Apache/Stronghold for Trusted Solaris/A/H3 +p +Trusted Computer Solutions, Inc. (TCS) offers a suite of Apache/Stronghold +based security solutions hosted on Sun's Trusted Solaris operating +system. Product and security information, white papers and the +company's latest news releases may be accessed ivia/i TCS' +World Wide Web site at +lt;URL:a href=http://www.tcs-sec.com;http://www.tcs-sec.com/agt; +or ivia/i email to lt;[EMAIL PROTECTED]gt;. +/p +hr + H3A NAME=raven HREF=http://ravenssl.com/;Covalent Raven SSL Module for Apache/A/H3 The Raven SSL module is a commerical product providing a strong
cvs commit: apache-site httpd.html
coar00/01/14 03:46:20 Modified:.httpd.html Log: The Big Bad Day is passed.. Revision ChangesPath 1.83 +0 -2 apache-site/httpd.html Index: httpd.html === RCS file: /home/cvs/apache-site/httpd.html,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- httpd.html1999/09/11 01:54:43 1.82 +++ httpd.html2000/01/14 11:46:20 1.83 @@ -20,8 +20,6 @@ H3A HREF=http://www.apache.org/dyn/closer.cgi; Mirrored worldwide - find your closest mirror/A/H3 -h2a href=foundation/Y2K.html -Apache's Y2K Readiness Statement/a/h2 TABLE TR TD
cvs commit: apache-1.3/src/support suexec.c
coar00/01/11 11:48:05 Modified:.STATUS Makefile.tmpl configure src CHANGES src/support suexec.c Log: Allow the builder to specify a default umask for scripts wrapped by suexec. PR: 4178 Reviewed by: Ryan Bloom, Martin Kraemer, Jim Jagielski, Greg Stein Revision ChangesPath 1.787 +1 -6 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.786 retrieving revision 1.787 diff -u -r1.786 -r1.787 --- STATUS2000/01/11 19:25:24 1.786 +++ STATUS2000/01/11 19:47:35 1.787 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/11 19:25:24 $] + Last modified at [$Date: 2000/01/11 19:47:35 $] Release: @@ -75,11 +75,6 @@ Available Patches: - -* 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, Martin +1 * Andrew Ford's patch (1999/12/05) to add absolute times to mod_expires Message-ID: [EMAIL PROTECTED] 1.95 +3 -1 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- Makefile.tmpl 1999/12/09 17:19:35 1.94 +++ Makefile.tmpl 2000/01/11 19:47:41 1.95 @@ -135,6 +135,7 @@ suexec_uidmin = @suexec_uidmin@ suexec_gidmin = @suexec_gidmin@ suexec_safepath = @suexec_safepath@ +suexec_umask= @suexec_umask@ # some substituted configuration parameters conf_user= @conf_user@ @@ -200,7 +201,8 @@ -DUSERDIR_SUFFIX=\$(suexec_userdir)\ \ -DLOG_EXEC=\$(suexec_logexec)\ \ -DDOC_ROOT=\$(suexec_docroot)\ \ - -DSAFE_PATH=\$(suexec_safepath)\ ' \ + -DSAFE_PATH=\$(suexec_safepath)\ \ + $(suexec_umask)' \ suexec; \ fi @echo === $(SRC)/support 1.115 +15 -1 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- configure 1999/12/10 11:03:00 1.114 +++ configure 2000/01/11 19:47:42 1.115 @@ -240,6 +240,8 @@ suexec_uidmin=100 suexec_gidmin=100 suexec_safepath=/usr/local/bin:/usr/bin:/bin +# if the umask is undefined, we don't change it +#suexec_umask=0755 # the installation flags iflags_program=-m 755 -s @@ -449,6 +451,7 @@ echo --suexec-uidmin=UIDset the suEXEC minimal allowed UID [$suexec_uidmin] echo --suexec-gidmin=GIDset the suEXEC minimal allowed GID [$suexec_gidmin] echo --suexec-safepath=PATH set the suEXEC safe PATH [$suexec_safepath] +echo --suexec-umask=UMASK set the umask for the suEXEC'd script [server's umask] echo echo Deprecated options: echo --layout backward compat only: use --show-layout @@ -976,6 +979,11 @@ suexec_safepath=$apc_optarg suexec_ok=1 ;; +--suexec-umask=*) +suexec_umask_val=$apc_optarg +suexec_umask=-DSUEXEC_UMASK=$apc_optarg +suexec_ok=1 +;; --server-uid=*) conf_user=$apc_optarg # protect the '#' against interpretation as comment @@ -1085,7 +1093,7 @@ for var in prefix exec_prefix bindir sbindir libexecdir mandir \ sysconfdir datadir iconsdir htdocsdir cgidir includedir \ localstatedir runtimedir logfiledir proxycachedir \ - suexec_docroot suexec_logexec; do + suexec_docroot suexec_logexec ; do eval val=\\$$var\; val=`echo $val | sed -e 's:\(.\)/*$:\1:'` eval $var=\$val\ @@ -1240,6 +1248,11 @@ echo caller ID: $suexec_caller echo minimum user ID: $suexec_uidmin echo minimum group ID: $suexec_gidmin +if [ x$suexec_umask != x ]; then +echo umask: $suexec_umask_val + else +echo umask: running server's +fi echo fi exit 0 @@ -1290,6 +1303,7 @@ -e [EMAIL PROTECTED]@%$suexec_uidmin%g \ -e [EMAIL PROTECTED]@%$suexec_gidmin%g \ -e [EMAIL PROTECTED]@%$suexec_safepath%g \ +-e [EMAIL PROTECTED]@%$suexec_umask%g \ -e [EMAIL PROTECTED]@%$conf_user%g \ -e [EMAIL
cvs commit: apache-1.3 STATUS
coar00/01/10 12:08:05 Modified:.STATUS Log: Showery, with scattered thunderstorms. I think. Revision ChangesPath 1.780 +2 -2 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.779 retrieving revision 1.780 diff -u -r1.779 -r1.780 --- STATUS2000/01/10 16:20:16 1.779 +++ STATUS2000/01/10 20:08:02 1.780 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/10 16:20:16 $] + Last modified at [$Date: 2000/01/10 20:08:02 $] Release: @@ -64,7 +64,7 @@ * Ken's patch to allow for umask settings for suExec. Suggested by PR#4178. Message-ID: [EMAIL PROTECTED] -Status: +Status: Ken +1 * Andrew Ford's patch (1999/12/05) to add absolute times to mod_expires Message-ID: [EMAIL PROTECTED]
cvs commit: apache-site/info apache_books.html
coar00/01/01 21:49:27 Modified:info apache_books.html Log: Change the pointer for the Dummies book.. Revision ChangesPath 1.18 +12 -18apache-site/info/apache_books.html Index: apache_books.html === RCS file: /home/cvs/apache-site/info/apache_books.html,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- apache_books.html 2000/01/02 00:18:58 1.17 +++ apache_books.html 2000/01/02 05:49:27 1.18 @@ -27,9 +27,6 @@ H21999/H2 UL - - - LI DL DTSTRONGApache: Das umfassende Referenzwerk./STRONG/DT @@ -221,25 +218,22 @@ /DD /DL /LI - LI - DL - DT -A - HREF=http://www.amazon.com/exec/obidos/ISBN=0764502913/meepzorconsultin/; -STRONGApache Server for Dummies/STRONG/A - /DT - DDAuthor: Ken Coar -BR + li + dl + dta href=http://Apache-Server.Com/; + bApache Server for Dummies/b/a/dt + ddAuthor: Ken Coar +br Published by: IDG Books Worldwide -BR +br ISBN: 0-7645-0291-3 -BR +br Language: English -BR +br Note: includes CD-ROM - /DD - /DL - /LI + /dd + /dl + /li LI DL DTA HREF=http://www.itp.de/online/0438/0438.html;STRONGApache Web-Server/STRONG/A
cvs commit: apache-1.3/src/main http_config.c http_main.c
coar00/01/01 09:07:37 Modified:src CHANGES src/main http_config.c http_main.c Log: Add a way to find out where Apache will be looking for the suexec binary, since its presence and correct permissions are all that it takes to enable it. It's sort-of a module, so add the report to the '-l' output. Revision ChangesPath 1.1488+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1487 retrieving revision 1.1488 diff -u -r1.1487 -r1.1488 --- CHANGES 1999/12/31 05:35:48 1.1487 +++ CHANGES 2000/01/01 17:07:32 1.1488 @@ -1,5 +1,8 @@ Changes with Apache 1.3.10 + *) Add a suexec status report to the '-l' (compiled-in modules) + output. [Ken Coar] + *) Changes to enable server-parsed mod_autoindex Header and Readme files. [Raymond S Brand [EMAIL PROTECTED]] 1.149 +6 -1 apache-1.3/src/main/http_config.c Index: http_config.c === RCS file: /home/cvs/apache-1.3/src/main/http_config.c,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- http_config.c 1999/10/11 23:05:15 1.148 +++ http_config.c 2000/01/01 17:07:34 1.149 @@ -1636,6 +1636,11 @@ int n; printf(Compiled-in modules:\n); -for (n = 0; ap_loaded_modules[n]; ++n) +for (n = 0; ap_loaded_modules[n]; ++n) { printf( %s\n, ap_loaded_modules[n]-name); +} +printf(suexec: %s\n, +ap_suexec_enabled +? enabled; valid wrapper SUEXEC_BIN +: disabled; invalid wrapper SUEXEC_BIN); } 1.486 +9 -6 apache-1.3/src/main/http_main.c Index: http_main.c === RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v retrieving revision 1.485 retrieving revision 1.486 diff -u -r1.485 -r1.486 --- http_main.c 1999/12/10 11:03:33 1.485 +++ http_main.c 2000/01/01 17:07:34 1.486 @@ -3158,17 +3158,19 @@ /* check to see if we have the 'suexec' setuid wrapper installed */ static int init_suexec(void) { +int result = 0; + #ifndef WIN32 struct stat wrapper; - -if ((stat(SUEXEC_BIN, wrapper)) != 0) - return (ap_suexec_enabled); -if ((wrapper.st_mode S_ISUID) wrapper.st_uid == 0) { - ap_suexec_enabled = 1; +if ((stat(SUEXEC_BIN, wrapper)) != 0) { + result = 0; +} +else if ((wrapper.st_mode S_ISUID) (wrapper.st_uid == 0)) { + result = 1; } #endif /* ndef WIN32 */ -return (ap_suexec_enabled); +return result; } /* @@ -4897,6 +4899,7 @@ show_compile_settings(); exit(0); case 'l': + ap_suexec_enabled = init_suexec(); ap_show_modules(); exit(0); case 'L':
cvs commit: apache-1.3/src/modules/standard mod_mime.c
coar99/12/10 06:51:04 Modified:src/modules/standard mod_mime.c Log: isascii isn't universal, alas.. Submitted by: gil [EMAIL PROTECTED] Reviewed by: Martin Kraemer, Ken Coar Revision ChangesPath 1.51 +11 -3 apache-1.3/src/modules/standard/mod_mime.c Index: mod_mime.c === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_mime.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- mod_mime.c1999/12/09 18:10:34 1.50 +++ mod_mime.c1999/12/10 14:51:03 1.51 @@ -68,6 +68,13 @@ #include http_config.h #include http_log.h +/* + * isascii(c) isn't universal, and even those places where it is + * 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) + typedef struct handlers_info { char *name; } handlers_info; @@ -338,7 +345,7 @@ { int res; -res = (isascii(c) isgraph(c) +res = (ap_isascii(c) isgraph(c) (strchr(tspecial, c) == NULL)) ? 1 : -1; return res; } @@ -347,7 +354,8 @@ { int res; -res = (isascii(c) (c != '') (c != '\\') (c != '\n')) ? 1 : -1; +res = (ap_isascii(c) (c != '') (c != '\\') (c != '\n')) + ? 1 : -1; return res; } @@ -358,7 +366,7 @@ if (((s + 1) != NULL) (*s == '\\')) { c = (int) *(s + 1); - if (isascii(c)) { + if (ap_isascii(c)) { res = 1; } }
cvs commit: apache-1.3/htdocs/manual/misc FAQ-D.html
coar99/12/10 06:56:26 Modified:htdocs/manual/misc FAQ-D.html Log: Add a note about DNS being required on Windows. PR: 5451 Submitted by: Hank Laskey [EMAIL PROTECTED] Reviewed by: Ken Coar Revision ChangesPath 1.5 +10 -2 apache-1.3/htdocs/manual/misc/FAQ-D.html Index: FAQ-D.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/FAQ-D.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- FAQ-D.html1999/09/17 17:31:37 1.4 +++ FAQ-D.html1999/12/10 14:56:26 1.5 @@ -31,7 +31,7 @@ !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P - $Revision: 1.4 $ ($Date: 1999/09/17 17:31:37 $) + $Revision: 1.5 $ ($Date: 1999/12/10 14:56:26 $) /P P The latest version of this FAQ is always available from the main @@ -356,7 +356,15 @@ /dl p in the file. Correct it if there one there with wrong information, or - add one if you don't already have one. Then try to start the server + add one if you don't already have one. + /p + p + Also, make sure that your Windows system has DNS enabled. See the TCP/IP + setup component of the Networking or Internet Options control panel. + /p + p + After verifying that DNS is enabled and that you have a valid hostname + in your sampServerName/samp directive, try to start the server again. /p hr
cvs commit: apache-1.3/htdocs/manual/mod mod_mime.html
coar99/12/09 10:10:42 Modified:src CHANGES .STATUS src/modules/standard mod_mime.c htdocs/manual/mod mod_mime.html Log: Add the AddCharset functionality to mod_mime. Submitted by: Youichirou Koga [EMAIL PROTECTED] Reviewed by: Ken Coar, Martin Kraemer Revision ChangesPath 1.1478+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1477 retrieving revision 1.1478 diff -u -r1.1477 -r1.1478 --- CHANGES 1999/12/09 17:19:28 1.1477 +++ CHANGES 1999/12/09 18:10:24 1.1478 @@ -1,4 +1,7 @@ Changes with Apache 1.3.10 + *) Enhance mod_mime with an AddCharset directive to properly handle + that negotiation dimension. + [Youichirou Koga [EMAIL PROTECTED]] *) OS: Added first cut at support for IBM's OS/390. [Ovies Brabson [EMAIL PROTECTED]] 1.764 +1 -4 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.763 retrieving revision 1.764 diff -u -r1.763 -r1.764 --- STATUS1999/12/09 17:21:35 1.763 +++ STATUS1999/12/09 18:10:30 1.764 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/12/09 17:21:35 $] + Last modified at [$Date: 1999/12/09 18:10:30 $] Release: @@ -42,9 +42,6 @@ Available Patches: -* Youichirou Koga's patch to add AddCharset to mod_mime. - Message-ID: 384E91DF.D92FABC2.Golux.Com - 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] 1.50 +336 -11 apache-1.3/src/modules/standard/mod_mime.c Index: mod_mime.c === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_mime.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- mod_mime.c1999/04/20 17:27:51 1.49 +++ mod_mime.c1999/12/09 18:10:34 1.50 @@ -75,6 +75,7 @@ typedef struct { table *forced_types;/* Additional AddTyped stuff */ table *encoding_types; /* Added with AddEncoding... */ +table *charset_types;/* Added with AddCharset... */ table *language_types; /* Added with AddLanguage... */ table *handlers;/* Added with AddHandler... */ array_header *handlers_remove; /* List of handlers to remove */ @@ -84,6 +85,24 @@ char *default_language; /* Language if no AddLanguage ext found */ } mime_dir_config; +typedef struct param_s { +char *attr; +char *val; +struct param_s *next; +} param; + +typedef struct { +char *type; +char *subtype; +param *param; +} content_type; + +static char tspecial[] = { +'(', ')', '', '', '@', ',', ';', ':', +'\\', '', '/', '[', ']', '?', '=', +'\0' +}; + module MODULE_VAR_EXPORT mime_module; static void *create_mime_dir_config(pool *p, char *dummy) @@ -93,6 +112,7 @@ new-forced_types = ap_make_table(p, 4); new-encoding_types = ap_make_table(p, 4); +new-charset_types = ap_make_table(p, 4); new-language_types = ap_make_table(p, 4); new-handlers = ap_make_table(p, 4); new-handlers_remove = ap_make_array(p, 4, sizeof(handlers_info)); @@ -119,9 +139,11 @@ } new-forced_types = ap_overlay_tables(p, add-forced_types, - base-forced_types); + base-forced_types); new-encoding_types = ap_overlay_tables(p, add-encoding_types, base-encoding_types); +new-charset_types = ap_overlay_tables(p, add-charset_types, +base-charset_types); new-language_types = ap_overlay_tables(p, add-language_types, base-language_types); new-handlers = ap_overlay_tables(p, add-handlers, @@ -135,17 +157,18 @@ return new; } -static const char *add_type(cmd_parms *cmd, mime_dir_config * m, char *ct, +static const char *add_type(cmd_parms *cmd, mime_dir_config *m, char *ct, char *ext) { if (*ext == '.') -++ext; + ++ext; + ap_str_tolower(ct); ap_table_setn(m-forced_types, ext, ct); return NULL; } -static const char *add_encoding(cmd_parms *cmd, mime_dir_config * m, char *enc, +static const char *add_encoding(cmd_parms *cmd, mime_dir_config *m, char *enc, char *ext
cvs commit: apache-devsite/apidoc api.list dict-ap_push_array.html dict-array_header.html mkapidict
coar99/12/08 06:54:36 Modified:apidoc api.list dict-ap_push_array.html dict-array_header.html mkapidict Log: Add a wee bit of documentation for arrays. Revision ChangesPath 1.11 +22 -1 apache-devsite/apidoc/api.list Index: api.list === RCS file: /home/cvs/apache-devsite/apidoc/api.list,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- api.list 1999/03/31 23:48:34 1.10 +++ api.list 1999/12/08 14:54:31 1.11 @@ -964,7 +964,28 @@ int nalloc; \n \ char *elts; \n \ } array_header;\ -|\ +|typedef struct item_t { \n \ +int length;\n \ +char *string; \n \ +} item_t;\n \ +:\n \ +array_header *item_array1; \n \ +item_t *item; \n \ +:\n \ +item_array1 = ap_make_array(p, 4, sizeof(item_t));\n \ +:\n \ +item = ap_push_array(item_array1);\n \ +item-gt;length = 1;\n \ +item-gt;string = a;\n \ +:\n \ +item_t *list;\n \ +\n \ +list = (item_t *) item_array1-gt;elts;\n \ +for (i = 0; i lt; item_array1-gt;nelts; ++i) {\n \ +item = list[i];\n \ +fprintf(stderr, Item %d: length=%d, string='%s'\\n,\n \ +i, item-gt;length, item-gt;string);\n \ +}\n \ |SA-array\ | R|ap_array_cat\ 1.3 +7 -6 apache-devsite/apidoc/dict-ap_push_array.html Index: dict-ap_push_array.html === RCS file: /home/cvs/apache-devsite/apidoc/dict-ap_push_array.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dict-ap_push_array.html 1999/03/30 22:11:42 1.2 +++ dict-ap_push_array.html 1999/12/08 14:54:31 1.3 @@ -1,6 +1,7 @@ -P -Allocates more memory for the additional array element(s). -/P -P -Returns a pointer to the next element of EMarr/EM. -/P +p +Allocates more memory for the additional array element and adds +it to the end of the array. +/p +p +Returns a pointer to the newly-created element of iarr/i. +/p 1.2 +4 -4 apache-devsite/apidoc/dict-array_header.html Index: dict-array_header.html === RCS file: /home/cvs/apache-devsite/apidoc/dict-array_header.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dict-array_header.html1999/03/06 18:17:23 1.1 +++ dict-array_header.html1999/12/08 14:54:32 1.2 @@ -1,4 +1,4 @@ -P -/P -P -/P +p +/p +p +/p 1.7 +88 -112 apache-devsite/apidoc/mkapidict Index: mkapidict === RCS file: /home/cvs/apache-devsite/apidoc/mkapidict,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mkapidict 1999/03/31 23:48:45 1.6 +++ mkapidict 1999/12/08 14:54:32 1.7 @@ -31,6 +31,8 @@ # # Edit history: # +# 1999-12-08 Ken Coar +# Downcase the HTML tags and do some line merging. # 1999-03-31 Ken Coar # Get rid of the ARGV processing and use command-line options # instead. Add a third level of layout; 0 now means 'full,' @@ -198,27 +200,19 @@ verbose(Dumping prologue.); print $ofh @Prologue; print $ofh EOHT; - H2Table of Contents/H2 - UL - LIA HREF=#RoutinesRoutine Descriptions/A - /LI - LIA HREF=#StructuresData Structure Definitions/A - /LI - LIA HREF=#CellsGlobal Data Cells/A - /LI - LIA HREF=#ConstantsConstant Definitions/A - /LI - /UL - HR + h2Table of Contents/h2 + ul + lia href=#RoutinesRoutine Descriptions/a/li + lia href=#StructuresData Structure Definitions/a/li + lia href=#CellsGlobal Data Cells/a/li + lia href=#ConstantsConstant Definitions/a/li + /ul + hr EOHT print $ofh EOHT; - H2 - A NAME=Routines -Routine Descriptions - /A - /H2 - HR + h2a name=RoutinesRoutine Descriptions/a/h2 + hr EOHT verbose(Dumping routines.); @@ -226,12 +220,8 @@ dump_list('R', %Routine); print $ofh EOHT; - H2 - A NAME=Structures -Data Structure Definitions - /A - /H2 - HR + h2a name=StructuresData Structure Definitions/a/h2 + hr EOHT verbose(Dumping structures.); @@ -239,12 +229,8 @@ dump_list('S', %Structure); print $ofh EOHT; - H2 - A NAME=Cells -Global Data Cells - /A - /H2 - HR + h2a name=CellsGlobal Data Cells/a/h2 + hr EOHT verbose(Dumping data cells.); @@ -252,30 +238,26 @@ dump_list('D', %Cell); print $ofh EOHT; - H2 - A NAME=Constants -Constant Definitions - /A - /H2 - P + h2a name=ConstantsConstant Definitions/a/h2 + p Many of the compile-time
cvs commit: apache-1.3 STATUS
coar99/12/08 09:18:37 Modified:.STATUS Log: Add Youichirou Koga's AddCharset patch to what's available. Revision ChangesPath 1.761 +5 -1 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.760 retrieving revision 1.761 diff -u -r1.760 -r1.761 --- STATUS1999/12/06 21:48:40 1.760 +++ STATUS1999/12/08 17:18:34 1.761 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/12/06 21:48:40 $] + Last modified at [$Date: 1999/12/08 17:18:34 $] Release: @@ -42,6 +42,10 @@ Available Patches: +* Youichirou Koga's patch to add AddCharset to mod_mime. + Message-ID: 384E91DF.D92FABC2.Golux.Com + Status: Ken +1 + * Andrew Ford's patch (1999/12/05) to add absolute times to mod_expires Message-ID: [EMAIL PROTECTED] Status:
cvs commit: apache-1.3/htdocs/manual/mod mod_actions.html
coar99/12/08 11:02:24 Modified:src CHANGES src/modules/standard mod_actions.c htdocs/manual/mod mod_actions.html Log: Add ability to handle arbitrary methods to Script directive. Revision ChangesPath 1.1473+6 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1472 retrieving revision 1.1473 diff -u -r1.1472 -r1.1473 --- CHANGES 1999/12/06 22:33:57 1.1472 +++ CHANGES 1999/12/08 19:01:13 1.1473 @@ -1,5 +1,11 @@ Changes with Apache 1.3.10 + *) Enhance mod_actions' Script handling to be able to deal with + arbitrary methods and not just the well-known ones. This allows + experimental or organisation-private methods to be used without + waiting for Apache to catch up. + [Ken Coar] + *) Fix various compile time warnings in hashbang_emul code which prevent successful compilation on OS/390 [Ovies Brabson [EMAIL PROTECTED], Paul Gilmartin [EMAIL PROTECTED]] 1.32 +83 -21apache-1.3/src/modules/standard/mod_actions.c Index: mod_actions.c === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_actions.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- mod_actions.c 1999/01/01 19:05:06 1.31 +++ mod_actions.c 1999/12/08 19:01:48 1.32 @@ -87,8 +87,18 @@ #include util_script.h typedef struct { +char *method; +char *script; +} xmethod_t; + +/* + * HTTP methods are case-sensitive, so we can't use a table structure to + * track extension method mappings -- table keys are case-INsensitive. + */ +typedef struct { table *action_types; /* Added with Action... */ char *scripted[METHODS]; /* Added with Script... */ +array_header *xmethods;/* Added with Script -- extension methods */ } action_dir_config; module action_module; @@ -96,11 +106,11 @@ static void *create_action_dir_config(pool *p, char *dummy) { action_dir_config *new = -(action_dir_config *) ap_palloc(p, sizeof(action_dir_config)); + (action_dir_config *) ap_palloc(p, sizeof(action_dir_config)); new-action_types = ap_make_table(p, 4); memset(new-scripted, 0, sizeof(new-scripted)); - +new-xmethods = ap_make_array(p, 4, sizeof(xmethod_t)); return new; } @@ -119,29 +129,56 @@ new-scripted[i] = add-scripted[i] ? add-scripted[i] : base-scripted[i]; } +new-xmethods = ap_append_arrays(p, add-xmethods, base-xmethods); return new; } -static const char *add_action(cmd_parms *cmd, action_dir_config * m, char *type, +static const char *add_action(cmd_parms *cmd, action_dir_config *m, char *type, char *script) { ap_table_setn(m-action_types, type, script); return NULL; } -static const char *set_script(cmd_parms *cmd, action_dir_config * m, +static const char *set_script(cmd_parms *cmd, action_dir_config *m, char *method, char *script) { int methnum; methnum = ap_method_number_of(method); -if (methnum == M_TRACE) -return TRACE not allowed for Script; -else if (methnum == M_INVALID) -return Unknown method type for Script; -else +if (methnum == M_TRACE) { + return TRACE not allowed for Script; +} +else if (methnum != M_INVALID) { m-scripted[methnum] = script; - +} +else { + /* + * We used to return Unknown method type for Script + * but now we actually handle unknown methods. + */ + xmethod_t *xm; + xmethod_t *list; + int i; + + /* + * Scan through the list; if the method already has a script + * defined, overwrite it. Otherwise, add it. + */ + list = (xmethod_t *) m-xmethods-elts; + for (i = 0; i m-xmethods-nelts; ++i) { + xm = list[i]; + if (strcmp(method, xm-method) == 0) { + xm-script = script; + break; + } + } + if (i = m-xmethods-nelts) { + xm = ap_push_array(m-xmethods); + xm-method = method; + xm-script = script; + } +} return NULL; } @@ -164,41 +201,66 @@ /* Set allowed stuff */ for (i = 0; i METHODS; ++i) { -if (conf-scripted[i]) -r-allowed |= (1 i); + if (conf-scripted[i]) { + r-allowed |= (1 i); + } } /* First, check for the method-handling scripts */ if (r-method_number == M_GET) { -if (r
cvs commit: apache-1.3 STATUS
coar99/12/06 13:48:48 Modified:.STATUS Log: Note a couple of submitted patches. Submitted by: Raymond S Brand [EMAIL PROTECTED] and Andrew Ford [EMAIL PROTECTED] Revision ChangesPath 1.760 +14 -3 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.759 retrieving revision 1.760 diff -u -r1.759 -r1.760 --- STATUS1999/12/04 15:38:19 1.759 +++ STATUS1999/12/06 21:48:40 1.760 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/12/04 15:38:19 $] + Last modified at [$Date: 1999/12/06 21:48:40 $] Release: @@ -42,9 +42,20 @@ Available Patches: +* Andrew Ford's patch (1999/12/05) to add absolute times to mod_expires + Message-ID: [EMAIL PROTECTED] + Status: + +* 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: + * Jayaram's patch (10/27/99) to fix PR4856 -PR: 4856 It is found that UnSetEnv directive fails to unset the environment -variable in the server config context. +PR: 4856 It is found that UnSetEnv directive fails to unset the + environment variable in the server config context. Status: * Jayaram's patch (10/27/99) for changes to mod_autoindex
cvs commit: apache-site index.html
coar99/12/01 07:32:21 Modified:.index.html Log: Add the ApacheCon 2000 banner-advert. Revision ChangesPath 1.8 +9 -0 apache-site/index.html Index: index.html === RCS file: /home/cvs/apache-site/index.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- index.html1999/11/09 09:50:48 1.7 +++ index.html1999/12/01 15:32:20 1.8 @@ -17,7 +17,16 @@ pba href=http://www.apache.org/dyn/closer.cgi;Mirroredbr Worldwide/b/p /td/tr +tr +td colspan=2 align=center + a href=http://ApacheCon.Com/; + img src=http://ApacheCon.Com/images/banners/banner2.gif; + alt=ApacheCon 2000 width=468 height=60 border=0/a + pnbsp; /p +/td +/tr /table + table width=100% border=0 trtd width=160 valign=top align=center
cvs commit: apache-1.3/src/modules/standard mod_autoindex.c
coar99/12/01 12:34:18 Modified:htdocs/manual/mod mod_autoindex.html src CHANGES src/modules/standard mod_autoindex.c Log: Add a FoldersFirst keyword to the IndexOptions directive, which causes subdirectories to always appear first in FancyIndexed listings. Reviewed by: Ryan Bloom, Martin Kraemer, Jim Jagielski Revision ChangesPath 1.32 +24 -8 apache-1.3/htdocs/manual/mod/mod_autoindex.html Index: mod_autoindex.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_autoindex.html,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- mod_autoindex.html1999/05/13 18:25:45 1.31 +++ mod_autoindex.html1999/12/01 20:33:48 1.32 @@ -545,7 +545,8 @@ REL=Help STRONGCompatibility:/STRONG/A '+/-' syntax and merging of multiple SAMPIndexOptions/SAMP directives is only available with - Apache 1.3.3 and later + Apache 1.3.3 and later; the sampFoldersFirst/samp option is only + available with Apache 1.3.10 and later P The IndexOptions directive specifies the behavior of the directory indexing. @@ -564,6 +565,21 @@ is combined with any SAMPIndexOptions/SAMP directive already specified for the current scope./STRONG /BLOCKQUOTE +dta name=indexoptions:foldersfirstFoldersFirst + (iApache 1.3.10 and later/i)/a/dt +dd +If this option is enabled, subdirectories in a FancyIndexed listing +will ialways/i appear first, followed by normal files in the +directory. The listing is basically broken into two components, +the files and the subdirectories, and each is sorted separately and +then displayed subdirectories-first. For instance, if the sort order +is descending by name, and sampFoldersFirst/samp is enabled, +subdirectory sampZed/samp will be listed before subdirectory +sampBeta/samp, which will be listed before normal files +sampGamma/samp and sampAlpha/samp. +bThis option only has an effect if +a href=#indexoptions:fancyindexingsampFancyIndexing/samp/a +is also enabled./b/dd DTA NAME=indexoptions:iconheightIconHeight[=pixels] (EMApache 1.3 and later/EM)/A DD !--%plaintext lt;?INDEX {\tt IconHeight} index optiongt; -- @@ -648,14 +664,14 @@ The default is that no options are enabled. If multiple IndexOptions could apply to a directory, then the most specific one is taken complete; the options are not merged. For example: -BLOCKQUOTECODE -lt;Directory /web/docsgt; BR -IndexOptions FancyIndexing BR -lt;/Directorygt;BR -lt;Directory /web/docs/specgt; BR -IndexOptions ScanHTMLTitles BR +BLOCKQUOTEpre +lt;Directory /web/docsgt; +IndexOptions FancyIndexing lt;/Directorygt; -/CODE/BLOCKQUOTE +lt;Directory /web/docs/specgt; +IndexOptions ScanHTMLTitles +lt;/Directorygt; +/pre/BLOCKQUOTE then only CODEScanHTMLTitles/CODE will be set for the /web/docs/spec directory. /P 1.1465+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1464 retrieving revision 1.1465 diff -u -r1.1464 -r1.1465 --- CHANGES 1999/12/01 20:24:50 1.1464 +++ CHANGES 1999/12/01 20:33:58 1.1465 @@ -1,5 +1,9 @@ Changes with Apache 1.3.10 + *) Add IndexOptions FoldersFirst to allow fancy-indexed directory + listings to have the subdirectories always listed at the top. + [Ken Coar] + *) BS2000: Use send() instead of write() in the core buff routines for better performance and fewer restrictions (max. transfer size) [Martin Kraemer] 1.111 +24 -0 apache-1.3/src/modules/standard/mod_autoindex.c Index: mod_autoindex.c === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- mod_autoindex.c 1999/06/05 15:48:12 1.110 +++ mod_autoindex.c 1999/12/01 20:34:10 1.111 @@ -95,6 +95,7 @@ #define SUPPRESS_PREAMBLE 64 #define SUPPRESS_COLSORT 128 #define NO_OPTIONS 256 +#define FOLDERS_FIRST 512 #define K_PAD 1 #define K_NOPAD 0 @@ -400,6 +401,9 @@ else if (!strcasecmp(w, SuppressColumnSorting)) { option = SUPPRESS_COLSORT; } +else if (!strcasecmp(w, FoldersFirst)) { +option = FOLDERS_FIRST; + } else if (!strcasecmp(w, None)) { if (action != '\0') { return Cannot combine '+' or '-' with 'None' keyword; @@ -681,6 +685,8 @@ time_t lm; struct ent *next; int ascending; +int isdir; +int checkdir; char key; }; @@ -1147,6
cvs commit: apache-1.3/src/modules/standard mod_autoindex.c
coar99/12/01 14:10:50 Modified:htdocs/manual/mod mod_autoindex.html src CHANGES src/modules/standard mod_autoindex.c Log: Add the long-awaited IndexOptions DescriptionWidth keyword. It was waiting for a way to avoid breaking HTML tags, but that's already been done as much as possible -- we can't do anything about breaking HTML elements without putting a full parser in. PR: 2324 Revision ChangesPath 1.33 +22 -1 apache-1.3/htdocs/manual/mod/mod_autoindex.html Index: mod_autoindex.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_autoindex.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- mod_autoindex.html1999/12/01 20:33:48 1.32 +++ mod_autoindex.html1999/12/01 22:10:32 1.33 @@ -215,6 +215,17 @@ CODEIndexOptionsnbsp;SuppressSize/CODE, and 19 bytes may be added if CODEIndexOptionsnbsp;SuppressLastModified/CODE is in effect. The widest this column can be is therefore 49 bytes. +blockquote +As of Apache 1.3.10, the +a href=#indexoptions:descriptionwidthDescriptionWidth/a +sampIndexOptions/samp keyword allows you to adjust this width +to any arbitrary size. +/blockquote +bCaution:/b Descriptive text defined with sampAddDescription/samp +may contain HTML markup, such as tags and character entities. If the +width of the description column should happen to truncate a tagged +element (such as cutting off the end of a bolded phrase), the results +may affect the rest of the directory listing. /P HR @@ -545,13 +556,23 @@ REL=Help STRONGCompatibility:/STRONG/A '+/-' syntax and merging of multiple SAMPIndexOptions/SAMP directives is only available with - Apache 1.3.3 and later; the sampFoldersFirst/samp option is only + Apache 1.3.3 and later; the sampFoldersFirst/samp and + sampDescriptionWidth/samp options are only available with Apache 1.3.10 and later P The IndexOptions directive specifies the behavior of the directory indexing. EMOption/EM can be one of DL +dta name=indexoptions:descriptionwidthDescriptionWidth=[emn/em | *] + (emApache 1.3.10 and later/em)/a +dd +The sampDescriptionWidth/samp keyword allows you to specify the +width of the description column in characters. If the keyword value +is 'samp*/samp', then the column is automatically sized to the +length of the longest filename in the display. +bSee the section on a href=#adddescriptionsampAddDescription/samp/a +for dangers inherent in truncating descriptions./b/dd DTA NAME=indexoptions:fancyindexingFancyIndexing/A DD!--%plaintext lt;?INDEX {\tt FancyIndexing} index optiongt; -- This turns on fancy indexing of directories. 1.1468+5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1467 retrieving revision 1.1468 diff -u -r1.1467 -r1.1468 --- CHANGES 1999/12/01 20:54:55 1.1467 +++ CHANGES 1999/12/01 22:10:39 1.1468 @@ -1,5 +1,10 @@ Changes with Apache 1.3.10 + *) Add IndexOptions DescriptionWidth so that the width of the + description field in fancy-indexed directory listings can + be specified. + [Ken Coar] PR#2324, plus lots that are closed unsatisfied + *) 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) 1.112 +80 -19apache-1.3/src/modules/standard/mod_autoindex.c Index: mod_autoindex.c === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- mod_autoindex.c 1999/12/01 20:34:10 1.111 +++ mod_autoindex.c 1999/12/01 22:10:45 1.112 @@ -125,6 +125,7 @@ * Other default dimensions. */ #define DEFAULT_NAME_WIDTH 23 +#define DEFAULT_DESC_WIDTH 23 struct item { char *type; @@ -141,13 +142,14 @@ } ai_desc_t; typedef struct autoindex_config_struct { - char *default_icon; int opts; int incremented_opts; int decremented_opts; int name_width; int name_adjust; +int desc_width; +int desc_adjust; int icon_width; int icon_height; char *default_order; @@ -465,6 +467,31 @@ d_cfg-name_adjust = K_NOADJUST; } } + else if (!strcasecmp(w, DescriptionWidth)) { + if (action != '-') { + return DescriptionWidth with no value may
cvs commit: apache-1.3/src/modules/standard mod_usertrack.c
coar99/10/29 14:29:59 Modified:src/modules/standard mod_usertrack.c Log: More in the continuing saga of nitfixes from the Netware update. I *think* this does this trick, but I don't build on either Windows or Netware. At least mod_usertrack compiles on Linux now.. Revision ChangesPath 1.43 +4 -1 apache-1.3/src/modules/standard/mod_usertrack.c Index: mod_usertrack.c === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_usertrack.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- mod_usertrack.c 1999/10/28 18:10:55 1.42 +++ mod_usertrack.c 1999/10/29 21:29:53 1.43 @@ -135,10 +135,13 @@ #if defined(NO_GETTIMEOFDAY) !defined(NO_TIMES) clock_t mpe_times; struct tms mpe_tms; -#elif !defined(WIN32) !defined(NETWARE) +#elif !defined(WIN32) struct timeval tv; +#ifdef NETWARE time_t tz = 0; +#else struct timezone tz = {0, 0}; +#endif /* defined(NETWARE) */ #endif /* 1024 == hardcoded constant */ char cookiebuf[1024];
cvs commit: apache-site bugdb.cgi
coar99/10/14 19:51:38 Modified:.bugdb.cgi Log: The -T flag breaks too many things for now.. Revision ChangesPath 1.47 +1 -1 apache-site/bugdb.cgi Index: bugdb.cgi === RCS file: /home/cvs/apache-site/bugdb.cgi,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- bugdb.cgi 1999/10/14 18:38:49 1.46 +++ bugdb.cgi 1999/10/15 02:51:36 1.47 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -T +#!/usr/local/bin/perl # wwwgnats.pl - a WWW interface to the GNATS bug tracking system # Thanks to Larry Wall, CERN, and NCSA for Perl, WWW, and Mosaic!
cvs commit: apache-site bugdb.cgi
coar99/10/14 11:38:52 Modified:.bugdb.cgi Log: Assume that internal calls to timestamp() are safe; have it untaint what it receives. (Fixes breakage caused by making -T the default.) Revision ChangesPath 1.46 +2 -0 apache-site/bugdb.cgi Index: bugdb.cgi === RCS file: /home/cvs/apache-site/bugdb.cgi,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- bugdb.cgi 1999/10/09 05:00:07 1.45 +++ bugdb.cgi 1999/10/14 18:38:49 1.46 @@ -667,6 +667,8 @@ sub timestamp { local($fname) = shift(@_); +$fname =~ /(.*)/; +$fname = $1; open(TIMESTAMP, $LSPROG -l $fname|) || die Error: can't record the timestamp of the PR ($fname); ($_=TIMESTAMP)=~ /\s(\S+\s+\S+\s+\S+)\s+\S+$/
cvs commit: apache-devsite anoncvs.txt index.html
coar99/10/05 09:43:14 Modified:.anoncvs.txt index.html Log: Point out the replacement anonymous CVS repository. Revision ChangesPath 1.8 +26 -25apache-devsite/anoncvs.txt Index: anoncvs.txt === RCS file: /home/cvs/apache-devsite/anoncvs.txt,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- anoncvs.txt 1999/08/09 08:28:16 1.7 +++ anoncvs.txt 1999/10/05 16:43:11 1.8 @@ -1,4 +1,6 @@ -Anonymous CVS access is not currently working. There is, however, +Anonymous CVS access is available again, but on a different system +than before. In addition to the anonymous CVS repository, there is +also http://www.apache.org/websrc/cvsweb.cgi @@ -12,9 +14,6 @@ to grab or update a local copy of the module-name sources. -The rest of this file can be ignored until we get anonymous CVS -access working again. - == HOW TO USE ANONCVS == @@ -37,53 +36,55 @@ need a reasonably recent CVS client to use it. An example of setting it from a bourne shell: - [EMAIL PROTECTED]:~$ CVSROOT=:pserver:[EMAIL PROTECTED]:/cvs - [EMAIL PROTECTED]:~$ export CVSROOT + [EMAIL PROTECTED]:~$ CVSROOT=:pserver:[EMAIL PROTECTED]:/cvs/apache + [EMAIL PROTECTED]:~$ export CVSROOT -It is very important that you do not put a trailing / on /cvs. +It is very important that you do not put a trailing / on /cvs/apache. Once you have set your CVSROOT, you need to login: - [EMAIL PROTECTED]:~$ cvs login - (Logging in to [EMAIL PROTECTED]:/cvs) + [EMAIL PROTECTED]:~$ cvs login + (Logging in to [EMAIL PROTECTED]:/cvs/apache) CVS password: -You can use anything you like for the password; it does not matter. +The password is anoncvs (without the quotation marks). To check out the current development tree: - [EMAIL PROTECTED]:~$ cvs checkout apache-1.3 - cvs server: Updating apache-1.3 - U apache-1.3/ABOUT_APACHE - U apache-1.3/CHANGES - U apache-1.3/KEYS + [EMAIL PROTECTED]:~$ cvs checkout apache-2.0 + cvs server: Updating apache-2.0 + U apache-2.0/ABOUT_APACHE + U apache-2.0/CHANGES + U apache-2.0/KEYS [...] - U apache-1.3/src/support/suexec.c - U apache-1.3/src/support/suexec.h - [EMAIL PROTECTED]:~$ ls apache-1.3 + U apache-2.0/src/support/suexec.c + U apache-2.0/src/support/suexec.h + [EMAIL PROTECTED]:~$ ls apache-2.0 ABOUT_APACHEKEYSREADME.NT conflogs CHANGES LICENSE cgi-bin htdocs src CVS README cgi-src icons -To checkout the current 1.2 tree: +To checkout the stable release tree (version 1.3): - [EMAIL PROTECTED]:~$ cvs checkout apache-1.2 + [EMAIL PROTECTED]:~$ cvs checkout apache-1.3 After 1.3a1, there was a source tree reorganization which resulted in the tree being split into apache-1.2 and apache-1.3. apache-1.2 is everything from before the reorganization, apache-1.3 is from after. apache-1.3 still retains the change histories of the files, however since they are in different locations you can not build an -apache-1.3 tree from before the reorganization. +apache-1.3 tree from before the reorganization. The current development +tree (apache-2.0) was largely restructured and repopulated, and +the layout is still in a bit of flux. To update your local tree to the latest version: - [EMAIL PROTECTED]:~$ cvs update -dP apache-1.3 + [EMAIL PROTECTED]:~$ cvs update -dP apache-1.3 or - [EMAIL PROTECTED]:~/apache-1.3/$ cvs update -dP . + [EMAIL PROTECTED]:~/apache-1.3/$ cvs update -dP . etc. @@ -105,7 +106,7 @@ To obtain a diff of changes between your checked out copy and the source tree at the time you checked it out: - [EMAIL PROTECTED]:~$ cvs diff -u apache-1.3 + [EMAIL PROTECTED]:~$ cvs diff -u apache-1.3 To obtain a diff against the current source tree, be sure to do an update before the diff. @@ -118,7 +119,7 @@ This anoncvs server is updated periodically from the main CVS repository, so it will lag a bit behind the current tree. -Currently, updates occur every two hours at 23 after the hour, in +Currently, updates occur every two hours at half past the hour, in normal time zones. NOTE: You need valid reverse DNS to be able to use anoncvs. If the 1.30 +2 -2 apache-devsite/index.html Index: index.html === RCS file: /home/cvs/apache-devsite/index.html,v retrieving revision 1.29
cvs commit: apache-site httpd.html
coar99/09/09 12:16:29 Modified:.httpd.html Log: I hate using base.. but without it (or frobbing every single href= and src= attribute) clients that come to the site via http://www.apache.org/httpd/ are going to get broken links and images. As has already happened. Revision ChangesPath 1.81 +1 -0 apache-site/httpd.html Index: httpd.html === RCS file: /home/cvs/apache-site/httpd.html,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- httpd.html1999/09/03 20:08:56 1.80 +++ httpd.html1999/09/09 19:16:25 1.81 @@ -1,6 +1,7 @@ HTML HEAD TITLEApache Project/TITLE +base href=http://www.apache.org/; /HEAD !-- Background white, links blue (unvisited), navy (visited), red (active) --
cvs commit: apache-1.3/src/support apxs.pl
coar99/09/05 11:04:44 Modified:src Configure src/support apxs.pl Log: APXS varfs on certain quoted strings as provided by Configure on DU. This is a stopgap fix, not a real one. Revision ChangesPath 1.371 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.370 retrieving revision 1.371 diff -u -r1.370 -r1.371 --- Configure 1999/08/16 18:55:44 1.370 +++ Configure 1999/09/05 18:04:41 1.371 @@ -1140,7 +1140,7 @@ */gcc|gcc ) CFLAGS_SHLIB=-fpic ;; */cc|cc ) CFLAGS_SHLIB= ;; esac - LDFLAGS_SHLIB=-shared -expect_unresolved '*' -s + LDFLAGS_SHLIB='-shared -expect_unresolved * -s' LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB LDFLAGS_SHLIB_EXPORT= ;; 1.27 +1 -1 apache-1.3/src/support/apxs.pl Index: apxs.pl === RCS file: /home/cvs/apache-1.3/src/support/apxs.pl,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- apxs.pl 1999/08/27 23:31:00 1.26 +++ apxs.pl 1999/09/05 18:04:42 1.27 @@ -73,7 +73,7 @@ my $CFG_CFLAGS= '@CFLAGS@';# substituted via Makefile.tmpl my $CFG_CFLAGS_SHLIB = '@CFLAGS_SHLIB@'; # substituted via Makefile.tmpl my $CFG_LD_SHLIB = '@LD_SHLIB@'; # substituted via Makefile.tmpl -my $CFG_LDFLAGS_SHLIB = '@LDFLAGS_MOD_SHLIB@'; # substituted via Makefile.tmpl +my $CFG_LDFLAGS_SHLIB = q(@LDFLAGS_MOD_SHLIB@);# substituted via Makefile.tmpl my $CFG_LIBS_SHLIB= '@LIBS_SHLIB@';# substituted via Makefile.tmpl my $CFG_PREFIX= '@prefix@';# substituted via APACI install my $CFG_SBINDIR = '@sbindir@'; # substituted via APACI install
cvs commit: apache-site/dist .htaccess
coar99/08/30 15:17:35 Modified:dist .htaccess Log: Rearrange the AddDescription lines so they work as intended.. and add the 404.html file to the 'don't show' list. (Why is it there, anyway?) Revision ChangesPath 1.23 +9 -9 apache-site/dist/.htaccess Index: .htaccess === RCS file: /export/home/cvs/apache-site/dist/.htaccess,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .htaccess 1999/08/19 19:30:57 1.22 +++ .htaccess 1999/08/30 22:17:34 1.23 @@ -1,4 +1,5 @@ IndexOptions FancyIndexing ScanHTMLTitles +AddDescription PGP signature .asc AddDescription 1.2.6 compressed source apache_1.2.6.tar.Z AddDescription 1.2.6 gzipped source apache_1.2.6.tar.gz AddDescription 1.3.1 compressed source apache_1.3.1.tar.Z @@ -19,13 +20,12 @@ AddDescription 1.3.9 compressed source apache_1.3.9.tar.Z AddDescription 1.3.9 gzipped source apache_1.3.9.tar.gz AddDescription 1.3.9 Win32 binary apache_1_3_9_win32.exe -AddDescription List of changes in 1.3 /www/apache.org/dist/CHANGES_1.3 -AddDescription List of changes in 1.2 /www/apache.org/dist/CHANGES_1.2 -AddDescription Developer PGP keys /www/apache.org/dist/KEYS -AddDescription PGP signature *.asc +AddDescription List of changes in 1.3 CHANGES_1.3 +AddDescription List of changes in 1.2 CHANGES_1.2 +AddDescription Developer PGP keys KEYS AddDescription Apache 1.3.9 Released Announcement.txt -AddDescription Binary distributions /www/apache.org/dist/binaries -AddDescription Contributed software /www/apache.org/dist/contrib -AddDescription Old source amp; binaries /www/apache.org/dist/old -AddDescription Official patches /www/apache.org/dist/patches -IndexIgnore CVS +AddDescription Binary distributions binaries +AddDescription Contributed software contrib +AddDescription Old source amp; binaries old +AddDescription Official patches patches +IndexIgnore CVS 404.html
cvs commit: apache-1.2/htdocs/manual index.html
coar99/08/30 15:20:40 Modified:htdocs/manual index.html Log: The 'search' link no longer works for the 1.2 docs, so remove it rather than pointing it to the 1.3 docco. Revision ChangesPath 1.15 +0 -7 apache-1.2/htdocs/manual/index.html Index: index.html === RCS file: /export/home/cvs/apache-1.2/htdocs/manual/index.html,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- index.html1997/06/04 11:07:48 1.14 +++ index.html1999/08/30 22:20:31 1.15 @@ -30,13 +30,6 @@ /ul H3a name=refApache Reference Manual/a/h3 -UL - LIA - HREF=http://www.apache.org/manual-index/docs; - STRONGSearch/STRONG/A - the master manual pages for key words - /LI -/UL ul liA HREF=install.htmlCompiling and Installing Apache/A liA HREF=invoking.htmlStarting Apache/A
cvs commit: apache-site/dist HEADER.html
coar99/08/20 05:24:32 Modified:dist HEADER.html Log: Oops; not on the how-to-release list, so I forgot to do it.. Thanks, Ask! Revision ChangesPath 1.8 +5 -6 apache-site/dist/HEADER.html Index: HEADER.html === RCS file: /home/cvs/apache-site/dist/HEADER.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- HEADER.html 1999/03/23 23:57:12 1.7 +++ HEADER.html 1999/08/20 12:24:31 1.8 @@ -1,9 +1,8 @@ -H2Make sure you're downloading from A HREF=http://www.apache.org/dyn/closer.cgi; -a nearby mirror site!/A/H2 - +H2Make sure you're downloading from + A HREF=http://www.apache.org/dyn/closer.cgi; a nearby mirror site!/A/H2 +p If you're having trouble accessing these files, there's probably a closer mirror to you.BR A HREF=http://www.apache.org/dyn/closer.cgi;Go here to find it./A -H2 - A HREF=Announcement.htmlApache 1.3.6/A is now available. -/H2 +/p +H2A HREF=Announcement.htmlApache 1.3.9/A is now available./H2
cvs commit: apache-1.3 Announcement
coar99/08/19 11:15:08 Modified:.Announcement Log: Lick and a promise for 1.3.9 announcement.. Revision ChangesPath 1.44 +10 -9 apache-1.3/Announcement Index: Announcement === RCS file: /home/cvs/apache-1.3/Announcement,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- Announcement 1999/03/22 23:38:25 1.43 +++ Announcement 1999/08/19 18:15:00 1.44 @@ -1,13 +1,14 @@ -Apache 1.3.6 Released +Apache 1.3.9 Released = The Apache Group is pleased to announce the release of version -1.3.6 of the Apache HTTP server. +1.3.9 of the Apache HTTP server. -This new Apache version incorporates over 60 significant improvements -to the server. Apart from portability and security fixes, documentation -enhancements, performance improvements, and assorted other minor -features or fixes notable changes are: +This new Apache version incorporates over 130 significant +improvements to the server. Apart from portability and +security fixes, documentation enhancements, performance +improvements, and assorted other minor features or fixes +notable changes are: - mod_log_config now supports conditional logging based upon environment variables and support for multiline entries. @@ -41,13 +42,13 @@ A complete listing with detailed descriptions is provided in the src/CHANGES file. -We consider Apache 1.3.6 to be the best version of Apache available and +We consider Apache 1.3.9 to be the best version of Apache available and we strongly recommend that users of older versions, especially of the 1.1.x and 1.2.x family, upgrade as soon as possible. No further releases will be made in the 1.2.x family. -Apache 1.3.6 is available for download from +Apache 1.3.9 is available for download from http://www.apache.org/dist/ @@ -58,7 +59,7 @@ http://www.apache.org/dist/binaries/ -As of Apache 1.3.6 binary distributions contain all standard Apache +As of Apache 1.3.9 binary distributions contain all standard Apache modules as shared objects (if supported by the platform) and include full source code. Installation is easily done by executing the included install script. See the README.bindist and INSTALL.bindist
cvs commit: apache-site/dist .htaccess Announcement.html Announcement.txt README.html
coar99/08/19 12:31:08 Modified:.httpd.html dist .htaccess Announcement.html Announcement.txt README.html Log: Make note of the 1.3.9 release. The dist/Announcement.* files need tweaking; the list of highlights is from 1.3.4 to 1.3.6, not 1.3.6 to 1.3.9. Revision ChangesPath 1.78 +3 -3 apache-site/httpd.html Index: httpd.html === RCS file: /home/cvs/apache-site/httpd.html,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- httpd.html1999/05/13 13:50:37 1.77 +++ httpd.html1999/08/19 19:30:52 1.78 @@ -62,13 +62,13 @@ PHR -H2 ALIGN=CENTERApache 1.3.6 Now Available/H2 +H2 ALIGN=CENTERApache 1.3.9 Now Available/H2 PBLOCKQUOTE The Apache Group is pleased to announce the release of the - 1.3.6 version of the Apache HTTP server, including a Win32 build. - Apache 1.3.6 is the best version of Apache currently available; + 1.3.9 version of the Apache HTTP server, including a Win32 build. + Apache 1.3.9 is the best version of Apache currently available; everyone running 1.2.X servers or earlier should upgrade to 1.3, as there will not be any further 1.2.X releases. At present, the Win32 port of Apache is not 1.22 +4 -1 apache-site/dist/.htaccess Index: .htaccess === RCS file: /home/cvs/apache-site/dist/.htaccess,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .htaccess 1999/03/23 23:32:36 1.21 +++ .htaccess 1999/08/19 19:30:57 1.22 @@ -16,11 +16,14 @@ AddDescription 1.3.6 compressed source apache_1.3.6.tar.Z AddDescription 1.3.6 gzipped source apache_1.3.6.tar.gz AddDescription 1.3.6 Win32 binary apache_1_3_6_win32.exe +AddDescription 1.3.9 compressed source apache_1.3.9.tar.Z +AddDescription 1.3.9 gzipped source apache_1.3.9.tar.gz +AddDescription 1.3.9 Win32 binary apache_1_3_9_win32.exe AddDescription List of changes in 1.3 /www/apache.org/dist/CHANGES_1.3 AddDescription List of changes in 1.2 /www/apache.org/dist/CHANGES_1.2 AddDescription Developer PGP keys /www/apache.org/dist/KEYS AddDescription PGP signature *.asc -AddDescription Apache 1.3.4 Released Announcement.txt +AddDescription Apache 1.3.9 Released Announcement.txt AddDescription Binary distributions /www/apache.org/dist/binaries AddDescription Contributed software /www/apache.org/dist/contrib AddDescription Old source amp; binaries /www/apache.org/dist/old 1.15 +7 -7 apache-site/dist/Announcement.html Index: Announcement.html === RCS file: /home/cvs/apache-site/dist/Announcement.html,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Announcement.html 1999/03/23 23:24:10 1.14 +++ Announcement.html 1999/08/19 19:30:58 1.15 @@ -1,17 +1,17 @@ HTML HEAD - TITLEApache 1.3.6 Released/TITLE + TITLEApache 1.3.9 Released/TITLE /HEAD BODY -H1Apache 1.3.6 Released/H1 +H1Apache 1.3.9 Released/H1 P The Apache Group is pleased to announce the release of version -1.3.6 of the Apache HTTP server. +1.3.9 of the Apache HTTP server. P -This new Apache version incorporates over 60 significant improvements +This new Apache version incorporates over 130 significant improvements to the server. Apart from portability and security fixes, documentation enhancements, performance improvements, and assorted other minor features or fixes notable changes are: @@ -52,13 +52,13 @@ src/CHANGES file. P -We consider Apache 1.3.6 to be the best version of Apache available and +We consider Apache 1.3.9 to be the best version of Apache available and we strongly recommend that users of older versions, especially of the 1.1.x and 1.2.x family, upgrade as soon as possible. No further releases will be made in the 1.2.x family. P -Apache 1.3.6 is available for download from +Apache 1.3.9 is available for download from UL A HREF=http://www.apache.org/dist/;http://www.apache.org/dist//A @@ -76,7 +76,7 @@ /UL P -As of Apache 1.3.6 binary distributions contain all standard Apache +As of Apache 1.3.9 binary distributions contain all standard Apache modules as shared objects (if supported by the platform) and include full source code. Installation is easily done by executing the included install script. See the README.bindist and INSTALL.bindist 1.9 +6 -6 apache-site/dist/Announcement.txt Index: Announcement.txt === RCS file: /home/cvs/apache-site/dist
cvs commit: apache-1.3 Announcement
coar99/08/19 14:13:35 Modified:.Announcement Log: Update the announcement. Revision ChangesPath 1.45 +58 -34apache-1.3/Announcement Index: Announcement === RCS file: /home/cvs/apache-1.3/Announcement,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- Announcement 1999/08/19 18:15:00 1.44 +++ Announcement 1999/08/19 21:13:07 1.45 @@ -4,41 +4,63 @@ The Apache Group is pleased to announce the release of version 1.3.9 of the Apache HTTP server. -This new Apache version incorporates over 130 significant -improvements to the server. Apart from portability and -security fixes, documentation enhancements, performance -improvements, and assorted other minor features or fixes -notable changes are: - - - mod_log_config now supports conditional logging based upon - environment variables and support for multiline entries. - - - New CustomLog directive %V: This logs the hostname according to the - UseCanonicalName setting (this is the pre-1.3.4 behaviour of %v). - - - Enhanced mod_rewrite's mapfile handling: The in-core cache for text - and DBM format mapfiles now uses a hash table with LRU functionality. - Furthermore map lookups for non-existent keys are now cached as well. - The changes drastically improve the performance when large rewrite - maps are in use. - - - Ability to handle DES or MD5 authentication passwords. - - - New LimitExcept directive to allow the user to assign authentication - control to any HTTP method that is *not* given in the argument list; - i.e., the logical negation of the Limit directive. - - - Improved content negotiation. - - - New ScriptInterpreterSource directive to enable searching the - Win32 registry for script interpreters. - - - The FAQ document was reorganised. - - - Overhauled ApacheBench benchmark program. - - - Several new API functions have been added. +This new Apache version incorporates over 130 significant improvements +to the server. Apart from portability and security fixes, documentation +enhancements, performance improvements, and assorted other minor +features or fixes notable changes are: + - A new experimental digest authentication module, compatible with + the latest digest-auth standards, has been added to the base package. + + - The expat XML parser has been added to allow modules to deal with + XML if necessary. + + - The processing on Windows of basic authentication passwords in + mod_auth password files has been fixed. In addition, the SHA1 + encoding algorithm has been added to those available and + known to htpasswd, and passwords on Windows may be longer than + the inadvertent 1.3.6 limit of 8 characters. + + - Several problems with mod_access and CIDR addresses have been fixed. + + - Support has been added or enhanced for Tandem, TPF, and + the Macintosh OS X platforms. + + - Some processing of Vary response header fields has been corrected. + + - Restarts with apache -k on Windows are now honoured immediately, + instead of after the system's listen queue is drained. + + - Expect: 100-continue processing has been corrected. + + - Script errors on Windows are now copied to the server's error log + if the scripts fail; this is closer to the Unix behaviour. + + - Mass-vhosting has been added (see the documentation for module + mod_vhost_alias). + + - The server no longer automatically checks for the existence of a + valid DocumentRoot for all virtual hosts; this was imposing a + significant startup penalty on systems with numerous vhosts. + The default behaviour has changed to *not* performing this + check, but it can be re-enabled by specifying the -t command + line option for full configuration testing. + + - apache -S on Windows now exits properly after completing the + configuration testing. + + - SetEnvIf* directives can now test the values of environment + variables as well as request attributes. In addition, + the request protocol and level (e.g., HTTP/1.1) can now be tested. + + - ReadmeName and HeaderName files (mod_autoindex) are now + server-parsable and accessible with MultiViews. + + - AddDescription directives now behave as documented with regard + to partial filename matches. + + - The name of the cookie used by mod_usertrack is now customisable. + A complete listing with detailed descriptions is provided in the src/CHANGES file. @@ -94,3 +116,5 @@ and resources by individuals and companies, we hope that the Win32 version of Apache will grow stronger through the 1.3.x release cycle. + +Thank you for using Apache.
cvs commit: apache-site httpd.html
coar99/08/19 14:51:35 Modified:.httpd.html Log: *Brother* am I sick of these. Make it just a bit more obvious. :-( Revision ChangesPath 1.79 +2 -0 apache-site/httpd.html Index: httpd.html === RCS file: /home/cvs/apache-site/httpd.html,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- httpd.html1999/08/19 19:30:52 1.78 +++ httpd.html1999/08/19 21:51:31 1.79 @@ -20,6 +20,8 @@ H3A HREF=http://www.apache.org/dyn/closer.cgi; Mirrored worldwide - find your closest mirror/A/H3 +h2a href=docs/misc/FAQ.html#year2000 +Apache's Y2K Readiness Statement/a/h2 TABLE TR TD
cvs commit: apache-1.3/src/os/win32 registry.c
coar99/08/16 10:58:15 Modified:src/include httpd.h src/os/win32 registry.c Log: Bumping the version to 1.3.9 final. Revision ChangesPath 1.294 +2 -2 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.293 retrieving revision 1.294 diff -u -r1.293 -r1.294 --- httpd.h 1999/08/14 08:35:47 1.293 +++ httpd.h 1999/08/16 17:57:53 1.294 @@ -419,7 +419,7 @@ * Example: Apache/1.1.0 MrWidget/0.1-alpha */ -#define SERVER_BASEVERSION Apache/1.3.9-dev/* SEE COMMENTS ABOVE */ +#define SERVER_BASEVERSION Apache/1.3.9/* SEE COMMENTS ABOVE */ #define SERVER_VERSION SERVER_BASEVERSION enum server_token_type { SrvTk_MIN, /* eg: Apache/1.3.0 */ @@ -435,7 +435,7 @@ * Always increases along the same track as the source branch. * For example, Apache 1.4.2 would be '10402100', 2.5b7 would be '2057'. */ -#define APACHE_RELEASE 10309000 +#define APACHE_RELEASE 10309100 #define SERVER_PROTOCOL HTTP/1.1 #ifndef SERVER_SUPPORT 1.25 +1 -1 apache-1.3/src/os/win32/registry.c Index: registry.c === RCS file: /export/home/cvs/apache-1.3/src/os/win32/registry.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- registry.c1999/08/09 17:46:32 1.24 +++ registry.c1999/08/16 17:58:13 1.25 @@ -38,7 +38,7 @@ #define VENDOR Apache Group #define SOFTWARE Apache -#define VERSION 1.3.9 dev +#define VERSION 1.3.9 #define REGKEY SOFTWARE\\ VENDOR \\ SOFTWARE \\ VERSION
cvs commit: apache-1.3/src Configure CHANGES
coar99/08/16 11:55:47 Modified:src/include httpd.h src/os/win32 registry.c src Configure CHANGES Log: Advance everything to 1.3.10-dev. Revision ChangesPath 1.295 +2 -2 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.294 retrieving revision 1.295 diff -u -r1.294 -r1.295 --- httpd.h 1999/08/16 17:57:53 1.294 +++ httpd.h 1999/08/16 18:55:31 1.295 @@ -419,7 +419,7 @@ * Example: Apache/1.1.0 MrWidget/0.1-alpha */ -#define SERVER_BASEVERSION Apache/1.3.9/* SEE COMMENTS ABOVE */ +#define SERVER_BASEVERSION Apache/1.3.10-dev /* SEE COMMENTS ABOVE */ #define SERVER_VERSION SERVER_BASEVERSION enum server_token_type { SrvTk_MIN, /* eg: Apache/1.3.0 */ @@ -435,7 +435,7 @@ * Always increases along the same track as the source branch. * For example, Apache 1.4.2 would be '10402100', 2.5b7 would be '2057'. */ -#define APACHE_RELEASE 10309100 +#define APACHE_RELEASE 1031 #define SERVER_PROTOCOL HTTP/1.1 #ifndef SERVER_SUPPORT 1.26 +1 -1 apache-1.3/src/os/win32/registry.c Index: registry.c === RCS file: /export/home/cvs/apache-1.3/src/os/win32/registry.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- registry.c1999/08/16 17:58:13 1.25 +++ registry.c1999/08/16 18:55:38 1.26 @@ -38,7 +38,7 @@ #define VENDOR Apache Group #define SOFTWARE Apache -#define VERSION 1.3.9 +#define VERSION 1.3.10 dev #define REGKEY SOFTWARE\\ VENDOR \\ SOFTWARE \\ VERSION 1.370 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.369 retrieving revision 1.370 diff -u -r1.369 -r1.370 --- Configure 1999/08/16 00:49:08 1.369 +++ Configure 1999/08/16 18:55:44 1.370 @@ -1735,7 +1735,7 @@ #select the special subtarget for shared core generation SUBTARGET=target_shared #determine additional suffixes for libhttpd.so - V=1 R=3 P=9 + V=1 R=3 P=10 if [ x$SHLIB_SUFFIX_DEPTH = x0 ]; then SHLIB_SUFFIX_LIST= fi 1.1423+2 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1422 retrieving revision 1.1423 diff -u -r1.1422 -r1.1423 --- CHANGES 1999/08/14 09:21:15 1.1422 +++ CHANGES 1999/08/16 18:55:45 1.1423 @@ -1,3 +1,5 @@ +Changes with Apache 1.3.10 + Changes with Apache 1.3.9 *) Remove bogus error message when a redirect doesn't set Location.
cvs commit: apache-1.3 KEYS
coar99/08/16 15:46:43 Modified:.KEYS Log: Update my key. Revision ChangesPath 1.24 +49 -17apache-1.3/KEYS Index: KEYS === RCS file: /home/cvs/apache-1.3/KEYS,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- KEYS 1999/08/07 13:35:01 1.23 +++ KEYS 1999/08/16 22:46:42 1.24 @@ -40,14 +40,16 @@ -END PGP PUBLIC KEY BLOCK- -Type Bits/KeyIDDate User ID -pub 1024/A99F75DD 1997/01/24 Rodent of Unusual Size [EMAIL PROTECTED] - Rodent of Unusual Size [EMAIL PROTECTED] - Rodent of Unusual Size [EMAIL PROTECTED] - Rodent of Unusual Size [EMAIL PROTECTED] +Type Bits KeyID CreatedExpiresAlgorithm Use +sec+ 1024 0xA99F75DD 1997-01-24 -- RSA Sign Encrypt +uid Rodent of Unusual Size [EMAIL PROTECTED] +uid Rodent of Unusual Size [EMAIL PROTECTED] +uid Rodent of Unusual Size [EMAIL PROTECTED] +uid Rodent of Unusual Size [EMAIL PROTECTED] +uid Rodent of Unusual Size [EMAIL PROTECTED] -BEGIN PGP PUBLIC KEY BLOCK- -Version: 2.6.3a +Version: PGPfreeware 5.0i for non-commercial use mQCNAzLpIyUAAAEEAN9KC8CxTeozPYJjsnhFpJ14d4Hhf2M6OTgqPQFRHOswM/3j B7IW0s+HwVyQ5/SjIlo+8ur9X7yaj1FS2GQmKD1x9LKeHRAoosBIs33okRtoeDRy @@ -56,17 +58,47 @@ AwUQNiiZ2JrNPMCpn3XdAQGlgwP+JLlZvNV/fJ2azKIwjibDa4n2LUDxa7ofKboU QL+D7FD24zQcmzmkBQm/BL/FSUtxZasJkvdVbU98N3G4h3C4AyErfQOFcrepyGAB M88onQ1DbQ6tiUA3gw9gIB+2l1C5R8wBOtlwoRJM4GFvjjtRp+KaQqvN3f+lLMMt -hKYB70m0KFJvZGVudCBvZiBVbnVzdWFsIFNpemUgPGNvYXJAQXBhY2hlLk9yZz6J -AJUDBRA2KJmIms08wKmfdd0BAT3yBADEDHAn++77n7bLA/u9QYM2LBQHnXdw5Is8 -YGHpHcNZVDA8CtRTOdub8rhe9qgsid/jEry0hT9Sygfx/ry5ntjmF12ltnxBDPdZ -uU2DaHaIh/zBUAv0hyaQeAXEYiV9J75GrDkTj5Jrrnd623uyIRoMZPKYb+oqsZ4H -jIe/w+CDfrQtUm9kZW50IG9mIFVudXN1YWwgU2l6ZSA8Q29hckBSYWxlaWdoLklC -TS5Db20+iQCVAwUQNiiiaZrNPMCpn3XdAQFnMwP/cX21KHwg6ID7NoGzEKxsfZE/ -dEgRGHFp5T6vznI9fO9WZZ2HmISWjEjri5zAAmXvQG2nWEYFVcF1oWph/ndLgLws -PfIsZiPXpj1LD7oon5PEXvJlkFfpHDqiG4xOORbbGWBcv1sqkx6djkpfyXLoMD36 -5YazFuKurHpWPwAQRJK0J1JvZGVudCBvZiBVbnVzdWFsIFNpemUgPENvYXJAREVD -VVMuT3JnPg== -=kWdi +hKYB70mJAJUDBRAz3QWlms08wKmfdd0BAQMfBAC1c+9gr7ELthxwzYGTB7LiBk+p +UABsPG/hT9z/cTGN8YQbK6VXV74sPAaeyD/t56xFUI9CRktZCinXp2cxvbNTe3Q0 +MLtD/PlCSRsgwsEIoM+1An1S3qOXWiGBXoXl/DgRzz9GVnB04m5/SP9XLE4Tmz+1 +X/Gu4TJnRjZZxN4xoYkAPwMFEDb44af9b4jGIdCnGxECiFUAnR3RORpXVyclwFEl +euOwoynPQbY6AJ9H5rwHnz4gkE+AVp95++HmyeDkYIkAlQMFEDb45Ogxpj2W7BQL +gQEBaS4D/R+EzfuRPiX5LgV7C70xtplIgS1iK+h0ddkPAr3P3zPxY0AEOjM81hiz +Ol2Kf0TUMhhcLqO0UjNK9EyIHpO+Bf7pQoV050XYvcIwzNyVez5VCbDM7JA+vVeG +/Pb+O/tPyEs7peSpdJAP4Kbg4Eu4b6+1QTLKrBCTWkEuNHABOuzDiQCVAwUQNzs2 +CairDeBjG1dJAQGb7AQAzHChrwaosl01sLcmlItrsqmzSFL5hbLor9Wh8UjVeYxX +FMVgTQGs/AwN1B0W8PApOsz8mg0pSJm8VPHv+pc4Z9eNhUokfUsRJ4LHjREpr3Gh ++5LoZ53nk1f62VQSOCxOOJ50cAH2rqv/ym9EVCaZ7evfHIR7/KH5+sVpcs14c/20 +KFJvZGVudCBvZiBVbnVzdWFsIFNpemUgPGNvYXJAQXBhY2hlLk9yZz6JAJUDBRA2 +KJmIms08wKmfdd0BAT3yBADEDHAn++77n7bLA/u9QYM2LBQHnXdw5Is8YGHpHcNZ +VDA8CtRTOdub8rhe9qgsid/jEry0hT9Sygfx/ry5ntjmF12ltnxBDPdZuU2DaHaI +h/zBUAv0hyaQeAXEYiV9J75GrDkTj5Jrrnd623uyIRoMZPKYb+oqsZ4HjIe/w+CD +fokAPwMFEDb44bT9b4jGIdCnGxECzDAAoNR8md7KvzarecOh/6NpTb5r8JXJAJ0a +JtTzsoNXpLaVwSMiGdm5ts2qOYkAlQMFEDb45PYxpj2W7BQLgQEBxKID/11Dft+U +eLddkIDFjaJGrIOfQ11y+QlJWaQ2Him/qNzNP8w8ZJ/meAb4PMSeQOI3PVKulf8v +Mp3Z0Jh2irfn1ycqsui4kDe6azvd5PultRKTRljtwVIDuqsrVMVq/zNAC2bN6CUn +kkdZ2O7a5qIkDDYnyRzAEwKhJxleWrXYHiIhiQCVAwUQNzs2GqirDeBjG1dJAQHc +YgP/eRCEQW5DJ6JQol5HQ26UnjBfQGdXsRvpT6gFNCDy/Nv+b886WC9j99T3IU+A +ztXfOPfPh7oU/2yC0VOmSaZS9SQ/PuuFdNhMggR8Q7goWothdBsMOUyO3iYrQCRn +V3mLNsOT+/gpSt9diLujs7SpiQeHZmQaNMQUrJPBp7tTbsa0LVJvZGVudCBvZiBV +bnVzdWFsIFNpemUgPENvYXJAUmFsZWlnaC5JQk0uQ29tPokAlQMFEDYoommazTzA +qZ913QEBZzMD/3F9tSh8IOiA+zaBsxCsbH2RP3RIERhxaeU+r85yPXzvVmWdh5iE +loxI64ucwAJl70Btp1hGBVXBdaFqYf53S4C8LD3yLGYj16Y9Sw+6KJ+TxF7yZZBX +6Rw6ohuMTjkW2xlgXL9bKpMenY5KX8ly6DA9+uWGsxbirqx6Vj8AEESSiQA/AwUQ +Nvjhv/1viMYh0KcbEQI04wCfcrpxqgqoy0oaupHCgVoI+MGA6LkAoJzV0/kcC3IW +WhAbFLZ8DAmn0OnyiQCVAwUQNvjlADGmPZbsFAuBAQFfWAP/U7/1XFenZrzKuVXa +onrEn1Td8Iv85VROuAODPD/bX2N5eCIbQIAzQClns1KqT3lpFIpmpagm9Njkr4/h +G4agwnUliNCLZ9eIJIejh8MXZE9NfGoKitCrozxywmqlDKSJRBF3od8pJRGTVZF+ +8aqLaLCIJAaKmp3SSbPJDZZISO+0LVJvZGVudCBvZiBVbnVzdWFsIFNpemUgPEtl +bi5Db2FyQE1lZXBab3IuQ29tPokAlQMFEDexh0+azTzAqZ913QEByLkD/Rt0Wjm1 +i94iNsaCFrN7Oi9CxZ6Bb/0aytDRxA8tGBJvS6nlafOhfULzgPpId8kn1T7cW8LD +ALMAJKm71jYu1Nl89FfSiZpxJyRS5ox6EwTaWoUxhU5zsXB+F/ue5gAM2wlslxbx +rE9m/KK7HrdEFag4VYcDixii5V1sw4kHa2NftCVSb2RlbnQgb2YgVW51c3VhbCBT +aXplIDxLZW5AQ29hci5Pcmc+iQCVAwUQN7Gd35rNPMCpn3XdAQHcoQQArrWwFNeS +A5Yu1nEXevfStfkSUQqzA6qsREPgrczIOgsCfDR/RA/1P7GcxiOvY5mtckuvgkP0 +A9atWkCFX4A0UzerKAKaSirUd/V6Dm8w3hOR/e66I
cvs commit: apache-1.3/src/support htpasswd.c
coar99/08/12 05:10:39 Modified:src/support htpasswd.c Log: Fix a typo and some line-wraps. (All cosmetic.) Revision ChangesPath 1.34 +8 -6 apache-1.3/src/support/htpasswd.c Index: htpasswd.c === RCS file: /home/cvs/apache-1.3/src/support/htpasswd.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- htpasswd.c1999/08/07 20:34:14 1.33 +++ htpasswd.c1999/08/12 12:10:38 1.34 @@ -242,15 +242,17 @@ .\n); fprintf(stderr, -d Force CRYPT encryption of the password #if (!(defined(WIN32) || defined(TPF))) - (default) + (default) #endif - .\n); + .\n); fprintf(stderr, -p Force NO encryption of the password.\n); fprintf(stderr, -s Force SHA encryption of the password.\n); -fprintf(stderr, -b Use the password from the command line rather ); -fprintf(stderr, than prompting for it.\n); -fprintf(stderr, On Windows and TPF systems the '-m' flag is used by default.\n); -fprintf(stderr, On all other systems, the '-p' will propably not work.\n); +fprintf(stderr, -b Use the password from the command line rather + than prompting for it.\n); +fprintf(stderr, + On Windows and TPF systems the '-m' flag is used by default.\n); +fprintf(stderr, + On all other systems, the '-p' flag will probably not work.\n); return ERR_SYNTAX; }
cvs commit: apache-1.3/src/support htpasswd.c
coar99/08/12 07:15:23 Modified:src/support htpasswd.c Log: 'Force NO encryption' alongside 'Force SHA' made it sound like NO was another algorithm. Revision ChangesPath 1.35 +1 -1 apache-1.3/src/support/htpasswd.c Index: htpasswd.c === RCS file: /home/cvs/apache-1.3/src/support/htpasswd.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- htpasswd.c1999/08/12 12:10:38 1.34 +++ htpasswd.c1999/08/12 14:15:22 1.35 @@ -245,7 +245,7 @@ (default) #endif .\n); -fprintf(stderr, -p Force NO encryption of the password.\n); +fprintf(stderr, -p Do not encrypt the password (plaintext).\n); fprintf(stderr, -s Force SHA encryption of the password.\n); fprintf(stderr, -b Use the password from the command line rather than prompting for it.\n);
cvs commit: apache-devsite how-to-release.html
coar99/08/10 08:37:17 Modified:.how-to-release.html Log: Fix the directory references to reflect Taz's new layout, and add the bit about fixing the FAQ -- expand.pl doesn't know how to deal with the QUERY_STRING aspects of the multi-part inclusion. Revision ChangesPath 1.57 +97 -87apache-devsite/how-to-release.html Index: how-to-release.html === RCS file: /home/cvs/apache-devsite/how-to-release.html,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- how-to-release.html 1999/03/06 19:24:46 1.56 +++ how-to-release.html 1999/08/10 15:37:16 1.57 @@ -20,7 +20,8 @@ H1How to build a release of Apache/H1 Alexei Kosut lt;[EMAIL PROTECTED]gt;BR Ralf S. Engelschall lt;[EMAIL PROTECTED]gt;BR -Jim Jagielski lt;[EMAIL PROTECTED]gt; +Jim Jagielski lt;[EMAIL PROTECTED]gt;br +Ken Coar lt;[EMAIL PROTECTED]gt; /DIV BLOCKQUOTE @@ -41,13 +42,13 @@ POnce a release is built (A HREF=#tarballsee below/A), it is time to announce it to the world. Ideally, the Announcement -should be composed and committed STRONGbefore/STRONG the +should be composed and committed Bbefore/B the Release is actually built. So we describe these steps at the beginning. OL HR - STRONG[ Adjusting Announcement to taste ]/STRONGBR + B[ Adjusting Announcement to taste ]/BBR P LIA prototype CODEAnnouncement/CODE is included in the main CVS source tree. This file should be updated @@ -55,25 +56,25 @@ release. For example, the Release Version should reflect what is actually being announced. Also, the key enhancements of the Release should be noted.BR - CODESTRONG$ cvs checkout apache-1.EMX/EM/Announcement/STRONG/CODEBR - CODESTRONG$ cd apache-1.EMX/EM/STRONG/CODEBR - CODESTRONG$ vi Announcement/STRONG/CODEBR - CODESTRONG$ cvs commit Announcement/STRONG/CODEBR - CODESTRONG$ cd ../STRONG/CODEBR - CODESTRONG$ cvs release -d apache-1.EMX/EM/STRONG/CODE + CODEB$ cvs checkout apache-1.EMX/EM/Announcement/B/CODEBR + CODEB$ cd apache-1.EMX/EM/B/CODEBR + CODEB$ vi Announcement/B/CODEBR + CODEB$ cvs commit Announcement/B/CODEBR + CODEB$ cd ../B/CODEBR + CODEB$ cvs release -d apache-1.EMX/EM/B/CODE P - STRONGNote:/STRONG This document is also present in the + BNote:/B This document is also present in the CODEapache-site/dist//CODE directory, both in HTML and plain text form. You may want to create one version out of the other. P HR - STRONG[ Building the source release ]/STRONGBR + B[ Building the source release ]/BBR P LIFirst, build the source release (A HREF=#tarballsee below/A) if not already done. P HR - STRONG[ Posting the Announcement ]/STRONGBR + B[ Posting the Announcement ]/BBR P LIOnce the tarball is built, give the mirrors a good 24 hours to get up to sync. This is really important if this this @@ -88,7 +89,7 @@ LICODEcomp.infosystems.www.servers.misc/CODE LICODEde.comm.infosystems.www.servers/CODE /UL -LIModerated UseNet newsgroups (do STRONGnot/STRONG crosspost) +LIModerated UseNet newsgroups (do Bnot/B crosspost) UL LICODEcomp.infosystems.www.announce/CODE /UL @@ -117,7 +118,7 @@ will be noted. PFONT COLOR=redImportant:/FONT Once tagged and the tarball -is rolled, there is STRONGno going back/STRONG. If there are +is rolled, there is Bno going back/B. If there are problems with the tarball, the version number (either the rev-level or beta-level) EMmust/EM be bumped resulting in a new tag, tarball and release. @@ -125,14 +126,14 @@ OL HR LI Checkout the Apache source if needed into a scratch directory:BR - CODESTRONG$ cvs checkout apache-1.EMX/EM/STRONG/CODE + CODEB$ cvs checkout apache-1.EMX/EM/B/CODE P LI cd into the CODEapache-1.EMX/EM/CODE CVS tree.BR - CODESTRONG$ cd apache-1.EMX/EM/STRONG/CODE + CODEB$ cd apache-1.EMX/EM/B/CODE P HR -STRONG[ Only for final releases, not for internal pre-releases ]/STRONGBR +B[ Only for final releases, not for internal pre-releases ]/BBR P LI Change CODESERVER_VERSION/CODE in TTsrc/include/httpd.h/TT from ``CODEApache/1.EMX.Y/EM-dev/CODE'' to @@ -146,9 +147,9 @@ CODEVERSION/CODE from CODE1.EMX.Y/EM dev/CODE to the string CODE1.EMX.Y/EM/CODE. BR - CODESTRONG$ vi src/include/httpd.h/STRONG/CODEBR - CODESTRONG$ vi src/os/win32/registry.c/STRONG/CODEBR - CODESTRONG$ cvs commit src/include/httpd.h src/os/win32/registry.c/STRONG/CODE + CODEB$ vi src/include/httpd.h/B/CODEBR + CODEB$ vi src/os/win32/registry.c/B
cvs commit: apache-devsite how-to-release.html
coar99/08/10 14:20:02 Modified:.how-to-release.html Log: Oops. Caught by the dichotomy between the online and the repository paths.. Revision ChangesPath 1.58 +1 -1 apache-devsite/how-to-release.html Index: how-to-release.html === RCS file: /home/cvs/apache-devsite/how-to-release.html,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- how-to-release.html 1999/08/10 15:37:16 1.57 +++ how-to-release.html 1999/08/10 21:19:59 1.58 @@ -185,7 +185,7 @@ p li Extract the FAQ as a single file, as it appears on the Web:br codeb$ lynx -source http://www.apache.org/docs/misc/FAQ.html - gt; htdocs/misc/FAQ.html/b/code + gt; htdocs/manual/misc/FAQ.html/b/code p LI Create CODEsrc/Configuration/CODE file:BR CODEB$ cp src/Configuration.tmpl src/Configuration/B/CODE
cvs commit: apache-1.3 configure
coar99/08/09 10:05:02 Modified:.configure Log: If mod_mmap_static is experimental yet listed, then so ought mod_auth_digest be -- especially since we're probably closer to unexperimentalising it.. Revision ChangesPath 1.97 +1 -0 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- configure 1999/08/06 03:35:00 1.96 +++ configure 1999/08/09 17:05:01 1.97 @@ -754,6 +754,7 @@ module_mmap_static=no # not all platforms have mmap() module_so=no # not all platforms have dlopen() module_example=no # only for developers +module_auth_digest=no # experimental module_log_agent=no # deprecated module_log_referer=no # deprecated ;;
cvs commit: apache-1.3/src/include httpd.h
coar99/08/09 10:22:13 Modified:src/os/win32 registry.c src/include httpd.h Log: Rolling 1.3.8.. Revision ChangesPath 1.23 +1 -1 apache-1.3/src/os/win32/registry.c Index: registry.c === RCS file: /export/home/cvs/apache-1.3/src/os/win32/registry.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- registry.c1999/07/29 22:58:30 1.22 +++ registry.c1999/08/09 17:22:02 1.23 @@ -38,7 +38,7 @@ #define VENDOR Apache Group #define SOFTWARE Apache -#define VERSION 1.3.8 dev +#define VERSION 1.3.8 #define REGKEY SOFTWARE\\ VENDOR \\ SOFTWARE \\ VERSION 1.290 +2 -2 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.289 retrieving revision 1.290 diff -u -r1.289 -r1.290 --- httpd.h 1999/08/08 11:45:16 1.289 +++ httpd.h 1999/08/09 17:22:10 1.290 @@ -419,7 +419,7 @@ * Example: Apache/1.1.0 MrWidget/0.1-alpha */ -#define SERVER_BASEVERSION Apache/1.3.8-dev/* SEE COMMENTS ABOVE */ +#define SERVER_BASEVERSION Apache/1.3.8/* SEE COMMENTS ABOVE */ #define SERVER_VERSION SERVER_BASEVERSION enum server_token_type { SrvTk_MIN, /* eg: Apache/1.3.0 */ @@ -435,7 +435,7 @@ * Always increases along the same track as the source branch. * For example, Apache 1.4.2 would be '10402100', 2.5b7 would be '2057'. */ -#define APACHE_RELEASE 10308000 +#define APACHE_RELEASE 10308100 #define SERVER_PROTOCOL HTTP/1.1 #ifndef SERVER_SUPPORT
cvs commit: apache-1.3/src/include httpd.h
coar99/08/09 10:46:38 Modified:.STATUS src CHANGES Configure src/os/win32 registry.c src/include httpd.h Log: Update to 1.3.9-dev. Revision ChangesPath 1.739 +3 -8 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.738 retrieving revision 1.739 diff -u -r1.738 -r1.739 --- STATUS1999/08/09 08:11:03 1.738 +++ STATUS1999/08/09 17:46:13 1.739 @@ -1,16 +1,11 @@ 1.3 STATUS: - Last modified at [$Date: 1999/08/09 08:11:03 $] + Last modified at [$Date: 1999/08/09 17:46:13 $] Release: -1.3.8-dev: current. 'Quiet mode' on 6 August 1999; should we roll -then, or wait for internal testing first? The --testers lists get the tarball as soon as it's rolled. -Current plan: test internally. If no problems, roll on -12 August and submit to -testers lists, then release on -Monday 16 August 1999. Roy wants it to happen faster. -Ken is RM. +1.3.9-dev: current. +1.3.8: Rolled on August 9. 1.3.7: Not released. 1.3.6. Tagged and rolled on Mar. 22. Released and announced on 24th. 1.3.5: Not released. 1.1415+2 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1414 retrieving revision 1.1415 diff -u -r1.1414 -r1.1415 --- CHANGES 1999/08/09 09:41:36 1.1414 +++ CHANGES 1999/08/09 17:46:24 1.1415 @@ -1,3 +1,5 @@ +Changes with Apache 1.3.9 + Changes with Apache 1.3.8 *) Flush the output buffer immediately after sending an error or redirect 1.368 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.367 retrieving revision 1.368 diff -u -r1.367 -r1.368 --- Configure 1999/08/09 07:38:37 1.367 +++ Configure 1999/08/09 17:46:25 1.368 @@ -1737,7 +1737,7 @@ #select the special subtarget for shared core generation SUBTARGET=target_shared #determine additional suffixes for libhttpd.so - V=1 R=3 P=8 + V=1 R=3 P=9 if [ x$SHLIB_SUFFIX_DEPTH = x0 ]; then SHLIB_SUFFIX_LIST= fi 1.24 +1 -1 apache-1.3/src/os/win32/registry.c Index: registry.c === RCS file: /export/home/cvs/apache-1.3/src/os/win32/registry.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- registry.c1999/08/09 17:22:02 1.23 +++ registry.c1999/08/09 17:46:32 1.24 @@ -38,7 +38,7 @@ #define VENDOR Apache Group #define SOFTWARE Apache -#define VERSION 1.3.8 +#define VERSION 1.3.9 dev #define REGKEY SOFTWARE\\ VENDOR \\ SOFTWARE \\ VERSION 1.291 +2 -2 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.290 retrieving revision 1.291 diff -u -r1.290 -r1.291 --- httpd.h 1999/08/09 17:22:10 1.290 +++ httpd.h 1999/08/09 17:46:38 1.291 @@ -419,7 +419,7 @@ * Example: Apache/1.1.0 MrWidget/0.1-alpha */ -#define SERVER_BASEVERSION Apache/1.3.8/* SEE COMMENTS ABOVE */ +#define SERVER_BASEVERSION Apache/1.3.9-dev/* SEE COMMENTS ABOVE */ #define SERVER_VERSION SERVER_BASEVERSION enum server_token_type { SrvTk_MIN, /* eg: Apache/1.3.0 */ @@ -435,7 +435,7 @@ * Always increases along the same track as the source branch. * For example, Apache 1.4.2 would be '10402100', 2.5b7 would be '2057'. */ -#define APACHE_RELEASE 10308100 +#define APACHE_RELEASE 10309000 #define SERVER_PROTOCOL HTTP/1.1 #ifndef SERVER_SUPPORT
cvs commit: apache-1.3/src/main http_main.c
coar99/08/08 05:05:15 Modified:src/main http_main.c Log: Fix a miniscule compilation warning. Revision ChangesPath 1.468 +1 -0 apache-1.3/src/main/http_main.c Index: http_main.c === RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v retrieving revision 1.467 retrieving revision 1.468 diff -u -r1.467 -r1.468 --- http_main.c 1999/08/05 20:04:04 1.467 +++ http_main.c 1999/08/08 12:05:13 1.468 @@ -6648,6 +6648,7 @@ * Force ap_validate_password() into the image so that modules like * mod_auth can use it even if they're dynamically loaded. */ +void suck_in_ap_validate_password(void); void suck_in_ap_validate_password(void) { ap_validate_password(a, b);
cvs commit: apache-1.3 STATUS
coar99/08/06 10:52:39 Modified:.STATUS Log: Add notes about memory leaks found by David Harris. It's unclear (to me, at least) how severe they are, but the module counters are involved and long-running servers with regularly scheduled restarts *could* be vulnerable..? Revision ChangesPath 1.736 +14 -5 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.735 retrieving revision 1.736 diff -u -r1.735 -r1.736 --- STATUS1999/08/05 18:42:20 1.735 +++ STATUS1999/08/06 17:52:37 1.736 @@ -1,12 +1,15 @@ 1.3 STATUS: - Last modified at [$Date: 1999/08/05 18:42:20 $] + Last modified at [$Date: 1999/08/06 17:52:37 $] Release: -1.3.8-dev: current. 'Quiet mode' on 6 August 1999, then internal - testing until 12 August 1999. If no problems, roll on +1.3.8-dev: current. 'Quiet mode' on 6 August 1999; should we roll +then, or wait for internal testing first? The +-testers lists get the tarball as soon as it's rolled. +Current plan: test internally. If no problems, roll on 12 August and submit to -testers lists, then release on -Monday 16 August 1999. Ken is RM. +Monday 16 August 1999. Roy wants it to happen faster. +Ken is RM. 1.3.7: Not released. 1.3.6. Tagged and rolled on Mar. 22. Released and announced on 24th. @@ -71,7 +74,13 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: -* Graham Legget has found that if he uses the 1.3.7-dev core, and +* David Harris' note of leakage problems in adding/removing + modules, plus additional findings by Dean and Jim. Discussion + in thread following message-ID below. + Message-ID: [EMAIL PROTECTED] + Status: + +* Graham Leggett has found that if he uses the 1.3.7-dev core, and the 1.3.6 proxy code (plus a small patch of his) he doesn't get the hangs he was reporting. The situation is better as of 18 July 1999; still an occasional problem, but no longer a
cvs commit: apache-1.3/src/ap ap_snprintf.c
coar99/08/06 15:16:05 Modified:src Configure src/ap ap_snprintf.c Log: Put in fixes for Tandem compilation. Submitted by: Michael Ottati [EMAIL PROTECTED] Reviewed by: Ken Coar Revision ChangesPath 1.366 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.365 retrieving revision 1.366 diff -u -r1.365 -r1.366 --- Configure 1999/08/02 10:45:29 1.365 +++ Configure 1999/08/06 22:15:54 1.366 @@ -742,7 +742,7 @@ ;; *-tandem-oss) OS='Tandem OSS' - CFLAGS=-D_TANDEM_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -g + CFLAGS=-D_TANDEM_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 CC='c89' ;; *) # default: Catch systems we don't know about 1.35 +5 -0 apache-1.3/src/ap/ap_snprintf.c Index: ap_snprintf.c === RCS file: /home/cvs/apache-1.3/src/ap/ap_snprintf.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- ap_snprintf.c 1999/05/23 16:55:29 1.34 +++ ap_snprintf.c 1999/08/06 22:15:59 1.35 @@ -89,7 +89,12 @@ typedef WIDE_INT wide_int; typedef unsigned WIDE_INT u_wide_int; typedef WIDEST_INT widest_int; +#ifdef __TANDEM +/* Although Tandem supports long long there is no unsigned variant. */ +typedef unsigned long u_widest_int; +#else typedef unsigned WIDEST_INT u_widest_int; +#endif typedef int bool_int; #define S_NULL (null)
cvs commit: apache-1.3 STATUS
coar99/08/05 08:04:44 Modified:.STATUS Log: Add another patch offering.. Revision ChangesPath 1.734 +6 -1 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.733 retrieving revision 1.734 diff -u -r1.733 -r1.734 --- STATUS1999/08/03 19:26:54 1.733 +++ STATUS1999/08/05 15:04:38 1.734 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/08/03 19:26:54 $] + Last modified at [$Date: 1999/08/05 15:04:38 $] Release: @@ -93,6 +93,11 @@ Available Patches: + +* David Harris' patch to add a function to report on the number + of bytes in a pool that are actually used. + Message-ID: [EMAIL PROTECTED] + Status: * Ian Turner's patch for port to Sequent (enabling DSO) PR: 4735
cvs commit: apache-1.3 STATUS
coar99/08/05 11:42:24 Modified:.STATUS Log: Add Paul Reder's patch for broken (?) .htaccess processing in regex directory sections. Revision ChangesPath 1.735 +7 -1 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.734 retrieving revision 1.735 diff -u -r1.734 -r1.735 --- STATUS1999/08/05 15:04:38 1.734 +++ STATUS1999/08/05 18:42:20 1.735 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/08/05 15:04:38 $] + Last modified at [$Date: 1999/08/05 18:42:20 $] Release: @@ -93,6 +93,12 @@ Available Patches: + +* Paul Reder's patch to fix Allow/Deny (.htaccess parsing) in + regex Directory* processing. + Message-ID: [EMAIL PROTECTED] + PR: 3019, 3454 + Status: * David Harris' patch to add a function to report on the number of bytes in a pool that are actually used.
cvs commit: apache-1.3/htdocs/manual/mod mod_imap.html
coar99/08/05 11:43:49 Modified:htdocs/manual/mod mod_imap.html Log: Typo fixage.. Submitted by: Jayaram A [EMAIL PROTECTED] Reviewed by: Ken Coar Revision ChangesPath 1.13 +1 -1 apache-1.3/htdocs/manual/mod/mod_imap.html Index: mod_imap.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_imap.html,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mod_imap.html 1998/05/20 14:12:56 1.12 +++ mod_imap.html 1999/08/05 18:43:47 1.13 @@ -66,7 +66,7 @@ A HREF=directive-dict.html#Syntax REL=Help -STRONGSyntax:/STRONG/A ImapMenu CODE{none, formatted, semi-formatted, +STRONGSyntax:/STRONG/A ImapMenu CODE{none, formatted, semiformatted, unformatted}/CODEBR A HREF=directive-dict.html#Context
cvs commit: apache-1.3/htdocs/manual/misc FAQ-D.html
coar99/08/04 10:43:50 Modified:htdocs/manual/misc FAQ-D.html Log: Boy is this one turning into a FAQ.. PR: Too numerous to mention. Revision ChangesPath 1.2 +35 -1 apache-1.3/htdocs/manual/misc/FAQ-D.html Index: FAQ-D.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/FAQ-D.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FAQ-D.html1999/06/24 15:02:51 1.1 +++ FAQ-D.html1999/08/04 17:43:46 1.2 @@ -31,7 +31,7 @@ !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P - $Revision: 1.1 $ ($Date: 1999/06/24 15:02:51 $) + $Revision: 1.2 $ ($Date: 1999/08/04 17:43:46 $) /P P The latest version of this FAQ is always available from the main @@ -97,6 +97,11 @@ than 1.2.0 and suddenly I have problems with Apache dying randomly or not restarting properly/A /LI + LIA HREF=#setservernameWhen I try to start Apache from a DOS +window, I get a message like sampCannot determine host name. + Use ServerName directive to set it manually./samp What does + this mean?/A + /LI /OL /LI !--#endif -- @@ -324,6 +329,35 @@ /P HR /LI + + LIA name=setservername + bWhen I try to start Apache from a DOS + window, I get a message like sampCannot determine host name. + Use ServerName directive to set it manually./samp What does + this mean?/b/A + + p + It means what it says; the Apache software can't determine the + hostname of your system. Edit your sampconf\httpd.conf/samp + file, look for the string ServerName, and make sure there's an + uncommented directive such as + /p + dl + ddcodeServerName localhost/code/dd + /dl + p + or + /p + dl + ddcodeServerName www.foo.com/code/dd + /dl + p + in the file. Correct it if there one there with wrong information, or + add one if you don't already have one. Then try to start the server + again. + /p + /LI + /OL !--#endif -- !--#if expr=$STANDALONE --
cvs commit: apache-1.3/htdocs/manual/misc FAQ-D.html
coar99/08/04 11:10:41 Modified:htdocs/manual/misc FAQ-D.html Log: Oops. Forgot the HR that I wasn't supposed to forget.. Revision ChangesPath 1.3 +2 -1 apache-1.3/htdocs/manual/misc/FAQ-D.html Index: FAQ-D.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/FAQ-D.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- FAQ-D.html1999/08/04 17:43:46 1.2 +++ FAQ-D.html1999/08/04 18:10:40 1.3 @@ -31,7 +31,7 @@ !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P - $Revision: 1.2 $ ($Date: 1999/08/04 17:43:46 $) + $Revision: 1.3 $ ($Date: 1999/08/04 18:10:40 $) /P P The latest version of this FAQ is always available from the main @@ -356,6 +356,7 @@ add one if you don't already have one. Then try to start the server again. /p + hr /LI /OL
cvs commit: apache-1.3 STATUS
coar99/08/03 10:53:19 Modified:.STATUS Log: Add a note about the proposed 1.3.8 schedule, and some votes. Revision ChangesPath 1.732 +7 -6 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.731 retrieving revision 1.732 diff -u -r1.731 -r1.732 --- STATUS1999/07/31 09:25:40 1.731 +++ STATUS1999/08/03 17:53:18 1.732 @@ -1,9 +1,12 @@ 1.3 STATUS: - Last modified at [$Date: 1999/07/31 09:25:40 $] + Last modified at [$Date: 1999/08/03 17:53:18 $] Release: -1.3.8-dev: current. +1.3.8-dev: current. 'Quiet mode' on 6 August 1999, then internal + testing until 12 August 1999. If no problems, roll on +12 August and submit to -testers lists, then release on +Monday 16 August 1999. Ken is RM. 1.3.7: Not released. 1.3.6. Tagged and rolled on Mar. 22. Released and announced on 24th. @@ -93,7 +96,7 @@ * Stipe Tolj's Cygwin32 port PR#: 2936 -Status: Lars +1 (on concept), Martin +1 (on concept) +Status: Lars +1 (on concept), Martin +1 (on concept), Ken +1 (concept) * Salvador Ortiz Garcia [EMAIL PROTECTED]' patch to allow DirectoryIndex to refer to URIs for non-static resources. @@ -117,7 +120,6 @@ to either the server UID or the file's owner. Message-ID: [EMAIL PROTECTED] Status: Ken +1, Dean +1, Randy +1, Lars +0, Jim +1 - (On hold until Aidan submits an update) * Keith Wannamaker's NT multiple services patch Message-ID: [EMAIL PROTECTED] @@ -131,7 +133,7 @@ * Jim Patterson's patch to make mod_info work on Win32 Message-ID: PR#1442 -Status: Lars +1 (on concept) +Status: Lars +1 (on concept), Ken +1 (concept) * Peter Greis' new '%m' CustomLog option: the time taken to serve the request, in milli-seconds. @@ -166,7 +168,6 @@ Message-ID: [EMAIL PROTECTED] Message-ID: [EMAIL PROTECTED] Status: Greg +1, Martin +1 (on concept) - In progress:
cvs commit: apache-1.3 STATUS
coar99/08/03 12:26:56 Modified:.STATUS Log: Add Sequent update patch. Revision ChangesPath 1.733 +5 -1 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.732 retrieving revision 1.733 diff -u -r1.732 -r1.733 --- STATUS1999/08/03 17:53:18 1.732 +++ STATUS1999/08/03 19:26:54 1.733 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/08/03 17:53:18 $] + Last modified at [$Date: 1999/08/03 19:26:54 $] Release: @@ -93,6 +93,10 @@ Available Patches: + +* Ian Turner's patch for port to Sequent (enabling DSO) + PR: 4735 + Status: * Stipe Tolj's Cygwin32 port PR#: 2936
cvs commit: apache-1.3/src/modules/standard mod_auth.c mod_auth_db.c mod_auth_dbm.c
coar99/08/02 13:50:23 Modified:src/ap ap_sha1.c src/include ap.h ap_md5.h ap_sha1.h src/main http_main.c src/modules/standard mod_auth.c mod_auth_db.c mod_auth_dbm.c Removed: src/include ap_checkpass.h Log: Fix some spacing issues in the SHA1 and ap_validate_password changes. ap_validate_password() isn't called by anything in the core, so the link may well omit it -- causing DSO mod_auth* modules to fail to load. Force a reference to it into the core server so that won't happen. As soon as ap_checkpass.c includes any other symbols routinely referenced by the core, the kludge at the bottom of http_main.c can go away. Or earlier, if someone finds a better solution. Revision ChangesPath 1.2 +100 -91 apache-1.3/src/ap/ap_sha1.c Index: ap_sha1.c === RCS file: /home/cvs/apache-1.3/src/ap/ap_sha1.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ap_sha1.c 1999/08/02 10:13:44 1.1 +++ ap_sha1.c 1999/08/02 20:50:12 1.2 @@ -55,7 +55,7 @@ * * The only exported function: * - *ap_sha1_base64(char *clear, int len, char *out); + *ap_sha1_base64(const char *clear, int len, char *out); * * provides a means to SHA1 crypt/encode a plaintext password in * a way which makes password files compatible with those commonly @@ -140,19 +140,19 @@ #define SHA_DIGESTSIZE 20 typedef struct { - LONG digest[5]; /* message digest */ - LONG count_lo, count_hi;/* 64-bit bit count */ - LONG data[16]; /* SHA data buffer */ - int local; /* unprocessed amount in data */ - } SHA_INFO; - -void sha_init(SHA_INFO *); -void sha_update(SHA_INFO *, BYTE *, int); -void sha_final(SHA_INFO *); -void sha_raw_swap(SHA_INFO *); -void output64chunk(unsigned char, unsigned char, unsigned char, - int, unsigned char **); -void encode_mime64(unsigned char *, unsigned char *, int); +LONG digest[5]; /* message digest */ +LONG count_lo, count_hi;/* 64-bit bit count */ +LONG data[16]; /* SHA data buffer */ +int local; /* unprocessed amount in data */ +} SHA_INFO; + +static void sha_init(SHA_INFO *); +static void sha_update(SHA_INFO *, const BYTE *, int); +static void sha_final(SHA_INFO *); +static void sha_raw_swap(SHA_INFO *); +static void output64chunk(unsigned char, unsigned char, unsigned char, + int, unsigned char **); +static void encode_mime64(unsigned char *, unsigned char *, int); void sha1_base64(char *, int, char *); /* do SHA transformation */ @@ -217,14 +217,15 @@ } union endianTest { - long Long; - char Char[sizeof(long)]; +long Long; +char Char[sizeof(long)]; }; -char isLittleEndian() { - static union endianTest u; - u.Long = 1; - return(u.Char[0]==1); +static char isLittleEndian(void) +{ +static union endianTest u; +u.Long = 1; +return (u.Char[0] == 1); } /* change endianness of data */ @@ -236,25 +237,25 @@ BYTE ct[4], *cp; if (isLittleEndian()) {/* do the swap only if it is little endian */ - count /= sizeof(LONG); - cp = (BYTE *) buffer; - for (i = 0; i count; ++i) { - ct[0] = cp[0]; - ct[1] = cp[1]; - ct[2] = cp[2]; - ct[3] = cp[3]; - cp[0] = ct[3]; - cp[1] = ct[2]; - cp[2] = ct[1]; - cp[3] = ct[0]; - cp += sizeof(LONG); - } + count /= sizeof(LONG); + cp = (BYTE *) buffer; + for (i = 0; i count; ++i) { + ct[0] = cp[0]; + ct[1] = cp[1]; + ct[2] = cp[2]; + ct[3] = cp[3]; + cp[0] = ct[3]; + cp[1] = ct[2]; + cp[2] = ct[1]; + cp[3] = ct[0]; + cp += sizeof(LONG); + } } } /* initialize the SHA digest */ -void sha_init(SHA_INFO *sha_info) +static void sha_init(SHA_INFO *sha_info) { sha_info-digest[0] = 0x67452301L; sha_info-digest[1] = 0xefcdab89L; @@ -268,7 +269,7 @@ /* update the SHA digest */ -void sha_update(SHA_INFO *sha_info, BYTE *buffer, int count) +static void sha_update(SHA_INFO *sha_info, const BYTE *buffer, int count) { int i; @@ -289,7 +290,8 @@ if (sha_info-local == SHA_BLOCKSIZE) { maybe_byte_reverse(sha_info-data, SHA_BLOCKSIZE); sha_transform(sha_info); - } else { + } + else { return; } } @@ -306,7 +308,7 @@ /* finish computing the SHA digest */ -void sha_final(SHA_INFO *sha_info) +static void sha_final(SHA_INFO
cvs commit: apache-1.3/src .gdbinit
coar99/07/29 15:28:56 Modified:src .gdbinit Log: Oops; add a newline to avoid nastygrams. Revision ChangesPath 1.4 +1 -1 apache-1.3/src/.gdbinit Index: .gdbinit === RCS file: /home/cvs/apache-1.3/src/.gdbinit,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .gdbinit 1999/07/29 22:21:50 1.3 +++ .gdbinit 1999/07/29 22:28:52 1.4 @@ -25,4 +25,4 @@ end document dump_string_array Print all of the elements in an array of strings. -end \ No newline at end of file +end
cvs commit: apache-1.3/src/os/win32 registry.c
coar99/07/29 15:36:20 Modified:src/include httpd.h src/os/win32 registry.c Log: Updating version for 1.3.7 tarball.. Revision ChangesPath 1.287 +2 -2 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.286 retrieving revision 1.287 diff -u -r1.286 -r1.287 --- httpd.h 1999/07/29 18:13:30 1.286 +++ httpd.h 1999/07/29 22:36:00 1.287 @@ -419,7 +419,7 @@ * Example: Apache/1.1.0 MrWidget/0.1-alpha */ -#define SERVER_BASEVERSION Apache/1.3.7-dev/* SEE COMMENTS ABOVE */ +#define SERVER_BASEVERSION Apache/1.3.7/* SEE COMMENTS ABOVE */ #define SERVER_VERSION SERVER_BASEVERSION enum server_token_type { SrvTk_MIN, /* eg: Apache/1.3.0 */ @@ -435,7 +435,7 @@ * Always increases along the same track as the source branch. * For example, Apache 1.4.2 would be '10402100', 2.5b7 would be '2057'. */ -#define APACHE_RELEASE 10307000 +#define APACHE_RELEASE 10307100 #define SERVER_PROTOCOL HTTP/1.1 #ifndef SERVER_SUPPORT 1.21 +1 -1 apache-1.3/src/os/win32/registry.c Index: registry.c === RCS file: /export/home/cvs/apache-1.3/src/os/win32/registry.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- registry.c1999/04/08 21:04:46 1.20 +++ registry.c1999/07/29 22:36:17 1.21 @@ -38,7 +38,7 @@ #define VENDOR Apache Group #define SOFTWARE Apache -#define VERSION 1.3.7 dev +#define VERSION 1.3.7 #define REGKEY SOFTWARE\\ VENDOR \\ SOFTWARE \\ VERSION
cvs commit: apache-1.3/src/os/win32 registry.c
coar99/07/29 15:58:36 Modified:src CHANGES Configure src/include httpd.h src/os/win32 registry.c Log: Apache 1.3.7 rolled, 1.3.8-dev now the development version. Revision ChangesPath 1.1404+2 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1403 retrieving revision 1.1404 diff -u -r1.1403 -r1.1404 --- CHANGES 1999/07/29 22:21:50 1.1403 +++ CHANGES 1999/07/29 22:58:09 1.1404 @@ -1,3 +1,5 @@ +Changes with Apache 1.3.8 + Changes with Apache 1.3.7 *) The Vary response header field is now sanitised right before 1.364 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.363 retrieving revision 1.364 diff -u -r1.363 -r1.364 --- Configure 1999/07/24 18:48:21 1.363 +++ Configure 1999/07/29 22:58:10 1.364 @@ -1687,7 +1687,7 @@ #select the special subtarget for shared core generation SUBTARGET=target_shared #determine additional suffixes for libhttpd.so - V=1 R=3 P=7 + V=1 R=3 P=8 if [ x$SHLIB_SUFFIX_DEPTH = x0 ]; then SHLIB_SUFFIX_LIST= fi 1.288 +2 -2 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.287 retrieving revision 1.288 diff -u -r1.287 -r1.288 --- httpd.h 1999/07/29 22:36:00 1.287 +++ httpd.h 1999/07/29 22:58:23 1.288 @@ -419,7 +419,7 @@ * Example: Apache/1.1.0 MrWidget/0.1-alpha */ -#define SERVER_BASEVERSION Apache/1.3.7/* SEE COMMENTS ABOVE */ +#define SERVER_BASEVERSION Apache/1.3.8-dev/* SEE COMMENTS ABOVE */ #define SERVER_VERSION SERVER_BASEVERSION enum server_token_type { SrvTk_MIN, /* eg: Apache/1.3.0 */ @@ -435,7 +435,7 @@ * Always increases along the same track as the source branch. * For example, Apache 1.4.2 would be '10402100', 2.5b7 would be '2057'. */ -#define APACHE_RELEASE 10307100 +#define APACHE_RELEASE 10308000 #define SERVER_PROTOCOL HTTP/1.1 #ifndef SERVER_SUPPORT 1.22 +1 -1 apache-1.3/src/os/win32/registry.c Index: registry.c === RCS file: /export/home/cvs/apache-1.3/src/os/win32/registry.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- registry.c1999/07/29 22:36:17 1.21 +++ registry.c1999/07/29 22:58:30 1.22 @@ -38,7 +38,7 @@ #define VENDOR Apache Group #define SOFTWARE Apache -#define VERSION 1.3.7 +#define VERSION 1.3.8 dev #define REGKEY SOFTWARE\\ VENDOR \\ SOFTWARE \\ VERSION
cvs commit: apache-1.3/src/support httpd.exp
coar99/07/28 10:37:22 Modified:.STATUS src CHANGES src/include alloc.h src/main alloc.c src/modules/standard mod_headers.c mod_negotiation.c mod_rewrite.c src/support httpd.exp Log: Treat the Vary response header field specially; change the modules that touch it to use a new routine that only adds a token if it isn't already present. O(n^2) behaviour as Dean points out, but absent set/atom operations it seems a reasonable stopgap for 1.3.7. PR: 4118 (previously closed with 'use force-no-vary') Reviewed by: Ken Coar Revision ChangesPath 1.727 +1 -8 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.726 retrieving revision 1.727 diff -u -r1.726 -r1.727 --- STATUS1999/07/28 14:06:20 1.726 +++ STATUS1999/07/28 17:37:05 1.727 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/07/28 14:06:20 $] + Last modified at [$Date: 1999/07/28 17:37:05 $] Release: @@ -67,13 +67,6 @@ RELEASE SHOWSTOPPERS: -* The Vary header field stuff is still broken (multiple - entries occur, etc.). The result is that some browsers (AFAIK at least - MSIE) are horribly confused by the responses. - Status: It should be fixed before 1.3.7 went out. For details - how it should be done, please look at new-httpd mailing list - archive: Ken, Ralf and Roy have already found consensus in the - past there. RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: 1.1400+7 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1399 retrieving revision 1.1400 diff -u -r1.1399 -r1.1400 --- CHANGES 1999/07/24 18:48:20 1.1399 +++ CHANGES 1999/07/28 17:37:09 1.1400 @@ -1,5 +1,12 @@ Changes with Apache 1.3.7 + *) Sanitise Vary values by not adding duplicate keywords. A + separate routine needs to be used to do this, so any module + that frobs Vary needs to be changed. The standard modules + have all been modified. This solution is somewhat inelegant, + but it does the job for now. PR#4118 (better fix than before) + [Ken Coar, Roy Fielding] + *) Link DSO's with gcc -shared instead of ld -Bshareable at least on Linux and FreeBSD for now. [Rasmus Lerdorf] 1.69 +4 -0 apache-1.3/src/include/alloc.h Index: alloc.h === RCS file: /home/cvs/apache-1.3/src/include/alloc.h,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- alloc.h 1999/05/13 19:44:14 1.68 +++ alloc.h 1999/07/28 17:37:14 1.69 @@ -225,6 +225,10 @@ API_EXPORT(const char *) ap_table_get(const table *, const char *); API_EXPORT(void) ap_table_set(table *, const char *name, const char *val); API_EXPORT(void) ap_table_setn(table *, const char *name, const char *val); +API_EXPORT(void) ap_table_merge_unique_token(table *t, const char *key, + const char *val); +API_EXPORT(void) ap_table_mergen_unique_token(table *t, const char *key, + const char *val); API_EXPORT(void) ap_table_merge(table *, const char *name, const char *more_val); API_EXPORT(void) ap_table_mergen(table *, const char *name, const char *more_val); API_EXPORT(void) ap_table_unset(table *, const char *key); 1.114 +26 -0 apache-1.3/src/main/alloc.c Index: alloc.c === RCS file: /home/cvs/apache-1.3/src/main/alloc.c,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- alloc.c 1999/05/25 15:32:54 1.113 +++ alloc.c 1999/07/28 17:37:16 1.114 @@ -1346,6 +1346,32 @@ } } +/* + * Merge an HTTP token into a table entry IFF it isn't already in there. + * (Intended primarily to avoid Vary: host, host.) + */ +API_EXPORT(void) ap_table_merge_unique_token(table *t, const char *key, + const char *val) +{ +const char *curval; + +curval = ap_table_get(t, key); +if ((curval == NULL) || (!ap_find_token(t-a.pool, curval, val))) { + ap_table_merge(t, key, val); +} +} + +API_EXPORT(void) ap_table_mergen_unique_token(table *t, const char *key, + const char *val) +{ +const char *curval
cvs commit: apache-1.3/src/main http_main.c
coar99/07/28 10:58:24 Modified:src/main http_main.c Log: Note that *SecurityDescriptor() resets the last error if it succeeds. Revision ChangesPath 1.463 +5 -0 apache-1.3/src/main/http_main.c Index: http_main.c === RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v retrieving revision 1.462 retrieving revision 1.463 diff -u -r1.462 -r1.463 --- http_main.c 1999/07/27 13:46:05 1.462 +++ http_main.c 1999/07/28 17:58:21 1.463 @@ -5886,6 +5886,11 @@ if (pSD == NULL || sa == NULL) { return NULL; } +/* + * We can safely use GetLastError() here without presetting it; + * InitializeSecurityDescriptor() has been verified as clearing it + * on successful completion. + */ if (!InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION) || GetLastError()) { LocalFree( pSD );
cvs commit: apache-1.3/src/main http_main.c
coar99/07/28 11:20:56 Modified:src ApacheCore.def src/include ap_mmn.h src/main http_main.c Log: Note some recent API changes in a couple of places; correct docco on *SecurityDescriptor safety. Revision ChangesPath 1.15 +3 -0 apache-1.3/src/ApacheCore.def Index: ApacheCore.def === RCS file: /home/cvs/apache-1.3/src/ApacheCore.def,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ApacheCore.def1999/03/12 13:54:22 1.14 +++ ApacheCore.def1999/07/28 18:20:53 1.15 @@ -343,4 +343,7 @@ ap_standalone @337 ap_server_confname @338 ap_sub_req_method_uri @339 + ap_field_noparam @340 + ap_table_merge_unique_token @341 + ap_table_mergen_unique_token @342 1.39 +2 -1 apache-1.3/src/include/ap_mmn.h Index: ap_mmn.h === RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- ap_mmn.h 1999/06/22 15:22:14 1.38 +++ ap_mmn.h 1999/07/28 18:20:54 1.39 @@ -220,6 +220,7 @@ * 19990320.3 - add ap_regexec() * 19990604.4 - add ap_field_noparam() * 19990621.5 - add local_ip/host to conn_rec for mass-vhost + * 19990728.6 - add ap_table_merge[n]_unique_token */ #define MODULE_MAGIC_COOKIE 0x41503133UL /* AP13 */ @@ -227,7 +228,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 19990320 #endif -#define MODULE_MAGIC_NUMBER_MINOR 5 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 6 /* 0...n */ #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward compat */ /* Useful for testing for features. */ 1.464 +1 -1 apache-1.3/src/main/http_main.c Index: http_main.c === RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v retrieving revision 1.463 retrieving revision 1.464 diff -u -r1.463 -r1.464 --- http_main.c 1999/07/28 17:58:21 1.463 +++ http_main.c 1999/07/28 18:20:54 1.464 @@ -5888,7 +5888,7 @@ } /* * We can safely use GetLastError() here without presetting it; - * InitializeSecurityDescriptor() has been verified as clearing it + * {Initialize,Set}SecurityDescriptor() have been verified as clearing it * on successful completion. */ if (!InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION)
cvs commit: apache-1.3 STATUS
coar99/07/27 11:48:54 Modified:.STATUS Log: Proxy issue no longer a showstopper; push release date out by a couple of days due to the recent flurry. Revision ChangesPath 1.725 +9 -8 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.724 retrieving revision 1.725 diff -u -r1.724 -r1.725 --- STATUS1999/07/07 11:05:15 1.724 +++ STATUS1999/07/27 18:48:51 1.725 @@ -1,11 +1,11 @@ 1.3 STATUS: - Last modified at [$Date: 1999/07/07 11:05:15 $] + Last modified at [$Date: 1999/07/27 18:48:51 $] Release: 1.3.7-dev: current. Ken volunteers to be release manager. -Proposed dates: roll on Mon, 26 July 1999, test, and release -on Fri, 30 July 1999. +Proposed dates: roll on Thu, 29 July 1999, test, and release +on Mon, 2 August 1999. 1.3.6. Tagged and rolled on Mar. 22. Released and announced on 24th. 1.3.5: Not released. @@ -67,12 +67,13 @@ RELEASE SHOWSTOPPERS: -- Graham Legget has found that if he uses the 1.3.7-dev core, and - the 1.3.6 proxy code (plus a small patch of his) he doesn't get - the hangs he was reporting. Something is broken in the 1.3.7-dev - proxy. - RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: + +* Graham Legget has found that if he uses the 1.3.7-dev core, and + the 1.3.6 proxy code (plus a small patch of his) he doesn't get + the hangs he was reporting. The situation is better as of + 18 July 1999; still an occasional problem, but no longer a + showstopper. * mod_rewrite/3874: RewriteLock doesn't work for virtual hosts Status: (Ralf): When I find time, I can look at this. But
cvs commit: apache-1.3/src/main http_main.c
coar99/07/20 10:44:21 Modified:src/main http_main.c Log: *SecurityDescriptor() should be returning an error on Win98, but sometimes doesn't -- so check the last error if it claims all went well, just in case it's fibbing. Submitted by: Allan Edwards [EMAIL PROTECTED], Keith Wannamaker [EMAIL PROTECTED] Reviewed by: Ken Coar Revision ChangesPath 1.455 +9 -5 apache-1.3/src/main/http_main.c Index: http_main.c === RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v retrieving revision 1.454 retrieving revision 1.455 diff -u -r1.454 -r1.455 --- http_main.c 1999/07/02 15:55:07 1.454 +++ http_main.c 1999/07/20 17:44:16 1.455 @@ -5757,16 +5757,20 @@ PSECURITY_DESCRIPTOR pSD; PSECURITY_ATTRIBUTES sa; -sa = (PSECURITY_ATTRIBUTES) LocalAlloc(LPTR, sizeof (SECURITY_ATTRIBUTES)); -pSD = (PSECURITY_DESCRIPTOR) LocalAlloc(LPTR, SECURITY_DESCRIPTOR_MIN_LENGTH); -if (pSD == NULL || sa == NULL) +sa = (PSECURITY_ATTRIBUTES) LocalAlloc(LPTR, sizeof(SECURITY_ATTRIBUTES)); +pSD = (PSECURITY_DESCRIPTOR) LocalAlloc(LPTR, + SECURITY_DESCRIPTOR_MIN_LENGTH); +if (pSD == NULL || sa == NULL) { return NULL; -if (!InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION)) { +} +if (!InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION) + || GetLastError()) { LocalFree( pSD ); LocalFree( sa ); return NULL; } -if (!SetSecurityDescriptorDacl(pSD, TRUE, (PACL) NULL, FALSE)) { +if (!SetSecurityDescriptorDacl(pSD, TRUE, (PACL) NULL, FALSE) + || GetLastError()) { LocalFree( pSD ); LocalFree( sa ); return NULL;
cvs commit: apache-1.3/src/support httpd.8
coar99/07/13 08:19:48 Modified:src/support httpd.8 Log: Fix a typo. Submitted by: Jayaram A [EMAIL PROTECTED] Reviewed by: Ken Coar Revision ChangesPath 1.14 +1 -1 apache-1.3/src/support/httpd.8 Index: httpd.8 === RCS file: /home/cvs/apache-1.3/src/support/httpd.8,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- httpd.8 1999/01/01 19:05:34 1.13 +++ httpd.8 1999/07/13 15:19:48 1.14 @@ -97,7 +97,7 @@ .B httpd is the Apache HyperText Transfer Protocol (HTTP) server program. It is designed to be run as a standalone daemon process. When used like this -is will create a pool of child processes to handle requests. To stop +it will create a pool of child processes to handle requests. To stop it, send a TERM signal to the initial (parent) process. The PID of this process is written to a file as given in the configuration file. Alternatively
cvs commit: apache-1.3 STATUS
coar99/07/07 04:05:16 Modified:.STATUS Log: Veto EAPI for 1.3.7 (too much confusion and controversy, esp. with the KEAPI alternative); defer it until the next release. Also note some platforms I can build. Revision ChangesPath 1.724 +8 -30 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.723 retrieving revision 1.724 diff -u -r1.723 -r1.724 --- STATUS1999/06/25 08:12:18 1.723 +++ STATUS1999/07/07 11:05:15 1.724 @@ -1,9 +1,11 @@ 1.3 STATUS: - Last modified at [$Date: 1999/06/25 08:12:18 $] + Last modified at [$Date: 1999/07/07 11:05:15 $] Release: 1.3.7-dev: current. Ken volunteers to be release manager. +Proposed dates: roll on Mon, 26 July 1999, test, and release +on Fri, 30 July 1999. 1.3.6. Tagged and rolled on Mar. 22. Released and announced on 24th. 1.3.5: Not released. @@ -20,7 +22,7 @@ Platform Avail. Volunteer -- alpha-dec-osf3.0 no Sameer Parekh - alpha-dec-osf4.0 yes Lars Eilebrecht + alpha-dec-osf4.0 yes Lars Eilebrecht, Ken Coar armv4l-whatever-linux2yes Rasmus Lerdorf hppa1.1-hp-hpux no Rob Hartill i386-slackware-linux(a.out) no Sameer Parekh @@ -34,9 +36,10 @@ i686-pc-freebsd3.1no Ralf S. Engelschall i586-unknown-linux2 yes Ralf S. Engelschall, Lars Eilebrecht i686-unknown-linux2 yes Lars Eilebrecht + i686-whatever-linux2 yes Ken Coar i386-unknown-linux(ELF) no Aram Mirzadeh, Michael Douglass i386-unknown-netBSD-1.2.1 N/A Lars Eilebrecht - i386-unknown-netBSD-1.3.2 yes Lars Eilebrecht + i386-unknown-netBSD-1.3.2 yes Lars Eilebrecht i386-unknown-sco3 no Ben Laurie i386-unknown-sco5 no Ben Laurie i386-sni-svr4 yes Martin Kraemer @@ -105,33 +108,8 @@ Status: Jim +1, Mark +1, Dean +1, BenH +1, Randy +1 (please choose name other than hook) Doug +1 on concept (untested), Lars +1 on concept, - Martin +1 (untested), - - Ken: -1 for pre-2.0 if it will: a) force a new release of - mod_perl or mod_php in order to maintain compatibility OR - b) require a version bump to 1.4.0 and a beta cycle -Ralf: It doesn't force a new release of any module (just a -recompilation), because it's a pure _ADDITION_ to the API and -doesn't make anything incompatible. The point b) I still do -not sunderstand, sorry. - -* H now we've to solve another problem for the EAPI -* idea: the existance of KEAPI. That's not my problem any -* longer. Others have to make decisions now. Additionally the -* group as a whole is far away from a point where it's clear -* what should be done in the future and also far away from -* the point where it's fun. -* -* So I finally withdraw my proposed addition of EAPI for -* 1.3.7/1.4.0 and for 2.0 I've still no strong opinion how it -* should be done. I'll try to stay out of all this and keep -* being happy to have EAPI myself and don't have to worry -* about all those useless politics and endless ping-pong -* decisions. -* -* IMHO the ASF should really quickly propose the -* revitalization of RST's old ENOTOWN symbolic errno value -* for use by its developers... -- RSE + Martin +1 (untested), Ken -1 for 1.3.7 (too controversial, + esp. w/KEAPI offered as well) * Brian Havard's patch to remove dependency of mod_auth_dbm on mod_auth. (PR#2598)
cvs commit: apache-1.3/htdocs/manual/misc FAQ-E.html
coar99/07/04 09:33:00 Modified:htdocs/manual/misc FAQ-E.html Log: P/P can't contain a OL/OL pair. Revision ChangesPath 1.4 +6 -4 apache-1.3/htdocs/manual/misc/FAQ-E.html Index: FAQ-E.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/FAQ-E.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- FAQ-E.html1999/07/04 01:51:16 1.3 +++ FAQ-E.html1999/07/04 16:33:00 1.4 @@ -31,7 +31,7 @@ !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P - $Revision: 1.3 $ ($Date: 1999/07/04 01:51:16 $) + $Revision: 1.4 $ ($Date: 1999/07/04 16:33:00 $) /P P The latest version of this FAQ is always available from the main @@ -567,13 +567,15 @@ whenever I try to access a particular directory?/STRONG/A P This message is generally caused because either + /P UL LIThe underlying file system permissions do not allow the -User/Group under which Apache is running to access the necessary -files; or + User/Group under which Apache is running to access the necessary + files; or LIThe Apache configuration has some access restrictions in -place which forbid access to the files. + place which forbid access to the files. /UL + P You can determine which case applies to your situation by checking the error log. /P
cvs commit: apache-1.3/htdocs/manual/misc FAQ-A.html FAQ-B.html FAQ-C.html FAQ-D.html FAQ-E.html FAQ-F.html FAQ-G.html FAQ-H.html FAQ-I.html FAQ.html
coar99/06/24 08:02:56 Modified:htdocs/manual/misc FAQ.html Added: htdocs/manual/misc FAQ-A.html FAQ-B.html FAQ-C.html FAQ-D.html FAQ-E.html FAQ-F.html FAQ-G.html FAQ-H.html FAQ-I.html Log: Break the FAQ into smaller pieces, stitched together for Web browsing with SSIs but more easily posted on USENET. Revision ChangesPath 1.145 +22 -2397 apache-1.3/htdocs/manual/misc/FAQ.html Index: FAQ.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/FAQ.html,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- FAQ.html 1999/05/27 16:49:26 1.144 +++ FAQ.html 1999/06/24 15:02:53 1.145 @@ -2,6 +2,7 @@ HTML HEAD TITLEApache Server Frequently Asked Questions/TITLE +!--#set var=FAQMASTER value=YES -- /HEAD !-- Background white, links blue (unvisited), navy (visited), red (active) -- BODY @@ -14,7 +15,7 @@ !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P - $Revision: 1.144 $ ($Date: 1999/05/27 16:49:26 $) + $Revision: 1.145 $ ($Date: 1999/06/24 15:02:53 $) /P P The latest version of this FAQ is always available from the main @@ -80,2406 +81,30 @@ !-- - '400 malformed request' on Win32 might mean stale proxy; see -- !-- PR #2300.-- !-- - how do I tell what version of Apache I am running? -- -UL - LISTRONGA. Background/STRONG - OL - LIA HREF=#whatWhat is Apache?/A - /LI - LIA HREF=#whyWhy was Apache created?/A - /LI - LIA HREF=#relateHow does The Apache Group's work relate to -other servers?/A - /LI - LIA HREF=#nameWhy the name quot;Apachequot;?/A - /LI - LIA HREF=#compareOK, so how does Apache compare to other servers?/A - /LI - LIA HREF=#testedHow thoroughly tested is Apache?/A - /LI - LIA HREF=#futureWhat are the future plans for Apache?/A - /LI - LIA HREF=#supportWhom do I contact for support?/A - /LI - LIA HREF=#moreIs there any more information on Apache?/A - /LI - LIA HREF=#whereWhere can I get Apache?/A - /LI - /OL - /LI - LISTRONGB. General Technical Questions/STRONG - OL - LIA HREF=#what2doquot;Why can't I ...? Why won't ... -work?quot; What to do in case of problems/A - /LI - LIA HREF=#compatibleHow compatible is Apache with my existing -NCSA 1.3 setup?/A - /LI - LIA HREF=#year2000Is Apache Year 2000 compliant?/A - /LI - LIA HREF=#submit_patchHow do I submit a patch to the Apache Group?/A - /LI - LIA HREF=#dominationWhy has Apache stolen my favourite site's -Internet address?/A - /LI - LIA HREF=#apspamWhy am I getting spam mail from the Apache site?/A - /LI - LIA HREF=#redistMay I include the Apache software on a CD or other -package I'm distributing?/A - /LI - LIA HREF=#zoomWhat's the best hardware/operating system/... How do -I get the most out of my Apache Web server?/A - /LI - LIA HREF=#regexWhat are regular expressions?/A - /LI - /OL - /LI - LISTRONGC. Building Apache/STRONG - OL - LIA HREF=#bind8.1Why do I get an error about an undefined -reference to quot;SAMP__inet_ntoa/SAMPquot; or other -SAMP__inet_*/SAMP symbols?/A - /LI - LIA HREF=#cantbuildWhy won't Apache compile with my -system's SAMPcc/SAMP?/A - /LI - LIA HREF=#linuxiovecWhy do I get complaints about redefinition -of quot;CODEstruct iovec/CODEquot; when compiling under Linux?/A - /LI - LIA HREF=#broken-gccI'm using gcc and I get some compilation errors, - what is wrong?/A - /LI - LIA HREF=#glibc-cryptI'm using RedHat Linux 5.0, or some other -SAMPglibc/SAMP-based Linux system, and I get errors with the -CODEcrypt/CODE function when I attempt to build Apache 1.2./A - /LI - /OL - /LI - - LISTRONGD. Error Log Messages and Problems Starting Apache/STRONG - OL - LIA HREF=#setgidWhy do I get quot;SAMPsetgid: Invalid -argument/SAMPquot; at startup?/A - /LI - LIA HREF=#nodelayWhy am I getting quot;SAMPhttpd: could not -set socket option TCP_NODELAY/SAMPquot; in my error log?/A - /LI - LIA HREF=#peerresetWhy am I getting quot;SAMPconnection -reset by peer/SAMPquot; in my error log?/A - /LI - LIA HREF=#wheres-the-dumpThe errorlog says Apache dumped core, -but where's the dump file?/A - /LI - LIA HREF=#linux-shmgetWhen I run it under Linux I get quot;shmget: -function not foundquot;, what should I do?/A - /LI - LIA HREF=#nfslockingServer hangs, or fails to start, and/or error log -fills
cvs commit: apache-1.3/htdocs/manual/misc FAQ-I.html
coar99/06/24 08:06:27 Modified:htdocs/manual/misc FAQ-I.html Log: Whoops, missed one LI update.. Revision ChangesPath 1.2 +2 -2 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FAQ-I.html1999/06/24 15:02:52 1.1 +++ FAQ-I.html1999/06/24 15:06:27 1.2 @@ -31,7 +31,7 @@ !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P - $Revision: 1.1 $ ($Date: 1999/06/24 15:02:52 $) + $Revision: 1.2 $ ($Date: 1999/06/24 15:06:27 $) /P P The latest version of this FAQ is always available from the main @@ -66,7 +66,7 @@ OL TYPE=A !--#endif -- !--#if expr=$TOC || $STANDALONE -- - LISTRONGI. Features/STRONG + LI VALUE=9STRONGFeatures/STRONG OL LIA HREF=#proxyDoes or will Apache act as a Proxy server?/A /LI
cvs commit: apache-1.3/htdocs/manual/mod mod_vhost_alias.html
coar99/06/23 11:24:04 Modified:src CHANGES htdocs/manual/mod mod_vhost_alias.html Log: Fix some docco. Submitted by: Tony Finch [EMAIL PROTECTED] Reviewed by: Ken Coar Revision ChangesPath 1.1385+1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1384 retrieving revision 1.1385 diff -u -r1.1384 -r1.1385 --- CHANGES 1999/06/22 21:54:41 1.1384 +++ CHANGES 1999/06/23 18:24:01 1.1385 @@ -4,7 +4,7 @@ [Randy Terbush [EMAIL PROTECTED]] *) Add the new mass-vhost module (mod_vhost_alias.c) developed and - used by Demon Internet, LTD. [Tony Finch [EMAIL PROTECTED]] + used by Demon Internet, Ltd. [Tony Finch [EMAIL PROTECTED]] *) Better GCC detection for DSO flags under Solaris 2 where the `cc' command potentially _is_ GCC. [Ralf S. Engelschall] 1.2 +1 -1 apache-1.3/htdocs/manual/mod/mod_vhost_alias.html Index: mod_vhost_alias.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_vhost_alias.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_vhost_alias.html 1999/06/22 00:51:24 1.1 +++ mod_vhost_alias.html 1999/06/23 18:24:03 1.2 @@ -110,7 +110,7 @@ A more even spread of files can be acheived by hashing from the end of the name, for example: PRE - VirtualDocumentRoot /u/%3+/%2.-1/%2.-2/%2.-3/%2 + VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.-1/%2.-2/%2.-3/%2 /PRE The example request would come from CODE/usr/local/apache/vhosts/isp.com/e/l/p/example/directory/file.html/CODE.
cvs commit: apache-1.3/src/modules/standard mod_vhost_alias.c
coar99/06/22 08:33:20 Modified:src Configuration.tmpl src/main http_core.c src/modules/standard mod_vhost_alias.c Log: Jim beat me to the server_rec and ap_mmn fixes, so what's left here is just some cleanup from the new module addition; be consistent and stylish. Oh, and fix the location in the Configuration.tmpl file. Revision ChangesPath 1.117 +1 -1 apache-1.3/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /home/cvs/apache-1.3/src/Configuration.tmpl,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- Configuration.tmpl1999/06/22 00:51:27 1.116 +++ Configuration.tmpl1999/06/22 15:33:10 1.117 @@ -219,7 +219,7 @@ ## based on the host header or local IP address of the request. ## See ../htdocs/manual/vhosts/mass.html. -# AddModule modules/extra/mod_vhost_alias.o +# AddModule modules/standard/mod_vhost_alias.o ## ## Config manipulation modules 1.266 +10 -7 apache-1.3/src/main/http_core.c Index: http_core.c === RCS file: /home/cvs/apache-1.3/src/main/http_core.c,v retrieving revision 1.265 retrieving revision 1.266 diff -u -r1.265 -r1.266 --- http_core.c 1999/06/22 00:51:30 1.265 +++ http_core.c 1999/06/22 15:33:14 1.266 @@ -696,11 +696,14 @@ struct in_addr *iaddr; struct hostent *hptr; int old_stat; - old_stat = ap_update_child_status(conn-child_num, SERVER_BUSY_DNS, r); + old_stat = ap_update_child_status(conn-child_num, + SERVER_BUSY_DNS, r); iaddr = (conn-local_addr.sin_addr); - hptr = gethostbyaddr((char *)iaddr, sizeof(struct in_addr), AF_INET); + hptr = gethostbyaddr((char *)iaddr, sizeof(struct in_addr), + AF_INET); if (hptr != NULL) { - conn-local_host = ap_pstrdup(conn-pool, (void *)hptr-h_name); + conn-local_host = ap_pstrdup(conn-pool, + (void *)hptr-h_name); ap_str_tolower(conn-local_host); } else { @@ -724,7 +727,7 @@ port = r-server-port ? r-server-port : ap_default_port(r); if (d-use_canonical_name == USE_CANONICAL_NAME_OFF - || d-use_canonical_name == USE_CANONICAL_NAME_DNS) { + || d-use_canonical_name == USE_CANONICAL_NAME_DNS) { return r-hostname ? ntohs(r-connection-local_addr.sin_port) : port; } @@ -2144,13 +2147,13 @@ return err; } -if (!strcasecmp(arg, on)) { +if (strcasecmp(arg, on) == 0) { d-use_canonical_name = USE_CANONICAL_NAME_ON; } -else if (!strcasecmp(arg, off)) { +else if (strcasecmp(arg, off) == 0) { d-use_canonical_name = USE_CANONICAL_NAME_OFF; } -else if (!strcasecmp(arg, dns)) { +else if (strcasecmp(arg, dns) == 0) { d-use_canonical_name = USE_CANONICAL_NAME_DNS; } else { 1.2 +116 -75 apache-1.3/src/modules/standard/mod_vhost_alias.c Index: mod_vhost_alias.c === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_vhost_alias.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_vhost_alias.c 1999/06/22 00:51:38 1.1 +++ mod_vhost_alias.c 1999/06/22 15:33:17 1.2 @@ -82,26 +82,30 @@ module MODULE_VAR_EXPORT vhost_alias_module; -/* basic configuration things */ +/* + * basic configuration things + * we abbreviate mod_vhost_alias to mva for shorter names + */ typedef enum { VHOST_ALIAS_UNSET, VHOST_ALIAS_NONE, VHOST_ALIAS_NAME, VHOST_ALIAS_IP -} vhost_alias_mode; +} mva_mode_e; -typedef struct vhost_alias_server_conf { +/* + * Per-server module config record. + */ +typedef struct mva_sconf_t { char *doc_root; char *cgi_root; -vhost_alias_mode doc_root_mode; -vhost_alias_mode cgi_root_mode; -} vhost_alias_server_conf; - +mva_mode_e doc_root_mode; +mva_mode_e cgi_root_mode; +} mva_sconf_t; -static void *vhost_alias_create_config(pool *p, server_rec *s) +static void *mva_create_server_config(pool *p, server_rec *s) { -vhost_alias_server_conf *conf = - (vhost_alias_server_conf *) - ap_pcalloc(p, sizeof(vhost_alias_server_conf)); +mva_sconf_t *conf; +conf = (mva_sconf_t *) ap_pcalloc(p, sizeof(mva_sconf_t)); conf-doc_root = NULL; conf-cgi_root = NULL; conf-doc_root_mode = VHOST_ALIAS_UNSET; @@ -109,13
cvs commit: apache-1.3/htdocs/manual/mod mod_headers.html
coar99/06/22 14:17:37 Modified:htdocs/manual/mod mod_headers.html Log: 'Header Unset' really unsets all values for the field, not just the first. Submitted by: Robin Langford [EMAIL PROTECTED] Reviewed by: Ken Coar Revision ChangesPath 1.10 +1 -1 apache-1.3/htdocs/manual/mod/mod_headers.html Index: mod_headers.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_headers.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mod_headers.html 1998/05/20 14:12:56 1.9 +++ mod_headers.html 1999/06/22 21:17:35 1.10 @@ -75,7 +75,7 @@ LISTRONGunset/STRONGBR The response header of this name is removed, if it exists. If there are - multiple headers of the same name, only the first one set will be removed. + multiple headers of the same name, all will be removed. /UL This argument is followed by a header name, which can include the
cvs commit: apache-1.3 STATUS
coar99/06/21 14:41:45 Modified:.STATUS Log: Vote clarification. Revision ChangesPath 1.718 +4 -3 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.717 retrieving revision 1.718 diff -u -r1.717 -r1.718 --- STATUS1999/06/14 19:29:09 1.717 +++ STATUS1999/06/21 21:41:37 1.718 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/06/14 19:29:09 $] + Last modified at [$Date: 1999/06/21 21:41:37 $] Release: @@ -106,8 +106,9 @@ Randy +1 (please choose name other than hook) Doug +1 on concept (untested), Lars +1 on concept, Martin +1 (untested), - Ken -1 for pre-2.0 if it will force a new release of - mod_perl or mod_php in order to maintain compatibility + Ken -1 for pre-2.0 if it will: a) force a new release of + mod_perl or mod_php in order to maintain compatibility OR + b) require a version bump to 1.4.0 and a beta cycle * Tony Finch's patch to support mass virtual hosting Message-ID: [EMAIL PROTECTED]
cvs commit: apache-1.3/src/main util.c
coar99/06/17 15:58:17 Modified:src/main util.c Log: Cosmetic; style fix and a nit: I object to the implicit assumption that NULL == 0, regardless of its validity. Revision ChangesPath 1.165 +3 -2 apache-1.3/src/main/util.c Index: util.c === RCS file: /home/cvs/apache-1.3/src/main/util.c,v retrieving revision 1.164 retrieving revision 1.165 diff -u -r1.164 -r1.165 --- util.c1999/06/17 06:03:20 1.164 +++ util.c1999/06/17 22:58:16 1.165 @@ -128,9 +128,10 @@ const char *semi; semi = strchr(intype, ';'); -if (!semi) { +if (semi == NULL) { return ap_pstrdup(p, intype); -} else { +} +else { while ((semi intype) ap_isspace(semi[-1])) { semi--; }
cvs commit: apache-apr/apr/lib Makefile.in
coar99/06/10 09:55:59 Modified:apr configure.in apr/lib Makefile.in Log: Initial skeletal get-configure-to-run-on-FreeBSD patch. Revision ChangesPath 1.18 +9 -0 apache-apr/apr/configure.in Index: configure.in === RCS file: /home/cvs/apache-apr/apr/configure.in,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- configure.in 1999/06/06 08:57:55 1.17 +++ configure.in 1999/06/10 16:55:57 1.18 @@ -12,6 +12,8 @@ dnl Checks for programs. AC_PROG_CC AC_PROG_RANLIB +AC_CHECK_PROG(RM, rm, rm) +AC_CHECK_PROG(AR, ar, ar) AC_CHECK_PROGS(SH, /bin/sh sh) dnl Checks for libraries. @@ -71,6 +73,11 @@ OSDIR=unix fi +if (test $SYS_SW = FreeBSD); then +PLATFORM=-DFreeBSD +OSDIR=unix +fi + if (test $SYS_SW = OS/2); then PLATFORM=-DOS2 OSDIR=os2 @@ -155,6 +162,8 @@ AC_SUBST(LDLIBS) AC_SUBST(OPTIM) AC_SUBST(RANLIB) +AC_SUBST(AR) +AC_SUBST(RM) AC_SUBST(PLATFORM) AC_SUBST(OSDIR) AC_SUBST(LIBPREFIX) 1.10 +2 -0 apache-apr/apr/lib/Makefile.in Index: Makefile.in === RCS file: /home/cvs/apache-apr/apr/lib/Makefile.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile.in 1999/06/06 08:57:57 1.9 +++ Makefile.in 1999/06/10 16:55:58 1.10 @@ -5,6 +5,8 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS)
cvs commit: apache-1.3 STATUS
coar99/06/09 11:23:39 Modified:.STATUS Log: Some updates to the status of various patches, and a note about the IE issue of replacing too-short error pages (even if CustomError generated) with its own pablum. Revision ChangesPath 1.712 +29 -22apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.711 retrieving revision 1.712 diff -u -r1.711 -r1.712 --- STATUS1999/06/09 11:31:14 1.711 +++ STATUS1999/06/09 18:23:38 1.712 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/06/09 11:31:14 $] + Last modified at [$Date: 1999/06/09 18:23:38 $] Release: @@ -64,7 +64,7 @@ RELEASE SHOWSTOPPERS: -- graham legget has found that if he uses the 1.3.7-dev core, and +- Graham Legget has found that if he uses the 1.3.7-dev core, and the 1.3.6 proxy code (plus a small patch of his) he doesn't get the hangs he was reporting. Something is broken in the 1.3.7-dev proxy. @@ -72,19 +72,19 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: * mod_rewrite/3874: RewriteLock doesn't work for virtual hosts - = When I find time, I can look at this. But I would appreciate - when someone other already can dive into this. My opinion - is already appended to the PR. -rse + Status: (Ralf): When I find time, I can look at this. But + I would appreciate when someone other already can dive into + this. My opinion is already appended to the PR. -rse * The Vary header field stuff is still broken (multiple entries occur, etc.), for instance also in mod_rewrite. - = I've already started to work on this, but I've not - finished it. I've less time... -rse + Status: (Ralf): I've already started to work on this, but + I've not finished it. I've less time... * long pathnames with many components and no AllowOverride None -Workaround is to define Directory / with AllowOverride None, -which is something all sites should do in any case. -Status: Marc was looking at it. + Workaround is to define Directory / with AllowOverride None, + which is something all sites should do in any case. + Status: Marc was looking at it. Documentation that needs writing: @@ -92,7 +92,7 @@ Available Patches: * Stipe Tolj's Cygwin32 port -PR#: 2936 + PR#: 2936 Status: Lars +1 (on concept) * Salvador Ortiz Garcia [EMAIL PROTECTED]' patch to allow DirectoryIndex @@ -102,24 +102,29 @@ * Ralf's [PATCH] to add EAPI (ctx, hook, mm, etc.) to the base package Message-ID: [EMAIL PROTECTED] - Status: Jim +1, Mark +1, Dean +1, BenH +1, Randy +1 (please choose name other than hook) -Doug +1 on concept (untested), Lars +1 on concept + Status: Jim +1, Mark +1, Dean +1, BenH +1, + Randy +1 (please choose name other than hook) +Doug +1 on concept (untested), Lars +1 on concept, + Ken -1 for pre-2.0 if it will force a new release of + mod_perl or mod_php in order to maintain compatibility * Tony Finch's patch to support mass virtual hosting Message-ID: [EMAIL PROTECTED] Message-ID: [EMAIL PROTECTED] Status: Dean +1, Randy +1, Lars +1 (if someone writes the docs) Jim +1 + (On hold until Tony revamps the mass-vhosting docco) * 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) + Status: Lars +1 (on concept), Ken +1 (on concept) * Aidan Cully's patch to allow assignment of 'ownership' of resources to either the server UID or the file's owner. Message-ID: [EMAIL PROTECTED] Status: Ken +1, Dean +1, Randy +1, Lars +0, Jim +1 + (On hold until Aidan submits an update) * Keith Wannamaker's NT multiple services patch Message-ID: [EMAIL PROTECTED] @@ -138,9 +143,9 @@ request, in milli-seconds. Message-ID: PR#2838 Status: Jim +0 (as is, the patch requires rework since it needs - to be aware of NO_GETTIMEOFDAY and NO_TIMES as well as - implement a times() alternative. Not only that, but with - extended_status, we calculate this anyway). + to be aware of NO_GETTIMEOFDAY and NO_TIMES as well as + implement a times() alternative. Not only that, but with + extended_status, we calculate this anyway). * Juan Gallego's patch to add CSH-style modifiers (:h, :r, :t
cvs commit: apache-1.3 STATUS
coar99/06/07 12:42:27 Modified:.STATUS Log: Add a note about the remainder of Tony's patch. Revision ChangesPath 1.709 +2 -1 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.708 retrieving revision 1.709 diff -u -r1.708 -r1.709 --- STATUS1999/06/06 14:20:49 1.708 +++ STATUS1999/06/07 19:42:21 1.709 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/06/06 14:20:49 $] + Last modified at [$Date: 1999/06/07 19:42:21 $] Release: @@ -113,6 +113,7 @@ * Tony Finch's patch to support mass virtual hosting Message-ID: [EMAIL PROTECTED] + Message-ID: [EMAIL PROTECTED] Status: Dean +1, Randy +1, Lars +1 (if someone writes the docs) Jim +1
cvs commit: apache-1.3 STATUS
coar99/06/05 05:08:46 Modified:.STATUS Log: Note the availability of a couple more patches.. Revision ChangesPath 1.702 +11 -1 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.701 retrieving revision 1.702 diff -u -r1.701 -r1.702 --- STATUS1999/06/04 18:30:07 1.701 +++ STATUS1999/06/05 12:08:45 1.702 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/06/04 18:30:07 $] + Last modified at [$Date: 1999/06/05 12:08:45 $] Release: @@ -96,6 +96,16 @@ Available Patches: + +* Salvador Ortiz Garcia [EMAIL PROTECTED]' patch to allow DirectoryIndex + to refer to URIs for non-static resources. + Message-ID: [EMAIL PROTECTED] + Status: Ken +1 (on concept) + +* Eli Marmor [EMAIL PROTECTED]'s patch to include apxs in ./configure's + and binbuild.sh's filesystem path editing. + Message-ID: PR#4526 + Status: * Ralf's [PATCH] to add EAPI (ctx, hook, mm, etc.) to the base package Message-ID: [EMAIL PROTECTED]
cvs commit: apache-1.3/src/modules/test mod_test_util_uri.c
coar99/06/05 08:48:14 Modified:src/include httpd.h src/main http_protocol.c src/modules/example mod_example.c src/modules/proxy proxy_ftp.c src/modules/standard mod_autoindex.c mod_imap.c mod_info.c mod_status.c src/modules/test mod_test_util_uri.c Log: Normalise the !DOCTYPE tags, and make sure we emit the right one when we're doing 3.2+ things (like FONT). Revision ChangesPath 1.281 +17 -0 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.280 retrieving revision 1.281 diff -u -r1.280 -r1.281 --- httpd.h 1999/06/04 18:30:24 1.280 +++ httpd.h 1999/06/05 15:48:08 1.281 @@ -574,6 +574,23 @@ #define DIR_MAGIC_TYPE httpd/unix-directory #define STATUS_MAGIC_TYPE application/x-httpd-status +/* + * Define the HTML doctype strings centrally. + */ +#define DOCTYPE_HTML_2_0 !DOCTYPE HTML PUBLIC \-//IETF// \ + DTD HTML 2.0//EN\\n +#define DOCTYPE_HTML_3_2 !DOCTYPE HTML PUBLIC \-//W3C// \ + DTD HTML 3.2 Final//EN\\n +#define DOCTYPE_HTML_4_0S !DOCTYPE HTML PUBLIC \-//W3C// \ + DTD HTML 4.0//EN\\n \ + \http://www.w3.org/TR/REC-html40/strict.dtd\;\n +#define DOCTYPE_HTML_4_0T !DOCTYPE HTML PUBLIC \-//W3C// \ + DTD HTML 4.0 Transitional//EN\\n \ + \http://www.w3.org/TR/REC-html40/loose.dtd\;\n +#define DOCTYPE_HTML_4_0F !DOCTYPE HTML PUBLIC \-//W3C// \ + DTD HTML 4.0 Frameset//EN\\n \ + \http://www.w3.org/TR/REC-html40/frameset.dtd\;\n + /* Just in case your linefeed isn't the one the other end is expecting. */ #ifndef CHARSET_EBCDIC #define LF 10 1.270 +1 -1 apache-1.3/src/main/http_protocol.c Index: http_protocol.c === RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v retrieving revision 1.269 retrieving revision 1.270 diff -u -r1.269 -r1.270 --- http_protocol.c 1999/06/02 20:11:19 1.269 +++ http_protocol.c 1999/06/05 15:48:09 1.270 @@ -2453,7 +2453,7 @@ h1 = title[4]; ap_rvputs(r, - !DOCTYPE HTML PUBLIC \-//IETF//DTD HTML 2.0//EN\\n + DOCTYPE_HTML_2_0 HTMLHEAD\nTITLE, title, /TITLE\n/HEADBODY\nH1, h1, /H1\n, NULL); 1.34 +1 -1 apache-1.3/src/modules/example/mod_example.c Index: mod_example.c === RCS file: /home/cvs/apache-1.3/src/modules/example/mod_example.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- mod_example.c 1999/01/01 19:05:00 1.33 +++ mod_example.c 1999/06/05 15:48:10 1.34 @@ -525,7 +525,7 @@ * Now send our actual output. Since we tagged this as being * text/html, we need to embed any HTML. */ -ap_rputs(!DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 3.2//EN\\n, r); +ap_rputs(DOCTYPE_HTML_3_2, r); ap_rputs(HTML\n, r); ap_rputs( HEAD\n, r); ap_rputs( TITLEmod_example Module Content-Handler Output\n, r); 1.76 +1 -1 apache-1.3/src/modules/proxy/proxy_ftp.c Index: proxy_ftp.c === RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_ftp.c,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- proxy_ftp.c 1999/05/01 17:02:28 1.75 +++ proxy_ftp.c 1999/06/05 15:48:11 1.76 @@ -291,7 +291,7 @@ path[n-1] = '\0'; /* print ftp://host/; */ -n = ap_snprintf(buf, sizeof(buf), !DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 3.2 Final//EN\\n +n = ap_snprintf(buf, sizeof(buf), DOCTYPE_HTML_3_2 HTMLHEADTITLE%s%s/TITLE\n BASE HREF=\%s%s\/HEAD\n BODYH2Directory of 1.110 +1 -1 apache-1.3/src/modules/standard/mod_autoindex.c Index: mod_autoindex.c === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- mod_autoindex.c 1999/06/04 18:30:35 1.109 +++ mod_autoindex.c 1999/06/05 15:48:12 1.110 @@ -192,7 +192,7 @@ */ static void emit_preamble(request_rec *r, char *title) { -ap_rvputs(r, !DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 3.2 Final//EN\\n, +ap_rvputs(r
cvs commit: apache-1.2/htdocs/manual/misc FAQ.html
coar99/06/05 09:06:39 Modified:htdocs/manual/misc FAQ.html Log: Fix a broken link in the 1.2 docco. Submitted by: Christian Ottosson [EMAIL PROTECTED] Revision ChangesPath 1.66 +2 -2 apache-1.2/htdocs/manual/misc/FAQ.html Index: FAQ.html === RCS file: /export/home/cvs/apache-1.2/htdocs/manual/misc/FAQ.html,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- FAQ.html 1998/02/18 21:11:03 1.65 +++ FAQ.html 1999/06/05 16:06:38 1.66 @@ -15,7 +15,7 @@ !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P - $Revision: 1.65 $ ($Date: 1998/02/18 21:11:03 $) + $Revision: 1.66 $ ($Date: 1999/06/05 16:06:38 $) /P P The latest version of this FAQ is always available from the main @@ -1107,7 +1107,7 @@ and SSI to simplify customized error messages?/STRONG /A P - Have a look at A HREF=custom_errordocs.htmlthis document/A. + Have a look at A HREF=../custom-error.htmlthis document/A. It shows in example form how you can a combination of XSSI and negotiation to tailor a set of CODEErrorDocument/CODEs to your personal taste, and returning different internationalized error
cvs commit: apache-1.3/src/support htdigest.dsp htdigest.mak htdigest.c htpasswd.dsp htpasswd.mak
coar99/06/05 12:10:08 Modified:src Makefile.nt Makefile_win32.txt Makefile_win32_debug.txt src/support htdigest.c htpasswd.dsp htpasswd.mak Added: src/support htdigest.dsp htdigest.mak Log: Bring htdigest along to Windows compilability. Maybe not entirely there yet, but it wasn't there at all before.. Submitted by: Keith Wannamaker [EMAIL PROTECTED] Reviewed by: Ken Coar Revision ChangesPath 1.32 +3 -0 apache-1.3/src/Makefile.nt Index: Makefile.nt === RCS file: /home/cvs/apache-1.3/src/Makefile.nt,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- Makefile.nt 1999/03/19 17:01:23 1.31 +++ Makefile.nt 1999/06/05 19:10:01 1.32 @@ -57,6 +57,7 @@ cd .. cd support nmake /nologo CFG=htpasswd - Win32 %LONG% -f htpasswd.mak + nmake /nologo CFG=htdigest - Win32 %LONG% -f htdigest.mak cd .. cd main nmake /nologo CFG=gen_uri_delims - Win32 %LONG% -f gen_uri_delims.mak @@ -102,6 +103,7 @@ copy os\win32\ApacheModuleUserTrack%SHORT%\ApacheModuleUserTrack.dll $(INSTDIR)\modules copy modules\proxy\%LONG%\ApacheModuleProxy.dll $(INSTDIR)\modules copy support\%LONG%\htpasswd.exe $(INSTDIR)\bin + copy support\%LONG%\htdigest.exe $(INSTDIR)\bin _clean: cd os\win32 @@ -115,6 +117,7 @@ cd .. cd support nmake /nologo CFG=htpasswd - Win32 %LONG% -f htpasswd.mak clean + nmake /nologo CFG=htdigest - Win32 %LONG% -f htdigest.mak clean cd .. cd main nmake /nologo CFG=gen_uri_delims - Win32 %LONG% -f gen_uri_delims.mak clean 1.4 +3 -0 apache-1.3/src/Makefile_win32.txt Index: Makefile_win32.txt === RCS file: /home/cvs/apache-1.3/src/Makefile_win32.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile_win32.txt1999/03/19 17:01:23 1.3 +++ Makefile_win32.txt1999/06/05 19:10:02 1.4 @@ -35,6 +35,7 @@ cd .. cd support nmake /nologo CFG=htpasswd - Win32 Release -f htpasswd.mak + nmake /nologo CFG=htdigest - Win32 Release -f htdigest.mak cd .. cd main nmake /nologo CFG=gen_uri_delims - Win32 Release -f gen_uri_delims.mak @@ -80,6 +81,7 @@ copy os\win32\ApacheModuleUserTrackR\ApacheModuleUserTrack.dll $(INSTDIR)\modules copy modules\proxy\Release\ApacheModuleProxy.dll $(INSTDIR)\modules copy support\Release\htpasswd.exe $(INSTDIR)\bin + copy support\Release\htdigest.exe $(INSTDIR)\bin clean: cd os\win32 @@ -93,6 +95,7 @@ cd .. cd support nmake /nologo CFG=htpasswd - Win32 Release -f htpasswd.mak clean + nmake /nologo CFG=htdigest - Win32 Release -f htdigest.mak clean cd .. cd main nmake /nologo CFG=gen_uri_delims - Win32 Release -f gen_uri_delims.mak clean 1.4 +3 -0 apache-1.3/src/Makefile_win32_debug.txt Index: Makefile_win32_debug.txt === RCS file: /home/cvs/apache-1.3/src/Makefile_win32_debug.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile_win32_debug.txt 1999/03/19 17:01:23 1.3 +++ Makefile_win32_debug.txt 1999/06/05 19:10:02 1.4 @@ -35,6 +35,7 @@ cd .. cd support nmake /nologo CFG=htpasswd - Win32 Debug -f htpasswd.mak + nmake /nologo CFG=htdigest - Win32 Debug -f htdigest.mak cd .. cd main nmake /nologo CFG=gen_uri_delims - Win32 Debug -f gen_uri_delims.mak @@ -80,6 +81,7 @@ copy os\win32\ApacheModuleUserTrackD\ApacheModuleUserTrack.dll $(INSTDIR)\modules copy modules\proxy\Debug\ApacheModuleProxy.dll $(INSTDIR)\modules copy support\Debug\htpasswd.exe $(INSTDIR)\bin + copy support\Debug\htdigest.exe $(INSTDIR)\bin clean: cd os\win32 @@ -93,6 +95,7 @@ cd .. cd support nmake /nologo CFG=htpasswd - Win32 Debug -f htpasswd.mak clean + nmake /nologo CFG=htdigest - Win32 Debug -f htdigest.mak clean cd .. cd main nmake /nologo CFG=gen_uri_delims - Win32 Debug -f gen_uri_delims.mak clean 1.24 +9 -4 apache-1.3/src/support/htdigest.c Index: htdigest.c === RCS file: /home/cvs/apache-1.3/src/support/htdigest.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- htdigest.c1999/05/31 19:44:30 1.23 +++ htdigest.c1999/06/05 19:10:05 1.24 @@ -68,13 +68,18
cvs commit: apache-1.3/src/support log_server_status
coar99/06/04 08:54:20 Modified:src/support log_server_status Log: {Sigh} %Y isn't universally accepted, so hack around it with %y and some Y2K math. Revision ChangesPath 1.12 +5 -2 apache-1.3/src/support/log_server_status Index: log_server_status === RCS file: /home/cvs/apache-1.3/src/support/log_server_status,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- log_server_status 1999/06/03 17:38:24 1.11 +++ log_server_status 1999/06/04 15:54:19 1.12 @@ -93,8 +93,11 @@ ### Main { - $date=`date +%Y%m%d:%H%M%S`; - chop($date); +$year=`date +%y`; + chomp($year); + $year += ($year 70) ? 2000 : 1900; + $date = $year . `date +%m%d:%H%M%S`; + chomp($date); ($day,$time)=split(/:/,$date); $res=tcp_connect($server,$port); open(OUT,$wherelog$day);
cvs commit: apache-1.3 STATUS
coar99/06/04 09:01:51 Modified:.STATUS Log: Update the patch list. Revision ChangesPath 1.696 +9 -1 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.695 retrieving revision 1.696 diff -u -r1.695 -r1.696 --- STATUS1999/06/04 15:17:48 1.695 +++ STATUS1999/06/04 16:01:47 1.696 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/06/04 15:17:48 $] + Last modified at [$Date: 1999/06/04 16:01:47 $] Release: @@ -92,6 +92,14 @@ Available Patches: + +* Ralf's [PATCH] to add EAPI to the base package + Message-ID: [EMAIL PROTECTED] + Status: Jim +1, Mark +1, Dean -0, BenH +1 + +* Ralf's [PATCH] to add MM (shared memory API) to the base package + Message-ID: [EMAIL PROTECTED] + Status: * Tony Finch's patch to support mass virtual hosting Message-ID: [EMAIL PROTECTED]
cvs commit: apache-1.3/src/modules/standard mod_autoindex.c
coar99/06/04 11:30:37 Modified:.STATUS src CHANGES src/include ap_mmn.h httpd.h src/main util.c src/modules/standard mod_autoindex.c Log: mod_autoindex was only checking for exact matches of text/html for ScanHTMLTitles, which meant that text/html;charset=foo documents wouldn't be scanned. As a side effect of this patch, add ap_field_noparam(), which returns the unparameterised value for any HTTP field that can use '*( ; parameter)'. PR: 4524 Revision ChangesPath 1.701 +1 -7 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.700 retrieving revision 1.701 diff -u -r1.700 -r1.701 --- STATUS1999/06/04 17:40:04 1.700 +++ STATUS1999/06/04 18:30:07 1.701 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/06/04 17:40:04 $] + Last modified at [$Date: 1999/06/04 18:30:07 $] Release: @@ -105,12 +105,6 @@ * Tony Finch's patch to support mass virtual hosting Message-ID: [EMAIL PROTECTED] Status: Dean +1 - -* Ken's patch to work around exact matches of content-types (PR#4524) - (Long-term fix should involve breaking this [and other fields with - parameters] into pieces.) - Message-ID: [EMAIL PROTECTED] - Status: Ken +1 * Brian Havard's patch to remove dependency of mod_auth_dbm on mod_auth. (PR#2598) 1.1370+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1369 retrieving revision 1.1370 diff -u -r1.1369 -r1.1370 --- CHANGES 1999/06/04 17:15:49 1.1369 +++ CHANGES 1999/06/04 18:30:16 1.1370 @@ -1,5 +1,8 @@ Changes with Apache 1.3.7 + *) Fix mod_autoindex's handling of ScanHTMLTitles when file + content-types are text/html;parameters. PR#4524 [Ken Coar] + *) Remove mxb support from mod_negotiation -- it was a draft feature never accepted into any standard, and it opens up certain DoS attacks. [Koen Holtman [EMAIL PROTECTED]] 1.37 +2 -1 apache-1.3/src/include/ap_mmn.h Index: ap_mmn.h === RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- ap_mmn.h 1999/05/21 15:38:49 1.36 +++ ap_mmn.h 1999/06/04 18:30:22 1.37 @@ -218,6 +218,7 @@ * 19990320.2 - add cmd_parms.context, ap_set_config_vectors, *export ap_add_file_conf * 19990320.3 - add ap_regexec() + * 19990604.4 - add ap_field_noparam() */ #define MODULE_MAGIC_COOKIE 0x41503133UL /* AP13 */ @@ -225,7 +226,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 19990320 #endif -#define MODULE_MAGIC_NUMBER_MINOR 3 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 4 /* 0...n */ #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward compat */ /* Useful for testing for features. */ 1.280 +1 -0 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.279 retrieving revision 1.280 diff -u -r1.279 -r1.280 --- httpd.h 1999/06/02 07:08:18 1.279 +++ httpd.h 1999/06/04 18:30:24 1.280 @@ -920,6 +920,7 @@ API_EXPORT(struct tm *) ap_get_gmtoff(int *tz); API_EXPORT(char *) ap_get_time(void); +API_EXPORT(char *) ap_field_noparam(pool *p, const char *intype); API_EXPORT(char *) ap_ht_time(pool *p, time_t t, const char *fmt, int gmt); API_EXPORT(char *) ap_gm_timestr_822(pool *p, time_t t); 1.163 +17 -0 apache-1.3/src/main/util.c Index: util.c === RCS file: /home/cvs/apache-1.3/src/main/util.c,v retrieving revision 1.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- util.c1999/05/25 15:24:01 1.162 +++ util.c1999/06/04 18:30:31 1.163 @@ -119,6 +119,23 @@ return (time_string); } +/* + * Examine a field value (such as a media-/content-type) string and return + * it sans any parameters; e.g., strip off any ';charset=foo' and the like. + */ +API_EXPORT(char *) ap_field_noparam(pool *p, const char *intype) +{ +const char *semi; + +semi = strchr(intype, ';'); +if (semi != NULL) { + while ((semi intype) ap_isspace(semi
cvs commit: apache-1.3/src/modules/standard mod_setenvif.c
coar99/06/04 11:40:01 Modified:src CHANGES htdocs/manual/mod mod_setenvif.html src/modules/standard mod_setenvif.c Log: A minor enhancement to SetEnvIf*: allow it to test envariables as well as request attributes. Revision ChangesPath 1.1371+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1370 retrieving revision 1.1371 diff -u -r1.1370 -r1.1371 --- CHANGES 1999/06/04 18:30:16 1.1370 +++ CHANGES 1999/06/04 18:39:57 1.1371 @@ -1,5 +1,8 @@ Changes with Apache 1.3.7 + *) Allow SetEnvIf[NoCase] to test environment variables as well + as header fields and request attributes. [Ken Coar] + *) Fix mod_autoindex's handling of ScanHTMLTitles when file content-types are text/html;parameters. PR#4524 [Ken Coar] 1.7 +24 -4 apache-1.3/htdocs/manual/mod/mod_setenvif.html Index: mod_setenvif.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_setenvif.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mod_setenvif.html 1999/05/19 13:26:06 1.6 +++ mod_setenvif.html 1999/06/04 18:40:00 1.7 @@ -261,7 +261,8 @@ HREF=directive-dict.html#Compatibility REL=Help STRONGCompatibility:/STRONG/A Apache 1.3 and above; the - Request_Protocol keyword is only available with 1.3.7 and later + Request_Protocol keyword and environment-variable matching are only + available with 1.3.7 and later /P P The SAMPSetEnvIf/SAMP directive defines environment variables @@ -299,15 +300,34 @@ SAMPHost/SAMP, SAMPUser-Agent/SAMP, and SAMPReferer/SAMP. /P P + If the EMattribute/EM name doesn't match any of the special keywords, + nor any of the request's header field names, it is tested as the name + of an environment variable in the list of those associated with the request. + This allows CODESetEnvIf/CODE directives to test against the result + of prior matches. + /P + BLOCKQUOTE + STRONGOnly those environment variables defined by earlier + CODESetEnvIf[NoCase]/CODE directives are available for testing in + this manner. 'Earlier' means that they were defined at a broader scope + (such as server-wide) or previously in the current directive's + scope./STRONG + /BLOCKQUOTE + P Example: /P PRE - SetEnvIf Request_URI \.(gif)|(jpg)|(xbm)$ object_is_image + SetEnvIf Request_URI \.gif$ object_is_image=gif + SetEnvIf Request_URI \.jpg$ object_is_image=jpg + SetEnvIf Request_URI \.xbm$ object_is_image=xbm +: SetEnvIf Referer www\.mydomain\.com intra_site_referral +: + SetEnvIf object_is_image xbm XBIT_PROCESSING=1 /PRE P - The first will set the envariable SAMPobject_is_image/SAMP if the - request was for an image file, and the second sets + The first three will set the envariable SAMPobject_is_image/SAMP if the + request was for an image file, and the fourth sets SAMPintra_site_referral/SAMP if the referring page was somewhere on the SAMPwww.mydomain.com/SAMP Web site. /P 1.29 +3 -0 apache-1.3/src/modules/standard/mod_setenvif.c Index: mod_setenvif.c === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_setenvif.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- mod_setenvif.c1999/05/21 12:16:24 1.28 +++ mod_setenvif.c1999/06/04 18:40:00 1.29 @@ -364,6 +364,9 @@ break; case SPECIAL_NOT: val = ap_table_get(r-headers_in, b-name); + if (val == NULL) { + val = ap_table_get(r-subprocess_env, b-name); + } break; } }
cvs commit: apache-1.3/src/support log_server_status
coar99/06/03 10:38:25 Modified:src/support log_server_status Log: Change to use four digits for the year. PR: 4523 Submitted by: Simon Burr [EMAIL PROTECTED] Reviewed by: Ken Coar Revision ChangesPath 1.11 +2 -2 apache-1.3/src/support/log_server_status Index: log_server_status === RCS file: /home/cvs/apache-1.3/src/support/log_server_status,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- log_server_status 1999/01/01 19:05:34 1.10 +++ log_server_status 1999/06/03 17:38:24 1.11 @@ -67,7 +67,7 @@ # require 'sys/socket.ph'; -$wherelog = /var/log/graph/; # Logs will be like /var/log/graph/960312 +$wherelog = /var/log/graph/; # Logs will be like /var/log/graph/19960312 $server = localhost; # Name of server, could be www.foo.com $port = 80; # Port on server $request = /status/?auto; # Request to send @@ -93,7 +93,7 @@ ### Main { - $date=`date +%y%m%d:%H%M%S`; + $date=`date +%Y%m%d:%H%M%S`; chop($date); ($day,$time)=split(/:/,$date); $res=tcp_connect($server,$port);
cvs commit: apache-1.3 STATUS
coar99/06/03 15:25:16 Modified:.STATUS Log: Add another patch to the list of those available. Revision ChangesPath 1.694 +7 -1 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.693 retrieving revision 1.694 diff -u -r1.693 -r1.694 --- STATUS1999/06/03 19:31:19 1.693 +++ STATUS1999/06/03 22:25:08 1.694 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/06/03 19:31:19 $] + Last modified at [$Date: 1999/06/03 22:25:08 $] Release: @@ -92,6 +92,12 @@ Available Patches: + +* Ken's patch to work around exact matches of content-types (PR#4524) + (Long-term fix should involve breaking this [and other fields with + parameters] into pieces.) + Message-ID: [EMAIL PROTECTED] + Status: Ken +1 * Brian Havard's patch to remove dependency of mod_auth_dbm on mod_auth. (PR#2598)
cvs commit: apache-1.3/src/main http_protocol.c
coar99/06/02 13:11:20 Modified:src CHANGES src/main http_protocol.c Log: Trap (with an errorlog entry) malformed redirects from modules; i.e., that fail to set a Location field. Revision ChangesPath 1.1366+3 -2 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1365 retrieving revision 1.1366 diff -u -r1.1365 -r1.1366 --- CHANGES 1999/06/02 20:01:50 1.1365 +++ CHANGES 1999/06/02 20:11:16 1.1366 @@ -9,8 +9,9 @@ *) If a Location field was stored in r-err_headers_out rather than r-headers_out, redirect processing wouldn't find it and - the server would core dump on ap_escape_html(NULL). - [Doug MacEachern, Ken Coar] + the server would core dump on ap_escape_html(NULL). Check both + tables and raise HTTP_INTERNAL_SERVER_ERROR with a log message + if Location isn't set. [Doug MacEachern, Ken Coar] *) Add RULE_EXPAT, the src/lib/ directory structure, and a modified copy of the Expat 1.0.2 distribution. [Greg Stein] 1.269 +20 -4 apache-1.3/src/main/http_protocol.c Index: http_protocol.c === RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v retrieving revision 1.268 retrieving revision 1.269 diff -u -r1.268 -r1.269 --- http_protocol.c 1999/05/26 18:28:06 1.268 +++ http_protocol.c 1999/06/02 20:11:19 1.269 @@ -2367,9 +2367,24 @@ r-err_headers_out = tmp; ap_clear_table(r-err_headers_out); -if ((location != NULL) *location - (ap_is_HTTP_REDIRECT(status) || status == HTTP_CREATED)) { -ap_table_setn(r-headers_out, Location, location); +if (ap_is_HTTP_REDIRECT(status) || (status == HTTP_CREATED)) { + if ((location != NULL) *location) { + ap_table_setn(r-headers_out, Location, location); + } + else { + /* + * We're supposed to tell the client to go somewhere, + * but the destination was omitted. Turn this into + * a 500 status with an explanatory note in the error log. + */ + ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r, + resource created or redirection requested + (status=%03d) but no Location field set + (URI=%s), + r-status, r-unparsed_uri); + r-status = status = HTTP_INTERNAL_SERVER_ERROR; + r-status_line = NULL; + } } r-content_language = NULL; @@ -2631,7 +2646,8 @@ (h1 = ap_table_get(r-notes, verbose-error-to)) != NULL (strcmp(h1, *) == 0)) { ap_rvputs(r, error_notes, P\n, NULL); - } else { + } + else { ap_rvputs(r, The server encountered an internal error or\n misconfiguration and was unable to complete\n your request.P\n
cvs commit: apache-1.3/src/include ap.h
coar99/05/31 10:09:32 Modified:src/ap Makefile.tmpl src/include ap.h Added: src/ap ap_getpass.c Log: Prepare for some rework of htpasswd and htdigest by moving a getpass() wrapper/abstraction into libap. Revision ChangesPath 1.32 +5 -2 apache-1.3/src/ap/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-1.3/src/ap/Makefile.tmpl,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- Makefile.tmpl 1999/01/12 15:47:04 1.31 +++ Makefile.tmpl 1999/05/31 17:09:30 1.32 @@ -5,8 +5,8 @@ LIB=libap.a -OBJS=ap_execve.o ap_cpystrn.o ap_signal.o \ - ap_slack.o ap_snprintf.o ap_fnmatch.o ap_md5c.o +OBJS=ap_cpystrn.o ap_execve.o ap_fnmatch.o ap_getpass.o ap_md5c.o ap_signal.o \ + ap_slack.o ap_snprintf.o .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $ @@ -52,6 +52,9 @@ ap_fnmatch.o: ap_fnmatch.c $(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 $(INCDIR)/fnmatch.h +ap_getpass.o: ap_getpass.c $(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 $(INCDIR)/ap.h ap_md5c.o: ap_md5c.c $(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 $(INCDIR)/ap_md5.h \ 1.1 apache-1.3/src/ap/ap_getpass.c Index: ap_getpass.c === /* * Copyright (c) 1995-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 developed by the Apache Group *for use in the Apache HTTP server project (http://www.apache.org/). * * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. * * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Group and was originally based * on public domain software written at the National Center for * Supercomputing Applications, University of Illinois, Urbana-Champaign. * For more information on the Apache Group and the Apache HTTP server * project, please see http://www.apache.org/. * */ /* * ap_getpass.c: abstraction to provide for obtaining a password from the * command line in whatever way the OS supports. In the best case, it's a * wrapper for the system library's getpass() routine; otherwise, we * use one we define ourselves
cvs commit: apache-1.3/src/support htpasswd.c
coar99/05/31 10:10:19 Modified:src/support htpasswd.c Log: Oops. Too much Perl coding at the time, I guess. :-* Revision ChangesPath 1.29 +2 -2 apache-1.3/src/support/htpasswd.c Index: htpasswd.c === RCS file: /home/cvs/apache-1.3/src/support/htpasswd.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- htpasswd.c1999/04/10 15:08:45 1.28 +++ htpasswd.c1999/05/31 17:10:19 1.29 @@ -431,8 +431,8 @@ /* * Make sure we still have exactly the right number of arguments left - # (the filename, the username, and possibly the password if -b was - # specified). + * (the filename, the username, and possibly the password if -b was + * specified). */ if ((argc - i) != args_left) { return usage();
cvs commit: apache-1.3/src/support htdigest.c htpasswd.c
coar99/05/31 12:44:31 Modified:src/support htdigest.c htpasswd.c Log: Use the ap_getpass() wrapper rather than reinventing it. Revision ChangesPath 1.23 +68 -12apache-1.3/src/support/htdigest.c Index: htdigest.c === RCS file: /home/cvs/apache-1.3/src/support/htdigest.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- htdigest.c1999/04/09 12:57:06 1.22 +++ htdigest.c1999/05/31 19:44:30 1.23 @@ -1,3 +1,59 @@ +/* + * Copyright (c) 1995-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 developed by the Apache Group + *for use in the Apache HTTP server project (http://www.apache.org/). + * + * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Group and was originally based + * on public domain software written at the National Center for + * Supercomputing Applications, University of Illinois, Urbana-Champaign. + * For more information on the Apache Group and the Apache HTTP server + * project, please see http://www.apache.org/. + * + */ /** ** * NOTE! This program is not safe as a setuid executable! Do not make it @@ -17,6 +73,7 @@ #else #include sys/signal.h #endif +#include ap.h #include ap_md5.h #ifdef CHARSET_EBCDIC @@ -31,15 +88,6 @@ char *tn; -static char *strd(char *s) -{ -char *d; - -d = (char *) malloc(strlen(s) + 1); -strcpy(d, s); -return (d); -} - static void getword(char *word, char *line, char stop) { int x = 0, y; @@ -89,15 +137,23 @@ AP_MD5_CTX context; unsigned char digest[16]; char string[MAX_STRING_LEN]; +char pwin[MAX_STRING_LEN]; +char pwv[MAX_STRING_LEN]; unsigned int i; -pw = strd((char *) getpass(New password:)); -if (strcmp(pw, (char *) getpass(Re-type new password:))) { +if (ap_getpass(New password: , pwin, sizeof(pwin)) != 0) { + fprintf(stderr, password too long); + exit(5); +} +ap_getpass(Re-type new password: , pwv, sizeof(pwv)); +if (strcmp(pwin, pwv) != 0) { fprintf(stderr, They don't match, sorry.\n); - if (tn) + if (tn) { unlink(tn); + } exit(1); } +pw = pwin; fprintf(f, %s:%s
cvs commit: apache-apr/apr configure.in
coar99/05/27 07:56:44 Modified:apr configure.in Log: Allow APR stuff to build on Tru64 UNIX (OSF/1). The handling is probably not complete, but it's better than nought. Revision ChangesPath 1.14 +5 -0 apache-apr/apr/configure.in Index: configure.in === RCS file: /home/cvs/apache-apr/apr/configure.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- configure.in 1999/05/26 20:43:43 1.13 +++ configure.in 1999/05/27 14:56:43 1.14 @@ -63,6 +63,11 @@ esac fi +if (test $SYS_SW = OSF1); then +PLATFORM=-DOSF1 +OSDIR=unix +fi + if (test $SYS_SW = OS/2); then PLATFORM=-DOS2 OSDIR=os2
cvs commit: apache-apr/apr configure.in
coar99/05/27 08:28:09 Modified:apr configure.in Log: Don't proceed with configuration if we don't recognise the platform. Revision ChangesPath 1.15 +6 -0 apache-apr/apr/configure.in Index: configure.in === RCS file: /home/cvs/apache-apr/apr/configure.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- configure.in 1999/05/27 14:56:43 1.14 +++ configure.in 1999/05/27 15:28:08 1.15 @@ -78,6 +78,12 @@ OSDIR=beos fi +dnl Verify that we've determined the platform, or all that follows is pointless +if (test x$PLATFORM = x); then +echo ** Don't know how to build for platform \$SYS_SW\. +exit 1 +fi + dnl Checks for header files. AC_HEADER_STDC
cvs commit: apache-1.3/htdocs/manual/misc FAQ.html
coar99/05/27 09:49:29 Modified:htdocs/manual/misc FAQ.html Log: These -1s cause us a lot of grief. When is a signed int not a signed int? When it's an unsigned int or long! {Sigh} Revision ChangesPath 1.144 +6 -2 apache-1.3/htdocs/manual/misc/FAQ.html Index: FAQ.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/FAQ.html,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- FAQ.html 1999/02/21 20:35:12 1.143 +++ FAQ.html 1999/05/27 16:49:26 1.144 @@ -14,7 +14,7 @@ !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P - $Revision: 1.143 $ ($Date: 1999/02/21 20:35:12 $) + $Revision: 1.144 $ ($Date: 1999/05/27 16:49:26 $) /P P The latest version of this FAQ is always available from the main @@ -959,7 +959,11 @@ A HREF=../mod/core.html#groupSAMPGroup/SAMP/A directive (probably in SAMPconf/httpd.conf/SAMP) needs to name a group that actually exists in the SAMP/etc/group/SAMP file (or - your system's equivalent). + your system's equivalent). This problem is also frequently seen when + a negative number is used in the CODEGroup/CODE directive + (EMe.g./EM, CODEGroupnbsp;#-1/CODE). Using a group name + -- not group number -- found in your system's group database should + solve this problem in all cases. /P HR /LI
cvs commit: apache-1.3/src/main http_protocol.c
coar99/05/26 11:28:16 Modified:src CHANGES src/main http_protocol.c Log: Make sure that redirect processing looks for the Location field in both headers_out and err_headers_out. Revision ChangesPath 1.1363+5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1362 retrieving revision 1.1363 diff -u -r1.1362 -r1.1363 --- CHANGES 1999/05/25 10:23:15 1.1362 +++ CHANGES 1999/05/26 18:27:43 1.1363 @@ -1,5 +1,10 @@ Changes with Apache 1.3.7 + *) If a Location field was stored in r-err_headers_out rather + than r-headers_out, redirect processing wouldn't find it and + the server would core dump on ap_escape_html(NULL). + [Doug MacEachern, Ken Coar] + *) Add RULE_EXPAT, the src/lib/ directory structure, and a modified copy of the Expat 1.0.2 distribution. [Greg Stein] 1.268 +11 -2 apache-1.3/src/main/http_protocol.c Index: http_protocol.c === RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v retrieving revision 1.267 retrieving revision 1.268 diff -u -r1.267 -r1.268 --- http_protocol.c 1999/05/03 15:09:07 1.267 +++ http_protocol.c 1999/05/26 18:28:06 1.268 @@ -2308,6 +2308,14 @@ char *custom_response; const char *location = ap_table_get(r-headers_out, Location); +/* + * It's possible that the Location field might be in r-err_headers_out + * instead of r-headers_out; use the latter if possible, else the + * former. + */ +if (location == NULL) { + location = ap_table_get(r-err_headers_out, Location); +} /* We need to special-case the handling of 204 and 304 responses, * since they have specific HTTP requirements and do not include a * message body. Note that being assbackwards here is not an option. @@ -2359,9 +2367,10 @@ r-err_headers_out = tmp; ap_clear_table(r-err_headers_out); -if (location *location - (ap_is_HTTP_REDIRECT(status) || status == HTTP_CREATED)) +if ((location != NULL) *location + (ap_is_HTTP_REDIRECT(status) || status == HTTP_CREATED)) { ap_table_setn(r-headers_out, Location, location); + } r-content_language = NULL; r-content_languages = NULL;
cvs commit: apache-site bugdb.cgi
coar99/05/24 10:43:44 Modified:.bugdb.cgi Log: Maybe this will slow down the 'pending' reports.. Revision ChangesPath 1.41 +15 -9 apache-site/bugdb.cgi Index: bugdb.cgi === RCS file: /home/cvs/apache-site/bugdb.cgi,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- bugdb.cgi 1999/01/19 19:37:15 1.40 +++ bugdb.cgi 1999/05/24 17:43:43 1.41 @@ -15,14 +15,18 @@ # Lifetime (in seconds) of displayed info before it expires. $life_time = 30 * 60; $CCNOTE = EOT; -[In order for any reply to be added to the PR database, ] -[you need to include [EMAIL PROTECTED] in the Cc line ] -[and leave the subject line UNCHANGED. This is not done] -[automatically because of the potential for mail loops. ] -[If you do not include this Cc, your reply may be ig- ] -[nored unless you are responding to an explicit request ] -[from a developer. ] -[Reply only with text; DO NOT SEND ATTACHMENTS! ] +# +[In order for any reply to be added to the PR database, you need] +[to include [EMAIL PROTECTED] in the Cc line and make sure the] +[subject line starts with the report component and number, with ] +[or without any 'Re:' prefixes (such as general/1098: or ] +[Re: general/1098:). If the subject doesn't match this ] +[pattern, your message will be misfiled and ignored. The ] +[apbugs address is not added to the Cc line of messages from ] +[the database automatically because of the potential for mail ] +[loops. If you do not include this Cc, your reply may be ig- ] +[nored unless you are responding to an explicit request from a ] +[developer. Reply only with text; DO NOT SEND ATTACHMENTS! ] EOT # @@ -145,6 +149,8 @@ #should go. # 01/19/1999 Ken Coar - IE5 doesn't like http:/no-server-name/path #URLs, so remove the scheme from server-local URLs we emit. +# 05/24/1999 Ken Coar - Try making the 'how to reply' message a little +#more explicit; we're getting lots of misfiled messages.. # ### End Modification log @@ -282,7 +288,7 @@ ### Main menu } elsif ($PATH_INFO eq ) { main_menu(); -print HRSMALLVersion: 19 January 1999BRAuthors: , +print HRSMALLVersion: 24 May 1999BRAuthors: , A HREF=\http://alumni.caltech.edu/~dank/gnats.html\;Dan Kegel , and Huy Le/A, BR , with revamp work by ,
cvs commit: apache-site bugdb.cgi
coar99/05/24 10:55:51 Modified:.bugdb.cgi Log: Argh.. 65-char marker left in by mistake. Revision ChangesPath 1.42 +0 -1 apache-site/bugdb.cgi Index: bugdb.cgi === RCS file: /home/cvs/apache-site/bugdb.cgi,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- bugdb.cgi 1999/05/24 17:43:43 1.41 +++ bugdb.cgi 1999/05/24 17:55:50 1.42 @@ -15,7 +15,6 @@ # Lifetime (in seconds) of displayed info before it expires. $life_time = 30 * 60; $CCNOTE = EOT; -# [In order for any reply to be added to the PR database, you need] [to include [EMAIL PROTECTED] in the Cc line and make sure the] [subject line starts with the report component and number, with ]
cvs commit: apache-1.3/src/modules/standard mod_setenvif.c
coar99/05/19 06:26:10 Modified:.STATUS htdocs/manual/mod mod_setenvif.html src CHANGES src/modules/standard mod_setenvif.c Log: Allow SetEnvIf* to set things according to the protocol of the request. Revision ChangesPath 1.688 +1 -5 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.687 retrieving revision 1.688 diff -u -r1.687 -r1.688 --- STATUS1999/05/17 18:02:51 1.687 +++ STATUS1999/05/19 13:26:03 1.688 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/05/17 18:02:51 $] + Last modified at [$Date: 1999/05/19 13:26:03 $] Release: @@ -132,10 +132,6 @@ * Ronald Tschalär's major update of mod_digest Message-ID: [EMAIL PROTECTED] Status: Big change -- needs review. - -* Ken's patch to add the request protocol to things mod_setenvif can test - Message-ID: [EMAIL PROTECTED] - Status: Ken +1 In progress: 1.6 +6 -1 apache-1.3/htdocs/manual/mod/mod_setenvif.html Index: mod_setenvif.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_setenvif.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mod_setenvif.html 1998/05/28 14:06:54 1.5 +++ mod_setenvif.html 1999/05/19 13:26:06 1.6 @@ -260,7 +260,8 @@ A HREF=directive-dict.html#Compatibility REL=Help - STRONGCompatibility:/STRONG/A Apache 1.3 and above + STRONGCompatibility:/STRONG/A Apache 1.3 and above; the + Request_Protocol keyword is only available with 1.3.7 and later /P P The SAMPSetEnvIf/SAMP directive defines environment variables @@ -284,6 +285,10 @@ /LI LISAMPRequest_Method/SAMP - the name of the method being used (SAMPGET/SAMP, SAMPPOST/SAMP, EMet cetera/EM) + /LI + LISAMPRequest_Protocol/SAMP - the name and version of the protocol +with which the request was made (EMe.g./EM, HTTP/0.9, HTTP/1.1, +EMetc./EM) /LI LISAMPRequest_URI/SAMP - the portion of the URL following the scheme and host portion 1.1360+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1359 retrieving revision 1.1360 diff -u -r1.1359 -r1.1360 --- CHANGES 1999/05/17 08:00:02 1.1359 +++ CHANGES 1999/05/19 13:26:07 1.1360 @@ -1,5 +1,9 @@ Changes with Apache 1.3.7 + *) Add 'Request_Protocol' special keyword to mod_setenvif so that + environment variables can be set according to the protocol version + (e.g., HTTP/0.9 or HTTP/1.1) of the request. [Ken Coar] + *) Add DSO support for OpenStep (Mach 4.2) platform. [Ralf S. Engelschall, Rex Dieter [EMAIL PROTECTED]] PR#3997 1.27 +8 -1 apache-1.3/src/modules/standard/mod_setenvif.c Index: mod_setenvif.c === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_setenvif.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- mod_setenvif.c1999/01/01 19:05:13 1.26 +++ mod_setenvif.c1999/05/19 13:26:09 1.27 @@ -125,7 +125,8 @@ SPECIAL_REMOTE_HOST, SPECIAL_REMOTE_USER, SPECIAL_REQUEST_URI, -SPECIAL_REQUEST_METHOD +SPECIAL_REQUEST_METHOD, +SPECIAL_REQUEST_PROTOCOL }; typedef struct { char *name; /* header name */ @@ -241,6 +242,9 @@ else if (!strcasecmp(fname, request_method)) { new-special_type = SPECIAL_REQUEST_METHOD; } + else if (!strcasecmp(fname, request_protocol)) { + new-special_type = SPECIAL_REQUEST_PROTOCOL; + } else { new-special_type = SPECIAL_NOT; } @@ -354,6 +358,9 @@ break; case SPECIAL_REQUEST_METHOD: val = r-method; + break; + case SPECIAL_REQUEST_PROTOCOL: + val = r-protocol; break; case SPECIAL_NOT: val = ap_table_get(r-headers_in, b-name);
cvs commit: apache-1.3 STATUS
coar99/05/17 11:02:56 Modified:.STATUS Log: Add a patch and clean out some stalities. Revision ChangesPath 1.687 +5 -14 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.686 retrieving revision 1.687 diff -u -r1.686 -r1.687 --- STATUS1999/05/11 03:26:29 1.686 +++ STATUS1999/05/17 18:02:51 1.687 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/05/11 03:26:29 $] + Last modified at [$Date: 1999/05/17 18:02:51 $] Release: @@ -64,9 +64,6 @@ RELEASE SHOWSTOPPERS: -* Plaintext passwords on Win32 no longer work; fix forthcoming - immediately. - *WHY* does www.apache.org say 1.3.6 is released?!?!?! RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: @@ -90,11 +87,6 @@ Message-ID: [EMAIL PROTECTED] Status: Ken +1 -* Raymond S Brand's patch to allow mod_autoindex's HeaderName and - ReadmeName files to be negociated and SSI-parsed. - Message-ID: [EMAIL PROTECTED] - Status: - * John Giannadrea's patch for ceiling on file size for mmap (PR#4122) Message-ID: [EMAIL PROTECTED] Status: Ken +1 @@ -141,6 +133,10 @@ Message-ID: [EMAIL PROTECTED] Status: Big change -- needs review. +* Ken's patch to add the request protocol to things mod_setenvif can test + Message-ID: [EMAIL PROTECTED] + Status: Ken +1 + In progress: * Ralf's [PATCH] Shared Memory Pools @@ -153,11 +149,6 @@ please review the shared memory deep-level code. Doug: +1 on concept (untested) Lars: +1 on concept - -* Marc's [PATCH] PR#3323: recursive includes -Message-ID: [EMAIL PROTECTED] - Status: Marc +1, Jim +1 (concept) - * Needs more in-depth review * * Mark Bixby's freshening up the MPE/iX port (mostly APACI) Message-ID: [EMAIL PROTECTED]