cvs commit: apache-devsite how-to-release.html
jim 00/02/25 18:46:44 Modified:.how-to-release.html Log: Various changes, esp since the change to locus Revision ChangesPath 1.60 +192 -179 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.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- how-to-release.html 2000/02/25 15:40:44 1.59 +++ how-to-release.html 2000/02/26 02:46:44 1.60 @@ -38,80 +38,8 @@ P BR -H2Announcing a New Release/H2 + H2A NAME=tarballHow to build an Apache Unix release/A/H2 -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 Bbefore/B the -Release is actually built. So we describe these steps at the beginning. - -OL -HR - - B[ Adjusting Announcement to taste ]/BBR - P - LIA prototype CODEAnnouncement/CODE is included in - the main CVS source tree. This file should be updated - to reflect the current state of affairs concerning the - release. For example, the Release Version should reflect - what is actually being announced. Also, the key enhancements - of the Release should be noted.BR - 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 - 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 - B[ Building the source release ]/BBR - P - LIFirst, build the source release (A HREF=#tarballsee below/A) - if not already done. - P - HR - 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 - a final (i.e.: non-beta) release. - LINow, CODEAnnouncement/CODE should be - posted to the following places: - UL -LIUnmoderated UseNet newsgroups (should be crossposted) - UL - LICODEcomp.infosystems.www.servers.unix/CODE - LICODEcomp.infosystems.www.servers.ms-windows/CODE - LICODEcomp.infosystems.www.servers.misc/CODE - LICODEde.comm.infosystems.www.servers/CODE - /UL -LIModerated UseNet newsgroups (do Bnot/B crosspost) - UL - LICODEcomp.infosystems.www.announce/CODE - /UL -LIMailing Lists - UL - LICODE[EMAIL PROTECTED]/CODE - LICODE[EMAIL PROTECTED]/CODE - /UL - /UL - P - LIMake sure that CODEAnnouncement.txt/CODE and - CODEAnnouncement.html/CODE in CODEapache-site/CODE - in the CODEdist/CODE directory are updated to include - these changes. - LIBask in the glow -/OL - -P -BR - -H2A NAME=tarballHow to build an Apache Unix release/A/H2 - PFONT COLOR=redNote:/FONT The below assumes that you are using CODEssh/CODE to login to your CODEdev.apache.org/CODE account. If you are rolling the tarball remotely, the differences @@ -124,25 +52,41 @@ tarball and release. OL -HR -LI Checkout the Apache source if needed into a scratch directory:BR + HR + LI Checkout the Apache source if needed into a scratch directory:BR CODEB$ cvs checkout apache-1.EMX/EM/B/CODE -P -LI cd into the CODEapache-1.EMX/EM/CODE CVS tree.BR + P + LI cd into the CODEapache-1.EMX/EM/CODE CVS tree.BR CODEB$ cd apache-1.EMX/EM/B/CODE -P - -HR -B[ Only for final releases, not for internal pre-releases ]/BBR -P -LI Change CODESERVER_VERSION/CODE in TTsrc/include/httpd.h/TT + Pb[ Adjusting Announcement to taste ]/bbr + LI + p +ul + liA prototype codeAnnouncement/code is included in + the main CVS source tree. This file should be updated + to reflect the current state of affairs concerning the + release. For example, the Release Version should reflect + what is actually being announced. Also, the key enhancements + of the Release should be noted.br + codeb$ vi Announcement/b/codebr + codeb$ cvs commit Announcement/b/codebr + p + 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. + /ul + HR + 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
cvs commit: apache-site/dist .htaccess Announcement.html Announcement.txt HEADER.html README.html
jim 00/02/25 08:58:32 Modified:.httpd.html dist .htaccess Announcement.html Announcement.txt HEADER.html README.html Log: Ready to announce Revision ChangesPath 1.86 +3 -3 apache-site/httpd.html Index: httpd.html === RCS file: /home/cvs/apache-site/httpd.html,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- httpd.html2000/02/02 18:04:11 1.85 +++ httpd.html2000/02/25 16:58:28 1.86 @@ -71,13 +71,13 @@ PHR -H2 ALIGN=CENTERApache 1.3.11 Now Available/H2 +H2 ALIGN=CENTERApache 1.3.12 Now Available/H2 PBLOCKQUOTE The Apache Group is pleased to announce the release of the - 1.3.11 version of the Apache HTTP server, including a Win32 build. - Apache 1.3.11 is the best version of Apache currently available; + 1.3.12 version of the Apache HTTP server. + Apache 1.3.12 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.26 +3 -3 apache-site/dist/.htaccess Index: .htaccess === RCS file: /home/cvs/apache-site/dist/.htaccess,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .htaccess 2000/02/25 02:46:49 1.25 +++ .htaccess 2000/02/25 16:58:29 1.26 @@ -3,9 +3,9 @@ AddIcon /icons/text.gif .README CHANGES CHANGES_1.2 CHANGES_1.3 AddDescription MD5 hash *.md5 AddDescription PGP signature .asc -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 1.3.12 compressed source apache_1.3.12.tar.Z +AddDescription 1.3.12 gzipped source apache_1.3.12.tar.gz +AddDescription 1.3.12 Win32 binary apache_1_3_12_win32.exe AddDescription 1.3.11 compressed source apache_1.3.11.tar.Z AddDescription 1.3.11 gzipped source apache_1.3.11.tar.gz AddDescription 1.3.11 Win32 binary apache_1_3_11_win32.exe 1.19 +30 -35apache-site/dist/Announcement.html Index: Announcement.html === RCS file: /home/cvs/apache-site/dist/Announcement.html,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- Announcement.html 2000/01/22 21:18:03 1.18 +++ Announcement.html 2000/02/25 16:58:29 1.19 @@ -1,47 +1,42 @@ HTML HEAD - TITLEApache 1.3.11 Released/TITLE + TITLEApache 1.3.12 Released/TITLE /HEAD BODY -h1Apache 1.3.11 Released/h1 +h1Apache 1.3.12 Released/h1 p The a href=http://www.apache.org/;Apache Software Foundation/a and The Apache Server Project are -pleased to announce the release of version 1.3.11 of the Apache HTTP server. -Apache 1.3.10 was not released due to a last-minute bug found and -fixed after the source was tagged and tested. -p -This new Apache version incorporates numerous 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: -ul - li Binary and shared builds on several platforms have been improved. - li The time that a parent waits for its children to die - after codeSIGKILL/code has been sent has been reduced. - li Various isuexec/i improvements. - li More rigorous checking of codeHost:/code headers to fix security problems - with mass name-based virtual hosting. - li Addition of the code%q/code logging format directive (logs ? and the query - string part of a query, or the empty string if no query). - li Improvement of the iOS390/i port. - li Several iEBCDIC/i fixes. - li Better error reporting during the compiler sanity check. - li Fixed the `quad integer' (aka `long long') handling in ap_snprintf.c - li mod_rewrite's general substitution function was overhauled. - li Several WIN32 bugs have been fixed, including: +pleased to announce the release of version 1.3.12 of the Apache HTTP server. +p +The primary changes in this version of Apache are those related to +the ``cross site scripting'' security alerts described at ul - li CGIs broken if script calls other programs which deliver on stdout - (Search this file for DETACHED) - li 16 bit CGIs should work now - li Server will not start if passed the -d option with spaces in the - argument. -/ul + lia href=http://www.cert.org/advisories/CA-2000-02.html;http://www.cert.org/advisories/CA-2000-02.html/a + lia
cvs commit: apache-site httpd.html
jim 00/02/25 09:10:19 Modified:.httpd.html Log: Clean up Revision ChangesPath 1.87 +5 -10 apache-site/httpd.html Index: httpd.html === RCS file: /home/cvs/apache-site/httpd.html,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- httpd.html2000/02/25 16:58:28 1.86 +++ httpd.html2000/02/25 17:10:19 1.87 @@ -61,22 +61,17 @@ /DIV PHR -H2 ALIGN=CENTERCross Site Scripting Security Problem/H2 -PBLOCKQUOTE -We have added information about the recently discovered -A HREF=info/css-security/Cross Site Scripting security problem/A -that was announced in a recent -A HREF=http://www.cert.org/advisories/CA-2000-02.html;CERT Advisory/A. -/BLOCKQUOTE - -PHR H2 ALIGN=CENTERApache 1.3.12 Now Available/H2 PBLOCKQUOTE The Apache Group is pleased to announce the release of the - 1.3.12 version of the Apache HTTP server. + 1.3.12 version of the Apache HTTP server. The main improvements + in this release are those pertaining to the + A HREF=info/css-security/Cross Site Scripting security problem/A + that was announced in a recent + A HREF=http://www.cert.org/advisories/CA-2000-02.html;CERT Advisory/A. Apache 1.3.12 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.
cvs commit: apache-site/info/css-security index.html
jim 00/02/25 09:14:05 Modified:info/css-security index.html Log: Adjust the patch information Revision ChangesPath 1.3 +4 -9 apache-site/info/css-security/index.html Index: index.html === RCS file: /home/cvs/apache-site/info/css-security/index.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- index.html2000/02/03 05:16:04 1.2 +++ index.html2000/02/25 17:14:05 1.3 @@ -93,15 +93,10 @@ UL LIA HREF=apache_specific.htmlApache HTTP server specific information/A - -LICurrent A HREF=apache_1.3.11_css_patch.txtApache patch/A against -1.3.11 that addresses the known issues in Apache and provides some help -to Apache users in protecting against certain instances of this problem. -Please see the previous document for a description of what this patch does. -As of the writing of this document, we have not yet released a new version -of Apache that includes these patches. We expect to do so in the near -future, once we are more confident that we have addressed all the issues. - +LIApache 1.3.12, which provides some protection against certain instances of + this problem. +LIOlder A HREF=apache_1.3.11_css_patch.txtApache patch/A against +1.3.11 that addressed the known issues in that version of Apache. LIA HREF=encoding_examples.htmlEncoding Examples/A page, describing how to properly encode your output to protect against this problem using common Apache related technologies, such as Apache modules, Perl,
cvs commit: apache-1.3/src/main util.c
jim 00/02/23 04:44:57 Modified:src CHANGES src/include ap_config.h src/main util.c Log: Are we ready ?? Revision ChangesPath 1.1515+3 -2 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1514 retrieving revision 1.1515 diff -u -r1.1514 -r1.1515 --- CHANGES 2000/02/20 15:04:59 1.1514 +++ CHANGES 2000/02/23 12:44:55 1.1515 @@ -1,8 +1,9 @@ Changes with Apache 1.3.12 *) Only OS/2 requires the addition t flag for ap_pfopen() - (as therefore fopen() as well). [Ian Turner [EMAIL PROTECTED]] - PR#5760 + (as therefore fopen() as well). This is handled by the + FOPEN_REQUIRES_T macro. [Ian Turner [EMAIL PROTECTED], + Jim Jagielski] PR#5760 *) The default charset is only added, when enabled, for those Content-types which require it (text/plain, text/html). 1.282 +1 -0 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.281 retrieving revision 1.282 diff -u -r1.281 -r1.282 --- ap_config.h 1999/12/15 22:13:33 1.281 +++ ap_config.h 2000/02/23 12:44:56 1.282 @@ -812,6 +812,7 @@ #define NO_RELIABLE_PIPED_LOGS #define USE_OS2SEM_SERIALIZED_ACCEPT #define SINGLE_LISTEN_UNSERIALIZED_ACCEPT +#define FOPEN_REQUIRES_T #elif defined(__MACHTEN__) typedef int rlim_t; 1.180 +1 -1 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.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- util.c2000/02/20 15:05:00 1.179 +++ util.c2000/02/23 12:44:57 1.180 @@ -841,7 +841,7 @@ return NULL; } -#ifdef OS2 +#ifdef FOPEN_REQUIRES_T file = ap_pfopen(p, name, rt); #else file = ap_pfopen(p, name, r);
cvs commit: apache-1.3 Announcement
jim 00/02/23 14:51:12 Modified:.Announcement Log: Final Announcement text Revision ChangesPath 1.50 +2 -2 apache-1.3/Announcement Index: Announcement === RCS file: /home/cvs/apache-1.3/Announcement,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- Announcement 2000/02/02 22:40:58 1.49 +++ Announcement 2000/02/23 22:51:11 1.50 @@ -12,8 +12,8 @@ http://www.apache.org/info/css-security/index.html Specifically, charset handling has been improved and reinforced -(including 2 new directives: AddDefaultCharset and AddDefaultCharsetName) -and server generated pages properly escape ``userland'' input. +(including a new directive: AddDefaultCharset) and server generated +pages properly escape ``userland'' input. A complete listing with detailed descriptions is provided in the src/CHANGES file.
cvs commit: apache-1.3/src/os/win32 registry.c
jim 00/02/23 15:01:34
Modified:src/include httpd.h
src/os/win32 registry.c
Log:
We are at 1.3.12
Revision ChangesPath
1.306 +2 -2 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.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- httpd.h 2000/02/20 01:14:46 1.305
+++ httpd.h 2000/02/23 23:01:33 1.306
@@ -427,7 +427,7 @@
* Example: Apache/1.1.0 MrWidget/0.1-alpha
*/
-#define SERVER_BASEVERSION Apache/1.3.12-dev /* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION Apache/1.3.12 /* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -443,7 +443,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 10312000
+#define APACHE_RELEASE 10312100
#define SERVER_PROTOCOL HTTP/1.1
#ifndef SERVER_SUPPORT
1.31 +1 -1 apache-1.3/src/os/win32/registry.c
Index: registry.c
===
RCS file: /home/cvs/apache-1.3/src/os/win32/registry.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- registry.c2000/01/20 02:55:02 1.30
+++ registry.c2000/02/23 23:01:34 1.31
@@ -38,7 +38,7 @@
#define VENDOR Apache Group
#define SOFTWARE Apache
-#define VERSION 1.3.12 dev
+#define VERSION 1.3.12
#define REGKEY SOFTWARE\\ VENDOR \\ SOFTWARE \\ VERSION
cvs commit: apache-1.3/src/os/win32 registry.c
jim 00/02/23 15:06:39
Modified:src CHANGES Configure
src/include httpd.h
src/os/win32 registry.c
Log:
And bump up to 1.3.13
Revision ChangesPath
1.1516+2 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1515
retrieving revision 1.1516
diff -u -r1.1515 -r1.1516
--- CHANGES 2000/02/23 12:44:55 1.1515
+++ CHANGES 2000/02/23 23:06:35 1.1516
@@ -1,3 +1,5 @@
+Changes with Apache 1.3.13
+
Changes with Apache 1.3.12
*) Only OS/2 requires the addition t flag for ap_pfopen()
1.394 +1 -1 apache-1.3/src/Configure
Index: Configure
===
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -r1.393 -r1.394
--- Configure 2000/02/06 01:27:19 1.393
+++ Configure 2000/02/23 23:06:36 1.394
@@ -1782,7 +1782,7 @@
#select the special subtarget for shared core generation
SUBTARGET=target_shared
#determine additional suffixes for libhttpd.so
- V=1 R=3 P=12
+ V=1 R=3 P=13
if [ x$SHLIB_SUFFIX_DEPTH = x0 ]; then
SHLIB_SUFFIX_LIST=
fi
1.307 +2 -2 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.306
retrieving revision 1.307
diff -u -r1.306 -r1.307
--- httpd.h 2000/02/23 23:01:33 1.306
+++ httpd.h 2000/02/23 23:06:37 1.307
@@ -427,7 +427,7 @@
* Example: Apache/1.1.0 MrWidget/0.1-alpha
*/
-#define SERVER_BASEVERSION Apache/1.3.12 /* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION Apache/1.3.13-dev /* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -443,7 +443,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 10312100
+#define APACHE_RELEASE 10313000
#define SERVER_PROTOCOL HTTP/1.1
#ifndef SERVER_SUPPORT
1.32 +1 -1 apache-1.3/src/os/win32/registry.c
Index: registry.c
===
RCS file: /home/cvs/apache-1.3/src/os/win32/registry.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- registry.c2000/02/23 23:01:34 1.31
+++ registry.c2000/02/23 23:06:38 1.32
@@ -38,7 +38,7 @@
#define VENDOR Apache Group
#define SOFTWARE Apache
-#define VERSION 1.3.12
+#define VERSION 1.3.13 dev
#define REGKEY SOFTWARE\\ VENDOR \\ SOFTWARE \\ VERSION
cvs commit: apache-1.3/src/main http_protocol.c util.c
jim 00/02/19 17:14:49
Modified:.STATUS
src/include ap_mmn.h httpd.h
src/main http_protocol.c util.c
Log:
Hrm
Revision ChangesPath
1.808 +3 -5 apache-1.3/STATUS
Index: STATUS
===
RCS file: /home/cvs/apache-1.3/STATUS,v
retrieving revision 1.807
retrieving revision 1.808
diff -u -r1.807 -r1.808
--- STATUS2000/02/19 12:51:11 1.807
+++ STATUS2000/02/20 01:14:45 1.808
@@ -1,5 +1,5 @@
1.3 STATUS:
- Last modified at [$Date: 2000/02/19 12:51:11 $]
+ Last modified at [$Date: 2000/02/20 01:14:45 $]
Release:
@@ -28,10 +28,8 @@
RELEASE SHOWSTOPPERS:
* general/5766: AddDefaultCharset bug with CGI scripts
- STATUS: Still not fixed. Jim has a patch that adds the
-default charset iff AddDefaultCharset is enabled AND
- the type is text/plain or text/html, but he's not sure
- if that's correct... Comments?
+ STATUS: Patch available.
+Message-ID: [EMAIL PROTECTED]
general/5760: Use of text type t in fopen call...
RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
1.44 +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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ap_mmn.h 2000/01/12 15:54:56 1.43
+++ ap_mmn.h 2000/02/20 01:14:46 1.44
@@ -226,6 +226,7 @@
*ap_base64encode_len(), ap_base64decode(),
*ap_base64decode_binary(), ap_base64decode_len(),
*ap_pbase64decode(), ap_pbase64encode()
+ * 19990320.7 - add ap_strcasestr()
*/
#define MODULE_MAGIC_COOKIE 0x41503133UL /* AP13 */
@@ -233,7 +234,7 @@
#ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 19990320
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 6 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 7 /* 0...n */
#define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward
compat */
/* Useful for testing for features. */
1.305 +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.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- httpd.h 2000/02/02 20:43:43 1.304
+++ httpd.h 2000/02/20 01:14:46 1.305
@@ -1008,6 +1008,7 @@
API_EXPORT(int) ap_is_matchexp(const char *str);
API_EXPORT(int) ap_strcmp_match(const char *str, const char *exp);
API_EXPORT(int) ap_strcasecmp_match(const char *str, const char *exp);
+API_EXPORT(char *) ap_strcasestr(const char *s1, const char *s2);
API_EXPORT(char *) ap_pbase64decode(pool *p, const char *bufcoded);
API_EXPORT(char *) ap_pbase64encode(pool *p, char *string);
API_EXPORT(char *) ap_uudecode(pool *p, const char *bufcoded);
1.289 +17 -9 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.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- http_protocol.c 2000/02/08 00:34:36 1.288
+++ http_protocol.c 2000/02/20 01:14:47 1.289
@@ -112,22 +112,30 @@
*- return type
*/
static const char *make_content_type(request_rec *r, const char *type) {
-const char *i;
+char *needcset[] = {
+ text/plain,
+ text/html,
+ NULL };
+char **pcset;
core_dir_config *conf = (core_dir_config *)ap_get_module_config(
r-per_dir_config, core_module);
if (!type) type = ap_default_type(r);
if (conf-add_default_charset != ADD_DEFAULT_CHARSET_ON) return type;
-i = type;
-while (*i *i != ';') i++;
-if (*i *i == ';') {
+if (ap_strcasestr(type, charset=) != NULL) {
/* already has parameter, do nothing */
- /* XXX should check for actual charset=, but then we need real
- * parsing code
- */
+ /* XXX we don't check the validity */
+ ;
} else {
- type = ap_pstrcat(r-pool, type, ; charset=,
- conf-add_default_charset_name, NULL);
+ /* see if it makes sense to add the charset. At present,
+ * we only add it if the Content-type is one of needcset[]
+ */
+ for (pcset = needcset; *pcset ; pcset++)
+ if (ap_strcasestr(type, *pcset) != NULL) {
+ type = ap_pstrcat(r-pool, type, ; charset=,
+ conf-add_default_charset_name, NULL
cvs commit: apache-1.3/src/main util.c
jim 00/02/20 07:05:01 Modified:.STATUS src CHANGES src/main util.c Log: The 't' option is only valid and needed for OS/2. PR:5760 Submitted by: Ian Turner [EMAIL PROTECTED] Reviewed by: Jim Jagielski Revision ChangesPath 1.810 +6 -6 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.809 retrieving revision 1.810 diff -u -r1.809 -r1.810 --- STATUS2000/02/20 01:35:26 1.809 +++ STATUS2000/02/20 15:04:59 1.810 @@ -1,13 +1,13 @@ 1.3 STATUS: - Last modified at [$Date: 2000/02/20 01:35:26 $] + Last modified at [$Date: 2000/02/20 15:04:59 $] Release: -1.3.12-dev: In development with a plan to RELEASE on Feb. 18, 2000. +1.3.12-dev: In development with a plan to RELEASE on Feb. 25, 2000. Jim offers to be RM. - Feb. 15: Freeze CVS tree - Feb. 16: tag and roll tarball - Feb. 18: Announce and release + Feb. 22: Freeze CVS tree + Feb. 23: tag and roll tarball + Feb. 25: Announce and release 1.3.11: Tagged and rolled Jan. 19, 2000. Released and announced on the 21st. 1.3.10: Not released. Pulled at last minute due to @@ -27,7 +27,7 @@ RELEASE SHOWSTOPPERS: - general/5760: Use of text type t in fopen call... +* None at present RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: 1.1514+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1513 retrieving revision 1.1514 diff -u -r1.1513 -r1.1514 --- CHANGES 2000/02/20 01:35:26 1.1513 +++ CHANGES 2000/02/20 15:04:59 1.1514 @@ -1,5 +1,9 @@ Changes with Apache 1.3.12 + *) Only OS/2 requires the addition t flag for ap_pfopen() + (as therefore fopen() as well). [Ian Turner [EMAIL PROTECTED]] + PR#5760 + *) The default charset is only added, when enabled, for those Content-types which require it (text/plain, text/html). [Jim Jagielski] PR#5766 1.179 +4 -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.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- util.c2000/02/20 01:14:48 1.178 +++ util.c2000/02/20 15:05:00 1.179 @@ -841,7 +841,11 @@ return NULL; } +#ifdef OS2 file = ap_pfopen(p, name, rt); +#else +file = ap_pfopen(p, name, r); +#endif #ifdef DEBUG saved_errno = errno; ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, NULL,
cvs commit: apache-1.3 STATUS
jim 00/02/18 18:03:07 Modified:.STATUS Log: Try to remove showstoppers to allow us to get 1.3.12 out. I think this is fixed Revision ChangesPath 1.806 +2 -1 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.805 retrieving revision 1.806 diff -u -r1.805 -r1.806 --- STATUS2000/02/17 16:50:23 1.805 +++ STATUS2000/02/19 02:03:07 1.806 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 2000/02/17 16:50:23 $] + Last modified at [$Date: 2000/02/19 02:03:07 $] Release: @@ -28,6 +28,7 @@ RELEASE SHOWSTOPPERS: * general/5766: AddDefaultCharset bug with CGI scripts + STATUS: Jim thinks he's fixed this in the latest CVS tree. general/5760: Use of text type t in fopen call... RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
cvs commit: apache-1.3 STATUS
jim 00/02/19 04:51:12 Modified:.STATUS Log: Argf. The bug still exists with charsets being added when they shouldn't be. Should we force charsets only for types of text/plain and text/html? Are there others? I need some guidance here :) Revision ChangesPath 1.807 +5 -2 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.806 retrieving revision 1.807 diff -u -r1.806 -r1.807 --- STATUS2000/02/19 02:03:07 1.806 +++ STATUS2000/02/19 12:51:11 1.807 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 2000/02/19 02:03:07 $] + Last modified at [$Date: 2000/02/19 12:51:11 $] Release: @@ -28,7 +28,10 @@ RELEASE SHOWSTOPPERS: * general/5766: AddDefaultCharset bug with CGI scripts - STATUS: Jim thinks he's fixed this in the latest CVS tree. + STATUS: Still not fixed. Jim has a patch that adds the +default charset iff AddDefaultCharset is enabled AND + the type is text/plain or text/html, but he's not sure + if that's correct... Comments? general/5760: Use of text type t in fopen call... RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
cvs commit: apache-1.3/src/main http_core.c
jim 00/02/18 12:41:47
Modified:src/main http_core.c
Log:
Stupid logic error... should fix PR#5766
Revision ChangesPath
1.281 +4 -4 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.280
retrieving revision 1.281
diff -u -r1.280 -r1.281
--- http_core.c 2000/02/05 00:33:21 1.280
+++ http_core.c 2000/02/18 20:41:47 1.281
@@ -1054,14 +1054,14 @@
return err;
}
if (!strcasecmp(arg, Off)) {
- d-add_default_charset = 0;
+ d-add_default_charset = ADD_DEFAULT_CHARSET_OFF;
}
else if (!strcasecmp(arg, On)) {
- d-add_default_charset = 1;
+ d-add_default_charset = ADD_DEFAULT_CHARSET_ON;
d-add_default_charset_name = DEFAULT_ADD_DEFAULT_CHARSET_NAME;
}
else {
- d-add_default_charset = 1;
+ d-add_default_charset = ADD_DEFAULT_CHARSET_ON;
d-add_default_charset_name = arg;
}
return NULL;
@@ -2819,7 +2819,7 @@
Directory to plop gmon.out files },
#endif
{ AddDefaultCharset, set_add_default_charset, NULL, OR_FILEINFO,
- TAKE1, The name of the default charset to add to any Content-Type without
one or 'None' to disable },
+ TAKE1, The name of the default charset to add to any Content-Type without
one or 'Off' to disable },
/* Old resource config file commands */
cvs commit: apache-1.3 STATUS
jim 00/02/13 09:41:31 Modified:.STATUS Log: Let's release on the 18th! Revision ChangesPath 1.803 +5 -5 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.802 retrieving revision 1.803 diff -u -r1.802 -r1.803 --- STATUS2000/02/05 13:46:42 1.802 +++ STATUS2000/02/13 17:41:30 1.803 @@ -1,13 +1,13 @@ 1.3 STATUS: - Last modified at [$Date: 2000/02/05 13:46:42 $] + Last modified at [$Date: 2000/02/13 17:41:30 $] Release: -1.3.12-dev: In development with a plan to RELEASE on Feb. 10, 2000. +1.3.12-dev: In development with a plan to RELEASE on Feb. 18, 2000. Jim offers to be RM. - Feb. 6: Freeze CVS tree - Feb. 8: tag and roll tarball - Feb. 10: Announce and release + Feb. 15: Freeze CVS tree + Feb. 16: tag and roll tarball + Feb. 18: Announce and release 1.3.11: Tagged and rolled Jan. 19, 2000. Released and announced on the 21st. 1.3.10: Not released. Pulled at last minute due to
cvs commit: apache-1.3/src/main http_core.c
jim 00/02/04 16:33:22
Modified:htdocs/manual/mod core.html
src/main http_core.c
Log:
Try to reduce confusion over multiple and possible conflicting
versions of the term default by changing AddDefaultCharset to
be of the mode Off | On | charset
Revision ChangesPath
1.165 +7 -5 apache-1.3/htdocs/manual/mod/core.html
Index: core.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- core.html 2000/02/03 14:22:25 1.164
+++ core.html 2000/02/05 00:33:18 1.165
@@ -166,13 +166,13 @@
H2A NAME=adddefaultcharsetAddDefaultCharset directive/A/H2
A HREF=directive-dict.html#Syntax REL=HelpSTRONGSyntax:/STRONG/A
-AddDefaultCharset EMNone / Default / charset/EMBR
+AddDefaultCharset EMOff / On / charset/EMBR
A HREF=directive-dict.html#Context REL=Help
STRONGContext:/STRONG/A
allBR
A HREF=directive-dict.html#Status REL=Help
STRONGStatus:/STRONG/A
coreBR
A HREF=directive-dict.html#Default
REL=HelpSTRONGDefault:/STRONG/A
-CODEAddDefaultCharset None/CODEBR
+CODEAddDefaultCharset Off/CODEBR
A HREF=directive-dict.html#Compatibility REL=HelpSTRONGCompatibility:
/STRONG/A AddDefaultCharset is only available in Apache 1.3.12 and
laterP
@@ -180,9 +180,11 @@
to any response that does not have any parameter on the content
type in the HTTP headers. This will override any character set specified
in the body of the document via a CODEMETA/CODE tag. A setting
-of CODEAddDefaultCharset None/CODE disables this functionality.
-CODEAddDefaultCharset Default/CODE is the exact same as
-codeAddDefaultCharsetName iso-8859-1/code.
+of CODEAddDefaultCharset Off/CODE disables this functionality.
+CODEAddDefaultCharset On/CODE enables Apache's internal
+default charset of codeiso-8859-1/code as required by the
+directive. You can also specify an alternate charset to be used;
+e.g. codeAddDefaultCharset utf-8/code.
PHR
H2A NAME=addmoduleAddModule directive/A/H2
1.280 +3 -2 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- http_core.c 2000/02/03 14:22:33 1.279
+++ http_core.c 2000/02/05 00:33:21 1.280
@@ -1053,9 +1053,10 @@
if (err != NULL) {
return err;
}
-if (!strcasecmp(arg, None))
+if (!strcasecmp(arg, Off)) {
d-add_default_charset = 0;
-else if (!strcasecmp(arg, Default)) {
+}
+else if (!strcasecmp(arg, On)) {
d-add_default_charset = 1;
d-add_default_charset_name = DEFAULT_ADD_DEFAULT_CHARSET_NAME;
}
cvs commit: apache-1.3/src/main http_core.c
jim 00/02/03 06:22:36 Modified:htdocs/manual/mod core.html directives.html src CHANGES src/main http_core.c Log: Streamline the AddDefaultCharset directive. Now this one directive controls the entire 'charset' specification setup. If there is heartburn, I have no trouble with backing this out, but it makes live easier for those not using the default charset, and reduces directive bloat a bit :) Reviewed by: Martin Revision ChangesPath 1.164 +9 -25 apache-1.3/htdocs/manual/mod/core.html Index: core.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- core.html 2000/02/02 20:43:11 1.163 +++ core.html 2000/02/03 14:22:25 1.164 @@ -24,7 +24,6 @@ LIA HREF=#accessconfigAccessConfig/A LIA HREF=#accessfilenameAccessFileName/A LIA HREF=#adddefaultcharsetAddDefaultCharset/A -LIA HREF=#adddefaultcharsetnameAddDefaultCharsetName/A LIA HREF=#addmoduleAddModule/A LIA HREF=#allowoverrideAllowOverride/A LIA HREF=#authnameAuthName/A @@ -167,38 +166,23 @@ H2A NAME=adddefaultcharsetAddDefaultCharset directive/A/H2 A HREF=directive-dict.html#Syntax REL=HelpSTRONGSyntax:/STRONG/A -AddDefaultCharset EMon / off/EMBR +AddDefaultCharset EMNone / Default / charset/EMBR A HREF=directive-dict.html#Context REL=Help STRONGContext:/STRONG/A allBR A HREF=directive-dict.html#Status REL=Help STRONGStatus:/STRONG/A coreBR A HREF=directive-dict.html#Default REL=HelpSTRONGDefault:/STRONG/A -CODEAddDefaultCharset off/CODEBR +CODEAddDefaultCharset None/CODEBR A HREF=directive-dict.html#Compatibility REL=HelpSTRONGCompatibility: -/STRONG/A AddDefaultCharset is only available in Apache 1.3.12 and laterP -If enabled, any response that does not have any parameter on the content -type in the HTTP headers will have a charset parameter added specifying -the character set the client should use for the document. This will -override any character set specified in the body of the document via a -CODEMETA/CODE tag. The character set added is specified by the -CODEAddDefaultCharsetName/CODE directive. -PHR - -H2A NAME=adddefaultcharsetnameAddDefaultCharsetName directive/A/H2 -A HREF=directive-dict.html#Syntax REL=HelpSTRONGSyntax:/STRONG/A -AddDefaultCharsetName EMcharset/EMBR -A HREF=directive-dict.html#Context REL=Help STRONGContext:/STRONG/A -allBR -A HREF=directive-dict.html#Status REL=Help STRONGStatus:/STRONG/A -coreBR -A HREF=directive-dict.html#Default REL=HelpSTRONGDefault:/STRONG/A -CODEAddDefaultCharsetName iso-8859-1/CODEBR -A HREF=directive-dict.html#Compatibility REL=HelpSTRONGCompatibility: -/STRONG/A AddDefaultCharsetName is only available in Apache 1.3.12 and +/STRONG/A AddDefaultCharset is only available in Apache 1.3.12 and laterP This directive specifies the name of the character set that will be added -if the A HREF=#adddefaultcharsetAddDefaultCharset/A directive is -enabled. +to any response that does not have any parameter on the content +type in the HTTP headers. This will override any character set specified +in the body of the document via a CODEMETA/CODE tag. A setting +of CODEAddDefaultCharset None/CODE disables this functionality. +CODEAddDefaultCharset Default/CODE is the exact same as +codeAddDefaultCharsetName iso-8859-1/code. PHR H2A NAME=addmoduleAddModule directive/A/H2 1.63 +0 -1 apache-1.3/htdocs/manual/mod/directives.html Index: directives.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/directives.html,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- directives.html 2000/02/03 11:54:28 1.62 +++ directives.html 2000/02/03 14:22:26 1.63 @@ -32,7 +32,6 @@ LIA HREF=mod_autoindex.html#addaltbytypeAddAltByType/A LIA HREF=mod_mime.html#addcharsetAddCharset/A LIA HREF=core.html#adddefaultcharsetAddDefaultCharset/A -LIA HREF=core.html#adddefaultcharsetnameAddDefaultCharsetName/A LIA HREF=mod_autoindex.html#adddescriptionAddDescription/A LIA HREF=mod_mime.html#addencodingAddEncoding/A LIA HREF=mod_mime.html#addhandlerAddHandler/A 1.1505+3 -4 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1504 retrieving revision 1.1505 diff -u -r1.1504 -r1.1505 --- CHANGES 2000/02/02 20:43:28 1.1504 +++ CHANGES 2000/02/03 14:22:28 1.1505 @@ -4,10 +4,9 @@ ap_send_error_response(), such as the default 404 page. [Marc Slemko
cvs commit: apache-1.3/src/modules/standard mod_actions.c mod_autoindex.c mod_expires.c mod_include.c mod_log_config.c mod_status.c
jim 00/02/02 12:44:16
Modified:htdocs/manual/mod core.html mod_include.html
src CHANGES
src/include http_core.h httpd.h
src/main http_core.c http_log.c http_protocol.c util.c
src/modules/proxy proxy_util.c
src/modules/standard mod_actions.c mod_autoindex.c
mod_expires.c mod_include.c mod_log_config.c
mod_status.c
Log:
Marc's CSS patch!
Revision ChangesPath
1.163 +38 -0 apache-1.3/htdocs/manual/mod/core.html
Index: core.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- core.html 2000/01/18 19:32:49 1.162
+++ core.html 2000/02/02 20:43:11 1.163
@@ -23,6 +23,8 @@
UL
LIA HREF=#accessconfigAccessConfig/A
LIA HREF=#accessfilenameAccessFileName/A
+LIA HREF=#adddefaultcharsetAddDefaultCharset/A
+LIA HREF=#adddefaultcharsetnameAddDefaultCharsetName/A
LIA HREF=#addmoduleAddModule/A
LIA HREF=#allowoverrideAllowOverride/A
LIA HREF=#authnameAuthName/A
@@ -162,6 +164,42 @@
lt;Directory /gt;BR
AllowOverride NoneBR
lt;/Directorygt;/CODE/BLOCKQUOTEPHR
+
+H2A NAME=adddefaultcharsetAddDefaultCharset directive/A/H2
+A HREF=directive-dict.html#Syntax REL=HelpSTRONGSyntax:/STRONG/A
+AddDefaultCharset EMon / off/EMBR
+A HREF=directive-dict.html#Context REL=Help
STRONGContext:/STRONG/A
+allBR
+A HREF=directive-dict.html#Status REL=Help
STRONGStatus:/STRONG/A
+coreBR
+A HREF=directive-dict.html#Default
REL=HelpSTRONGDefault:/STRONG/A
+CODEAddDefaultCharset off/CODEBR
+A HREF=directive-dict.html#Compatibility REL=HelpSTRONGCompatibility:
+/STRONG/A AddDefaultCharset is only available in Apache 1.3.12 and
laterP
+If enabled, any response that does not have any parameter on the content
+type in the HTTP headers will have a charset parameter added specifying
+the character set the client should use for the document. This will
+override any character set specified in the body of the document via a
+CODEMETA/CODE tag. The character set added is specified by the
+CODEAddDefaultCharsetName/CODE directive.
+PHR
+
+H2A NAME=adddefaultcharsetnameAddDefaultCharsetName directive/A/H2
+A HREF=directive-dict.html#Syntax REL=HelpSTRONGSyntax:/STRONG/A
+AddDefaultCharsetName EMcharset/EMBR
+A HREF=directive-dict.html#Context REL=Help
STRONGContext:/STRONG/A
+allBR
+A HREF=directive-dict.html#Status REL=Help
STRONGStatus:/STRONG/A
+coreBR
+A HREF=directive-dict.html#Default
REL=HelpSTRONGDefault:/STRONG/A
+CODEAddDefaultCharsetName iso-8859-1/CODEBR
+A HREF=directive-dict.html#Compatibility REL=HelpSTRONGCompatibility:
+/STRONG/A AddDefaultCharsetName is only available in Apache 1.3.12 and
+laterP
+This directive specifies the name of the character set that will be added
+if the A HREF=#adddefaultcharsetAddDefaultCharset/A directive is
+enabled.
+PHR
H2A NAME=addmoduleAddModule directive/A/H2
!--%plaintext lt;?INDEX {\tt AddModule} directivegt; --
1.24 +22 -1 apache-1.3/htdocs/manual/mod/mod_include.html
Index: mod_include.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_include.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mod_include.html 1998/09/17 12:06:40 1.23
+++ mod_include.html 2000/02/02 20:43:16 1.24
@@ -89,15 +89,34 @@
routine when printing dates.
/DL
+A NAME=echo
DTSTRONGecho/STRONG
DD
This command prints one of the include variables, defined below.
If the variable is unset, it is printed as CODE(none)/CODE.
Any dates printed are subject to the currently configured
CODEtimefmt/CODE.
+
Attributes:
DL
DTvar
DDThe value is the name of the variable to print.
+DTencoding
+DDSpecifies how Apache should encode special characters contained
+in the variable before outputting them. If set to none, no encoding
+will be done. If set to url, then URL encoding (also known as
+%-encoding; this is appropriate for use within URLs in links, etc.)
+will be performed. At the start of an CODEecho/CODE element,
+the default is set to entity, resulting in entity encoding (which
+is appropriate in the context of a block-level HTML element, eg.
+a paragraph of text). This can be changed by adding an
+CODEencoding/CODE attribute, which will remain in effect until
+the next CODEencoding/CODE attribute is encountered or the
+element ends, whichever comes first. Note that only special
+characters as defined in the ISO-8859-1 character encoding will be
+encoded. This encoding process may not have the desired result
cvs commit: apache-1.3 Announcement
jim 00/02/02 14:41:00 Modified:.Announcement Log: And this will be the Announcement... Revision ChangesPath 1.49 +14 -41apache-1.3/Announcement Index: Announcement === RCS file: /export/home/cvs/apache-1.3/Announcement,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- Announcement 2000/01/19 22:43:01 1.48 +++ Announcement 2000/02/02 22:40:58 1.49 @@ -1,57 +1,30 @@ -Apache 1.3.11 Released +Apache 1.3.12 Released == The Apache Software Foundation and The Apache Server Project are -pleased to announce the release of version 1.3.11 of the Apache HTTP server. -Apache 1.3.10 was not released due to a last-minute bug found and -fixed after the source was tagged and tested. +pleased to announce the release of version 1.3.12 of the Apache HTTP server. -This new Apache version incorporates numerous 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: +The primary changes in this version of Apache are those related to +the ``cross site scripting'' security alerts described at - - Binary and shared builds on several platforms have been - improved. + http://www.cert.org/advisories/CA-2000-02.html + - and - + http://www.apache.org/info/css-security/index.html + +Specifically, charset handling has been improved and reinforced +(including 2 new directives: AddDefaultCharset and AddDefaultCharsetName) +and server generated pages properly escape ``userland'' input. - - The time that a parent waits for its children to die - after SIGKILL has been sent has been reduced. - - - Various suexec improvements. - - - More rigorous checking of Host: headers to fix security problems - with mass name-based virtual hosting. - - - Addition of the %q logging format directive (logs ? and the query - string part of a query, or the empty string if no query). - - - Improvement of the OS390 port. - - - Several EBCDIC fixes. - - - Better error reporting during the compiler sanity check. - - - Fixed the `quad integer' (aka `long long') handling in ap_snprintf.c - - - mod_rewrite's general substitution function was overhauled. - - - Several WIN32 bugs have been fixed, including: - - CGIs broken if script calls other programs which deliver on stdout - (Search this file for DETACHED) - - 16 bit CGIs should work now - - Server will not start if passed the -d option with spaces in the - argument. - A complete listing with detailed descriptions is provided in the src/CHANGES file. -We consider Apache 1.3.11 to be the best version of Apache available and +We consider Apache 1.3.12 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.11 is available for download from +Apache 1.3.12 is available for download from http://www.apache.org/dist/ @@ -62,7 +35,7 @@ http://www.apache.org/dist/binaries/ -As of Apache 1.3.11 binary distributions contain all standard Apache +As of Apache 1.3.12 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-1.3 STATUS
jim 00/01/24 05:32:52 Modified:.STATUS Log: Open up CVS. Now keep track of which binaries have been built and uploaded Revision ChangesPath 1.796 +7 -6 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.795 retrieving revision 1.796 diff -u -r1.795 -r1.796 --- STATUS2000/01/18 17:06:49 1.795 +++ STATUS2000/01/24 13:32:51 1.796 @@ -1,13 +1,14 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/18 17:06:49 $] + Last modified at [$Date: 2000/01/24 13:32:51 $] Release: -1.3.11-dev: Current. We will release on 1/21/2000. - Timeline: - 1/19/2000: tag and roll tarball - 1/21/2000: Release and announce - 1/23/2000: Re-open CVS +1.3.12-dev: In development +1.3.11: Tagged and rolled Jan. 19, 2000. Released and +announced on the 21st. + PREBUILT BINARIES: + + 1.3.10: Not released. Pulled at last minute due to a build bug in the MPE port. 1.3.9: Tagged and rolled on Aug. 16. Released and announced on 19th.
cvs commit: apache-1.3 STATUS
jim 00/01/24 05:46:35 Modified:.STATUS Log: The FreeBSD 2.2.8 binary is available Revision ChangesPath 1.797 +2 -2 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.796 retrieving revision 1.797 diff -u -r1.796 -r1.797 --- STATUS2000/01/24 13:32:51 1.796 +++ STATUS2000/01/24 13:46:34 1.797 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/24 13:32:51 $] + Last modified at [$Date: 2000/01/24 13:46:34 $] Release: @@ -7,7 +7,7 @@ 1.3.11: Tagged and rolled Jan. 19, 2000. Released and announced on the 21st. PREBUILT BINARIES: - + FreeBSD-2.2.8: Jim 1.3.10: Not released. Pulled at last minute due to a build bug in the MPE port.
cvs commit: apache-site/dist .htaccess Announcement.html Announcement.txt README.html
jim 00/01/22 13:09:34 Modified:dist .htaccess Announcement.html Announcement.txt README.html Log: Announcement changes for 1.3.11 Revision ChangesPath 1.24 +4 -1 apache-site/dist/.htaccess Index: .htaccess === RCS file: /export/home/cvs/apache-site/dist/.htaccess,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .htaccess 1999/08/30 22:17:34 1.23 +++ .htaccess 2000/01/22 21:09:32 1.24 @@ -20,10 +20,13 @@ 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 1.3.11 compressed source apache_1.3.11.tar.Z +AddDescription 1.3.11 gzipped source apache_1.3.11.tar.gz +AddDescription 1.3.11 Win32 binary apache_1_3_11_win32.exe 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 Apache 1.3.11 Released Announcement.txt AddDescription Binary distributions binaries AddDescription Contributed software contrib AddDescription Old source amp; binaries old 1.17 +43 -72apache-site/dist/Announcement.html Index: Announcement.html === RCS file: /export/home/cvs/apache-site/dist/Announcement.html,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Announcement.html 1999/08/19 20:59:58 1.16 +++ Announcement.html 2000/01/22 21:09:32 1.17 @@ -1,84 +1,54 @@ HTML HEAD - TITLEApache 1.3.9 Released/TITLE + TITLEApache 1.3.11 Released/TITLE /HEAD BODY -H1Apache 1.3.9 Released/H1 - -P -The Apache Group is pleased to announce the release of version -1.3.9 of the Apache HTTP server. - -P -This new Apache version incorporates over 130 significant improvements +h1Apache 1.3.11 Released/h1 +p +The :a href=http://www.apache.org/;Apache Software Foundation/a +and The Apache Server Project are +pleased to announce the release of version 1.3.11 of the Apache HTTP server. +Apache 1.3.10 was not released due to a last-minute bug found and +fixed after the source was tagged and tested. +p +This new Apache version incorporates numerous 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: - -UL - liA new experimental digest authentication module, compatible with - the latest digest-auth standards, has been added to the base package. - liThe codeexpat/code XML parser has been added to allow - modules to deal with XML if necessary. - liThe processing on Windows of basic authentication passwords in - codemod_auth/code password files has been fixed. In addition, - the SHA1 encoding algorithm has been added to those available and - known to codehtpasswd/code, and passwords on Windows may be - longer than the inadvertent 1.3.6 limit of 8 characters. - liSeveral problems with codemod_access/code and CIDR addresses have - been fixed. - liSupport has been added or enhanced for Tandem, TPF, and - the Macintosh OS X platforms. - liSome processing of codeVary/code response header fields has been - corrected. - liRestarts with codeapachenbsp;-k/code on Windows are now honoured - immediately, instead of after the system's listen queue is drained. - licodeExpect: 100-continue/code processing has been corrected. - liScript errors on Windows are now copied to the server's error log - if the scripts fail; this is closer to the Unix behaviour. - liMass-vhosting has been added (see the documentation for module - codemod_vhost_alias/code). - liThe server no longer automatically checks for the existence of a valid - codeDocumentRoot/code for all virtual hosts; this was imposing - a significant startup penalty on systems with numerous vhosts. - The default behaviour has changed to inot/i performing this - check, but it can be re-enabled by specifying the code-t/code - command line option for full configuration testing. - licodeapache -S/code on Windows now exits properly after - completing the configuration testing. - licodeSetEnvIf*/code directives can now test the values of - environment variables as well as request attributes. In addition, - the request protocol and level (ie.g./i, codeHTTP/1.1/code) - can now be tested. - liReadmeName and HeaderName files (codemod_autoindex/code) are - now server-parsable and accessible with MultiViews. - licodeAddDescription/code directives now behave as documented
cvs commit: apache-site httpd.html
jim 00/01/22 13:11:24 Modified:.httpd.html Log: And the homepage Revision ChangesPath 1.84 +3 -3 apache-site/httpd.html Index: httpd.html === RCS file: /export/home/cvs/apache-site/httpd.html,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- httpd.html2000/01/14 11:46:20 1.83 +++ httpd.html2000/01/22 21:11:23 1.84 @@ -62,13 +62,13 @@ PHR -H2 ALIGN=CENTERApache 1.3.9 Now Available/H2 +H2 ALIGN=CENTERApache 1.3.11 Now Available/H2 PBLOCKQUOTE The Apache Group is pleased to announce the release of the - 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; + 1.3.11 version of the Apache HTTP server, including a Win32 build. + Apache 1.3.11 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
cvs commit: apache-site/dist HEADER.html
jim 00/01/22 13:16:41 Modified:dist HEADER.html Log: And the header text Revision ChangesPath 1.9 +1 -1 apache-site/dist/HEADER.html Index: HEADER.html === RCS file: /export/home/cvs/apache-site/dist/HEADER.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- HEADER.html 1999/08/20 12:24:31 1.8 +++ HEADER.html 2000/01/22 21:16:40 1.9 @@ -5,4 +5,4 @@ closer mirror to you.BR A HREF=http://www.apache.org/dyn/closer.cgi;Go here to find it./A /p -H2A HREF=Announcement.htmlApache 1.3.9/A is now available./H2 +H2A HREF=Announcement.htmlApache 1.3.11/A is now available./H2
cvs commit: apache-site/dist Announcement.html
jim 00/01/22 13:18:07 Modified:dist Announcement.html Log: Arf. Typo Revision ChangesPath 1.18 +1 -1 apache-site/dist/Announcement.html Index: Announcement.html === RCS file: /export/home/cvs/apache-site/dist/Announcement.html,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- Announcement.html 2000/01/22 21:09:32 1.17 +++ Announcement.html 2000/01/22 21:18:03 1.18 @@ -6,7 +6,7 @@ h1Apache 1.3.11 Released/h1 p -The :a href=http://www.apache.org/;Apache Software Foundation/a +The a href=http://www.apache.org/;Apache Software Foundation/a and The Apache Server Project are pleased to announce the release of version 1.3.11 of the Apache HTTP server. Apache 1.3.10 was not released due to a last-minute bug found and
cvs commit: apache-1.3/src/os/win32 registry.c
jim 00/01/19 18:41:19
Modified:src/include httpd.h
src/os/win32 registry.c
Log:
Get ready to tag: we are 1.3.11
Revision ChangesPath
1.301 +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.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- httpd.h 2000/01/17 00:48:32 1.300
+++ httpd.h 2000/01/20 02:41:16 1.301
@@ -421,7 +421,7 @@
* Example: Apache/1.1.0 MrWidget/0.1-alpha
*/
-#define SERVER_BASEVERSION Apache/1.3.11-dev /* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION Apache/1.3.11 /* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -437,7 +437,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 10311000
+#define APACHE_RELEASE 10311100
#define SERVER_PROTOCOL HTTP/1.1
#ifndef SERVER_SUPPORT
1.29 +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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- registry.c2000/01/17 00:48:33 1.28
+++ registry.c2000/01/20 02:41:18 1.29
@@ -38,7 +38,7 @@
#define VENDOR Apache Group
#define SOFTWARE Apache
-#define VERSION 1.3.11 dev
+#define VERSION 1.3.11
#define REGKEY SOFTWARE\\ VENDOR \\ SOFTWARE \\ VERSION
cvs commit: apache-1.3/src/os/win32 registry.c
jim 00/01/19 18:55:02
Modified:src CHANGES Configure
src/include httpd.h
src/os/win32 registry.c
Log:
And we bump up to 1.3.12-dev
Revision ChangesPath
1.1503+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1502
retrieving revision 1.1503
diff -u -r1.1502 -r1.1503
--- CHANGES 2000/01/18 17:12:13 1.1502
+++ CHANGES 2000/01/20 02:54:52 1.1503
@@ -1,3 +1,6 @@
+Changes with Apache 1.3.12
+
+
Changes with Apache 1.3.11
*) MPE builds are no longer stripped, which caused the executable
1.391 +1 -1 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -r1.390 -r1.391
--- Configure 2000/01/17 00:48:30 1.390
+++ Configure 2000/01/20 02:54:54 1.391
@@ -1775,7 +1775,7 @@
#select the special subtarget for shared core generation
SUBTARGET=target_shared
#determine additional suffixes for libhttpd.so
- V=1 R=3 P=11
+ V=1 R=3 P=12
if [ x$SHLIB_SUFFIX_DEPTH = x0 ]; then
SHLIB_SUFFIX_LIST=
fi
1.302 +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.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- httpd.h 2000/01/20 02:41:16 1.301
+++ httpd.h 2000/01/20 02:55:00 1.302
@@ -421,7 +421,7 @@
* Example: Apache/1.1.0 MrWidget/0.1-alpha
*/
-#define SERVER_BASEVERSION Apache/1.3.11 /* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION Apache/1.3.12-dev /* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -437,7 +437,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 10311100
+#define APACHE_RELEASE 10312000
#define SERVER_PROTOCOL HTTP/1.1
#ifndef SERVER_SUPPORT
1.30 +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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- registry.c2000/01/20 02:41:18 1.29
+++ registry.c2000/01/20 02:55:02 1.30
@@ -38,7 +38,7 @@
#define VENDOR Apache Group
#define SOFTWARE Apache
-#define VERSION 1.3.11
+#define VERSION 1.3.12 dev
#define REGKEY SOFTWARE\\ VENDOR \\ SOFTWARE \\ VERSION
cvs commit: apache-1.3 Announcement
jim 00/01/19 14:43:07 Modified:.Announcement Log: Very soon will tag/roll 1.3.11. Until then, add a nice Apachecon reminder :) Revision ChangesPath 1.48 +4 -0 apache-1.3/Announcement Index: Announcement === RCS file: /export/home/cvs/apache-1.3/Announcement,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- Announcement 2000/01/18 17:12:05 1.47 +++ Announcement 2000/01/19 22:43:01 1.48 @@ -99,3 +99,7 @@ Thank you for using Apache. +-- +See you at ApacheCon 2000 in Orlanda, Florida, March 8-10, 2000. +http://www.Apachecon.com/ +
cvs commit: apache-1.3 STATUS
jim 00/01/18 09:06:50 Modified:.STATUS Log: We will go with 1.3.11 on the 21st, we hope Revision ChangesPath 1.795 +7 -7 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.794 retrieving revision 1.795 diff -u -r1.794 -r1.795 --- STATUS2000/01/15 22:35:08 1.794 +++ STATUS2000/01/18 17:06:49 1.795 @@ -1,15 +1,15 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/15 22:35:08 $] + Last modified at [$Date: 2000/01/18 17:06:49 $] Release: -1.3.10-dev: Current. We will release on 1/19/2000. As such, - only bug-fixes and doc changes will be allowed. +1.3.11-dev: Current. We will release on 1/21/2000. Timeline: -1/15/2000: Code freeze. No changes at all. -1/16/2000: tag and roll tarball -1/19/2000: Release and announce -1/21/2000: Re-open CVS (delay just in case) + 1/19/2000: tag and roll tarball + 1/21/2000: Release and announce + 1/23/2000: Re-open CVS +1.3.10: Not released. Pulled at last minute due to +a build bug in the MPE port. 1.3.9: Tagged and rolled on Aug. 16. Released and announced on 19th. 1.3.8: Not released. 1.3.7: Not released.
cvs commit: apache-1.3/src/os/win32 registry.c
jim 00/01/16 16:37:54 Modified:.Announcement src/include httpd.h src/os/win32 registry.c Log: This _is_ 1.3.10 Revision ChangesPath 1.46 +30 -51apache-1.3/Announcement Index: Announcement === RCS file: /export/home/cvs/apache-1.3/Announcement,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Announcement 1999/08/19 21:13:07 1.45 +++ Announcement 2000/01/17 00:37:51 1.46 @@ -1,76 +1,55 @@ -Apache 1.3.9 Released -= +Apache 1.3.10 Released +== -The Apache Group is pleased to announce the release of version -1.3.9 of the Apache HTTP server. +The Apache Software Foundation and The Apache Server Project are +pleased to announce the release of version 1.3.10 of the Apache HTTP server. -This new Apache version incorporates over 130 significant improvements +This new Apache version incorporates numerous 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. + - Binary and shared builds on several platforms have been + improved. - - The expat XML parser has been added to allow modules to deal with - XML if necessary. + - The time that a parent waits for its children to die + after SIGKILL has been sent has been reduced. - - 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. + - Various suexec improvements. - - Several problems with mod_access and CIDR addresses have been fixed. + - More rigorous checking of Host: headers to fix security problems + with mass name-based virtual hosting. - - Support has been added or enhanced for Tandem, TPF, and - the Macintosh OS X platforms. + - Addition of the %q logging format directive (logs ? and the query + string part of a query, or the empty string if no query). - - Some processing of Vary response header fields has been corrected. + - Improvement of the OS390 port. - - Restarts with apache -k on Windows are now honoured immediately, - instead of after the system's listen queue is drained. + - Several EBCDIC fixes. - - Expect: 100-continue processing has been corrected. + - Better error reporting during the compiler sanity check. - - Script errors on Windows are now copied to the server's error log - if the scripts fail; this is closer to the Unix behaviour. + - Fixed the `quad integer' (aka `long long') handling in ap_snprintf.c - - Mass-vhosting has been added (see the documentation for module - mod_vhost_alias). + - mod_rewrite's general substitution function was overhauled. - - 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. + - Several WIN32 bugs have been fixed, including: + - CGIs broken if script calls other programs which deliver on stdout + (Search this file for DETACHED) + - 16 bit CGIs should work now + - Server will not start if passed the -d option with spaces in the + argument. - - 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. -We consider Apache 1.3.9 to be the best version of Apache available and +We consider Apache 1.3.10 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
cvs commit: apache-1.3/src/os/win32 registry.c
jim 00/01/16 16:48:34
Modified:src CHANGES Configure
src/include httpd.h
src/os/win32 registry.c
Log:
Bump up to 1.3.11-dev. CVS tree is STILL
FROZEN!!! DO NOT COMMIT UNTIL AFTER THE RELEASE!!
Revision ChangesPath
1.1501+2 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1500
retrieving revision 1.1501
diff -u -r1.1500 -r1.1501
--- CHANGES 2000/01/16 18:06:25 1.1500
+++ CHANGES 2000/01/17 00:48:29 1.1501
@@ -1,3 +1,5 @@
+Changes with Apache 1.3.11
+
Changes with Apache 1.3.10
*) Fixed parsing of TAKE13-based configuration directives.
1.390 +1 -1 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -r1.389 -r1.390
--- Configure 2000/01/15 16:10:46 1.389
+++ Configure 2000/01/17 00:48:30 1.390
@@ -1775,7 +1775,7 @@
#select the special subtarget for shared core generation
SUBTARGET=target_shared
#determine additional suffixes for libhttpd.so
- V=1 R=3 P=10
+ V=1 R=3 P=11
if [ x$SHLIB_SUFFIX_DEPTH = x0 ]; then
SHLIB_SUFFIX_LIST=
fi
1.300 +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.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- httpd.h 2000/01/17 00:37:52 1.299
+++ httpd.h 2000/01/17 00:48:32 1.300
@@ -421,7 +421,7 @@
* Example: Apache/1.1.0 MrWidget/0.1-alpha
*/
-#define SERVER_BASEVERSION Apache/1.3.10 /* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION Apache/1.3.11-dev /* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -437,7 +437,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 10310100
+#define APACHE_RELEASE 10311000
#define SERVER_PROTOCOL HTTP/1.1
#ifndef SERVER_SUPPORT
1.28 +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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- registry.c2000/01/17 00:37:53 1.27
+++ registry.c2000/01/17 00:48:33 1.28
@@ -38,7 +38,7 @@
#define VENDOR Apache Group
#define SOFTWARE Apache
-#define VERSION 1.3.10
+#define VERSION 1.3.11 dev
#define REGKEY SOFTWARE\\ VENDOR \\ SOFTWARE \\ VERSION
cvs commit: apache-1.3 STATUS
jim 00/01/15 14:35:09 Modified:.STATUS Log: Ready to go... Revision ChangesPath 1.794 +3 -13 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.793 retrieving revision 1.794 diff -u -r1.793 -r1.794 --- STATUS2000/01/14 18:47:52 1.793 +++ STATUS2000/01/15 22:35:08 1.794 @@ -1,9 +1,9 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/14 18:47:52 $] + Last modified at [$Date: 2000/01/15 22:35:08 $] Release: -1.3.10-dev: Current. We will try to release on 1/19/2000. As such, +1.3.10-dev: Current. We will release on 1/19/2000. As such, only bug-fixes and doc changes will be allowed. Timeline: 1/15/2000: Code freeze. No changes at all. @@ -25,17 +25,7 @@ RELEASE SHOWSTOPPERS: -* HPUX build failure without -Ae provided to HPUX compiler as a CFLAG. - The error message states this flag is required for long long types - to be recognized by HPUX's compiler -Ryan submitted a patch for this problem -STATUS: Ryan +1, Jim, +1, Greg +1 - -* DSO emulation for AIX 4.2 appears hosed. Sascha has submitted - a patch which fixes the problems and addresses some concerns. -Message-ID: [EMAIL PROTECTED] - Message-ID: [EMAIL PROTECTED] - Status: Sascha +1, Jim +1 (untested), Ryan +1 (untested) +* NONE !! * RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
cvs commit: apache-1.3 STATUS
jim 00/01/14 10:47:56 Modified:.STATUS Log: Almost there... Revision ChangesPath 1.793 +1 -22 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.792 retrieving revision 1.793 diff -u -r1.792 -r1.793 --- STATUS2000/01/14 09:15:16 1.792 +++ STATUS2000/01/14 18:47:52 1.793 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/14 09:15:16 $] + Last modified at [$Date: 2000/01/14 18:47:52 $] Release: @@ -24,27 +24,6 @@ 2.0 : In pre-alpha development, see apache-2.0 repository RELEASE SHOWSTOPPERS: - -* HPUX binary build failure due to the fact that it is building - libstandard.a and adding .so objects to the libstandard.a starting - with mod_vhost_alias.so. -Message-ID: [EMAIL PROTECTED] - Status: Randy committed a temporary fix - UPDATE: Keith Wannamaker reports that Ralf's patch to - fix PR4974 has broken this again. Please see: - [EMAIL PROTECTED] - UPDATE: Ryan suggested that SHLIB_SUFFIX_NAME=sl be backed - out. Jim has done this. However, there is still debate - on the correct fix. At present, this seems to fix the - symptom, but not the full problem, which is inherent - in how the shared functionality was coded. Other - suggested patches break other platforms. So it - is entirely possible that this fix is the one we - will ship with. -UPDATE: Brian posted a patch which implements SHMOD_SUFFIX_NAME. - This has been reported to work on OS/2 and HPUX. - [EMAIL PROTECTED] - Ryan +1 * HPUX build failure without -Ae provided to HPUX compiler as a CFLAG. The error message states this flag is required for long long types
cvs commit: apache-1.3 STATUS
jim 00/01/12 09:44:23 Modified:.STATUS Log: Push back the release... We need to fix these before we release Revision ChangesPath 1.788 +15 -12apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.787 retrieving revision 1.788 diff -u -r1.787 -r1.788 --- STATUS2000/01/11 19:47:35 1.787 +++ STATUS2000/01/12 17:44:12 1.788 @@ -1,15 +1,15 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/11 19:47:35 $] + Last modified at [$Date: 2000/01/12 17:44:12 $] Release: -1.3.10-dev: Current. We will try to release on 1/14/2000. As such, +1.3.10-dev: Current. We will try to release on 1/19/2000. As such, only bug-fixes and doc changes will be allowed. Timeline: -1/12/2000: Code freeze. No changes at all. -1/13/2000: tag and roll tarball -1/17/2000: Release and announce -1/19/2000: Re-open CVS (delay just in case) +1/15/2000: Code freeze. No changes at all. +1/16/2000: tag and roll tarball +1/19/2000: Release and announce +1/21/2000: Re-open CVS (delay just in case) 1.3.9: Tagged and rolled on Aug. 16. Released and announced on 19th. 1.3.8: Not released. 1.3.7: Not released. @@ -35,8 +35,10 @@ [EMAIL PROTECTED] UPDATE: Ryan suggested that SHLIB_SUFFIX_NAME=sl be backed out. Jim has done this. However, there is still debate - on the correct fix. ALL patches regarding this MUST - be verified on a HPUX machine. + on the correct fix. At present, this seems to fix the + symptom, but not the full problem, which is inherent + in how the shared functionality was coded. Other + suggested patches break other platforms. * HPUX build failure without -Ae provided to HPUX compiler as a CFLAG. The error message states this flag is required for long long types @@ -44,10 +46,11 @@ Ryan submitted a patch for this problem STATUS: Ryan +1, Jim, +1 -* There is a Netware patch which should be applied. We've let - Netware hang too long. Patch by Mike Gardiner [EMAIL PROTECTED] -Message-ID: [EMAIL PROTECTED] - STATUS: Bill +1, Ryan +1 +* DSO emulation for AIX 4.2 appears hosed. +Message-ID: [EMAIL PROTECTED] + STATUS: Ryan, Sascha and others are looking into + what is really going on. + RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
cvs commit: apache-1.3 STATUS
jim 00/01/11 07:22:14 Modified:.STATUS Log: Votes Revision ChangesPath 1.784 +3 -3 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.783 retrieving revision 1.784 diff -u -r1.783 -r1.784 --- STATUS2000/01/11 14:41:56 1.783 +++ STATUS2000/01/11 15:22:12 1.784 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/11 14:41:56 $] + Last modified at [$Date: 2000/01/11 15:22:12 $] Release: @@ -42,7 +42,7 @@ The error message states this flag is required for long long types to be recognized by HPUX's compiler Ryan submitted a patch for this problem -STATUS: Ryan +1 +STATUS: Ryan +1, Jim, +1 RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: @@ -74,7 +74,7 @@ * Ken's patch to allow for umask settings for suExec. Suggested by PR#4178. Message-ID: [EMAIL PROTECTED] -Status: Ken +1, Ryan +1 +Status: Ken +1, Ryan +1, Jim +1 * Andrew Ford's patch (1999/12/05) to add absolute times to mod_expires Message-ID: [EMAIL PROTECTED]
cvs commit: apache-1.3 STATUS
jim 00/01/11 11:25:29 Modified:.STATUS Log: Some votes and a slight change in schedule due to the number of patches being presented Revision ChangesPath 1.786 +13 -8 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.785 retrieving revision 1.786 diff -u -r1.785 -r1.786 --- STATUS2000/01/11 16:21:24 1.785 +++ STATUS2000/01/11 19:25:24 1.786 @@ -1,15 +1,15 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/11 16:21:24 $] + Last modified at [$Date: 2000/01/11 19:25:24 $] Release: 1.3.10-dev: Current. We will try to release on 1/14/2000. As such, only bug-fixes and doc changes will be allowed. Timeline: -1/11/2000: Code freeze. No changes at all. -1/12/2000: tag and roll tarball -1/14/2000: Release and announce -1/16/2000: Re-open CVS (delay just in case) +1/12/2000: Code freeze. No changes at all. +1/13/2000: tag and roll tarball +1/17/2000: Release and announce +1/19/2000: Re-open CVS (delay just in case) 1.3.9: Tagged and rolled on Aug. 16. Released and announced on 19th. 1.3.8: Not released. 1.3.7: Not released. @@ -34,15 +34,20 @@ fix PR4974 has broken this again. Please see: [EMAIL PROTECTED] UPDATE: Ryan suggested that SHLIB_SUFFIX_NAME=sl be backed - out. Jim has done this. With this fix, we no longer - consider this a show-stopper, but we are leaving this here - so people look at this and double check. + out. Jim has done this. However, there is still debate + on the correct fix. ALL patches regarding this MUST + be verified on a HPUX machine. * HPUX build failure without -Ae provided to HPUX compiler as a CFLAG. The error message states this flag is required for long long types to be recognized by HPUX's compiler Ryan submitted a patch for this problem STATUS: Ryan +1, Jim, +1 + +* There is a Netware patch which should be applied. We've let + Netware hang too long. Patch by Mike Gardiner [EMAIL PROTECTED] +Message-ID: [EMAIL PROTECTED] + STATUS: Bill +1, Ryan +1 RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
cvs commit: apache-1.3 STATUS
jim 00/01/10 08:20:21 Modified:.STATUS Log: Add the suExec umask patch Revision ChangesPath 1.779 +6 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.778 retrieving revision 1.779 diff -u -r1.778 -r1.779 --- STATUS2000/01/08 14:41:19 1.778 +++ STATUS2000/01/10 16:20:16 1.779 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/08 14:41:19 $] + Last modified at [$Date: 2000/01/10 16:20:16 $] Release: @@ -60,6 +60,11 @@ Available Patches: + +* Ken's patch to allow for umask settings for suExec. Suggested + by PR#4178. +Message-ID: [EMAIL PROTECTED] +Status: * Andrew Ford's patch (1999/12/05) to add absolute times to mod_expires Message-ID: [EMAIL PROTECTED]
cvs commit: apache-1.3/src CHANGES Configure
jim 00/01/10 13:33:19 Modified:.STATUS src CHANGES Configure Log: Back out SHLIB_SUFFIX_NAME=sl patch, thus allowing HPUX builds to work again Revision ChangesPath 1.781 +5 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.780 retrieving revision 1.781 diff -u -r1.780 -r1.781 --- STATUS2000/01/10 20:08:02 1.780 +++ STATUS2000/01/10 21:32:58 1.781 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/10 20:08:02 $] + Last modified at [$Date: 2000/01/10 21:32:58 $] Release: @@ -33,6 +33,10 @@ UPDATE: Keith Wannamaker reports that Ralf's patch to fix PR4974 has broken this again. Please see: [EMAIL PROTECTED] + UPDATE: Ryan suggested that SHLIB_SUFFIX_NAME=sl be backed + out. Jim has done this. With this fix, we no longer + consider this a show-stopper, but we are leaving this here + so people look at this and double check. RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: 1.1490+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1489 retrieving revision 1.1490 diff -u -r1.1489 -r1.1490 --- CHANGES 2000/01/08 14:50:05 1.1489 +++ CHANGES 2000/01/10 21:33:06 1.1490 @@ -1,5 +1,9 @@ Changes with Apache 1.3.10 + *) Reverse a patch which broke HPUX shared builds. Basically + we comment out the SHLIB_SUFFIX_NAME=sl line in Configure. + [Ryan Bloom] + *) Added the mod_rewrite `URL Rewriting Guide' to the online documentation (htdocs/manual/misc/rewriteguide.html). This paper provides a large collection of practical solutions to URL based 1.385 +2 -2 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.384 retrieving revision 1.385 diff -u -r1.384 -r1.385 --- Configure 2000/01/10 10:39:46 1.384 +++ Configure 2000/01/10 21:33:10 1.385 @@ -1244,7 +1244,7 @@ LDFLAGS_SHLIB=-b LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB LDFLAGS_SHLIB_EXPORT=-Wl,-E -Wl,-B,deferred - SHLIB_SUFFIX_NAME=sl +#SHLIB_SUFFIX_NAME=sl ;; *-hp-hpux10.*|*-hp-hpux11.*) case $CC in @@ -1254,7 +1254,7 @@ LDFLAGS_SHLIB=-b LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB LDFLAGS_SHLIB_EXPORT=-Wl,-E -Wl,-B,deferred -Wl,+s - SHLIB_SUFFIX_NAME=sl +#SHLIB_SUFFIX_NAME=sl ;; *-ibm-aix*) case $CC in
cvs commit: apache-1.3/src Configure
jim 00/01/10 15:53:13 Modified:src Configure Log: Adjust from a previously unused test method (-n) to an ugly case statement Revision ChangesPath 1.386 +6 -3 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.385 retrieving revision 1.386 diff -u -r1.385 -r1.386 --- Configure 2000/01/10 21:33:10 1.385 +++ Configure 2000/01/10 23:53:08 1.386 @@ -1487,9 +1487,12 @@ # Activate RISC compilation if this is a SR2000 machine # (test written by Thomas Dorner [EMAIL PROTECTED] # for perl5 port): - if [ -n `bs2cmd SHOW-SYSTEM-INFO | grep 'HSI-ATT.*TYPE.*SR'` ]; then - CFLAGS=$CFLAGS -Krisc_4000 - fi + ISSR2000=`bs2cmd SHOW-SYSTEM-INFO | grep 'HSI-ATT'` + case $ISSR2000 in + *TYPE*SR*) + CFLAGS=$CFLAGS -Krisc_4000 + ;; + esac # Depending on the BS2000 OS and compiler/crte release, # -lnsl may be available (or may be not). # In standard SVR4 systems, -lsocket relies on some symbols
cvs commit: apache-2.0/src/lib/apr Makefile.in
jim 00/01/08 19:52:38 Modified:src/lib/apr Makefile.in Log: R isn't portable. r pretty much is Revision ChangesPath 1.16 +2 -2 apache-2.0/src/lib/apr/Makefile.in Index: Makefile.in === RCS file: /export/home/cvs/apache-2.0/src/lib/apr/Makefile.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Makefile.in 1999/12/22 11:46:35 1.15 +++ Makefile.in 2000/01/09 03:52:35 1.16 @@ -39,7 +39,7 @@ # building the entire package. # all: Makefile $(MODULES) subdirs - @rm -Rf objs + @rm -rf objs @mkdir objs @rm -f @[EMAIL PROTECTED] for i in $(SUBDIRS); do cp $$i/*.o objs ; done; @@ -55,7 +55,7 @@ -$(RM) -f *.o *.a *.so -$(RM) -f config.cache config.status config.log -$(RM) -f Makefile - -$(RM) -Rf objs + -$(RM) -rf objs subdirs: @for i in $(SUBDIRS); do \
cvs commit: apache-1.3 STATUS
jim 00/01/08 06:41:20 Modified:.STATUS Log: Some updates. Before we release I'd like for us to look at these 2 additions. The HPUX problem I consider a show-stopper (it was before). Randy, can you confirm that the builds are broken? Revision ChangesPath 1.778 +16 -4 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.777 retrieving revision 1.778 diff -u -r1.777 -r1.778 --- STATUS2000/01/06 17:02:58 1.777 +++ STATUS2000/01/08 14:41:19 1.778 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/06 17:02:58 $] + Last modified at [$Date: 2000/01/08 14:41:19 $] Release: @@ -25,15 +25,27 @@ RELEASE SHOWSTOPPERS: - -RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: - * HPUX binary build failure due to the fact that it is building libstandard.a and adding .so objects to the libstandard.a starting with mod_vhost_alias.so. Message-ID: [EMAIL PROTECTED] Status: Randy committed a temporary fix + UPDATE: Keith Wannamaker reports that Ralf's patch to + fix PR4974 has broken this again. Please see: + [EMAIL PROTECTED] + +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/contributors index.html
jim 00/01/07 05:32:01 Modified:contributors index.html Log: clarify Revision ChangesPath 1.85 +1 -1 apache-site/contributors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/contributors/index.html,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- index.html1999/12/13 23:36:16 1.84 +++ index.html2000/01/07 13:32:00 1.85 @@ -357,7 +357,7 @@ STRONGOrganization:/STRONG A HREF=http://www.jaguNET.com/;jaguNET Access Services, LLC/ABR STRONGOccupation:/STRONG ISP and Web Hosting/Design firmBR STRONGLocation:/STRONG Forest Hill, Maryland, USABR -STRONGOS Expertise:/STRONG A/UX and various SysV flavors, lately FreeBSDBR +STRONGOS Expertise:/STRONG FreeBSD and various SysV flavorsBR STRONGContributions:/STRONG Started off with the A/UX port; added SysV shared memory support for the scoreboard; flock mutexes; several mod_status updates such as bytes/requests counters and making
cvs commit: apache-1.3 STATUS
jim 00/01/06 05:16:45 Modified:.STATUS Log: Time for release? Revision ChangesPath 1.776 +3 -3 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.775 retrieving revision 1.776 diff -u -r1.775 -r1.776 --- STATUS1999/12/23 21:40:02 1.775 +++ STATUS2000/01/06 13:16:44 1.776 @@ -1,10 +1,10 @@ 1.3 STATUS: - Last modified at [$Date: 1999/12/23 21:40:02 $] + Last modified at [$Date: 2000/01/06 13:16:44 $] Release: -1.3.10-dev: Current. Proposal open to try to release after - the start of the new year (2000). Jim offers to be RM. +1.3.10-dev: Current. Proposal open to try to release on + 1/14/2000. Jim offers to be RM. 1.3.9: Tagged and rolled on Aug. 16. Released and announced on 19th. 1.3.8: Not released. 1.3.7: Not released.
cvs commit: apache-1.3 STATUS
jim 00/01/06 09:03:00 Modified:.STATUS Log: The schedule Revision ChangesPath 1.777 +8 -3 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.776 retrieving revision 1.777 diff -u -r1.776 -r1.777 --- STATUS2000/01/06 13:16:44 1.776 +++ STATUS2000/01/06 17:02:58 1.777 @@ -1,10 +1,15 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/06 13:16:44 $] + Last modified at [$Date: 2000/01/06 17:02:58 $] Release: -1.3.10-dev: Current. Proposal open to try to release on - 1/14/2000. Jim offers to be RM. +1.3.10-dev: Current. We will try to release on 1/14/2000. As such, + only bug-fixes and doc changes will be allowed. + Timeline: +1/11/2000: Code freeze. No changes at all. +1/12/2000: tag and roll tarball +1/14/2000: Release and announce +1/16/2000: Re-open CVS (delay just in case) 1.3.9: Tagged and rolled on Aug. 16. Released and announced on 19th. 1.3.8: Not released. 1.3.7: Not released.
cvs commit: apache-1.3 STATUS
jim 99/12/23 09:48:54 Modified:.STATUS Log: moof Revision ChangesPath 1.774 +3 -3 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.773 retrieving revision 1.774 diff -u -r1.773 -r1.774 --- STATUS1999/12/20 05:27:25 1.773 +++ STATUS1999/12/23 17:48:53 1.774 @@ -1,10 +1,10 @@ 1.3 STATUS: - Last modified at [$Date: 1999/12/20 05:27:25 $] + Last modified at [$Date: 1999/12/23 17:48:53 $] Release: -1.3.10-dev: Current. Proposal open to try to release on - Dec 24th, 1999. Jim offers to be RM. +1.3.10-dev: Current. Proposal open to try to release after + the start of the new year (200). Jim offers to be RM. 1.3.9: Tagged and rolled on Aug. 16. Released and announced on 19th. 1.3.8: Not released. 1.3.7: Not released.
cvs commit: apache-1.3 STATUS
jim 99/12/23 13:40:03 Modified:.STATUS Log: Blarf Revision ChangesPath 1.775 +2 -2 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.774 retrieving revision 1.775 diff -u -r1.774 -r1.775 --- STATUS1999/12/23 17:48:53 1.774 +++ STATUS1999/12/23 21:40:02 1.775 @@ -1,10 +1,10 @@ 1.3 STATUS: - Last modified at [$Date: 1999/12/23 17:48:53 $] + Last modified at [$Date: 1999/12/23 21:40:02 $] Release: 1.3.10-dev: Current. Proposal open to try to release after - the start of the new year (200). Jim offers to be RM. + the start of the new year (2000). Jim offers to be RM. 1.3.9: Tagged and rolled on Aug. 16. Released and announced on 19th. 1.3.8: Not released. 1.3.7: Not released.
cvs commit: apache-1.3 STATUS
jim 99/12/15 16:31:50 Modified:.STATUS Log: Foggy Revision ChangesPath 1.769 +8 -4 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.768 retrieving revision 1.769 diff -u -r1.768 -r1.769 --- STATUS1999/12/13 16:44:42 1.768 +++ STATUS1999/12/16 00:31:45 1.769 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/12/13 16:44:42 $] + Last modified at [$Date: 1999/12/16 00:31:45 $] Release: @@ -115,11 +115,15 @@ * Ralf's [PATCH] to add EAPI (ctx, hook, mm, etc.) to the base package Message-ID: [EMAIL PROTECTED] - Status: Jim -1 (alternatives?), Mark +1, Dean +1, BenH +1, + Status: 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 1.3.7 (too controversial, - esp. w/KEAPI offered as well), Fred +1 + Martin +1 (untested), Fred +1, + Jim ---0 (I really don't think it makes sense to + add this right now. If we do, then we want a long + beta period so that other packages that need to + patch the official source code have plenty of time + to make the required changes) * Brian Havard's patch to remove dependency of mod_auth_dbm on mod_auth. (PR#2598)
cvs commit: apache-1.3 STATUS
jim 99/12/16 06:05:30 Modified:.STATUS Log: Change the projected release. Cast my votes for IPv6 and EAPI for 1.3.10 Revision ChangesPath 1.770 +6 -8 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.769 retrieving revision 1.770 diff -u -r1.769 -r1.770 --- STATUS1999/12/16 00:31:45 1.769 +++ STATUS1999/12/16 14:05:29 1.770 @@ -1,10 +1,10 @@ 1.3 STATUS: - Last modified at [$Date: 1999/12/16 00:31:45 $] + Last modified at [$Date: 1999/12/16 14:05:29 $] Release: 1.3.10-dev: Current. Proposal open to try to release on - Dec 19th, 1999. Jim offers to be RM. + Dec 24th, 1999. Jim offers to be RM. 1.3.9: Tagged and rolled on Aug. 16. Released and announced on 19th. 1.3.8: Not released. 1.3.7: Not released. @@ -119,11 +119,9 @@ Randy +1 (please choose name other than hook) Doug +1 on concept (untested), Lars +1 on concept, Martin +1 (untested), Fred +1, - Jim ---0 (I really don't think it makes sense to - add this right now. If we do, then we want a long - beta period so that other packages that need to - patch the official source code have plenty of time - to make the required changes) + Jim -1 (I really don't think it makes sense to + add this right now this late in the release cycle + for 1.3.10. I am +1 for 1.3.11) * Brian Havard's patch to remove dependency of mod_auth_dbm on mod_auth. (PR#2598) @@ -146,7 +144,7 @@ Status: Lars +1 (on concept), Dirkx +1 (tested), Martin +1 (on concept, but patched apache does not compile successfully on pre-IPv6-SVR4, - and possibly others) + and possibly others), Jim -1 (not for 1.3.10) * Jim Patterson's patch to make mod_info work on Win32 Message-ID: PR#1442
cvs commit: apache-2.0/src/lib/apr/lib apr_snprintf.c
jim 99/12/13 05:36:17
Modified:src/lib/apr/lib apr_snprintf.c
Log:
Fold in the snprintf() changes
Revision ChangesPath
1.5 +202 -44 apache-2.0/src/lib/apr/lib/apr_snprintf.c
Index: apr_snprintf.c
===
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/lib/apr_snprintf.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- apr_snprintf.c1999/12/09 21:00:44 1.4
+++ apr_snprintf.c1999/12/13 13:36:16 1.5
@@ -54,7 +54,7 @@
* project, please see http://www.apache.org/.
*
* This code is based on, and used with the permission of, the
- * SIO stdiocntxteplacement strx_* functions by Panos Tsirigotis
+ * SIO stdio-replacement strx_* functions by Panos Tsirigotis
* [EMAIL PROTECTED] for xinetd.
*/
@@ -90,12 +90,22 @@
#ifndef TRUE
#define TRUE 1
#endif
+#ifndef AP_LONGEST_LONG
+#define AP_LONGEST_LONG long
+#endif
#define NUL '\0'
-#define INT_NULL ((int *)0)
#define WIDE_INT long
+#define WIDEST_INT AP_LONGEST_LONG
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)
@@ -131,7 +141,7 @@
register int r2;
double fi, fj;
register char *p, *p1;
-
+
if (ndigits = NDIG - 1)
ndigits = NDIG - 2;
r2 = 0;
@@ -350,6 +360,10 @@
* The caller provides a buffer for the string: that is the buf_end argument
* which is a pointer to the END of the buffer + 1 (i.e. if the buffer
* is declared as buf[ 100 ], buf_end should be buf[ 100 ])
+ *
+ * Note: we have 2 versions. One is used when we need to use quads
+ * (conv_10_quad), the other when we don't (conv_10). We're assuming the
+ * latter is faster.
*/
static char *conv_10(register wide_int num, register bool_int is_unsigned,
register bool_int *is_negative, char *buf_end,
@@ -398,6 +412,62 @@
return (p);
}
+static char *conv_10_quad(widest_int num, register bool_int is_unsigned,
+ register bool_int *is_negative, char *buf_end,
+ register int *len)
+{
+register char *p = buf_end;
+u_widest_int magnitude;
+
+/*
+ * We see if we can use the faster non-quad version by checking the
+ * number against the largest long value it can be. If =, we
+ * punt to the quicker version.
+ */
+if ((num = ULONG_MAX is_unsigned) || (num = LONG_MAX
!is_unsigned))
+ return(conv_10( (wide_int)num, is_unsigned, is_negative,
+buf_end, len));
+
+if (is_unsigned) {
+ magnitude = (u_widest_int) num;
+ *is_negative = FALSE;
+}
+else {
+ *is_negative = (num 0);
+
+ /*
+ * On a 2's complement machine, negating the most negative integer
+ * results in a number that cannot be represented as a signed integer.
+ * Here is what we do to obtain the number's magnitude:
+ * a. add 1 to the number
+ * b. negate it (becomes positive)
+ * c. convert it to unsigned
+ * d. add 1
+ */
+ if (*is_negative) {
+ widest_int t = num + 1;
+
+ magnitude = ((u_widest_int) -t) + 1;
+ }
+ else
+ magnitude = (u_widest_int) num;
+}
+
+/*
+ * We use a do-while loop so that we write at least 1 digit
+ */
+do {
+ u_widest_int new_magnitude = magnitude / 10;
+
+ *--p = (char) (magnitude - new_magnitude * 10 + '0');
+ magnitude = new_magnitude;
+}
+while (magnitude);
+
+*len = buf_end - p;
+return (p);
+}
+
static char *conv_in_addr(struct in_addr *ia, char *buf_end, int *len)
@@ -537,6 +607,9 @@
* The caller provides a buffer for the string: that is the buf_end argument
* which is a pointer to the END of the buffer + 1 (i.e. if the buffer
* is declared as buf[ 100 ], buf_end should be buf[ 100 ])
+ *
+ * As with conv_10, we have a faster version which is used when
+ * the number isn't quad size.
*/
static char *conv_p2(register u_wide_int num, register int nbits,
char format, char *buf_end, register int *len)
@@ -557,12 +630,34 @@
return (p);
}
+static char *conv_p2_quad(u_widest_int num, register int nbits,
+ char format, char *buf_end, register int *len)
+{
+register int mask = (1 nbits) - 1;
+register char *p = buf_end;
+static
cvs commit: apache-2.0/src/lib/apr/lib apr_snprintf.c
jim 99/12/13 05:39:24
Modified:src/lib/apr/lib apr_snprintf.c
Log:
Use the ap_vformatter_buff_t type :)
Revision ChangesPath
1.6 +5 -5 apache-2.0/src/lib/apr/lib/apr_snprintf.c
Index: apr_snprintf.c
===
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/lib/apr_snprintf.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apr_snprintf.c1999/12/13 13:36:16 1.5
+++ apr_snprintf.c1999/12/13 13:39:23 1.6
@@ -656,8 +656,8 @@
/*
* Do format conversion placing the output in buffer
*/
-API_EXPORT(int) ap_vformatter(int (*flush_func)(ap_vformatter_buff *),
-ap_vformatter_buff *vbuff, const char *fmt, va_list ap)
+API_EXPORT(int) ap_vformatter(int (*flush_func)(ap_vformatter_buff_t *),
+ap_vformatter_buff_t *vbuff, const char *fmt, va_list ap)
{
register char *sp;
register char *bep;
@@ -1149,7 +1149,7 @@
}
-static int snprintf_flush(ap_vformatter_buff *vbuff)
+static int snprintf_flush(ap_vformatter_buff_t *vbuff)
{
/* if the buffer fills we have to abort immediately, there is no way
* to flush an ap_snprintf... there's nowhere to flush it to.
@@ -1162,7 +1162,7 @@
{
int cc;
va_list ap;
-ap_vformatter_buff vbuff;
+ap_vformatter_buff_t vbuff;
if (len == 0)
return 0;
@@ -1182,7 +1182,7 @@
va_list ap)
{
int cc;
-ap_vformatter_buff vbuff;
+ap_vformatter_buff_t vbuff;
if (len == 0)
return 0;
cvs commit: apache-site/contributors index.html
jim 99/12/13 15:36:16 Modified:contributors index.html Log: Welcome to the 90s Revision ChangesPath 1.84 +2 -2 apache-site/contributors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/contributors/index.html,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- index.html1999/12/06 17:05:47 1.83 +++ index.html1999/12/13 23:36:16 1.84 @@ -353,8 +353,8 @@ STRONGName:/STRONG A NAME=jagielskiJim Jagielski/ABR STRONGEmail:/STRONG A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR -STRONGURL:/STRONG A HREF=http://www.jaguNET.com/;http://www.jaguNET.com//ABR -STRONGOrganization:/STRONG jaguNET Access Services, LLCBR +STRONGURL:/STRONG A HREF=http://www.jaguNET.com/jim.html;http://www.jaguNET.com/jim.html/ABR +STRONGOrganization:/STRONG A HREF=http://www.jaguNET.com/;jaguNET Access Services, LLC/ABR STRONGOccupation:/STRONG ISP and Web Hosting/Design firmBR STRONGLocation:/STRONG Forest Hill, Maryland, USABR STRONGOS Expertise:/STRONG A/UX and various SysV flavors, lately FreeBSDBR
cvs commit: apache-1.3 STATUS
jim 99/12/09 09:21:36 Modified:.STATUS Log: Actually nice and sunny Revision ChangesPath 1.763 +3 -3 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.762 retrieving revision 1.763 diff -u -r1.762 -r1.763 --- STATUS1999/12/09 16:16:57 1.762 +++ STATUS1999/12/09 17:21:35 1.763 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/12/09 16:16:57 $] + Last modified at [$Date: 1999/12/09 17:21:35 $] Release: @@ -48,7 +48,7 @@ * Andrew Ford's patch (1999/12/05) to add absolute times to mod_expires Message-ID: [EMAIL PROTECTED] - Status: Martin +1 + Status: Martin +1, Jim +1 * Raymond S Brand's path to mod_autoindex to fix the header/readme include processing so the envariables are correct for the included @@ -118,7 +118,7 @@ * 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, + Status: Jim -1 (alternatives?), 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 1.3.7 (too controversial,
cvs commit: apache-1.3 STATUS
jim 99/12/04 07:38:20 Modified:.STATUS Log: Try to release on the 19th?? Revision ChangesPath 1.759 +4 -4 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.758 retrieving revision 1.759 diff -u -r1.758 -r1.759 --- STATUS1999/11/05 14:53:32 1.758 +++ STATUS1999/12/04 15:38:19 1.759 @@ -1,10 +1,10 @@ 1.3 STATUS: - Last modified at [$Date: 1999/11/05 14:53:32 $] + Last modified at [$Date: 1999/12/04 15:38:19 $] Release: -1.3.10-dev: Current - +1.3.10-dev: Current. Proposal open to try to release on + Dec 19th, 1999. Jim offers to be RM. 1.3.9: Tagged and rolled on Aug. 16. Released and announced on 19th. 1.3.8: Not released. 1.3.7: Not released. @@ -16,7 +16,7 @@ 1.3.1: Tagged and rolled on July 19. Announced and released. 1.3.0: Tagged and rolled on June 1. Announced and released on the 6th. -2.0 : In pre-alpha development, see apache-2.0 and apache-apr repository +2.0 : In pre-alpha development, see apache-2.0 repository RELEASE SHOWSTOPPERS:
cvs commit: apache-1.3/src CHANGES Configure
jim 99/11/30 07:52:05 Modified:src CHANGES Configure Log: Force verbose mode during the sanity check if the check fails Revision ChangesPath 1.1463+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1462 retrieving revision 1.1463 diff -u -r1.1462 -r1.1463 --- CHANGES 1999/11/28 15:46:59 1.1462 +++ CHANGES 1999/11/30 15:51:59 1.1463 @@ -1,5 +1,9 @@ Changes with Apache 1.3.10 + *) If the compiler sanity check fails, force the verbose output + for TestCompile so people can have a clue what the problem + is. [Jim Jagielski] + *) Add --iconsdir, --htdocsdir, and --cgidir option to top-level configure script to allow one to override the corresponding variables from config.layout. 1.376 +17 -7 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.375 retrieving revision 1.376 diff -u -r1.375 -r1.376 --- Configure 1999/11/28 13:21:48 1.375 +++ Configure 1999/11/30 15:52:00 1.376 @@ -2150,13 +2150,23 @@ if ./helpers/TestCompile $vflag sanity; then : else - echo ** A test compilation with your Makefile configuration - echo ** failed. Re-run your configure script with --verbose - echo ** to get a better idea of what is failing. Note that - echo ** Apache requires an ANSI C Compiler, such as gcc. - echo Aborting! - exitcode=1 - exit 1 + if [ x$vflag = x-v ] ; then + WHEREERR=above + else + WHEREERR=below + fi + echo ** A test compilation with your Makefile configuration + echo ** failed. The $WHEREERR error output from the compilation + echo ** test will give you an idea what is failing. Note that + echo ** Apache requires an ANSI C Compiler, such as gcc. + echo + echo Error Output for sanity check + (./helpers/TestCompile -v sanity) + echo = End of Error Report = + echo + echo Aborting! + exitcode=1 + exit 1 fi fi
cvs commit: apache-1.3/src/ap ap_snprintf.c
jim 99/11/28 07:47:02 Modified:src CHANGES src/ap ap_snprintf.c Log: The real fix for ap_snprintf :) Revision ChangesPath 1.1462+1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1461 retrieving revision 1.1462 diff -u -r1.1461 -r1.1462 --- CHANGES 1999/11/28 14:15:32 1.1461 +++ CHANGES 1999/11/28 15:46:59 1.1462 @@ -6,7 +6,7 @@ [Ralf S. Engelschall] *) Fixed `quad integer' (aka `long long') handling in ap_snprintf.c - [Ralf S. Engelschall] + [Jim Jagielski, Ralf S. Engelschall] *) Fixed error handling in dbmmanage script. [Andrew McRae [EMAIL PROTECTED]] PR#4973 1.40 +4 -3 apache-1.3/src/ap/ap_snprintf.c Index: ap_snprintf.c === RCS file: /export/home/cvs/apache-1.3/src/ap/ap_snprintf.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- ap_snprintf.c 1999/11/28 13:53:40 1.39 +++ ap_snprintf.c 1999/11/28 15:47:02 1.40 @@ -410,10 +410,11 @@ u_widest_int magnitude; /* - * If the value is less than the maximum unsigned long value, - * then we know we aren't using quads, so use the faster function + * We see if we can use the faster non-quad version by checking the + * number against the largest long value it can be. If =, we + * punt to the quicker version. */ -if (num = ULONG_MAX is_unsigned) +if ((num = ULONG_MAX is_unsigned) || (num = LONG_MAX !is_unsigned)) return(conv_10( (wide_int)num, is_unsigned, is_negative, buf_end, len));
cvs commit: apache-2.0/src/lib/apr/file_io/unix dir.c
jim 99/11/13 06:39:54
Modified:src/lib/apr acconfig.h configure.in
src/lib/apr/file_io/unix dir.c
Log:
Handle the fact that FreeBSD has threaded functions in
libc_r and not libpthread
Revision ChangesPath
1.12 +2 -0 apache-2.0/src/lib/apr/acconfig.h
Index: acconfig.h
===
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/acconfig.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- acconfig.h1999/11/10 13:40:52 1.11
+++ acconfig.h1999/11/13 14:39:51 1.12
@@ -39,6 +39,8 @@
#undef USE_PROC_PTHREAD_SERIALIZE
#undef USE_PTHREAD_SERIALIZE
+#undef READDIR_IS_THREAD_SAFE
+
#undef NEED_RLIM_T
#undef USEBCOPY
1.26 +5 -0 apache-2.0/src/lib/apr/configure.in
Index: configure.in
===
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/configure.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- configure.in 1999/11/13 00:07:05 1.25
+++ configure.in 1999/11/13 14:39:52 1.26
@@ -86,7 +86,11 @@
AC_DEFINE_UNQUOTED($ac_decision)
AC_CHECK_LIB(pthread, pthread_mutex_init, AC_DEFINE(USE_PTHREAD_SERIALIZE))
+AC_CHECK_LIB(c_r, pthread_mutex_init, AC_DEFINE(USE_PTHREAD_SERIALIZE))
+ac_cv_define_READDIR_IS_THREAD_SAFE=no
+AC_CHECK_LIB(c_r, readdir, AC_DEFINE(READDIR_IS_THREAD_SAFE))
+
case $OS in
*-os2*)
CFLAGS=$CFLAGS -DOS2 -Zmt
@@ -104,6 +108,7 @@
AC_CHECK_LIB(dl, dlopen)
AC_CHECK_LIB(pthread, pthread_mutex_init)
+AC_CHECK_LIB(c_r, pthread_mutex_init)
AC_CHECK_LIB(socket,socket)
AC_CHECK_LIB(crypt,crypt)
AC_CHECK_LIB(ufc,crypt)
1.16 +2 -1 apache-2.0/src/lib/apr/file_io/unix/dir.c
Index: dir.c
===
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/file_io/unix/dir.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dir.c 1999/11/04 07:26:20 1.15
+++ dir.c 1999/11/13 14:39:53 1.16
@@ -124,7 +124,8 @@
*/
ap_status_t ap_readdir(struct dir_t *thedir)
{
-#if APR_HAS_THREADS defined(_POSIX_THREAD_SAFE_FUNCTIONS)
+#if APR_HAS_THREADS defined(_POSIX_THREAD_SAFE_FUNCTIONS) \
+ !defined(READDIR_IS_THREAD_SAFE)
ap_status_t ret;
ret = readdir_r(thedir-dirstruct, thedir-entry, thedir-entry);
/* Avoid the Linux problem where at end-of-directory thedir-entry
cvs commit: apache-2.0/src/lib/apr configure.in
jim 99/09/11 04:49:32 Modified:src/lib/apr configure.in Log: -x isn't present on 7th edition shells, so move down to -f Revision ChangesPath 1.10 +1 -1 apache-2.0/src/lib/apr/configure.in Index: configure.in === RCS file: /export/home/cvs/apache-2.0/src/lib/apr/configure.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- configure.in 1999/09/10 16:52:42 1.9 +++ configure.in 1999/09/11 11:49:31 1.10 @@ -50,7 +50,7 @@ AC_C_INLINE # Use /bin/sh if it exists, otherwise go looking for sh in the path -if (test -z $SH -a -x /bin/sh); then +if (test -z $SH -a -f /bin/sh); then SH=/bin/sh fi AC_CHECK_PROG(SH, sh, sh)
cvs commit: apache-2.0/src/lib/apr configure configure.in
jim 99/09/10 09:52:46 Modified:src/lib/apr configure configure.in Log: Not all tests support -e, so use -x Revision ChangesPath 1.6 +1 -1 apache-2.0/src/lib/apr/configure Index: configure === RCS file: /export/home/cvs/apache-2.0/src/lib/apr/configure,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- configure 1999/09/03 14:20:17 1.5 +++ configure 1999/09/10 16:52:39 1.6 @@ -1541,7 +1541,7 @@ # Use /bin/sh if it exists, otherwise go looking for sh in the path -if (test -z $SH -a -e /bin/sh); then +if (test -z $SH -a -x /bin/sh); then SH=/bin/sh fi # Extract the first word of sh, so it can be a program name with args. 1.9 +1 -1 apache-2.0/src/lib/apr/configure.in Index: configure.in === RCS file: /export/home/cvs/apache-2.0/src/lib/apr/configure.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- configure.in 1999/09/07 13:16:22 1.8 +++ configure.in 1999/09/10 16:52:42 1.9 @@ -50,7 +50,7 @@ AC_C_INLINE # Use /bin/sh if it exists, otherwise go looking for sh in the path -if (test -z $SH -a -e /bin/sh); then +if (test -z $SH -a -x /bin/sh); then SH=/bin/sh fi AC_CHECK_PROG(SH, sh, sh)
cvs commit: apache-2.0/mpm/src Configuration.mpm
jim 99/08/19 06:01:51 Modified:mpm/src Configuration.mpm Log: Ack... backout the Configuration.mpm stuff Revision ChangesPath 1.14 +12 -406 apache-2.0/mpm/src/Configuration.mpm Index: Configuration.mpm === RCS file: /export/home/cvs/apache-2.0/mpm/src/Configuration.mpm,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Configuration.mpm 1999/08/19 12:59:58 1.13 +++ Configuration.mpm 1999/08/19 13:01:50 1.14 @@ -1,458 +1,64 @@ -# Config file for the Apache httpd. - -# Configuration.tmpl is the template for Configuration. Configuration should -# be edited to select the modules to be included as well as various flags -# for Makefile. - -# The template should only be changed when a new system or module is added, -# or an existing one modified. This will also most likely require some minor -# changes to Configure to recognize those changes. - -# There are 5 types of lines here: - -# '#' comments, distinguished by having a '#' as the first non-blank character -# -# Makefile options, such as CC=gcc, etc... -# -# Rules, distinguished by having Rule at the front. These are used to -# control Configure's behavior as far as how to create Makefile. The value -# of Rules is up to the implementer. -# -# Module selection lines, distinguished by having 'AddModule' at the front. -# These list the configured modules, in priority order (highest priority -# last). They're down at the bottom. -# -# Optional module selection lines, distinguished by having `%Module' -# at the front. These specify a module that is to be compiled in (but -# not enabled). The AddModule directive can be used to enable such a -# module. By default no such modules are defined. - - - -# Makefile configuration -# -# These are added to the general flags determined by Configure. -# Edit these to work around Configure if needed. The EXTRA_* family -# will be added to the regular Makefile flags. For example, if you -# want to compile with -Wall, then add that to EXTRA_CFLAGS. These -# will be added to whatever flags Configure determines as appropriate -# and needed for your platform. -# -# You can also set the compiler (CC) and optimization (OPTIM) used here as -# well. Settings here have priority; If not set, Configure will attempt to -# guess the C compiler, looking for gcc first, then cc. -# -# Optimization note: -# Be careful when adding optimization flags (like -O3 or -O6) on the OPTIM -# entry, especially when using some GCC variants. Experience showed that using -# these for compiling Apache is risky. If you don't want to see Apache dumping -# core regularly then at most use -O or -O2. -# -# The EXTRA_DEPS can be used to add extra Makefile dependencies to external -# files (for instance third-party libraries) for the httpd target. The effect -# is that httpd is relinked when those files are changed. -# -EXTRA_CFLAGS=-Wall -Wshadow -Wmissing-prototypes -Wmissing-declarations +# Add the appropriate flags to compile threaded code when using the +# mpmt_pthread MPM (-pthread in EXTRA_CFLAGS on Linux) +EXTRA_CFLAGS= -Wall EXTRA_LDFLAGS= EXTRA_LIBS= EXTRA_INCLUDES= EXTRA_DEPS= - #CC= #CPP= -#OPTIM= +OPTIM=-O2 -g #RANLIB= - - -# Name of the installed Apache HTTP webserver. -# #TARGET= - - -# Dynamic Shared Object (DSO) support -# -# There is experimental support for compiling the Apache core and -# the Apache modules into dynamic shared object (DSO) files for -# maximum runtime flexibility. -# -# The Configure script currently has only limited built-in -# knowledge on how to compile these DSO files because this is -# heavily platform-dependent. The current state of supported and -# explicitly unsupported platforms can be found in the file -# htdocs/manual/dso.html, under Supported Platforms. -# -# For other platforms where you want to use the DSO mechanism you -# first have to make sure it supports the pragmatic dlopen() -# system call and then you have to provide the appropriate -# compiler and linker flags below to create the DSO files on your -# particular platform. -# -# The placement of the Apache core into a DSO file is triggered -# by the SHARED_CORE rule below while support for building -# individual Apache Modules as DSO files and loading them under -# runtime without recompilation is triggered by `SharedModule' -# commands. To be able to use the latter one first enable the -# module mod_so (see corresponding `AddModule' command below). -# Then enable the DSO feature for particular modules
cvs commit: apache-1.3 STATUS
jim 99/08/16 09:27:06 Modified:.STATUS Log: Fer de record Revision ChangesPath 1.747 +3 -2 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.746 retrieving revision 1.747 diff -u -r1.746 -r1.747 --- STATUS1999/08/16 16:06:48 1.746 +++ STATUS1999/08/16 16:27:02 1.747 @@ -1,11 +1,12 @@ 1.3 STATUS: - Last modified at [$Date: 1999/08/16 16:06:48 $] + Last modified at [$Date: 1999/08/16 16:27:02 $] Release: 1.3.9-dev: COUNTDOWN restarted at 08/15 3:00pm PDT Tarball planned for Monday morning unless problems found. - Votes for rolling: Ralf +1, Martin +1, Roy +1, Randy +1 + Votes for rolling: Ralf +1, Martin +1, Roy +1, Randy +1, + Jim +1 1.3.8: Not released. 1.3.7: Not released.
cvs commit: apache-1.3/src/helpers TestCompile
jim 99/07/21 07:32:55
Modified:src/helpers TestCompile
Log:
Portable solution for VERBOSE and RUNIT vars.
Make them settable via the environment. Namechange for RUNIT
just in case
Revision ChangesPath
1.34 +10 -5 apache-1.3/src/helpers/TestCompile
Index: TestCompile
===
RCS file: /export/home/cvs/apache-1.3/src/helpers/TestCompile,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- TestCompile 1999/07/21 12:05:13 1.33
+++ TestCompile 1999/07/21 14:32:55 1.34
@@ -49,10 +49,15 @@
cd ./helpers
#
-# Handle verbose, silent and runit flags
+# Handle verbose, silent and runit flags. Allow for them
+# to be set via the environment
#
-: ${VERBOSE:=no}
-RUNIT=no
+if [ x$VERBOSE = x ]; then
+VERBOSE=no
+fi
+if [ x$TCRUNIT = x ]; then
+TCRUNIT=no;
+fi
case $1 in
-v)
VERBOSE=yes
@@ -63,7 +68,7 @@
shift
;;
-r)
-RUNIT=yes
+TCRUNIT=yes
shift
;;
esac
@@ -211,7 +216,7 @@
# have PrintPath just search this directory.
if ./PrintPath -s -p`pwd` $TARGET ; then
-if [ x$RUNIT = xyes ]; then
+if [ x$TCRUNIT = xyes ]; then
`pwd`/$TARGET
fi
exstat=0
cvs commit: apache-2.0/mpm/src Configuration.mpm Configuration.tmpl Configure
jim 99/07/10 11:20:17
Modified:mpm 00README_FIRST_REALLY configure
mpm/src Configuration.mpm Configuration.tmpl Configure
Log:
Some [cC]onfigure cleaning. First, remove the MPM Rule and the MPM_METHOD
var and reimplement the MPM_METHOD Rule. Then add the --set-rule action
to configure to allow for Rules to actually be set rather than simply
enabled or disabled. Finally (and this should go in 1.3.7 as well) fix
the 'tr' calls to work correctly with all versions of 'tr' esp the
SysV based ones.
Revision ChangesPath
1.4 +9 -6 apache-2.0/mpm/00README_FIRST_REALLY
Index: 00README_FIRST_REALLY
===
RCS file: /export/home/cvs/apache-2.0/mpm/00README_FIRST_REALLY,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 00README_FIRST_REALLY 1999/07/07 15:06:20 1.3
+++ 00README_FIRST_REALLY 1999/07/10 18:20:15 1.4
@@ -7,18 +7,16 @@
You can build for 1.3 preforking via:
-$ MPM_METHOD=prefork \
- ./configure \
- --enable-rule=MPM
+$ ./configure \
+ --set-rule=MPM_METHOD:prefork
--disable-module=status
--disable-module=include
--disable-module=cgi
and for the MPM pthreading stuff via:
-$ MPM_METHOD=mpmt_pthread \
- ./configure \
- --enable-rule=MPM
+$ ./configure \
+ --set-rule=MPM_METHOD:mpmt_pthread
--disable-module=status
--disable-module=include
--disable-module=cgi
@@ -26,3 +24,8 @@
(on some systems you also need ``CFLAGS=-pthread LDFLAGS=-pthread'' !!)
- Ralf
+
+Or you can use the old Configure method and the Configuration.mpm
+file.
+
+- Jim
1.3 +21 -8 apache-2.0/mpm/configure
Index: configure
===
RCS file: /export/home/cvs/apache-2.0/mpm/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure 1999/07/04 09:13:29 1.2
+++ configure 1999/07/10 18:20:15 1.3
@@ -257,7 +257,7 @@
for rule in `grep '^Rule' $src/Configuration.tmpl`; do
rule=`echo $rule | sed -e 's/^Rule[]*//'`
name=`echo $rule | sed -e 's/=.*$//'`
-namelow=`echo $name | tr 'A-Z' 'a-z'`
+namelow=`echo $name | tr '[A-Z]' '[a-z]'`
arg=`echo $rule | sed -e 's/^.*=//'`
eval rule_$namelow=$arg
rules=$rules:$namelow
@@ -392,8 +392,9 @@
echo --proxycachedir=DIRinstall proxy cache data in DIR
echo
echo Configuration options:
-echo --enable-rule=NAME enable a particular Rule named
'NAME'
-echo --disable-rule=NAMEdisable a particular Rule named
'NAME'
+echo --enable-rule=NAME enable a particular Rule named
'NAME' (set to 'yes')
+echo --disable-rule=NAMEdisable a particular Rule named
'NAME' (set to 'no')
+echo --set-rule=NAME:VALset particular Rule named 'NAME'
to the value 'VAL'
$aux/ppl.sh $rulelist
echo --add-module=FILE on-the-fly copy activate a
3rd-party Module
echo --activate-module=FILE on-the-fly activate existing
3rd-party Module
@@ -714,8 +715,8 @@
esac
case $apc_feature in
rule )
-apc_optarg=`echo $apc_optarg | tr A-Z a-z`
-apc_optarg_real=`echo $apc_optarg | tr a-z A-Z`
+apc_optarg=`echo $apc_optarg | tr '[A-Z]' '[a-z]'`
+apc_optarg_real=`echo $apc_optarg | tr '[a-z]' '[A-Z]'`
eval exists=\$rule_${apc_optarg}
if [ x$exists = x ]; then
echo configure:Error: No such rule named
'${apc_optarg_real}' 12
@@ -809,8 +810,8 @@
esac
case $apc_feature in
rule )
-apc_optarg=`echo $apc_optarg | tr A-Z a-z`
-apc_optarg_real=`echo $apc_optarg | tr a-z A-Z`
+apc_optarg=`echo $apc_optarg | tr '[A-Z]' '[a-z]'`
+apc_optarg_real=`echo $apc_optarg | tr '[a-z]' '[A-Z]'`
eval exists=\$rule_${apc_optarg}
if [ x$exists = x ]; then
echo configure:Error: No such rule named
'${apc_optarg_real}' 12
@@ -864,6 +865,18 @@
;;
esac
;;
+--set-rule=*:*)
+rulename=`echo $apc_optarg | sed -e 's/:.*//'`
+ rulenamelow=`echo $rulename | tr '[A-Z]' '[a-z]'`
+ruleval=`echo $apc_optarg | sed -e 's/.*://'`
+ ruleval=`echo $ruleval | tr '[A-Z]' '[a-z]'`
+ eval exists=\$rule_${rulenamelow}
+ if [ x$exists = x ]; then
+ echo
cvs commit: apache-1.3/src CHANGES
jim 99/07/10 11:27:27
Modified:.configure
src CHANGES
Log:
Make configure SysV tr happy. Also, some typos :)
Revision ChangesPath
1.94 +5 -5 apache-1.3/configure
Index: configure
===
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- configure 1999/06/17 17:44:59 1.93
+++ configure 1999/07/10 18:27:25 1.94
@@ -714,8 +714,8 @@
esac
case $apc_feature in
rule )
-apc_optarg=`echo $apc_optarg | tr A-Z a-z`
-apc_optarg_real=`echo $apc_optarg | tr a-z A-Z`
+apc_optarg=`echo $apc_optarg | tr '[A-Z]' '[a-z]'`
+apc_optarg_real=`echo $apc_optarg | tr '[a-z]' '[A-Z]'`
eval exists=\$rule_${apc_optarg}
if [ x$exists = x ]; then
echo configure:Error: No such rule named
'${apc_optarg_real}' 12
@@ -809,8 +809,8 @@
esac
case $apc_feature in
rule )
-apc_optarg=`echo $apc_optarg | tr A-Z a-z`
-apc_optarg_real=`echo $apc_optarg | tr a-z A-Z`
+apc_optarg=`echo $apc_optarg | tr '[A-Z]' '[a-z]'`
+apc_optarg_real=`echo $apc_optarg | tr '[a-z]' '[A-Z]'`
eval exists=\$rule_${apc_optarg}
if [ x$exists = x ]; then
echo configure:Error: No such rule named
'${apc_optarg_real}' 12
@@ -1274,7 +1274,7 @@
OIFS=$IFS
IFS=':'
for rule in $rules; do
-name=`echo $rule | tr a-z A-Z`
+name=`echo $rule | tr '[a-z]' '[A-Z]'`
eval val=\$rule_$rule
echo $SEO s%^\\(Rule $name=\\).*%\\1$val%g $sedsubst
if [ x$verbose = xyes ]; then
1.1396+6 -3 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1395
retrieving revision 1.1396
diff -u -r1.1395 -r1.1396
--- CHANGES 1999/07/09 21:44:23 1.1395
+++ CHANGES 1999/07/10 18:27:26 1.1396
@@ -1,5 +1,8 @@
Changes with Apache 1.3.7
+ *) Fix 'configure' to work correctly with SysV-based versions of
+ 'tr' (consistent with Configure's use as well). [Jim Jagielski]
+
*) apxs: Add -S var=val option which allows for override of CFG_*
built-in values. Add -e option which works like -i but doesn't
install the DSO; useful for editing httpd.conf with apxs. Fix
@@ -220,7 +223,7 @@
[Graham Leggett [EMAIL PROTECTED],
Tim Costello [EMAIL PROTECTED]] PR#3178
- *) Fix inconsistant error messages reported by mod_proxy.
+ *) Fix inconsistent error messages reported by mod_proxy.
[Graham Leggett [EMAIL PROTECTED]]
*) OS/2: Fix terminating CGIs that aren't compiled by EMX GCC when a
@@ -698,7 +701,7 @@
and check to see if the tar we wind up with supports '-h'.
[Jim Jagielski] PR#3671
- *) A consistant and conservative style for all shell scripts has been
+ *) A consistent and conservative style for all shell scripts has been
implemented. Basically, all shell string tests use the traditional
hack of 'if [ x$var != x ]' or 'if [ x$var = xstring ]'
to protect against bare null variable strings (ie: wrapping both
@@ -2684,7 +2687,7 @@
*) PORT: IRIX needs the -n32 flag iff using the 'cc' compiler
[Jim Jagielski] PR#1901
- *) BUG: Configure was using TCC and CC inconsistantly. Make sure
+ *) BUG: Configure was using TCC and CC inconsistently. Make sure
Configure knows which CC we are using. [Jim Jagielski]
*) Options +Includes wasn't correctly merged if +IncludesNoExec
cvs commit: apache-1.3/src/main http_main.c
jim 99/06/29 20:34:38
Modified:src/main http_main.c
Log:
Final phase - add to getopt string
Revision ChangesPath
1.453 +4 -3 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -r1.452 -r1.453
--- http_main.c 1999/06/29 15:13:12 1.452
+++ http_main.c 1999/06/30 03:34:36 1.453
@@ -4680,7 +4680,7 @@
ap_setup_prelinked_modules();
while ((c = getopt(argc, argv,
- D:C:c:xXd:f:vVlLR:Sth
+ D:C:c:xXd:f:vVlLR:StTh
#ifdef DEBUG_SIGSTOP
Z:
#endif
@@ -6175,7 +6175,7 @@
ap_cpystrn(cwd, ap_os_canonical_filename(pcommands, cwd), sizeof(cwd));
ap_cpystrn(ap_server_root, cwd, sizeof(ap_server_root));
-while ((c = getopt(argc, argv, D:C:c:Xd:f:vVlLZ:iusSthk:n:)) != -1) {
+while ((c = getopt(argc, argv, D:C:c:Xd:f:vVlLZ:iusStThk:n:)) != -1) {
char **new;
switch (c) {
case 'c':
@@ -6462,7 +6462,7 @@
* but only handle the -L option
*/
llp_dir = SHARED_CORE_DIR;
-while ((c = getopt(argc, argv, D:C:c:Xd:f:vVlLR:SZ:th)) != -1) {
+while ((c = getopt(argc, argv, D:C:c:Xd:f:vVlLR:SZ:tTh)) != -1) {
switch (c) {
case 'D':
case 'C':
@@ -6477,6 +6477,7 @@
case 'S':
case 'Z':
case 't':
+ case 'T':
case 'h':
case '?':
break;
cvs commit: apache-2.0/mpm/src/modules/mpm/mpm_prefork Makefile.libdir Makefile.tmpl mpm_prefork.c
jim 99/06/23 16:01:30 Removed: mpm/src/modules/mpm/mpm_mpmt_pthread Makefile.libdir Makefile.tmpl acceptlock.c acceptlock.h http_accept.c mpm_mpmt_pthread.c scoreboard.c mpm/src/modules/mpm/mpm_prefork Makefile.libdir Makefile.tmpl mpm_prefork.c Log: Wait until Dean is done until we move. Reverse stuff done right in the middle
cvs commit: apache-2.0/mpm/src/modules/mpm - New directory
jim 99/06/23 17:24:22 apache-2.0/mpm/src/modules/mpm - New directory
cvs commit: apache-2.0/mpm/src/modules/mpm/prefork - New directory
jim 99/06/23 17:24:38 apache-2.0/mpm/src/modules/mpm/prefork - New directory
cvs commit: apache-2.0/mpm/src/modules/mpm/mpmt_pthread - New directory
jim 99/06/23 17:24:39 apache-2.0/mpm/src/modules/mpm/mpmt_pthread - New directory
cvs commit: apache-2.0/mpm/src/modules/mpm_prefork Makefile.libdir Makefile.tmpl mpm_prefork.c
jim 99/06/23 18:58:13
Modified:mpm/src CHANGES Configure
Added: mpm/src/modules/mpm MPM.NAMING
mpm/src/modules/mpm/mpmt_pthread Makefile.libdir
Makefile.tmpl acceptlock.c acceptlock.h
http_accept.c mpmt_pthread.c scoreboard.c
mpm/src/modules/mpm/prefork Makefile.libdir Makefile.tmpl
prefork.c
Removed: mpm/src/modules/mpm_mpmt_pthread Makefile.libdir
Makefile.tmpl acceptlock.c acceptlock.h
http_accept.c mpm_mpmt_pthread.c scoreboard.c
mpm/src/modules/mpm_prefork Makefile.libdir Makefile.tmpl
mpm_prefork.c
Log:
Consistant and shorter naming
of MPM methods implemented.
Revision ChangesPath
1.11 +1 -1 apache-2.0/mpm/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-2.0/mpm/src/CHANGES,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CHANGES 1999/06/23 07:17:16 1.10
+++ CHANGES 1999/06/24 01:57:43 1.11
@@ -1,7 +1,7 @@
Changes with MPM
* Implement mpm_* methods as modules. Each method gets it's own
- subdir in src/modules (eg: src/modules/mpm_prefork). Selection
+ subdir in src/modules (eg: src/modules/prefork). Selection
of method uses Rule MPM_METHOD. [Jim Jagielski]
* Port the hybrid server from the apache-apr repository as
1.8 +56 -41apache-2.0/mpm/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-2.0/mpm/src/Configure,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Configure 1999/06/23 00:28:11 1.7
+++ Configure 1999/06/24 01:57:45 1.8
@@ -1481,37 +1481,47 @@
##
# First, add the shadow MPM method module
##
-echo AddModule modules/mpm_$RULE_MPM_METHOD/libmpm_$RULE_MPM_METHOD.a
$tmpfile
+echo AddModule modules/mpm/$RULE_MPM_METHOD/lib$RULE_MPM_METHOD.a
$tmpfile
+echo - using mpm method $RULE_MPM_METHOD
+
MODFILES=`awk $tmpfile '($1 == AddModule || $1 == SharedModule) {
printf %s , $2 }'`
MODDIRS=`awk $tmpfile '
($1 == Module $3 ~ /^modules\//) {
- split ($3, pp, /)
- if (! SEEN[pp[2]]) {
- printf %s , pp[2]
- SEEN[pp[2]] = 1
- }
+ count = split ($3, pp, /)
+ dir = pp[2]
+ for (i = 3; i count; i++) dir = dir / pp[i]
+ if (! SEEN[dir]) {
+ printf %s , dir
+ SEEN[dir] = 1
+ }
}
(($1 == AddModule || $1 == SharedModule) $2 ~ /^modules\//) {
- split ($2, pp, /)
- if (! SEEN[pp[2]]) {
- printf %s , pp[2]
- SEEN[pp[2]] = 1
+ count = split ($2, pp, /)
+ dir = pp[2]
+ for (i = 3; i count; i++) dir = dir / pp[i]
+ if (! SEEN[dir]) {
+ printf %s , dir
+ SEEN[dir] = 1
}
}'`
MODDIRS_NO_SO=`awk $tmpfile '
($1 == Module $3 ~ /^modules\//) {
- split ($3, pp, /)
- if (! SEEN[pp[2]]) {
- printf %s , pp[2]
- SEEN[pp[2]] = 1
- }
+ count = split ($3, pp, /)
+ dir = pp[2]
+ for (i = 3; i count; i++) dir = dir / pp[i]
+ if (! SEEN[dir]) {
+ printf %s , dir
+ SEEN[dir] = 1
+ }
}
(($1 == AddModule) $2 ~ /^modules\//) {
- split ($2, pp, /)
- if (! SEEN[pp[2]]) {
- printf %s , pp[2]
- SEEN[pp[2]] = 1
+ count = split ($2, pp, /)
+ dir = pp[2]
+ for (i = 3; i count; i++) dir = dir / pp[i]
+ if (! SEEN[dir]) {
+ printf %s , dir
+ SEEN[dir] = 1
}
}'`
@@ -1576,7 +1586,14 @@
sed 's/^mod_//' | sed 's/^lib//' | sed 's/$/_module/'`
fi
if [ x$ext != x$SHLIB_SUFFIX_NAME ]; then
- echo Module $modname $modbase.$ext $tmpfile
+ # Special Case: Handle MPM methods.
+ # Prepend mpm to $modname
+ mpm=`echo $modbase | awk '/modules\/mpm\// { print 1 }'`
+ if [ x$mpm = x1 ]; then
+ echo Module mpm_${modname} $modbase.$ext $tmpfile
+ else
+ echo Module $modname $modbase.$ext $tmpfile
+ fi
fi
# optionally generate export file for some linkers
if [ x$ext = x$SHLIB_SUFFIX_NAME -a x$SHLIB_EXPORT_FILES = xyes
]; then
@@ -1596,10 +1613,7 @@
fi
cvs commit: apache-2.0/mpm/src/modules/mpm/mpmt_pthread .cvsignore
jim 99/06/24 05:24:32 Added: mpm/src/modules/mpm/mpmt_pthread .cvsignore Log: Revision ChangesPath 1.1 apache-2.0/mpm/src/modules/mpm/mpmt_pthread/.cvsignore Index: .cvsignore === Makefile
cvs commit: apache-1.3 STATUS
jim 99/06/24 09:09:58 Modified:.STATUS Log: Furgle Revision ChangesPath 1.721 +15 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.720 retrieving revision 1.721 diff -u -r1.720 -r1.721 --- STATUS1999/06/22 09:11:53 1.720 +++ STATUS1999/06/24 16:09:47 1.721 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/06/22 09:11:53 $] + Last modified at [$Date: 1999/06/24 16:09:47 $] Release: @@ -70,6 +70,20 @@ proxy. RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: + +* What to do about DocumentRootCheck? + After commited Dean and Brian suggested just getting rid of + the stat itself and removing the need for the directive. Jim + points out that it's useful to have the stat for the -t + command line. + +Votes: + Keep as is: + Remove directive and stat totally^: + Remove directive but keep stat for -t^: + whatever/don't care: + +^ = CHANGES needs big bold notice about this change. * 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_core.c http_main.c
jim 99/06/24 09:38:54
Modified:.STATUS
htdocs/manual/mod core.html directives.html
src CHANGES
src/include http_conf_globals.h
src/main http_core.c http_main.c
Log:
Backout the DocumentRootCheck stuff.
I wash my hands of this... :)
Revision ChangesPath
1.722 +1 -15 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.721
retrieving revision 1.722
diff -u -r1.721 -r1.722
--- STATUS1999/06/24 16:09:47 1.721
+++ STATUS1999/06/24 16:38:31 1.722
@@ -1,5 +1,5 @@
1.3 STATUS:
- Last modified at [$Date: 1999/06/24 16:09:47 $]
+ Last modified at [$Date: 1999/06/24 16:38:31 $]
Release:
@@ -70,20 +70,6 @@
proxy.
RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
-
-* What to do about DocumentRootCheck?
- After commited Dean and Brian suggested just getting rid of
- the stat itself and removing the need for the directive. Jim
- points out that it's useful to have the stat for the -t
- command line.
-
-Votes:
- Keep as is:
- Remove directive and stat totally^:
- Remove directive but keep stat for -t^:
- whatever/don't care:
-
-^ = CHANGES needs big bold notice about this change.
* mod_rewrite/3874: RewriteLock doesn't work for virtual hosts
Status: (Ralf): When I find time, I can look at this. But
1.153 +0 -39 apache-1.3/htdocs/manual/mod/core.html
Index: core.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- core.html 1999/06/22 01:11:09 1.152
+++ core.html 1999/06/24 16:38:33 1.153
@@ -36,7 +36,6 @@
LIA HREF=#directorylt;Directorygt;/A
LIA HREF=#directorymatchlt;DirectoryMatchgt;/A
LIA HREF=#documentrootDocumentRoot/A
-LIA HREF=#documentrootcheckDocumentRootCheck/A
LIA HREF=#errordocumentErrorDocument/A
LIA HREF=#errorlogErrorLog/A
LIA HREF=#fileslt;Filesgt;/A
@@ -744,44 +743,6 @@
PThere appears to be a bug in mod_dir which causes problems when the
DocumentRoot has a trailing slash (EMi.e./EM, DocumentRoot /usr/web/)
so
please avoid that.
-
-PHR
-
-H2A NAME=documentrootcheckDocumentRootCheck directive/A/H2
-!--%plaintext lt;?INDEX {\tt DocumentRootCheck} directivegt; --
-A
- HREF=directive-dict.html#Syntax
- REL=Help
-STRONGSyntax:/STRONG/A DocumentRootCheck EMOn/Off/EMBR
-A
- HREF=directive-dict.html#Default
- REL=Help
-STRONGDefault:/STRONG/A CODEDocumentRootCheck On/CODEBR
-A
- HREF=directive-dict.html#Context
- REL=Help
-STRONGContext:/STRONG/A server configBR
-A
- HREF=directive-dict.html#Status
- REL=Help
-STRONGStatus:/STRONG/A coreBR
-A
- HREF=directive-dict.html#Compatibility
- REL=Help
-STRONGCompatibility:/STRONG/A Available in Apache 1.3.7 and later
-P
-During startup, Apache does a CODEstat/CODE of each
-A HREF=#documentrootDocumentRoot/A
-to determine if the directory exists. If your server is
-configured with lots of DocumentRoot directives (for example,
-if you serve numerous virtual hosts), this can emgreatly/em increase
-the startup time. If you are sure that all the DocumentRoot
-entries exist, you can tell Apache to bypass this check using:
-BLOCKQUOTECODEDocumentRootCheck Off/CODE/BLOCKQUOTE
-P
-This directive is ignored when Apache is called with the
-CODE-t/CODE command line option to perform a configuration
-test.
PHR
1.58 +0 -1 apache-1.3/htdocs/manual/mod/directives.html
Index: directives.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/directives.html,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- directives.html 1999/06/13 19:59:37 1.57
+++ directives.html 1999/06/24 16:38:34 1.58
@@ -95,7 +95,6 @@
LIA HREF=core.html#directorymatchlt;DirectoryMatchgt;/A
LIA HREF=mod_dir.html#directoryindexDirectoryIndex/A
LIA HREF=core.html#documentrootDocumentRoot/A
-LIA HREF=core.html#documentrootcheckDocumentRootCheck/A
LIA HREF=core.html#errordocumentErrorDocument/A
LIA HREF=core.html#errorlogErrorLog/A
LIA HREF=mod_example.html#exampleExample/A
1.1387+7 -5 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1386
retrieving revision 1.1387
diff -u -r1.1386 -r1.1387
--- CHANGES 1999/06/24 14:30:32
cvs commit: apache-2.0/mpm/src/main Makefile.tmpl http_main.c http_request.c
jim 99/06/24 10:48:31 Modified:mpm/src/main Makefile.tmpl http_main.c http_request.c Log: Allow for prefork to compile on systems that don't have pthreads installed Revision ChangesPath 1.8 +1 -2 apache-2.0/mpm/src/main/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-2.0/mpm/src/main/Makefile.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile.tmpl 1999/06/24 08:58:56 1.7 +++ Makefile.tmpl 1999/06/24 17:48:24 1.8 @@ -133,8 +133,7 @@ $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/http_request.h $(INCDIR)/http_core.h \ $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \ - $(INCDIR)/http_main.h $(INCDIR)/scoreboard.h /usr/include/pthread.h \ - $(INCDIR)/fnmatch.h + $(INCDIR)/http_main.h $(INCDIR)/fnmatch.h http_vhost.o: http_vhost.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ 1.2 +1 -0 apache-2.0/mpm/src/main/http_main.c Index: http_main.c === RCS file: /export/home/cvs/apache-2.0/mpm/src/main/http_main.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- http_main.c 1999/06/18 18:39:30 1.1 +++ http_main.c 1999/06/24 17:48:26 1.2 @@ -244,6 +244,7 @@ pool *plog; /* Pool for error-logging files */ pool *ptemp; /* Pool for temporart config stuff */ pool *pcommands; /* Pool for -C and -c switches */ +extern char *optarg; /* TODO: PATHSEPARATOR should be one of the os defines */ 1.5 +2 -0 apache-2.0/mpm/src/main/http_request.c Index: http_request.c === RCS file: /export/home/cvs/apache-2.0/mpm/src/main/http_request.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- http_request.c1999/06/20 12:27:10 1.4 +++ http_request.c1999/06/24 17:48:27 1.5 @@ -73,7 +73,9 @@ #include http_protocol.h #include http_log.h #include http_main.h +#if 0 #include scoreboard.h +#endif #include fnmatch.h /*
cvs commit: apache-2.0/mpm/src/mpm/prefork - New directory
jim 99/06/22 16:11:16 apache-2.0/mpm/src/mpm/prefork - New directory
cvs commit: apache-2.0/mpm/src/mpm/pthread - New directory
jim 99/06/22 16:11:17 apache-2.0/mpm/src/mpm/pthread - New directory
cvs commit: apache-2.0/mpm/src/modules/mpm_prefork - New directory
jim 99/06/22 17:21:31 apache-2.0/mpm/src/modules/mpm_prefork - New directory
cvs commit: apache-2.0/mpm/src/modules/mpm_pthread - New directory
jim 99/06/22 17:21:47 apache-2.0/mpm/src/modules/mpm_pthread - New directory
cvs commit: apache-2.0/mpm/src/modules/mpm_pthread Makefile.libdir Makefile.tmpl acceptlock.c acceptlock.h http_accept.c mpm_mpmt_pthread.c scoreboard.c
jim 99/06/22 17:28:26
Modified:mpm/src CHANGES Configure
Added: mpm/src/modules/mpm_prefork Makefile.libdir Makefile.tmpl
mpm_prefork.c
mpm/src/modules/mpm_pthread Makefile.libdir Makefile.tmpl
acceptlock.c acceptlock.h http_accept.c
mpm_mpmt_pthread.c scoreboard.c
Log:
Implement MPM methods as modules. Having src/modules/mpm/prefork,
for example, would be better, but would require work on Configure
that could be better spent elsewhere. Instead, we have, eg,
src/modules/mpm_prefork (or whatever).
Revision ChangesPath
1.9 +4 -0 apache-2.0/mpm/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-2.0/mpm/src/CHANGES,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CHANGES 1999/06/20 22:59:49 1.8
+++ CHANGES 1999/06/23 00:28:10 1.9
@@ -1,5 +1,9 @@
Changes with MPM
+* Implement mpm_* methods as modules. Each method gets it's own
+ subdir in src/modules (eg: src/modules/mpm_prefork). Selection
+ of method uses Rule MPM_METHOD. [Jim Jagielski]
+
* os/unix/unixd.[ch]: detach, setuid, setgid, stuff which will be common
amongst the unix MPMs
1.7 +1 -6 apache-2.0/mpm/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-2.0/mpm/src/Configure,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Configure 1999/06/20 23:49:28 1.6
+++ Configure 1999/06/23 00:28:11 1.7
@@ -1481,7 +1481,7 @@
##
# First, add the shadow MPM method module
##
-echo AddModule modules/mpm/mpm_$RULE_MPM_METHOD.o $tmpfile
+echo AddModule modules/mpm_$RULE_MPM_METHOD/libmpm_$RULE_MPM_METHOD.a
$tmpfile
MODFILES=`awk $tmpfile '($1 == AddModule || $1 == SharedModule) {
printf %s , $2 }'`
MODDIRS=`awk $tmpfile '
@@ -1703,11 +1703,6 @@
## Now create modules.c
##
-
-## TODO: the mpm thing below should be controlled by a configuration
-## TODO: directive... it should really be like another module, with
-## TODO: a default selected depending on the platform
-## TODO: there should be an mpm/foo/ hierarchy for the MPM
$CAT $awkfile EOFM
BEGIN {
1.1 apache-2.0/mpm/src/modules/mpm_prefork/Makefile.libdir
Index: Makefile.libdir
===
This is a place-holder which indicates to Configure that it shouldn't
provide the default targets when building the Makefile in this directory.
Instead it'll just prepend all the important variable definitions, and
copy the Makefile.tmpl onto the end.
1.1 apache-2.0/mpm/src/modules/mpm_prefork/Makefile.tmpl
Index: Makefile.tmpl
===
LIB=libmpm_prefork.$(LIBEXT)
OBJS=\
mpm_prefork.o
OBJS_PIC=\
mpm_prefork.lo
all: lib
lib: $(LIB)
libmpm_prefork.a: $(OBJS)
rm -f $@
ar cr $@ $(OBJS)
$(RANLIB) $@
libmpm_prefork.so: $(OBJS_PIC)
rm -f $@
$(LD_SHLIB) $(LDFLAGS_SHLIB) -o $@ $(OBJS_PIC) $(LIBS_SHLIB)
libmpm_prefork.dll: $(OBJS_PIC) mpm_prefork.def
$(LD_SHLIB) $(LDFLAGS_SHLIB) -o $* $(OBJS_PIC) $(LIBS_SHLIB)
emxbind -b -q -s -h0 -dmpm_prefork.def $* \
rm $*
.SUFFIXES: .o .lo .dll
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $
.c.lo:
$(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $ mv $*.o $*.lo
clean:
rm -f $(OBJS) $(OBJS_PIC) $(LIB)
distclean: clean
-rm -f Makefile
# We really don't expect end users to use this rule. It works only with
# gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after
# using it.
depend:
cp Makefile.tmpl Makefile.tmpl.bak \
sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl Makefile.new \
gcc -MM $(INCLUDES) $(CFLAGS) *.c Makefile.new \
sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
-e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
Makefile.tmpl \
rm Makefile.new
#Dependencies
$(OBJS) $(OBJS_PIC): Makefile
# DO NOT REMOVE
mpm_prefork.o: mpm_prefork.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
$(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_main.h $(INCDIR)/http_log.h $(INCDIR)/http_config.h \
$(INCDIR
cvs commit: apache-2.0/mpm/src/modules/mpm Makefile.tmpl acceptlock.c acceptlock.h http_accept.c mpm_mpmt_pthread.c mpm_prefork.c scoreboard.c
jim 99/06/22 17:30:41 Removed: mpm/src/modules/mpm Makefile.tmpl acceptlock.c acceptlock.h http_accept.c mpm_mpmt_pthread.c mpm_prefork.c scoreboard.c Log: Finish up... Moving the pthread and prefork was easier with the amount of changes
cvs commit: apache-2.0/mpm/src/modules/mpm_mpmt_pthread - New directory
jim 99/06/22 17:36:18 apache-2.0/mpm/src/modules/mpm_mpmt_pthread - New directory
cvs commit: apache-2.0/mpm/src/modules/mpm_pthread Makefile.libdir Makefile.tmpl acceptlock.c acceptlock.h http_accept.c mpm_mpmt_pthread.c scoreboard.c
jim 99/06/22 17:39:12 Removed: mpm/src/modules/mpm_pthread Makefile.libdir Makefile.tmpl acceptlock.c acceptlock.h http_accept.c mpm_mpmt_pthread.c scoreboard.c Log: Arg! Force name change
cvs commit: apache-2.0/mpm/src/modules/mpm/mpm_prefork - New directory
jim 99/06/23 15:34:43 apache-2.0/mpm/src/modules/mpm/mpm_prefork - New directory
cvs commit: apache-2.0/mpm/src/modules/mpm/mpm_mpmt_pthread - New directory
jim 99/06/23 15:34:44 apache-2.0/mpm/src/modules/mpm/mpm_mpmt_pthread - New directory
cvs commit: apache-1.3/htdocs/manual/mod core.html
jim 99/06/21 18:11:13
Modified:htdocs/manual/mod core.html
Log:
Minor nit. There are 3 options now :)
Revision ChangesPath
1.152 +1 -1 apache-1.3/htdocs/manual/mod/core.html
Index: core.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- core.html 1999/06/22 00:51:23 1.151
+++ core.html 1999/06/22 01:11:09 1.152
@@ -3105,7 +3105,7 @@
H2A NAME=usecanonicalnameUseCanonicalName directive/A/H2
!--%plaintext lt;?INDEX {\tt UseCanonicalName} directivegt; --
A HREF=directive-dict.html#Syntax REL=Help
-STRONGSyntax:/STRONG/A UseCanonicalName EMon|off/EMBR
+STRONGSyntax:/STRONG/A UseCanonicalName EMon|off|dns/EMBR
A HREF=directive-dict.html#Default REL=Help
STRONGDefault:/STRONG/A CODEUseCanonicalName on/CODEBR
A HREF=directive-dict.html#Context REL=Help
cvs commit: apache-1.3/src/include ap_mmn.h httpd.h
jim 99/06/22 08:22:15 Modified:src/include ap_mmn.h httpd.h Log: MMN bump and change of location for local_ip and local_host slots Revision ChangesPath 1.38 +2 -1 apache-1.3/src/include/ap_mmn.h Index: ap_mmn.h === RCS file: /export/home/cvs/apache-1.3/src/include/ap_mmn.h,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- ap_mmn.h 1999/06/04 18:30:22 1.37 +++ ap_mmn.h 1999/06/22 15:22:14 1.38 @@ -219,6 +219,7 @@ *export ap_add_file_conf * 19990320.3 - add ap_regexec() * 19990604.4 - add ap_field_noparam() + * 19990621.5 - add local_ip/host to conn_rec for mass-vhost */ #define MODULE_MAGIC_COOKIE 0x41503133UL /* AP13 */ @@ -226,7 +227,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 19990320 #endif -#define MODULE_MAGIC_NUMBER_MINOR 4 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 5 /* 0...n */ #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward compat */ /* Useful for testing for features. */ 1.283 +4 -4 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.282 retrieving revision 1.283 diff -u -r1.282 -r1.283 --- httpd.h 1999/06/22 00:51:29 1.282 +++ httpd.h 1999/06/22 15:22:14 1.283 @@ -827,10 +827,6 @@ * if it has and no address was found. * N.B. Only access this though * get_remote_host() */ -char *local_ip; /* server IP address */ -char *local_host;/* used for ap_get_server_name when - * UseCanonicalName is set to DNS - * (ignores setting of HostnameLookups) */ char *remote_logname;/* Only ever set if doing rfc1413 lookups. * N.B. Only access this through * get_remote_logname() */ @@ -847,6 +843,10 @@ signed int double_reverse:2;/* have we done double-reverse DNS? * -1 yes/failure, 0 not yet, 1 yes/success */ int keepalives; /* How many times have we used it? */ +char *local_ip; /* server IP address */ +char *local_host;/* used for ap_get_server_name when + * UseCanonicalName is set to DNS + * (ignores setting of HostnameLookups) */ }; /* Per-vhost config... */
cvs commit: apache-2.0/mpm/src/modules/mpm - New directory
jim 99/06/20 16:46:22 apache-2.0/mpm/src/modules/mpm - New directory
cvs commit: apache-2.0/mpm/src/modules/mpm Makefile.tmpl mpm_prefork.c
jim 99/06/20 16:49:39
Modified:mpm/src Configuration.mpm Configure
mpm/src/main Makefile.tmpl
Added: mpm/src/modules/mpm Makefile.tmpl mpm_prefork.c
Removed: mpm/src/main mpm_prefork.c
Log:
First cut at implementing the MPM methods as modules. Uses a new
Configure Rule, MPM_METHOD to determine the actual method. Configure
then automagically prepends the mpm_ on front and adds the correct
subdir under modules. Right now, only (mpm_)prefork is enabled. Since
this is implemented as modules, all the module Config tricks work.
Revision ChangesPath
1.8 +1 -0 apache-2.0/mpm/src/Configuration.mpm
Index: Configuration.mpm
===
RCS file: /export/home/cvs/apache-2.0/mpm/src/Configuration.mpm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Configuration.mpm 1999/06/20 21:12:47 1.7
+++ Configuration.mpm 1999/06/20 23:49:27 1.8
@@ -21,6 +21,7 @@
Rule PARANOID=no
Rule EXPAT=no
Rule WANTHSREGEX=default
+Rule MPM_METHOD=default
# AddModule modules/experimental/mod_mmap_static.o
AddModule modules/standard/mod_env.o
AddModule modules/standard/mod_log_config.o
1.6 +10 -5 apache-2.0/mpm/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-2.0/mpm/src/Configure,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Configure 1999/06/20 23:14:17 1.5
+++ Configure 1999/06/20 23:49:28 1.6
@@ -1478,6 +1478,11 @@
echo + adding selected modules
+##
+# First, add the shadow MPM method module
+##
+echo AddModule modules/mpm/mpm_$RULE_MPM_METHOD.o $tmpfile
+
MODFILES=`awk $tmpfile '($1 == AddModule || $1 == SharedModule) {
printf %s , $2 }'`
MODDIRS=`awk $tmpfile '
($1 == Module $3 ~ /^modules\//) {
@@ -1704,15 +1709,15 @@
## TODO: a default selected depending on the platform
## TODO: there should be an mpm/foo/ hierarchy for the MPM
-$CAT $awkfile 'EOFM'
+$CAT $awkfile EOFM
BEGIN {
modules[n++] = core
pmodules[pn++] = core
- modules[n++] = mpm_prefork
- pmodules[pn++] = mpm_prefork
+ modules[n++] = mpm_$RULE_MPM_METHOD
+ pmodules[pn++] = mpm_$RULE_MPM_METHOD
}
-/^Module/ { modules[n++] = $2 ; pmodules[pn++] = $2 }
-/^%Module/ { pmodules[pn++] = $2 }
+/^Module/ { modules[n++] = \$2 ; pmodules[pn++] = \$2 }
+/^%Module/ { pmodules[pn++] = \$2 }
END {
print /*
print * modules.c --- automatically generated by Apache
1.5 +1 -10 apache-2.0/mpm/src/main/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache-2.0/mpm/src/main/Makefile.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.tmpl 1999/06/20 23:14:31 1.4
+++ Makefile.tmpl 1999/06/20 23:49:32 1.5
@@ -11,7 +11,7 @@
http_config.o http_core.o http_log.o \
http_main.o http_protocol.o http_request.o http_vhost.o \
util.o util_date.o util_script.o util_uri.o util_md5.o \
- rfc1413.o mpm_prefork.o http_connection.o iol_unix.o
+ rfc1413.o http_connection.o iol_unix.o
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $
@@ -148,15 +148,6 @@
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
$(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h
-mpm_prefork.o: mpm_prefork.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
- $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
- $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_log.h $(INCDIR)/http_config.h \
- $(INCDIR)/http_core.h $(INCDIR)/http_connection.h \
- $(INCDIR)/scoreboard_prefork.h $(INCDIR)/ap_mpm.h \
- $(OSDIR)/unixd.h
rfc1413.o: rfc1413.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
1.1 apache-2.0/mpm/src/modules/mpm/Makefile.tmpl
Index: Makefile.tmpl
===
#Dependencies
$(OBJS) $(OBJS_PIC): Makefile
# DO NOT REMOVE
mpm_prefork.o: mpm_prefork.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
$(INCDIR
cvs commit: apache-2.0/mpm/src Configuration.mpm
jim 99/06/20 08:59:57 Modified:mpm/src Configuration.mpm Log: Thanks to Dmitry Khrustalev Revision ChangesPath 1.6 +2 -2 apache-2.0/mpm/src/Configuration.mpm Index: Configuration.mpm === RCS file: /export/home/cvs/apache-2.0/mpm/src/Configuration.mpm,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Configuration.mpm 1999/06/19 22:16:03 1.5 +++ Configuration.mpm 1999/06/20 15:59:56 1.6 @@ -1,5 +1,5 @@ -EXTRA_CFLAGS= -Wall -EXTRA_LDFLAGS= #-pthread # Uncomment for FreeBSD +EXTRA_CFLAGS= -Wall #-pthread -D_THREAD_SAFE # Uncomment for FreeBSD +EXTRA_LDFLAGS= EXTRA_LIBS= EXTRA_INCLUDES= EXTRA_DEPS=
cvs commit: apache-2.0/mpm/src Configure
jim 99/06/20 15:25:25 Modified:mpm/src Configure Log: Stub of the mpm/ directory of methods Revision ChangesPath 1.4 +18 -0 apache-2.0/mpm/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-2.0/mpm/src/Configure,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Configure 1999/06/20 21:12:48 1.3 +++ Configure 1999/06/20 22:25:24 1.4 @@ -227,6 +227,7 @@ RULE_EXPAT=`./helpers/CutRule EXPAT $file` RULE_SHARED_CORE=`./helpers/CutRule SHARED_CORE $file` RULE_SHARED_CHAIN=`./helpers/CutRule SHARED_CHAIN $file` +RULE_MPM_METHOD=`./helpers/CutRule MPM_METHOD $file` ## Rule SHARED_CORE implies required DSO support @@ -807,6 +808,17 @@ fi +## Now handle the MPM implementation. Default to 1.3 prefork +## +if [ x$RULE_MPM_METHOD = xdefault ]; then + if [ x$DEF_MPM_METHOD = x ]; then + RULE_MPM_METHOD=prefork + else + RULE_MPM_METHOD=$DEF_MPM_METHOD + fi +fi + + ## Now we determine the C-compiler and optimization level ## to use. Settings of CC and OPTIM in Configuration have ## the highest precedence; next comes any settings from @@ -1577,6 +1589,12 @@ SUBDIRS=regex $SUBDIRS CFLAGS=$CFLAGS -DUSE_HSREGEX fi + + +## Choose the right MPM method +## TODO:: More later + +SUBDIRS=mpm/$RULE_MPM_METHOD $SUBDIRS ## Add in the Expat library if needed/wanted.
cvs commit: apache-2.0/mpm/src/modules/standard mod_env.c
jim 99/06/19 15:04:39 Modified:mpm/src/modules/standard mod_env.c Log: Too many elements Revision ChangesPath 1.3 +0 -2 apache-2.0/mpm/src/modules/standard/mod_env.c Index: mod_env.c === RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_env.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_env.c 1999/06/19 20:40:49 1.2 +++ mod_env.c 1999/06/19 22:04:39 1.3 @@ -268,7 +268,5 @@ fixup_env_module, /* fixups */ NULL, /* logger */ NULL, /* header parser */ -NULL, /* child_init */ -NULL, /* child_exit */ NULL/* post read-request */ };
cvs commit: apache-2.0/mpm/src Configuration.mpm
jim 99/06/19 15:16:04 Modified:mpm/src Configuration.mpm Log: FreeBSD requires this to grab the thread lib for pthreads. Uncomment when trying on that Revision ChangesPath 1.5 +1 -1 apache-2.0/mpm/src/Configuration.mpm Index: Configuration.mpm === RCS file: /export/home/cvs/apache-2.0/mpm/src/Configuration.mpm,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Configuration.mpm 1999/06/19 20:40:48 1.4 +++ Configuration.mpm 1999/06/19 22:16:03 1.5 @@ -1,5 +1,5 @@ EXTRA_CFLAGS= -Wall -EXTRA_LDFLAGS= +EXTRA_LDFLAGS= #-pthread # Uncomment for FreeBSD EXTRA_LIBS= EXTRA_INCLUDES= EXTRA_DEPS=
cvs commit: apache-1.3/src/main http_core.c http_main.c
jim 99/06/17 04:49:35
Modified:htdocs/manual/mod core.html
src CHANGES
src/include http_conf_globals.h
src/main http_core.c http_main.c
Log:
Always perform the check for DocumentRoot
when doing the config test
Revision ChangesPath
1.150 +4 -1 apache-1.3/htdocs/manual/mod/core.html
Index: core.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- core.html 1999/06/14 18:41:23 1.149
+++ core.html 1999/06/17 11:49:26 1.150
@@ -778,7 +778,10 @@
the startup time. If you are sure that all the DocumentRoot
entries exist, you can tell Apache to bypass this check using:
BLOCKQUOTECODEDocumentRootCheck Off/CODE/BLOCKQUOTE
-
+P
+This directive is ignored when Apache is called with the
+CODE-t/CODE command line option to perform a configuration
+test.
PHR
1.1380+3 -1 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1379
retrieving revision 1.1380
diff -u -r1.1379 -r1.1380
--- CHANGES 1999/06/16 22:19:16 1.1379
+++ CHANGES 1999/06/17 11:49:28 1.1380
@@ -4,7 +4,9 @@
*) New directive, DocumentRootCheck, added to determine if
we bother doing the stat of each DocumentRoot during
- startup. [Mathijs Maassen [EMAIL PROTECTED]. Jim Jagielski]
+ startup. Ignored when using the '-t' command line option
+ to perform a configuration test. [Mathijs Maassen [EMAIL PROTECTED].
+ Jim Jagielski]
*) Win32: The query switch apache -S didn't exit after showing the
vhost settings. That was inconsistent with the other query functions.
1.37 +1 -0 apache-1.3/src/include/http_conf_globals.h
Index: http_conf_globals.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/http_conf_globals.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- http_conf_globals.h 1999/06/13 19:59:40 1.36
+++ http_conf_globals.h 1999/06/17 11:49:31 1.37
@@ -68,6 +68,7 @@
extern int ap_standalone;
extern int ap_documentroot_check;
+extern int ap_configtestonly;
extern uid_t ap_user_id;
extern char *ap_user_name;
extern gid_t ap_group_id;
1.264 +2 -1 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- http_core.c 1999/06/13 19:59:41 1.263
+++ http_core.c 1999/06/17 11:49:32 1.264
@@ -1031,7 +1031,8 @@
return err;
}
-ap_documentroot_check = arg != 0;
+if (!ap_configtestonly)
+ap_documentroot_check = arg != 0;
return NULL;
}
1.446 +5 -6 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- http_main.c 1999/06/13 19:59:41 1.445
+++ http_main.c 1999/06/17 11:49:33 1.446
@@ -231,6 +231,7 @@
int ap_standalone=0;
int ap_documentroot_check=1;
+int ap_configtestonly=0;
uid_t ap_user_id=0;
char *ap_user_name=NULL;
gid_t ap_group_id=0;
@@ -4634,7 +4635,6 @@
int REALMAIN(int argc, char *argv[])
{
int c;
-int configtestonly = 0;
int sock_in;
int sock_out;
char *s;
@@ -4743,7 +4743,7 @@
ap_dump_settings = 1;
break;
case 't':
- configtestonly = 1;
+ ap_configtestonly = 1;
break;
case 'h':
usage(argv[0]);
@@ -4755,7 +4755,7 @@
ap_suexec_enabled = init_suexec();
server_conf = ap_read_config(pconf, ptrans, ap_server_confname);
-if (configtestonly) {
+if (ap_configtestonly) {
fprintf(stderr, Syntax OK\n);
exit(0);
}
@@ -6132,7 +6132,6 @@
char *s;
char *service_name = NULL;
int install = 0;
-int configtestonly = 0;
int conf_specified = 0;
char *signal_to_send = NULL;
char cwd[MAX_STRING_LEN];
@@ -6252,7 +6251,7 @@
++one_process; /* Weird debugging mode. */
break;
case 't':
- configtestonly = 1;
+ ap_configtestonly = 1;
break;
case 'h
cvs commit: apache-1.3/src/main http_core.c http_main.c
jim 99/06/13 12:59:43
Modified:.STATUS
htdocs/manual/mod core.html directives.html
src CHANGES
src/include http_conf_globals.h
src/main http_core.c http_main.c
Log:
Submitted by: Mathijs Maassen [EMAIL PROTECTED]
Reviewed by: Jim, Lars
Add the new DocumentRootCheck directive. This determines if we
check for each DocumentRoot during startup.
Revision ChangesPath
1.715 +1 -6 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.714
retrieving revision 1.715
diff -u -r1.714 -r1.715
--- STATUS1999/06/13 11:25:24 1.714
+++ STATUS1999/06/13 19:59:34 1.715
@@ -1,5 +1,5 @@
1.3 STATUS:
- Last modified at [$Date: 1999/06/13 11:25:24 $]
+ Last modified at [$Date: 1999/06/13 19:59:34 $]
Release:
@@ -90,11 +90,6 @@
Available Patches:
-
-* Mathijs Maassen [EMAIL PROTECTED] path to disable the initial
- check/stat of DocumentRoot.
-Message-ID: [EMAIL PROTECTED]
- Status: Jim +1 (will add to docs), Lars +1
* Stipe Tolj's Cygwin32 port
PR#: 2936
1.147 +36 -0 apache-1.3/htdocs/manual/mod/core.html
Index: core.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- core.html 1999/04/20 22:19:15 1.146
+++ core.html 1999/06/13 19:59:35 1.147
@@ -36,6 +36,7 @@
LIA HREF=#directorylt;Directorygt;/A
LIA HREF=#directorymatchlt;DirectoryMatchgt;/A
LIA HREF=#documentrootDocumentRoot/A
+LIA HREF=#documentrootCheckDocumentRootCheck/A
LIA HREF=#errordocumentErrorDocument/A
LIA HREF=#errorlogErrorLog/A
LIA HREF=#fileslt;Filesgt;/A
@@ -743,6 +744,41 @@
PThere appears to be a bug in mod_dir which causes problems when the
DocumentRoot has a trailing slash (EMi.e./EM, DocumentRoot /usr/web/)
so
please avoid that.
+
+PHR
+
+H2A NAME=documentrootcheckDocumentRootCheck directive/A/H2
+!--%plaintext lt;?INDEX {\tt DocumentRootCheck} directivegt; --
+A
+ HREF=directive-dict.html#Syntax
+ REL=Help
+STRONGSyntax:/STRONG/A DocumentRootCheck EMOn/Off/EMBR
+A
+ HREF=directive-dict.html#Default
+ REL=Help
+STRONGDefault:/STRONG/A CODEDocumentRootCheck On/CODEBR
+A
+ HREF=directive-dict.html#Context
+ REL=Help
+STRONGContext:/STRONG/A server configBR
+A
+ HREF=directive-dict.html#Status
+ REL=Help
+STRONGStatus:/STRONG/A coreBR
+A
+ HREF=directive-dict.html#Compatibility
+ REL=Help
+STRONGCompatibility:/STRONG/A Available in Apache 1.3.7 and later
+P
+During startup, Apache does a CODEstat/CODE of each
+A HREF=#documentrootDocumentRoot/A
+to determine if the directory exists. If your server is
+configured with lots of DocumentRoot directives (for example,
+if you server numerous virtual hosts), this can emgreatly/em increase
+the startup time. If you are sure that all the DocumentRoot
+entries exist, you can tell Apache to bypass this check using
+BLOCKQUOTECODEDocumentRootCheck Off/CODE/BLOCKQUOTE
+
PHR
1.57 +1 -0 apache-1.3/htdocs/manual/mod/directives.html
Index: directives.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/directives.html,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- directives.html 1999/03/23 14:35:47 1.56
+++ directives.html 1999/06/13 19:59:37 1.57
@@ -95,6 +95,7 @@
LIA HREF=core.html#directorymatchlt;DirectoryMatchgt;/A
LIA HREF=mod_dir.html#directoryindexDirectoryIndex/A
LIA HREF=core.html#documentrootDocumentRoot/A
+LIA HREF=core.html#documentrootcheckDocumentRootCheck/A
LIA HREF=core.html#errordocumentErrorDocument/A
LIA HREF=core.html#errorlogErrorLog/A
LIA HREF=mod_example.html#exampleExample/A
1.1378+7 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1377
retrieving revision 1.1378
diff -u -r1.1377 -r1.1378
--- CHANGES 1999/06/09 17:22:44 1.1377
+++ CHANGES 1999/06/13 19:59:38 1.1378
@@ -1,5 +1,9 @@
Changes with Apache 1.3.7
+ *) New directive, DocumentRootCheck, added to determine if
+ we bother doing the stat of each DocumentRoot during
+ startup. [Mathijs Maassen [EMAIL PROTECTED]. Jim Jagielski]
+
*) Win32: The query switch apache -S didn't exit after showing the
vhost settings. That was inconsistent with the other query functions.
[Bill
cvs commit: apache-1.3/htdocs/manual/mod core.html
jim 99/06/13 13:06:43 Modified:htdocs/manual/mod core.html Log: Typo Revision ChangesPath 1.148 +2 -2 apache-1.3/htdocs/manual/mod/core.html Index: core.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- core.html 1999/06/13 19:59:35 1.147 +++ core.html 1999/06/13 20:06:42 1.148 @@ -774,9 +774,9 @@ A HREF=#documentrootDocumentRoot/A to determine if the directory exists. If your server is configured with lots of DocumentRoot directives (for example, -if you server numerous virtual hosts), this can emgreatly/em increase +if you serve numerous virtual hosts), this can emgreatly/em increase the startup time. If you are sure that all the DocumentRoot -entries exist, you can tell Apache to bypass this check using +entries exist, you can tell Apache to bypass this check using: BLOCKQUOTECODEDocumentRootCheck Off/CODE/BLOCKQUOTE
cvs commit: apache-1.3 STATUS
jim 99/06/11 06:18:58 Modified:.STATUS Log: Add some available patches Revision ChangesPath 1.713 +10 -4 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.712 retrieving revision 1.713 diff -u -r1.712 -r1.713 --- STATUS1999/06/09 18:23:38 1.712 +++ STATUS1999/06/11 13:18:57 1.713 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/06/09 18:23:38 $] + Last modified at [$Date: 1999/06/11 13:18:57 $] Release: @@ -91,6 +91,11 @@ Available Patches: +* Mathijs Maassen [EMAIL PROTECTED] path to disable the initial + check/stat of DocumentRoot. +Message-ID: [EMAIL PROTECTED] + Status: Jim +1 (will add to docs) + * Stipe Tolj's Cygwin32 port PR#: 2936 Status: Lars +1 (on concept) @@ -111,9 +116,10 @@ * 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) + Message-ID: [EMAIL PROTECTED] + Status: Dean +1, Randy +1, Jim +1 + Previous Status: Dean +1, Randy +1, Jim +1, + Lars +1 (if someone writes the docs) * Brian Havard's patch to remove dependency of mod_auth_dbm on mod_auth. (PR#2598)
cvs commit: apache-1.3 STATUS
jim 99/06/06 07:20:51 Modified:.STATUS Log: Some votes Revision ChangesPath 1.708 +4 -3 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.707 retrieving revision 1.708 diff -u -r1.707 -r1.708 --- STATUS1999/06/06 13:45:50 1.707 +++ STATUS1999/06/06 14:20:49 1.708 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/06/06 13:45:50 $] + Last modified at [$Date: 1999/06/06 14:20:49 $] Release: @@ -114,6 +114,7 @@ * Tony Finch's patch to support mass virtual hosting Message-ID: [EMAIL PROTECTED] Status: Dean +1, Randy +1, Lars +1 (if someone writes the docs) +Jim +1 * Brian Havard's patch to remove dependency of mod_auth_dbm on mod_auth. (PR#2598) @@ -123,11 +124,11 @@ * 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 + Status: Ken +1, Dean +1, Randy +1, Lars +0, Jim +1 * John Giannadrea's patch for ceiling on file size for mmap (PR#4122) Message-ID: [EMAIL PROTECTED] - Status: Ken +1, Dean +1, Randy +1, Lars +1 + Status: Ken +1, Dean +1, Randy +1, Lars +1, Jim +1 * Keith Wannamaker's NT multiple services patch Message-ID: [EMAIL PROTECTED]
cvs commit: apache-1.3/src CHANGES
jim 99/06/03 17:21:39 Modified:src CHANGES Log: Hmmm... forgot to add this Revision ChangesPath 1.1368+6 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1367 retrieving revision 1.1368 diff -u -r1.1367 -r1.1368 --- CHANGES 1999/06/03 15:42:33 1.1367 +++ CHANGES 1999/06/04 00:21:36 1.1368 @@ -1,5 +1,11 @@ Changes with Apache 1.3.7 + *) The source is now quad (long long) aware as needed. Specifically, + the Configure process determines the correct size of off_t and + *void. When the OS/platform/compiler supports quads, ap_snprintf() + provides for the 'q' format qualifier (if quads are not available, + 'q' is silently demoted to long). [Jim Jagielski] + *) When the username or password fed to htpasswd is too long, include the size limit in the error message. Also report illegal characters (currently only ':') in the username. Add the size restrictions
cvs commit: apache-1.3/src Configure
jim 99/05/25 05:24:45 Modified:src Configure Log: be consistant (and anal) ;) Revision ChangesPath 1.350 +3 -3 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.349 retrieving revision 1.350 diff -u -r1.349 -r1.350 --- Configure 1999/05/25 10:15:04 1.349 +++ Configure 1999/05/25 12:24:44 1.350 @@ -1570,18 +1570,18 @@ ## Add in the Expat library if needed/wanted. ## if [ -d ./lib/expat/ ]; then -if [ $RULE_EXPAT = default ]; then +if [ x$RULE_EXPAT = xdefault ]; then RULE_EXPAT=yes fi else -if [ $RULE_EXPAT = yes ]; then +if [ $xRULE_EXPAT = xyes ]; then echo ERROR: RULE_EXPAT set to \yes\ but is not available. exit 1 else RULE_EXPAT=no fi fi -if [ $RULE_EXPAT = yes ]; then +if [ x$RULE_EXPAT = xyes ]; then EXPATLIB=lib/expat/libexpat.a APLIBDIRS=expat $APLIBDIRS CFLAGS=$CFLAGS -DUSE_EXPAT -I\$(SRCDIR)/lib/expat
cvs commit: apache-1.3/src/ap ap_snprintf.c
jim 99/05/23 09:55:30
Modified:src Configure
src/ap ap_snprintf.c
Log:
What the hell, we can determine the size of void *
so just avoid any warnings in snprintf.c
Revision ChangesPath
1.348 +39 -8 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- Configure 1999/05/21 23:57:48 1.347
+++ Configure 1999/05/23 16:55:28 1.348
@@ -1847,14 +1847,17 @@
## More building ap_config_auto.h
##
-## We check to see if this OS and/or compiler supports long-long
+## We check the sizeof various data types
##
-echo + checking for the long long data type
-if ./helpers/TestCompile sizeof long long; then
-AP_LONGEST_LONG=long long
-else
+echo + checking sizeof various data types
+AP_TYPE_QUAD=`./helpers/TestCompile -r sizeof 'long long'`
+if [ x$AP_TYPE_QUAD = x ]; then
+AP_TYPE_QUAD=unknown_quad
AP_LONGEST_LONG=long
+else
+AP_LONGEST_LONG=long long
fi
+
echo $AP_CONFIG_AUTO_H
echo /* determine: longest possible integer type */ $AP_CONFIG_AUTO_H
echo #ifndef AP_LONGEST_LONG $AP_CONFIG_AUTO_H
@@ -1864,11 +1867,17 @@
##
## Now compare the sizes of off_t to long
##
-echo + determining if off_t is quad or long
AP_TYPE_OFF_T=`./helpers/TestCompile -r sizeof off_t`
+if [ x$AP_TYPE_OFF_T = x ]; then
+AP_TYPE_OFF_T=unknown_off_t
+fi
+
AP_TYPE_LONG=`./helpers/TestCompile -r sizeof long`
-if [ x$AP_TYPE_OFF_T != x ] [ x$AP_TYPE_OFF_T != x$AP_TYPE_LONG ]
-then
+if [ x$AP_TYPE_LONG = x ]; then
+AP_TYPE_LONG=unknown_long
+fi
+
+if [ x$AP_TYPE_OFF_T != x$AP_TYPE_LONG ]; then
echo $AP_CONFIG_AUTO_H
echo /* determine: is off_t a quad */ $AP_CONFIG_AUTO_H
echo #ifndef AP_OFF_T_IS_QUAD $AP_CONFIG_AUTO_H
@@ -1879,6 +1888,28 @@
echo /* determine: is off_t a quad */ $AP_CONFIG_AUTO_H
echo #ifndef AP_OFF_T_IS_QUAD $AP_CONFIG_AUTO_H
echo #undef AP_OFF_T_IS_QUAD $AP_CONFIG_AUTO_H
+echo #endif $AP_CONFIG_AUTO_H
+fi
+
+##
+## Now see of void * is as big as a quad (long long)
+##
+AP_TYPE_VOID_P=`./helpers/TestCompile -r sizeof 'void *'`
+if [ x$AP_TYPE_VOID_P = x ]; then
+AP_TYPE_VOID_P=unknown_void_p
+fi
+
+if [ x$AP_TYPE_VOID_P = x$AP_TYPE_QUAD ]; then
+echo $AP_CONFIG_AUTO_H
+echo /* determine: is void * a quad */ $AP_CONFIG_AUTO_H
+echo #ifndef AP_VOID_P_IS_QUAD $AP_CONFIG_AUTO_H
+echo #define AP_VOID_P_IS_QUAD 1 $AP_CONFIG_AUTO_H
+echo #endif $AP_CONFIG_AUTO_H
+else
+echo $AP_CONFIG_AUTO_H
+echo /* determine: is void * a quad */ $AP_CONFIG_AUTO_H
+echo #ifndef AP_VOID_P_IS_QUAD $AP_CONFIG_AUTO_H
+echo #undef AP_VOID_P_IS_QUAD $AP_CONFIG_AUTO_H
echo #endif $AP_CONFIG_AUTO_H
fi
1.34 +10 -10apache-1.3/src/ap/ap_snprintf.c
Index: ap_snprintf.c
===
RCS file: /export/home/cvs/apache-1.3/src/ap/ap_snprintf.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ap_snprintf.c 1999/05/22 11:24:41 1.33
+++ ap_snprintf.c 1999/05/23 16:55:29 1.34
@@ -998,22 +998,22 @@
* If the pointer size is equal to or smaller than the size
* of the largest unsigned int, we convert the pointer to a
* hex number, otherwise we print %p to indicate that we
- * don't handle %p. Note that depending on the
- * sizes of the various pointers and u_wide_int
- * and u_widest_int, gcc will warn about the
- * assignments, but we are actually OK.
+ * don't handle %p.
*/
case 'p':
- if (sizeof(char *) = sizeof(u_wide_int)) {
- ui_num = (u_wide_int) va_arg(ap, void *);
- s = conv_p2(ui_num, 4, 'x',
- num_buf[NUM_BUF_SIZE], s_len);
- }
- else if (sizeof(char *) = sizeof(u_widest_int)) {
+#ifdef AP_VOID_P_IS_QUAD
+ if (sizeof(void *) = sizeof(u_widest_int)) {
ui_quad = (u_widest_int) va_arg(ap, void *);
s = conv_p2_quad(ui_quad, 4, 'x',
num_buf[NUM_BUF_SIZE], s_len);
}
+#else
+ if (sizeof(void *) = sizeof(u_wide_int)) {
+ ui_num = (u_wide_int) va_arg(ap, void *);
+ s = conv_p2(ui_num, 4, 'x',
+ num_buf
cvs commit: apache-1.3/src/modules/standard mod_include.c
jim 99/05/21 16:58:01
Modified:src Configure
src/helpers TestCompile
src/modules/standard mod_include.c
Log:
The final phases of the great 'quad' update.
ap_snprintf() can now handle quads, assuming the compiler knows
about them, and we now determine which type is the off_t
typedef
Revision ChangesPath
1.347 +38 -0 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- Configure 1999/05/17 08:00:03 1.346
+++ Configure 1999/05/21 23:57:48 1.347
@@ -1845,6 +1845,44 @@
fi
+## More building ap_config_auto.h
+##
+## We check to see if this OS and/or compiler supports long-long
+##
+echo + checking for the long long data type
+if ./helpers/TestCompile sizeof long long; then
+AP_LONGEST_LONG=long long
+else
+AP_LONGEST_LONG=long
+fi
+echo $AP_CONFIG_AUTO_H
+echo /* determine: longest possible integer type */ $AP_CONFIG_AUTO_H
+echo #ifndef AP_LONGEST_LONG $AP_CONFIG_AUTO_H
+echo #define AP_LONGEST_LONG $AP_LONGEST_LONG $AP_CONFIG_AUTO_H
+echo #endif $AP_CONFIG_AUTO_H
+
+##
+## Now compare the sizes of off_t to long
+##
+echo + determining if off_t is quad or long
+AP_TYPE_OFF_T=`./helpers/TestCompile -r sizeof off_t`
+AP_TYPE_LONG=`./helpers/TestCompile -r sizeof long`
+if [ x$AP_TYPE_OFF_T != x ] [ x$AP_TYPE_OFF_T != x$AP_TYPE_LONG ]
+then
+echo $AP_CONFIG_AUTO_H
+echo /* determine: is off_t a quad */ $AP_CONFIG_AUTO_H
+echo #ifndef AP_OFF_T_IS_QUAD $AP_CONFIG_AUTO_H
+echo #define AP_OFF_T_IS_QUAD 1 $AP_CONFIG_AUTO_H
+echo #endif $AP_CONFIG_AUTO_H
+else
+echo $AP_CONFIG_AUTO_H
+echo /* determine: is off_t a quad */ $AP_CONFIG_AUTO_H
+echo #ifndef AP_OFF_T_IS_QUAD $AP_CONFIG_AUTO_H
+echo #undef AP_OFF_T_IS_QUAD $AP_CONFIG_AUTO_H
+echo #endif $AP_CONFIG_AUTO_H
+fi
+
+
## Finish building ap_config_auto.h
##
## We pick out all -D's from CFLAGS and insert them as defines into
1.28 +33 -1 apache-1.3/src/helpers/TestCompile
Index: TestCompile
===
RCS file: /export/home/cvs/apache-1.3/src/helpers/TestCompile,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- TestCompile 1999/04/28 08:40:44 1.27
+++ TestCompile 1999/05/21 23:57:53 1.28
@@ -22,6 +22,10 @@
# ./helpers/TestCompile sanity
#Which does a simple sanity check/test compile
#
+# ./helpers/TestCompile sizeof type
+#Which prints out the sizeof type (sure would be nice
+#if sizeof could be use in preprocessor if's)
+#
# It does these by creating a small mini-makefile, based on
# ../Makefile.config and trying to compile a small dummy
# program. If the compilation succeeds, we assume the test
@@ -41,8 +45,9 @@
cd ./helpers
#
-# Handle verbose and silent flags
+# Handle verbose, silent and runit flags
#
+RUNIT=no
case $1 in
-v)
VERBOSE=yes
@@ -52,6 +57,10 @@
VERBOSE=no
shift
;;
+-r)
+RUNIT=yes
+ shift
+ ;;
esac
#
@@ -76,6 +85,26 @@
echo int main(void) { $3(); return(0); } testfunc.c
fi
;;
+sizeof)
+ if [ x$2 = x ]; then
+ exit
+ fi
+ TLIB=
+ if [ x$VERBOSE = xyes ]; then
+ ERRDIR=
+ else
+ ERRDIR='2/dev/null'
+ fi
+ TARGET='testfunc'
+ cat EOF testfunc.c
+#include stdio.h
+#include sys/types.h
+int main(void) {
+printf(%d\n, sizeof($2));
+return(0);
+}
+EOF
+ ;;
sanity)
TLIB=
if [ x$VERBOSE = xno ]; then
@@ -154,5 +183,8 @@
# have PrintPath just search this directory.
if ./PrintPath -s -p`pwd` $TARGET ; then
+if [ x$RUNIT = xyes ]; then
+ `pwd`/$TARGET
+fi
exstat=0
fi
1.118 +2 -3 apache-1.3/src/modules/standard/mod_include.c
Index: mod_include.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_include.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- mod_include.c 1999/05/21 12:16:25 1.117
+++ mod_include.c 1999/05/21 23:57:57 1.118
@@ -1134,9 +1134,8 @@
}
else {
int l, x;
-#if defined(BSD) BSD 199305
-/* ap_snprintf can't handle %qd
cvs commit: apache-1.3/src/ap ap_snprintf.c
jim 99/05/21 17:16:51
Modified:src/ap ap_snprintf.c
Log:
Really handle the short 'h' flag now
Revision ChangesPath
1.29 +27 -4 apache-1.3/src/ap/ap_snprintf.c
Index: ap_snprintf.c
===
RCS file: /export/home/cvs/apache-1.3/src/ap/ap_snprintf.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ap_snprintf.c 1999/05/21 22:41:43 1.28
+++ ap_snprintf.c 1999/05/22 00:16:50 1.29
@@ -585,6 +585,7 @@
/*
* Flag variables
*/
+boolean_e is_short;
boolean_e is_long;
boolean_e is_quad;
boolean_e alternate_form;
@@ -687,18 +688,25 @@
if (*fmt == 'q') {
is_quad = YES;
is_long = NO;
+ is_short = NO;
fmt++;
}
else if (*fmt == 'l') {
+ is_quad = NO;
is_long = YES;
+ is_short = NO;
+ fmt++;
+ }
+ else if (*fmt == 'h') {
is_quad = NO;
+ is_long = NO;
+ is_short = YES;
fmt++;
}
else {
- if (*fmt == 'h') /* short backward compatibility */
- ++fmt;
- is_long = NO;
is_quad = NO;
+ is_long = NO;
+ is_short = NO;
}
/*
@@ -718,6 +726,8 @@
i_num = va_arg(ap, u_widest_int);
else if (is_long)
i_num = (widest_int) va_arg(ap, u_wide_int);
+ else if (is_short)
+ i_num = (widest_int) (unsigned short) va_arg(ap, unsigned
int);
else
i_num = (widest_int) va_arg(ap, unsigned int);
s = conv_10(i_num, 1, is_negative,
@@ -731,6 +741,8 @@
i_num = va_arg(ap, widest_int);
else if (is_long)
i_num = (widest_int) va_arg(ap, wide_int);
+ else if (is_short)
+ i_num = (widest_int) (short) va_arg(ap, int);
else
i_num = (widest_int) va_arg(ap, int);
s = conv_10(i_num, 0, is_negative,
@@ -751,6 +763,8 @@
ui_num = va_arg(ap, u_widest_int);
else if (is_long)
ui_num = (u_widest_int) va_arg(ap, u_wide_int);
+ else if (is_short)
+ ui_num = (u_widest_int) (unsigned short) va_arg(ap,
unsigned int);
else
ui_num = (u_widest_int) va_arg(ap, unsigned int);
s = conv_p2(ui_num, 3, *fmt,
@@ -769,6 +783,8 @@
ui_num = va_arg(ap, u_widest_int);
else if (is_long)
ui_num = (u_widest_int) va_arg(ap, u_wide_int);
+ else if (is_short)
+ ui_num = (u_widest_int) (unsigned short) va_arg(ap,
unsigned int);
else
ui_num = (u_widest_int) va_arg(ap, unsigned int);
s = conv_p2(ui_num, 4, *fmt,
@@ -862,7 +878,14 @@
case 'n':
- *(va_arg(ap, int *)) = cc;
+ if (is_quad)
+ *(va_arg(ap, widest_int *)) = cc;
+ else if (is_long)
+ *(va_arg(ap, long *)) = cc;
+ else if (is_short)
+ *(va_arg(ap, short *)) = cc;
+ else
+ *(va_arg(ap, int *)) = cc;
break;
/*
