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/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/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/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/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/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
cvs commit: apache-1.3/src/os/win32 registry.c
coar99/08/16 10:58:15
Modified:src/include httpd.h
src/os/win32 registry.c
Log:
Bumping the version to 1.3.9 final.
Revision ChangesPath
1.294 +2 -2 apache-1.3/src/include/httpd.h
Index: httpd.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- httpd.h 1999/08/14 08:35:47 1.293
+++ httpd.h 1999/08/16 17:57:53 1.294
@@ -419,7 +419,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha"
*/
-#define SERVER_BASEVERSION "Apache/1.3.9-dev"/* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION "Apache/1.3.9"/* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -435,7 +435,7 @@
* Always increases along the same track as the source branch.
* For example, Apache 1.4.2 would be '10402100', 2.5b7 would be '2057'.
*/
-#define APACHE_RELEASE 10309000
+#define APACHE_RELEASE 10309100
#define SERVER_PROTOCOL "HTTP/1.1"
#ifndef SERVER_SUPPORT
1.25 +1 -1 apache-1.3/src/os/win32/registry.c
Index: registry.c
===
RCS file: /export/home/cvs/apache-1.3/src/os/win32/registry.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- registry.c1999/08/09 17:46:32 1.24
+++ registry.c1999/08/16 17:58:13 1.25
@@ -38,7 +38,7 @@
#define VENDOR "Apache Group"
#define SOFTWARE "Apache"
-#define VERSION "1.3.9 dev"
+#define VERSION "1.3.9"
#define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION
cvs commit: apache-1.3/src/os/win32 registry.c
coar99/07/29 15:58:36
Modified:src CHANGES Configure
src/include httpd.h
src/os/win32 registry.c
Log:
Apache 1.3.7 rolled, 1.3.8-dev now the development version.
Revision ChangesPath
1.1404+2 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1403
retrieving revision 1.1404
diff -u -r1.1403 -r1.1404
--- CHANGES 1999/07/29 22:21:50 1.1403
+++ CHANGES 1999/07/29 22:58:09 1.1404
@@ -1,3 +1,5 @@
+Changes with Apache 1.3.8
+
Changes with Apache 1.3.7
*) The "Vary" response header field is now sanitised right before
1.364 +1 -1 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -r1.363 -r1.364
--- Configure 1999/07/24 18:48:21 1.363
+++ Configure 1999/07/29 22:58:10 1.364
@@ -1687,7 +1687,7 @@
#select the special subtarget for shared core generation
SUBTARGET=target_shared
#determine additional suffixes for libhttpd.so
- V=1 R=3 P=7
+ V=1 R=3 P=8
if [ "x$SHLIB_SUFFIX_DEPTH" = "x0" ]; then
SHLIB_SUFFIX_LIST=""
fi
1.288 +2 -2 apache-1.3/src/include/httpd.h
Index: httpd.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- httpd.h 1999/07/29 22:36:00 1.287
+++ httpd.h 1999/07/29 22:58:23 1.288
@@ -419,7 +419,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha"
*/
-#define SERVER_BASEVERSION "Apache/1.3.7"/* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION "Apache/1.3.8-dev"/* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -435,7 +435,7 @@
* Always increases along the same track as the source branch.
* For example, Apache 1.4.2 would be '10402100', 2.5b7 would be '2057'.
*/
-#define APACHE_RELEASE 10307100
+#define APACHE_RELEASE 10308000
#define SERVER_PROTOCOL "HTTP/1.1"
#ifndef SERVER_SUPPORT
1.22 +1 -1 apache-1.3/src/os/win32/registry.c
Index: registry.c
===
RCS file: /export/home/cvs/apache-1.3/src/os/win32/registry.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- registry.c1999/07/29 22:36:17 1.21
+++ registry.c1999/07/29 22:58:30 1.22
@@ -38,7 +38,7 @@
#define VENDOR "Apache Group"
#define SOFTWARE "Apache"
-#define VERSION "1.3.7"
+#define VERSION "1.3.8 dev"
#define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION
cvs commit: apache-1.3/src/os/win32 registry.c
coar99/07/29 15:36:20
Modified:src/include httpd.h
src/os/win32 registry.c
Log:
Updating version for 1.3.7 tarball..
Revision ChangesPath
1.287 +2 -2 apache-1.3/src/include/httpd.h
Index: httpd.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- httpd.h 1999/07/29 18:13:30 1.286
+++ httpd.h 1999/07/29 22:36:00 1.287
@@ -419,7 +419,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha"
*/
-#define SERVER_BASEVERSION "Apache/1.3.7-dev"/* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION "Apache/1.3.7"/* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -435,7 +435,7 @@
* Always increases along the same track as the source branch.
* For example, Apache 1.4.2 would be '10402100', 2.5b7 would be '2057'.
*/
-#define APACHE_RELEASE 10307000
+#define APACHE_RELEASE 10307100
#define SERVER_PROTOCOL "HTTP/1.1"
#ifndef SERVER_SUPPORT
1.21 +1 -1 apache-1.3/src/os/win32/registry.c
Index: registry.c
===
RCS file: /export/home/cvs/apache-1.3/src/os/win32/registry.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- registry.c1999/04/08 21:04:46 1.20
+++ registry.c1999/07/29 22:36:17 1.21
@@ -38,7 +38,7 @@
#define VENDOR "Apache Group"
#define SOFTWARE "Apache"
-#define VERSION "1.3.7 dev"
+#define VERSION "1.3.7"
#define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION
cvs commit: apache-1.3/src/os/win32 registry.c registry.h service.c service.h
stoddard99/04/08 14:04:55 Modified:src CHANGES src/main http_main.c src/os/win32 registry.c registry.h service.c service.h Log: Update CHANGES and get rid of the ^Z. Revision ChangesPath 1.1301+31 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1300 retrieving revision 1.1301 diff -u -r1.1300 -r1.1301 --- CHANGES 1999/04/08 20:56:34 1.1300 +++ CHANGES 1999/04/08 21:04:41 1.1301 @@ -1,4 +1,34 @@ Changes with Apache 1.3.7 + *) Win32: Win32 multiple services patch. Added capability to install and + run multiple copies of apache as individual services. + + Example 1: + apache -n apache1 -i -f c:/httpd.conf +Installs apache as service 'apache1' and associates c:/httpd.conf +with that service. + net start apache1 +Starts apache1 service. + net stop apache1 +Stops apache1 service + + Example 2: + apache -n apache2 -i +Installs apache as service 'apache2'. httpd.conf is located under +the default server root (/apache/conf/httpd.conf). + net start apache2 +Starts apache2 service. + + Example 3: + apache -n apache3 -i -d c:/program files/apache +Install apache as service 'apache3' and sets server root to +c:/program files/apache. + + Example 4: + apache -n apache2 -k restart +Restart apache2 service + + [Keith Wannamaker, Ken Parzygnat, Bill Stoddard] + *) Correct the signed/unsigned character handling for the MD5 routines; mismatches were causing compilation problems with gcc -pedantic and in the TPF cross-compilation. [Ken Coar] @@ -6341,3 +6371,4 @@ *) Based on NCSA httpd 1.3 by Rob McCool and patches by CERT, Roy Fielding, Robert Thau, Nicolas Pioch, David Robinson, Brian Behlendorf, Rob Hartill, and Cliff Skolnick + 1.429 +1 -1 apache-1.3/src/main/http_main.c Index: http_main.c === RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v retrieving revision 1.428 retrieving revision 1.429 diff -u -r1.428 -r1.429 --- http_main.c 1999/04/08 20:26:24 1.428 +++ http_main.c 1999/04/08 21:04:43 1.429 @@ -6297,4 +6297,4 @@ #endif /* ndef SHARED_CORE_BOOTSTRAP */ - \ No newline at end of file + 1.20 +0 -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.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- registry.c1999/04/08 20:26:26 1.19 +++ registry.c1999/04/08 21:04:46 1.20 @@ -469,4 +469,3 @@ return rv < 0 ? -1 : 0; } - \ No newline at end of file 1.3 +0 -1 apache-1.3/src/os/win32/registry.h Index: registry.h === RCS file: /export/home/cvs/apache-1.3/src/os/win32/registry.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- registry.h1999/04/08 20:26:26 1.2 +++ registry.h1999/04/08 21:04:46 1.3 @@ -6,4 +6,3 @@ extern int ap_registry_set_server_root(char *dir); extern int ap_registry_get_service_conf(pool *p, char *dir, int size, char *service_name); extern int ap_registry_set_service_conf(char *dir, char *service_name); - \ No newline at end of file 1.13 +1 -1 apache-1.3/src/os/win32/service.c Index: service.c === RCS file: /export/home/cvs/apache-1.3/src/os/win32/service.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- service.c 1999/04/08 20:26:26 1.12 +++ service.c 1999/04/08 21:04:47 1.13 @@ -428,4 +428,4 @@ } #endif /* WIN32 */ - \ No newline at end of file + 1.4 +0 -1 apache-1.3/src/os/win32/service.h Index: service.h === RCS file: /export/home/cvs/apache-1.3/src/os/win32/service.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- service.h 1999/04/08 20:26:27 1.3 +++ service.h 1999/04/08 21:04:48 1.4 @@ -15,4 +15,3 @@ #endif /* WIN32 */ #endif /* SERVICE_H */ - \ No newline at end of file
cvs commit: apache-1.3/src/os/win32 registry.c registry.h service.c service.h
stoddard99/04/08 13:26:28
Modified:src/main http_main.c
src/os/win32 registry.c registry.h service.c service.h
Log:
Win32 multiple services patch. Documentation to follow.
Submitted by: Keith Wannamaker
Reviewed by: Bill Stoddard, Ken Parzygnat
Revision ChangesPath
1.428 +216 -66 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.427
retrieving revision 1.428
diff -u -r1.427 -r1.428
--- http_main.c 1999/03/17 23:05:43 1.427
+++ http_main.c 1999/04/08 20:26:24 1.428
@@ -180,6 +180,10 @@
#ifdef WIN32
#include "../os/win32/service.h"
#include "../os/win32/registry.h"
+#define DEFAULTSERVICENAME "Apache"
+#define PATHSEPARATOR '\\'
+#else
+#define PATHSEPARATOR '/'
#endif
@@ -984,6 +988,9 @@
#endif
fprintf(stderr, " %s [-C \"directive\"] [-c \"directive\"]\n",
pad);
fprintf(stderr, " %s [-v] [-V] [-h] [-l] [-L] [-S] [-t]\n", pad);
+#ifdef WIN32
+fprintf(stderr, " %s [-n service] [-k signal] [-i] [-u]\n", pad);
+#endif
fprintf(stderr, "Options:\n");
#ifdef SHARED_CORE
fprintf(stderr, " -R directory : specify an alternate location for
shared object files\n");
@@ -1001,8 +1008,12 @@
fprintf(stderr, " -S : show parsed settings (currently
only vhost settings)\n");
fprintf(stderr, " -t : run syntax test for configuration
files only\n");
#ifdef WIN32
+fprintf(stderr, " -n name : set service name and use its
ServerConfigFile\n");
fprintf(stderr, " -k shutdown : tell running Apache to
shutdown\n");
fprintf(stderr, " -k restart : tell running Apache to do a
graceful restart\n");
+fprintf(stderr, " -k start : tell Apache to start\n");
+fprintf(stderr, " -i : install an Apache service\n");
+fprintf(stderr, " -u : uninstall an Apache service\n");
#endif
exit(1);
}
@@ -3465,7 +3476,7 @@
* some of it is #ifdef'd but was duplicated before anyhow. This stuff
* is still a mess.
*/
-static void common_init(void)
+void common_init(void)
{
INIT_SIGLIST()
#ifdef AUX3
@@ -4485,7 +4496,7 @@
common_init();
-if ((s = strrchr(argv[0], '/')) != NULL) {
+if ((s = strrchr(argv[0], PATHSEPARATOR)) != NULL) {
ap_server_argv0 = ++s;
}
else {
@@ -5434,7 +5445,13 @@
{
char buf[40], mod[200];
int i, rv;
-char **pass_argv = (char **) alloca(sizeof(char *) * (argc + 3));
+
+#ifdef WIN32
+#define NUMCHILDARGS 4
+#else
+#define NUMCHILDARGS 2
+#endif
+char **pass_argv = (char **) alloca(sizeof(char *) * (argc +
NUMCHILDARGS + 1));
/* We need an event to tell the child process to kill itself when
* the parent is doing a shutdown/restart. This will be named
@@ -5456,10 +5473,14 @@
pass_argv[0] = argv[0];
pass_argv[1] = "-Z";
pass_argv[2] = buf;
+#ifdef WIN32
+pass_argv[3] = "-f";
+pass_argv[4] = ap_server_confname;
+#endif
for (i = 1; i < argc; i++) {
- pass_argv[i + 2] = argv[i];
+pass_argv[i + NUMCHILDARGS] = argv[i];
}
-pass_argv[argc + 2] = NULL;
+pass_argv[argc + NUMCHILDARGS] = NULL;
rv = GetModuleFileName(NULL, mod, sizeof(mod));
if (rv == sizeof(mod)) {
@@ -5533,8 +5554,47 @@
return 0;
}
+/* To share the semaphores with other processes, we need a NULL ACL
+ * Code from MS KB Q106387
+ */
+
+static PSECURITY_ATTRIBUTES GetNullACL()
+{
+PSECURITY_DESCRIPTOR pSD;
+PSECURITY_ATTRIBUTES sa;
+
+sa = (PSECURITY_ATTRIBUTES) LocalAlloc(LPTR, sizeof
(SECURITY_ATTRIBUTES));
+pSD = (PSECURITY_DESCRIPTOR) LocalAlloc(LPTR,
SECURITY_DESCRIPTOR_MIN_LENGTH);
+if (pSD == NULL || sa == NULL)
+return NULL;
+if (!InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION)) {
+LocalFree( pSD );
+LocalFree( sa );
+return NULL;
+}
+if (!SetSecurityDescriptorDacl(pSD, TRUE, (PACL) NULL, FALSE)) {
+LocalFree( pSD );
+LocalFree( sa );
+return NULL;
+}
+sa->nLength = sizeof(sa);
+sa->lpSecurityDescriptor = pSD;
+sa->bInheritHandle = TRUE;
+return sa;
+}
+
+
+static void CleanNullACL( void *sa ) {
+if( sa ) {
+LocalFree( ((PSECURITY_ATTRIBUTES)sa)->lpSecurityDescriptor);
+LocalFree( sa );
+}
+}
+
int master_main(int argc, char **argv)
{
+/* returns NULL if invalid (Win95?) */
+PSECURITY_ATTRIBUTES sa = GetNullACL();
int nchild = ap_daemons_to_start;
event **ev;
cvs commit: apache-1.3/src/os/win32 registry.c
lars99/03/22 16:11:28
Modified:src/include httpd.h
src/os/win32 registry.c
Log:
let's go for take 2...
Revision ChangesPath
1.275 +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.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- httpd.h 1999/03/21 05:07:17 1.274
+++ httpd.h 1999/03/23 00:10:59 1.275
@@ -413,7 +413,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha"
*/
-#define SERVER_BASEVERSION "Apache/1.3.6-dev"/* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION "Apache/1.3.6"/* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -429,7 +429,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 10306000
+#define APACHE_RELEASE 10306100
#define SERVER_PROTOCOL "HTTP/1.1"
#ifndef SERVER_SUPPORT
1.17 +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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- registry.c1999/03/21 05:07:22 1.16
+++ registry.c1999/03/23 00:11:27 1.17
@@ -28,7 +28,7 @@
#define VENDOR "Apache Group"
#define SOFTWARE "Apache"
-#define VERSION "1.3.6 dev"
+#define VERSION "1.3.6"
#define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION
cvs commit: apache-1.3/src/os/win32 registry.c
lars99/03/20 20:33:46
Modified:src/include httpd.h
src/os/win32 registry.c
Log:
roll 1.3.5
Revision ChangesPath
1.273 +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.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- httpd.h 1999/03/20 23:43:24 1.272
+++ httpd.h 1999/03/21 04:33:41 1.273
@@ -413,7 +413,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha"
*/
-#define SERVER_BASEVERSION "Apache/1.3.5-dev"/* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION "Apache/1.3.5"/* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -429,7 +429,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 10305000
+#define APACHE_RELEASE 10305100
#define SERVER_PROTOCOL "HTTP/1.1"
#ifndef SERVER_SUPPORT
1.15 +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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- registry.c1999/01/10 07:49:00 1.14
+++ registry.c1999/03/21 04:33:44 1.15
@@ -28,7 +28,7 @@
#define VENDOR "Apache Group"
#define SOFTWARE "Apache"
-#define VERSION "1.3.5 dev"
+#define VERSION "1.3.5"
#define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION
cvs commit: apache-1.3/src/os/win32 registry.c
fielding99/01/09 23:49:00
Modified:.STATUS
src CHANGES Configure
src/include httpd.h
src/os/win32 registry.c
Log:
Bump all of the version numbers to 1.3.5-dev
Revision ChangesPath
1.598 +7 -4 apache-1.3/STATUS
Index: STATUS
===
RCS file: /home/cvs/apache-1.3/STATUS,v
retrieving revision 1.597
retrieving revision 1.598
diff -u -r1.597 -r1.598
--- STATUS1999/01/10 06:45:33 1.597
+++ STATUS1999/01/10 07:48:55 1.598
@@ -1,11 +1,14 @@
1.3 STATUS:
- Last modified at [$Date: 1999/01/10 06:45:33 $]
+ Last modified at [$Date: 1999/01/10 07:48:55 $]
Release:
-1.3.4: current.
- Tarball planned for Saturday afternoon PST, Roy is RM
- Release planned for Monday, January 11.
+1.3.5-dev: current.
+
+1.3.4: Tagged and rolled on Jan. 9. Release planned for Monday, 11th.
+ NEED signature(s) on tarballs
+ NEED binary and installation for Win32
+ Tarball Tested Platforms:
1.3.3: Tagged and rolled on Oct. 7. Released on 9th, announced on 10th.
1.3.2: Tagged and rolled on Sep. 21. Announced and released on 23rd.
1.1211+2 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1210
retrieving revision 1.1211
diff -u -r1.1210 -r1.1211
--- CHANGES 1999/01/10 05:55:01 1.1210
+++ CHANGES 1999/01/10 07:48:57 1.1211
@@ -1,3 +1,5 @@
+Changes with Apache 1.3.5
+
Changes with Apache 1.3.4
*) Renamed macros status_drops_connection to ap_status_drops_connection
1.322 +1 -1 apache-1.3/src/Configure
Index: Configure
===
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -r1.321 -r1.322
--- Configure 1999/01/09 14:24:51 1.321
+++ Configure 1999/01/10 07:48:57 1.322
@@ -1565,7 +1565,7 @@
#select the special subtarget for shared core generation
SUBTARGET=target_shared
#determine additional suffixes for libhttpd.so
- V=1 R=3 P=4
+ V=1 R=3 P=5
if [ "$SHLIB_SUFFIX_DEPTH" = "0" ]; then
SHLIB_SUFFIX_LIST=""
fi
1.264 +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.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- httpd.h 1999/01/10 06:45:35 1.263
+++ httpd.h 1999/01/10 07:48:59 1.264
@@ -415,7 +415,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha"
*/
-#define SERVER_BASEVERSION "Apache/1.3.4" /* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION "Apache/1.3.5-dev"/* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -431,7 +431,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 10304100
+#define APACHE_RELEASE 10305000
#define SERVER_PROTOCOL "HTTP/1.1"
#ifndef SERVER_SUPPORT
1.14 +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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- registry.c1999/01/10 06:45:37 1.13
+++ registry.c1999/01/10 07:49:00 1.14
@@ -28,7 +28,7 @@
#define VENDOR "Apache Group"
#define SOFTWARE "Apache"
-#define VERSION "1.3.4"
+#define VERSION "1.3.5 dev"
#define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION
cvs commit: apache-1.3/src/os/win32 registry.c
fielding99/01/09 22:45:38
Modified:.STATUS
src/include httpd.h
src/os/win32 registry.c
Log:
Ready to roll 1.3.4. Update to new APACHE_RELEASE definition.
Revision ChangesPath
1.597 +2 -15 apache-1.3/STATUS
Index: STATUS
===
RCS file: /home/cvs/apache-1.3/STATUS,v
retrieving revision 1.596
retrieving revision 1.597
diff -u -r1.596 -r1.597
--- STATUS1999/01/08 22:37:02 1.596
+++ STATUS1999/01/10 06:45:33 1.597
@@ -1,9 +1,9 @@
1.3 STATUS:
- Last modified at [$Date: 1999/01/08 22:37:02 $]
+ Last modified at [$Date: 1999/01/10 06:45:33 $]
Release:
-1.3.4-dev: current.
+1.3.4: current.
Tarball planned for Saturday afternoon PST, Roy is RM
Release planned for Monday, January 11.
@@ -45,8 +45,6 @@
Documentation that needs writing:
-* Document compilation on Win95 and NT
-
* Need a document explaining mod_rewrite/"UseCanonicalName off" based
virtualhosting. (If it exists already I can't find it easily.)
=> It still doesn't exists but I've already assembled the relevant
@@ -163,17 +161,6 @@
* Official retirement of 1.2; when? Ken suggests as of 1.3.4.
Status: Ken +1
-
-* Redefine APACHE_RELEASE. Add another 'bit' to signify whether
- it's a beta or final release. Maybe 'MMNNFFRBB' which means:
-MM: Major release #
- NN: Minor release #
- FF: "fix" level
- R: 0 if beta, 1 if final release
- BB: beta number
-
- See: <[EMAIL PROTECTED]>
- Status: Jim +1, Ben +1, Martin +1, Ralf +1
* Someone other than Dean has to do a security/correctness review on
psprintf(), bprintf(), and ap_snprintf(). In particular these routines
1.263 +4 -5 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.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- httpd.h 1999/01/09 00:21:33 1.262
+++ httpd.h 1999/01/10 06:45:35 1.263
@@ -415,7 +415,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha"
*/
-#define SERVER_BASEVERSION "Apache/1.3.4-dev" /* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION "Apache/1.3.4" /* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -427,12 +427,11 @@
API_EXPORT(void) ap_add_version_component(const char *component);
API_EXPORT(const char *) ap_get_server_built(void);
-/* Numeric release version identifier: major minor bugfix betaseq
+/* Numeric release version identifier: MMNNFFRBB: major minor fix final beta
* Always increases along the same track as the source branch.
- * For a final release, 'betaseq' should be set to '99'.
- * For example, Apache 1.4.2 should be '1040299'
+ * For example, Apache 1.4.2 would be '10402100', 2.5b7 would be '2057'.
*/
-#define APACHE_RELEASE 1030401
+#define APACHE_RELEASE 10304100
#define SERVER_PROTOCOL "HTTP/1.1"
#ifndef SERVER_SUPPORT
1.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- registry.c1998/10/07 10:18:18 1.12
+++ registry.c1999/01/10 06:45:37 1.13
@@ -28,7 +28,7 @@
#define VENDOR "Apache Group"
#define SOFTWARE "Apache"
-#define VERSION "1.3.4 dev"
+#define VERSION "1.3.4"
#define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION
cvs commit: apache-1.3/src/os/win32 registry.c
martin 98/10/07 03:18:19
Modified:src Configure
src/include httpd.h
src/os/win32 registry.c
Log:
Bump version number to 1.3.4-dev
Revision ChangesPath
1.299 +1 -1 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- Configure 1998/10/07 09:19:30 1.298
+++ Configure 1998/10/07 10:18:16 1.299
@@ -1505,7 +1505,7 @@
#select the special subtarget for shared core generation
SUBTARGET=target_shared
#determine additional suffixes for libhttpd.so
-V=1 R=3 P=3
+ V=1 R=3 P=4
if [ ".$SHLIB_SUFFIX_DEPTH" = .0 ]; then
SHLIB_SUFFIX_LIST=""
fi
1.248 +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.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- httpd.h 1998/10/07 09:19:06 1.247
+++ httpd.h 1998/10/07 10:18:17 1.248
@@ -410,7 +410,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha"
*/
-#define SERVER_BASEVERSION "Apache/1.3.3"/* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION "Apache/1.3.4-dev" /* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -427,7 +427,7 @@
* For a final release, 'betaseq' should be set to '99'.
* For example, Apache 1.4.2 should be '1040299'
*/
-#define APACHE_RELEASE 1030399
+#define APACHE_RELEASE 1030401
#define SERVER_PROTOCOL "HTTP/1.1"
#ifndef SERVER_SUPPORT
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- registry.c1998/10/07 09:19:29 1.11
+++ registry.c1998/10/07 10:18:18 1.12
@@ -28,7 +28,7 @@
#define VENDOR "Apache Group"
#define SOFTWARE "Apache"
-#define VERSION "1.3.3"
+#define VERSION "1.3.4 dev"
#define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION
cvs commit: apache-1.3/src/os/win32 registry.c
rse 98/09/21 12:44:13
Modified:src/include httpd.h
src/os/win32 registry.c
Log:
Bump up version number to 1.3.3-dev
Revision ChangesPath
1.244 +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.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- httpd.h 1998/09/21 19:12:17 1.243
+++ httpd.h 1998/09/21 19:44:12 1.244
@@ -410,7 +410,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha"
*/
-#define SERVER_BASEVERSION "Apache/1.3.2"/* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION "Apache/1.3.3-dev"/* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -427,7 +427,7 @@
* For a final release, 'betaseq' should be set to '99'.
* For example, Apache 1.4.2 should be '1040299'
*/
-#define APACHE_RELEASE 1030299
+#define APACHE_RELEASE 1030301
#define SERVER_PROTOCOL "HTTP/1.1"
#ifndef SERVER_SUPPORT
1.10 +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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- registry.c1998/09/21 19:15:31 1.9
+++ registry.c1998/09/21 19:44:13 1.10
@@ -28,7 +28,7 @@
#define VENDOR "Apache Group"
#define SOFTWARE "Apache"
-#define VERSION "1.3.2"
+#define VERSION "1.3.3 dev"
#define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION
cvs commit: apache-1.3/src/os/win32 registry.c
rse 98/09/21 12:15:32 Modified:src/os/win32 registry.c Log: Jump to release version: 1.3.2 Revision ChangesPath 1.9 +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.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- registry.c1998/07/18 23:35:43 1.8 +++ registry.c1998/09/21 19:15:31 1.9 @@ -28,7 +28,7 @@ #define VENDOR "Apache Group" #define SOFTWARE "Apache" -#define VERSION "1.3.2 dev" +#define VERSION "1.3.2" #define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION
cvs commit: apache-1.3/src/os/win32 registry.c
marc98/07/18 16:35:43
Modified:src/include httpd.h
src/os/win32 registry.c
Log:
And bump to 1.3.2-dev after roll.
Revision ChangesPath
1.228 +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.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- httpd.h 1998/07/18 22:57:27 1.227
+++ httpd.h 1998/07/18 23:35:40 1.228
@@ -382,7 +382,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha"
*/
-#define SERVER_BASEVERSION "Apache/1.3.1"/* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION "Apache/1.3.2-dev"/* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -399,7 +399,7 @@
* For a final release, 'betaseq' should be set to '99'.
* For example, Apache 1.4.2 should be '1040299'
*/
-#define APACHE_RELEASE 1030199
+#define APACHE_RELEASE 1030201
#define SERVER_PROTOCOL "HTTP/1.1"
#ifndef SERVER_SUPPORT
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- registry.c1998/07/18 22:57:31 1.7
+++ registry.c1998/07/18 23:35:43 1.8
@@ -28,7 +28,7 @@
#define VENDOR "Apache Group"
#define SOFTWARE "Apache"
-#define VERSION "1.3.1"
+#define VERSION "1.3.2 dev"
#define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION
cvs commit: apache-1.3/src/os/win32 registry.c
jim 98/06/02 04:24:39
Modified:src/include httpd.h
src/os/win32 registry.c
Log:
Oops... wrong naming scheme
Revision ChangesPath
1.221 +1 -1 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.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- httpd.h 1998/06/01 22:23:40 1.220
+++ httpd.h 1998/06/02 11:24:38 1.221
@@ -382,7 +382,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha"
*/
-#define SERVER_BASEVERSION "Apache/1.3.1-b1" /* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION "Apache/1.3.1-dev"/* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- registry.c1998/06/01 22:23:42 1.5
+++ registry.c1998/06/02 11:24:39 1.6
@@ -28,7 +28,7 @@
#define VENDOR "Apache Group"
#define SOFTWARE "Apache"
-#define VERSION "1.3.1 beta"
+#define VERSION "1.3.1 dev"
#define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION
cvs commit: apache-1.3/src/os/win32 registry.c
jim 98/06/01 15:23:42
Modified:src/include httpd.h
src/os/win32 registry.c
Log:
And bump up
Revision ChangesPath
1.220 +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.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- httpd.h 1998/06/01 22:18:43 1.219
+++ httpd.h 1998/06/01 22:23:40 1.220
@@ -382,7 +382,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha"
*/
-#define SERVER_BASEVERSION "Apache/1.3.0"/* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION "Apache/1.3.1-b1" /* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -397,7 +397,7 @@
/* Numeric release version identifier: major minor bugfix betaseq
* Always increases along the same track as the source branch.
*/
-#define APACHE_RELEASE 103
+#define APACHE_RELEASE 1030101
#define SERVER_PROTOCOL "HTTP/1.1"
#ifndef SERVER_SUPPORT
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- registry.c1998/06/01 22:18:44 1.4
+++ registry.c1998/06/01 22:23:42 1.5
@@ -28,7 +28,7 @@
#define VENDOR "Apache Group"
#define SOFTWARE "Apache"
-#define VERSION "1.3.0"
+#define VERSION "1.3.1 beta"
#define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION
cvs commit: apache-1.3/src/os/win32 registry.c
jim 98/06/01 15:18:44
Modified:.Announcement
src/include httpd.h
src/os/win32 registry.c
Log:
Ready to tag and roll 1.3.0
Revision ChangesPath
1.23 +9 -56 apache-1.3/Announcement
Index: Announcement
===
RCS file: /export/home/cvs/apache-1.3/Announcement,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Announcement 1998/05/21 20:45:23 1.22
+++ Announcement 1998/06/01 22:18:42 1.23
@@ -1,15 +1,9 @@
- Apache 1.3 Beta 7 Released
- ==
+ Apache 1.3.0 Released
+ =
- The Apache Group is pleased to announce the release of the 1.3b7 version
- of Apache, the latest beta release of the Apache HTTP server. 1.3b7 is
- a second release candidate for Apache 1.3.0.
-
- This version is stable under UNIX but remains beta-level under Win32. No
- new features are expected between 1.3b7 and 1.3.0, so please give this
- version a good thrashing in order to provide as much feedback as possible
- to the Apache Group before the release of 1.3.0.
+ The Apache Group is pleased to announce the release of the long
+ awaited 1.3.0 version of the Apache HTTP server.
To grab the latest Apache distribution, check out
http://www.apache.org/dist/
@@ -18,52 +12,11 @@
For a full list of specific code changes see src/CHANGES.
- For an overview of new features in 1.2 please read the CHANGES file
+ For an overview of new features in 1.3 please read the CHANGES file
in the distribution and the "New Features with Apache 1.3" document at
http://www.apache.org/docs/new_features_1_3.html
- Major changes with this beta:
- HTTP: fixes for 400 and 408 error codes.
- WIN32: Child process spawning now uses native Win32 API.
-This should address many problems people have had
- on Win32 - it also forced us to modify the
- related child_spawn calls in the Apache API.
- Other various stability fixes.
- Extensive overhaul of the way UNCs are handled.
- Various mod_rewrite fixes.
- Various makefile cleanups.
- Various APACI changes.
- Various DSO cleanups, better support for AIX, OpenBSD, NetBSD
- Server's OS family now reported in Server: strings.
- PORT: added support for NCR MP/RAS 3.0
- Security: we now make sure all config files opened by Apache are not
-special devices.
- Added "-s" command line option to dump out vhost settings.
-
- Contributing code to this beta:
- Ralf S. Engelschall <[EMAIL PROTECTED]>
- Ed Korthof <[EMAIL PROTECTED]>
- Rick Ohnemus <[EMAIL PROTECTED]>
- Brian Behlendorf <[EMAIL PROTECTED]>
- Bob Beck <[EMAIL PROTECTED]>
- Ben Laurie <[EMAIL PROTECTED]>
- Bill Stoddard <[EMAIL PROTECTED]>
- Ernst Kloppenburg <[EMAIL PROTECTED]>
- John Withers <[EMAIL PROTECTED]>
- Jim Patterson <[EMAIL PROTECTED]>
- Jim Jagielski <[EMAIL PROTECTED]>
- Martin Kraemer <[EMAIL PROTECTED]>
- Dean Gaudet <[EMAIL PROTECTED]>
- Paul Eggert <[EMAIL PROTECTED]>
- Lars Eilebrecht <[EMAIL PROTECTED]>
- [EMAIL PROTECTED]
- Kari Likovuori <[EMAIL PROTECTED]>
- Michael Anderson's <[EMAIL PROTECTED]
- Jaromir Dolecek <[EMAIL PROTECTED]>
- Roy Fielding <[EMAIL PROTECTED]>
- David MacKenzie <[EMAIL PROTECTED]>
- Francisco Tomei <[EMAIL PROTECTED]>
- Jens Schleusener <[EMAIL PROTECTED]>
- Jeff Earickson <[EMAIL PROTECTED]>
- Marc Slemko <[EMAIL PROTECTED]>
-
+ In general, Apache 1.3.0 offers several substantial improvements
+ over previous versions, including better performance, reliability
+ and a wider-range of supported platforms, including Windows95 and
+ NT.
1.219 +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.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- httpd.h 1998/05/29 00:15:56 1.218
+++ httpd.h 1998/06/01 22:18:43 1.219
@@ -382,7 +382,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha"
*/
-#define SERVER_BASEVERSION "Apache/1.3b8-dev"/* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION "Apache/1.3.0"/* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -397,7 +397,7 @@
/* Numeric release version identifier: major minor bugfix betaseq
* Always increases along the same track as the source branch.
*/
-#define APACHE_RELEASE 1030007
+#define APACHE_RELEASE 103
#define SERVER_PROTOCOL "HTTP/1.1"
#ifndef SERVER_SUPPORT
1.4 +1
cvs commit: apache-1.3/src/os/win32 registry.c
marc98/03/20 21:15:35
Modified:src/os/win32 registry.c
Log:
Two log messages indicating different things from different places
in the code that have the same text are bad. Change the text of
one to make it better represent what it is saying.
Revision ChangesPath
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- registry.c1998/02/24 11:37:24 1.1
+++ registry.c1998/03/21 05:15:34 1.2
@@ -332,7 +332,7 @@
if (rv == ERROR_FILE_NOT_FOUND) {
aplog_error(APLOG_MARK,APLOG_WARNING|APLOG_NOERRNO,NULL,
- "Registry does not contain key " REGKEY);
+ "Registry does not contain key " REGKEY " after creation");
return -1;
}
cvs commit: apache-1.3/src/os/win32 registry.c registry.h
pcs 98/02/24 03:37:25
Added: src/os/win32 registry.c registry.h
Log:
Functions to access the Win32 registry. Currently two functions are
defined for use by the core: ap_registry_get_server_root() and
ap_registry_set_server_root(). The key name used for Apache is defined in
registry.c if it needs changing...
Reviewed by: (concept only) Martin Kraemer, Jim Jagielski, Ken Coar
Revision ChangesPath
1.1 apache-1.3/src/os/win32/registry.c
Index: registry.c
===
/*
* Functions to handle interacting with the Win32 registry
*/
/*
* Apache registry key structure
*
* Apache's registry information is stored in the HKEY_LOCAL_MACHINE
* key, under
*
* HKLM\SOFTWARE\Apache Group\Apache\version
*
* These keys are defined in this file. The definition of the "version" part
* will need updating each time Apache moves from beta to non-beta or from a
* release to a development or beta version.
*/
#include
#include
#include "httpd.h"
#include "http_log.h"
/* Define where the Apache values are stored in the registry. In general
* VERSION will be the same across all beta releases for a particular
* major release, but will change when the final release is made.
*/
#define VENDOR "Apache Group"
#define SOFTWARE "Apache"
#define VERSION "1.3 beta"
#define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION
/*
* The Windows API registry key functions don't set the last error
* value (the windows equivalent of errno). So we need to set it
* with SetLastError() before calling the aplog_error() function.
* Because this is common, let's have a macro.
*/
#define do_error(rv,fmt,arg) do { \
SetLastError(rv); \
aplog_error(APLOG_MARK, APLOG_WIN32ERROR|APLOG_ERR, NULL, fmt,arg); \
} while (0);
/*
* Get the data for registry key value. This is a generic function that
* can either get a value into a caller-supplied buffer, or it can
* allocate space for the value from the pass-in pool. It will normally
* be used by other functions within this file to get specific key values
* (e.g. registry_get_server_root()). This function returns a number of
* different error statuses, allowing the caller to differentiate
* between a key or value not existing and other kinds of errors. Depending
* on the type of data being obtained the caller can then either ignore
* the key-not-existing error, or treat it as a real error.
*
* If ppValue is NULL, allocate space for the value and return it in
* *pValue. The return value is the number of bytes in the value.
* The first argument is the pool to use to allocate space for the value.
*
* If pValue is not NULL, assume it is a buffer of nSizeValue bytes,
* and write the value into the buffer. The return value is the number
* of bytes in the value (so if the return value is greater than
* the supplied nSizeValue, the caller knows that *pValue is truncated).
* The pool argument is ignored.
*
* The return value is the number of bytes in the successfully retreived
* key if everything worked, or:
*
* -1 the key does not exists
* -2 if out of memory during the function
* -3 if the buffer specified by *pValue/nSizeValue was not large enough
* for the value.
* -4 if an error occurred
*
* If the return value is negative a message will be logged to the error
* log (aplog_error) function. If the return value is -2, -3 or -4 the message
* will be logged at priority "error", while if the return value is -1 the
* message will be logged at priority "warning".
*/
static int ap_registry_get_key_int(pool *p, char *key, char *pBuffer, int
nSizeBuffer, char **ppValue)
{
long rv;
HKEY hKey;
char *pValue;
int nSize;
int retval;
rv = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
REGKEY,
0,
KEY_READ,
&hKey);
if (rv == ERROR_FILE_NOT_FOUND) {
aplog_error(APLOG_MARK,APLOG_WARNING|APLOG_NOERRNO,NULL,
"Registry does not contain key " REGKEY);
return -1;
}
if (rv != ERROR_SUCCESS) {
do_error(rv, "RegOpenKeyEx HKLM\\" REGKEY,
NULL);
return -4;
}
if (pBuffer == NULL) {
/* Find the size required for the data by passing NULL as the buffer
* pointer. On return nSize will contain the size required for the
* buffer if the return value is ERROR_SUCCESS.
*/
rv = RegQueryValueEx(hKey,
key, /* key name */
NULL, /* reserved */
NULL, /* type */
NULL, /*
