## |_____|
## ____________________________________________________________________________
##
-## Annotated patch file: addon.patch
+## Annotated patch file: ssldoc.patch
## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved.
-## Created on: 20-May-2001
+## Created on: 16-Oct-2001
##
## This file assembles changes to existing Apache source files
## between the original Apache and the patched variant. It can be
## 'patch' tool to upgrade those files. Each patch snippet is
## annotated with a short description.
##
+## This file contains all patches to the Apache source
+## tree which link the SSL documentation into the Apache
+## documents tree.
+##
+---------------------------------------------------------------------------
-| Add an entry for mod_define.
+| Adjust the English frontdoor webpage where we now indicate that
+| this is an SSL-aware Apache, give additional hyperlinks to mod_ssl and
+| provide the three new "powered by Apache", "secured by mod_ssl" and
+| "includes OpenSSL" buttons.
+---------------------------------------------------------------------------
-Index: src/Configuration.tmpl
---- src/Configuration.tmpl 1999/08/17 11:21:38 1.1.1.5
-+++ src/Configuration.tmpl 2000/10/09 12:15:02 1.21
-@@ -243,6 +298,11 @@
-
- AddModule modules/standard/mod_env.o
-
-+## mod_define expands variables on arbitrary directive lines.
-+## It requires Extended API (EAPI).
-+
-+# AddModule modules/extra/mod_define.o
-+
- ##
- ## Request logging modules
- ##
+Index: htdocs/index.html.en
+--- htdocs/index.html.en 2001/05/20 08:16:29 1.1.1.3
++++ htdocs/index.html.en 2001/05/20 08:23:01 1.4
+@@ -1,38 +1,87 @@
+-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+-<html xmlns="http://www.w3.org/1999/xhtml">
+-<head>
+-<title>Test Page for Apache Installation</title>
+-</head>
+-<!-- Background white, links blue (unvisited), navy (visited), red
+-(active) -->
+-<body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
+-vlink="#000080" alink="#FF0000">
+-<p>If you can see this, it means that the installation of the <a
+-href="http://www.apache.org/foundation/preFAQ.html">Apache web
+-server</a> software on this system was successful. You may now add
+-content to this directory and replace this page.</p>
+-
+-<hr width="50%" size="8" />
+-<h2 align="center">Seeing this instead of the website you
+-expected?</h2>
+-
+-<p>This page is here because the site administrator has changed the
+-configuration of this web server. Please <strong>contact the person
+-responsible for maintaining this server with questions.</strong>
+-The Apache Software Foundation, which wrote the web server software
+-this site administrator is using, has nothing to do with
+-maintaining this site and cannot help resolve configuration
+-issues.</p>
+-
+-<hr width="50%" size="8" />
+-<p>The Apache <a href="manual/">documentation</a> has been included
+-with this distribution.</p>
+-
+-<p>You are free to use the image below on an Apache-powered web
+-server. Thanks for using Apache!</p>
+-
+-<div align="center"><img src="apache_pb.gif" alt="" /></div>
+-</body>
+-</html>
+-
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
++<HTML>
++ <HEAD>
++ <TITLE>Test Page for the SSL/TLS-aware Apache Installation on Web Site</TITLE>
++ <STYLE TYPE="text/css">
++ H1 {
++ font-weight: bold;
++ font-size: 18pt;
++ line-height: 18pt;
++ font-family: arial,helvetica;
++ font-variant: normal;
++ font-style: normal;
++ }
++ BODY {
++ color: black;
++ background-color: white;
++ background-image: url(manual/images/feather.jpg);
++ background-repeat: no-repeat;
++ }
++ </STYLE>
++ </HEAD>
++<!-- Background white, links blue (unvisited), navy (visited), red (active) -->
++ <BODY
++ BGCOLOR="#FFFFFF"
++ TEXT="#000000"
++ LINK="#0000FF"
++ VLINK="#0000FF"
++ ALINK="#FF0000"
++ >
++ <BLOCKQUOTE>
++ <BLOCKQUOTE>
++ <BR>
++ <H1>
++ Hey, it worked <I>!</I><BR>
++ The SSL/TLS-aware Apache webserver was<BR>
++ successfully installed on this website.
++ </H1>
++ <P>
++ If you can see this page, then the people who own this website have just
++ installed the <A HREF="http://www.apache.org/">Apache Web server</A>
++ software and the <A HREF="http://www.modssl.org/">Apache
++ Interface to OpenSSL (mod_ssl)</A> successfully. They now have to add
++ content to this directory and replace this placeholder page, or else point
++ the server at their real content.
++ </P>
++ <BLOCKQUOTE>
++ <STRONG>ATTENTION!</STRONG><BR>
++ If you are seeing this page instead of the site you expected, please
++ <STRONG>contact the administrator of the site involved.</STRONG>
++ (Try sending mail to <SAMP><webmaster@<EM>domain</EM>></SAMP>.)
++ Although this site is
++ running the Apache software it almost certainly has no other connection
++ to the Apache Group, so please do not send mail about this site or its
++ contents to the Apache authors. If you do, your message will be
++ <STRONG>ignored</STRONG>.
++ </BLOCKQUOTE>
++ <P>
++ The Apache online
++ <A
++ HREF="manual/index.html"
++ >documentation</A>
++ has been included with this distribution.<BR>
++ Especially also read the
++ <A
++ HREF="manual/mod/mod_ssl/"
++ >mod_ssl User Manual</A>
++ carefully.
++ </P>
++ <P>
++ Your are allowed to use the images below on your SSL-aware Apache Web server.<BR>
++ Thanks for using Apache, mod_ssl and OpenSSL!
++ </P>
++ <P>
++ <DIV ALIGN="CENTER">
++ <A HREF="http://www.apache.org/"
++ ><IMG SRC="manual/images/apache_pb.gif" ALT="Apache Webserver" BORDER=0></A>
++
++ <A HREF="http://www.modssl.org/"
++ ><IMG SRC="manual/images/mod_ssl_sb.gif" ALT="mod_ssl Interface" BORDER=0></A>
++
++ <A HREF="http://www.openssl.org/"
++ ><IMG SRC="manual/images/openssl_ics.gif" ALT="OpenSSL Toolkit" BORDER=0></A>
++ </DIV>
++ </BLOCKQUOTE>
++ </BLOCKQUOTE>
++ </BODY>
++</HTML>
+---------------------------------------------------------------------------
-| Add more beautiful optic to the status page table..
+| Add a hyperlink to the mod_ssl document.
+---------------------------------------------------------------------------
-Index: src/modules/standard/mod_status.c
---- src/modules/standard/mod_status.c 2001/05/20 08:16:21 1.1.1.12
-+++ src/modules/standard/mod_status.c 2001/05/20 08:23:02 1.9
-@@ -482,12 +482,33 @@
- if (no_table_report)
- ap_rputs("<p><hr><h2>Server Details</h2>\n\n", r);
- else
-+#ifndef NO_PRETTYPRINT
-+ ap_rputs("<p>\n\n<table bgcolor=\"#ffffff\" border=\"0\">"
-+ "<tr bgcolor=000000>"
-+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Srv</b></font></td>"
-+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>PID</b></font></td>"
-+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Acc</b></font></td>"
-+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>M</b></font></td>"
-+#ifndef NO_TIMES
-+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>CPU</b></font></td>"
-+#endif
-+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>SS</b></font></td>"
-+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Req</b></font></td>"
-+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Conn</b></font></td>"
-+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Child</b></font></td>"
-+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Slot</b></font></td>"
-+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Host</b></font></td>"
-+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>VHost</b></font></td>"
-+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Request</b></td>"
-+ "</tr>\n", r);
-+#else /* NO_PRETTYPRINT */
- #ifdef NO_TIMES
- /* Allow for OS/2 not having CPU stats */
- ap_rputs("<p>\n\n<table border=0><tr><th>Srv<th>PID<th>Acc<th>M\n<th>SS<th>Req<th>Conn<th>Child<th>Slot<th>Client<th>VHost<th>Request</tr>\n\n", r);
- #else
- ap_rputs("<p>\n\n<table border=0><tr><th>Srv<th>PID<th>Acc<th>M<th>CPU\n<th>SS<th>Req<th>Conn<th>Child<th>Slot<th>Client<th>VHost<th>Request</tr>\n\n", r);
- #endif
-+#endif /* NO_PRETTYPRINT */
- }
+Index: htdocs/manual/mod/index.html.en
+--- htdocs/manual/mod/index.html.en 2001/10/16 11:46:59 1.1.1.1
++++ htdocs/manual/mod/index.html.en 2001/10/16 12:17:00 1.2
+@@ -214,6 +218,11 @@
+
+ <dt><a href="mod_speling.html">mod_speling</a> Apache 1.3 and
+ up</dt>
++
++ <dt><a href="mod_ssl/index.html">mod_ssl</a> Apache 1.3 with mod_ssl
++ applied</dt>
++
++ <dd>Apache SSL interface to OpenSSL</dd>
+
+ <dd>Automatically correct minor typos in URLs</dd>
- for (i = 0; i < HARD_SERVER_LIMIT; ++i) {
-@@ -605,14 +626,19 @@
- vhost->server_hostname) : "(unavailable)");
- }
- else { /* !no_table_report */
-+#ifndef NO_PRETTYPRINT
-+ ap_rprintf(r,"<tr bgcolor=\"#ffffff\">");
-+#else
-+ ap_rprintf(r,"<tr>");
-+#endif
- if (score_record.status == SERVER_DEAD)
- ap_rprintf(r,
-- "<tr><td><b>%d-%d</b><td>-<td>%d/%lu/%lu",
-+ "<td><b>%d-%d</b><td>-<td>%d/%lu/%lu",
- i, (int) ps_record.generation,
- (int) conn_lres, my_lres, lres);
- else
- ap_rprintf(r,
-- "<tr><td><b>%d-%d</b><td>%d<td>%d/%lu/%lu",
-+ "<td><b>%d-%d</b><td>%d<td>%d/%lu/%lu",
- i, (int) ps_record.generation,
- (int) ps_record.pid, (int) conn_lres,
- my_lres, lres);
-@@ -672,12 +698,23 @@
- ap_rprintf(r,
- "<td>?<td nowrap>?<td nowrap>..reading.. </tr>\n\n");
- else
-+#ifndef NO_PRETTYPRINT
-+ ap_rprintf(r,
-+ "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%s</font>"
-+ "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%s</font>"
-+ "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%s</font>"
-+ "</tr>\n\n",
-+ score_record.client,
-+ vhost ? vhost->server_hostname : "(unavailable)",
-+ ap_escape_html(r->pool, score_record.request));
-+#else
- ap_rprintf(r,
- "<td>%s<td nowrap>%s<td nowrap>%s</tr>\n\n",
- ap_escape_html(r->pool, score_record.client),
- vhost ? ap_escape_html(r->pool,
- vhost->server_hostname) : "(unavailable)",
- ap_escape_html(r->pool, score_record.request));
-+#endif
- } /* no_table_report */
- } /* !short_report */
- } /* if (<active child>) */
+---------------------------------------------------------------------------
-| Add a hyperlink to the mod_define.html document.
+| Add a hyperlink to the mod_ssl document.
+---------------------------------------------------------------------------
-Index: htdocs/manual/mod/index.html
---- htdocs/manual/mod/index.html 2001/01/23 11:35:19 1.1.1.4
-+++ htdocs/manual/mod/index.html 2001/01/23 11:48:05 1.10
-@@ -65,6 +65,8 @@
- <DT><A HREF="mod_cookies.html">mod_cookies</A> up to Apache 1.1.1
- <DD>Support for Netscape-like cookies. Replaced in Apache 1.2 by
- mod_usertrack
-+<DT><A HREF="mod_define.html">mod_define</A>
-+<DD>Variable Definition for Arbitrary Directives
- <DT><A HREF="mod_digest.html">mod_digest</A> Apache 1.1 and up
- <DD>MD5 authentication
- <DT><A HREF="mod_dir.html">mod_dir</A>
+Index: htdocs/manual/mod/index-bytype.html.en
+--- htdocs/manual/mod/index-bytype.html.en 2001/10/16 11:46:59 1.1.1.1
++++ htdocs/manual/mod/index-bytype.html.en 2001/10/16 12:17:00 1.2
+@@ -254,6 +254,11 @@
+
+ <dd>Experimental file caching, mapping files into memory to
+ improve performace</dd>
++
++ <dt><a href="mod_ssl/index.html">mod_ssl</a> Apache 1.3 with mod_ssl
++ applied</dt>
++
++ <dd>Apache SSL interface to OpenSSL</dd>
+ </dl>
+
+ <h2>Development</h2>
+---------------------------------------------------------------------------
-| Add a hyperlink for the Define directives.
+| Add hyperlinks for all SSL directives which are
+| documented inside the mod_ssl document.
+---------------------------------------------------------------------------
-Index: htdocs/manual/mod/directives.html
---- htdocs/manual/mod/directives.html 2001/05/20 08:16:32 1.1.1.10
-+++ htdocs/manual/mod/directives.html 2001/05/20 08:23:01 1.20
-@@ -99,6 +99,7 @@
- <LI><A HREF="mod_autoindex.html#defaulticon">DefaultIcon</A>
- <LI><A HREF="mod_mime.html#defaultlanguage">DefaultLanguage</A>
- <LI><A HREF="core.html#defaulttype">DefaultType</A>
-+<LI><A HREF="mod_define.html#define">Define</A>
- <LI><A HREF="mod_access.html#deny">Deny</A>
- <LI><A HREF="core.html#directory"><Directory></A>
- <LI><A HREF="core.html#directorymatch"><DirectoryMatch></A>
+Index: htdocs/manual/mod/directives.html.en
+--- htdocs/manual/mod/directives.html.en 2001/10/16 11:46:59 1.1.1.1
++++ htdocs/manual/mod/directives.html.en 2001/10/16 12:17:00 1.2
+@@ -526,6 +528,28 @@
+ href="mod_setenvif.html#SetEnvIfNoCase">SetEnvIfNoCase</a></li>
+
+ <li><a href="mod_mime.html#sethandler">SetHandler</a></li>
++
++ <li><a href="mod_ssl/ssl_reference.html#SSLPassPhraseDialog">SSLPassPhraseDialog</a>
++ <li><a href="mod_ssl/ssl_reference.html#SSLMutex">SSLMutex</a>
++ <li><a href="mod_ssl/ssl_reference.html#SSLRandomSeed">SSLRandomSeed</a>
++ <li><a href="mod_ssl/ssl_reference.html#SSLSessionCache">SSLSessionCache</a>
++ <li><a href="mod_ssl/ssl_reference.html#SSLSessionCacheTimeout">SSLSessionCacheTimeout</a>
++ <li><a href="mod_ssl/ssl_reference.html#SSLEngine">SSLEngine</a>
++ <li><a href="mod_ssl/ssl_reference.html#SSLProtocol">SSLProtocol</a>
++ <li><a href="mod_ssl/ssl_reference.html#SSLCipherSuite">SSLCipherSuite</a>
++ <li><a href="mod_ssl/ssl_reference.html#SSLCertificateFile">SSLCertificateFile</a>
++ <li><a href="mod_ssl/ssl_reference.html#SSLCertificateKeyFile">SSLCertificateKeyFile</a>
++ <li><a href="mod_ssl/ssl_reference.html#SSLCACertificatePath">SSLCACertificatePath</a>
++ <li><a href="mod_ssl/ssl_reference.html#SSLCACertificateFile">SSLCACertificateFile</a>
++ <li><a href="mod_ssl/ssl_reference.html#SSLCARevocationPath">SSLCARevocationPath</a>
++ <li><a href="mod_ssl/ssl_reference.html#SSLCARevocationFile">SSLCARevocationFile</a>
++ <li><a href="mod_ssl/ssl_reference.html#SSLVerifyClient">SSLVerifyClient</a>
++ <li><a href="mod_ssl/ssl_reference.html#SSLVerifyDepth">SSLVerifyDepth</a>
++ <li><a href="mod_ssl/ssl_reference.html#SSLLog">SSLLog</a>
++ <li><a href="mod_ssl/ssl_reference.html#SSLLogLevel">SSLLogLevel</a>
++ <li><a href="mod_ssl/ssl_reference.html#SSLOptions">SSLOptions</a>
++ <li><a href="mod_ssl/ssl_reference.html#SSLRequireSSL">SSLRequireSSL</a>
++ <li><a href="mod_ssl/ssl_reference.html#SSLRequire">SSLRequire</a>
+
+ <li><a href="core.html#startservers">StartServers</a></li>
+
##
## Annotated patch file: eapi.patch
## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved.
-## Created on: 20-May-2001
+## Created on: 16-Oct-2001
##
## This file assembles changes to existing Apache source files
## between the original Apache and the patched variant. It can be
| patches and configured the shared memory support via the MM library.
+---------------------------------------------------------------------------
Index: src/Configuration.tmpl
---- src/Configuration.tmpl 1999/08/17 11:21:38 1.1.1.5
-+++ src/Configuration.tmpl 2000/10/09 12:15:02 1.21
+--- src/Configuration.tmpl 2001/10/16 11:47:06 1.1.1.6
++++ src/Configuration.tmpl 2001/10/16 11:57:38 1.22
@@ -68,6 +105,24 @@
#TARGET=
| Patch in implementation of the EAPI rule.
+---------------------------------------------------------------------------
Index: src/Configure
---- src/Configure 2001/05/20 08:16:15 1.1.1.15
-+++ src/Configure 2001/05/20 08:23:01 1.17
-@@ -1829,6 +1829,72 @@
+--- src/Configure 2001/10/16 11:47:06 1.1.1.16
++++ src/Configure 2001/10/16 11:57:38 1.18
+@@ -1860,6 +1860,72 @@
fi
####################################################################
+####################################################################
## Add in the Expat library if needed/wanted.
##
- if [ -d ./lib/expat-lite/ ]; then
+
+---------------------------------------------------------------------------
| Add the build support for the ap_hook.c and ap_ctx.c sources (Unix)
| Add the build support for the ap_hook.c and ap_ctx.c sources (Win32)
+---------------------------------------------------------------------------
Index: src/ap/ap.mak
---- src/ap/ap.mak 2001/05/20 08:16:15 1.1.1.8
-+++ src/ap/ap.mak 2001/05/20 08:23:01 1.8
-@@ -52,6 +52,9 @@
+--- src/ap/ap.mak 2001/10/16 11:47:06 1.1.1.9
++++ src/ap/ap.mak 2001/10/16 11:57:38 1.9
+@@ -50,6 +50,9 @@
-@erase "$(INTDIR)\ap_cpystrn.obj"
-@erase "$(INTDIR)\ap_fnmatch.obj"
-@erase "$(INTDIR)\ap_md5c.obj"
-@erase "$(INTDIR)\ap_sha1.obj"
-@erase "$(INTDIR)\ap_signal.obj"
-@erase "$(INTDIR)\ap_slack.obj"
-@@ -78,6 +81,9 @@
+@@ -108,6 +111,9 @@
"$(INTDIR)\ap_cpystrn.obj" \
"$(INTDIR)\ap_fnmatch.obj" \
"$(INTDIR)\ap_md5c.obj" \
"$(INTDIR)\ap_sha1.obj" \
"$(INTDIR)\ap_signal.obj" \
"$(INTDIR)\ap_slack.obj" \
-@@ -114,6 +120,9 @@
+@@ -144,6 +150,9 @@
-@erase "$(INTDIR)\ap_cpystrn.obj"
-@erase "$(INTDIR)\ap_fnmatch.obj"
-@erase "$(INTDIR)\ap_md5c.obj"
-@erase "$(INTDIR)\ap_sha1.obj"
-@erase "$(INTDIR)\ap_signal.obj"
-@erase "$(INTDIR)\ap_slack.obj"
-@@ -140,6 +149,9 @@
+@@ -202,6 +211,9 @@
"$(INTDIR)\ap_cpystrn.obj" \
"$(INTDIR)\ap_fnmatch.obj" \
"$(INTDIR)\ap_md5c.obj" \
| global module context.
+---------------------------------------------------------------------------
Index: src/include/http_conf_globals.h
---- src/include/http_conf_globals.h 2001/01/23 11:35:07 1.1.1.8
-+++ src/include/http_conf_globals.h 2001/01/23 11:48:05 1.9
-@@ -92,6 +92,9 @@
- extern int ap_listenbacklog;
+--- src/include/http_conf_globals.h 2001/10/16 11:47:12 1.1.1.9
++++ src/include/http_conf_globals.h 2001/10/16 11:57:38 1.10
+@@ -95,6 +95,9 @@
+ #endif
extern int ap_dump_settings;
extern API_VAR_EXPORT int ap_extended_status;
+#ifdef EAPI
| some modules need a generic timeout mechanism.
+---------------------------------------------------------------------------
Index: src/include/http_main.h
---- src/include/http_main.h 2001/01/23 11:35:07 1.1.1.5
-+++ src/include/http_main.h 2001/01/23 11:48:05 1.5
+--- src/include/http_main.h 2001/10/16 11:47:12 1.1.1.6
++++ src/include/http_main.h 2001/10/16 11:57:38 1.6
@@ -125,7 +125,11 @@
API_EXPORT(void) ap_sync_scoreboard_image(void);
int ap_update_child_status(int child_num, int status, request_rec *r);
| function.
+---------------------------------------------------------------------------
Index: src/include/httpd.h
---- src/include/httpd.h 2001/05/20 08:16:17 1.1.1.15
-+++ src/include/httpd.h 2001/05/20 08:23:02 1.25
+--- src/include/httpd.h 2001/10/16 11:47:12 1.1.1.16
++++ src/include/httpd.h 2001/10/16 11:57:38 1.26
@@ -70,7 +70,19 @@
/* Headers in which EVERYONE has an interest... */
#include "buff.h"
#include "ap.h"
-@@ -141,8 +153,13 @@
+@@ -141,12 +153,17 @@
#define DEFAULT_HTTP_PORT 80
#define DEFAULT_HTTPS_PORT 443
#define ap_is_default_port(port,r) ((port) == ap_default_port(r))
+#define ap_http_method(r) (((r)->ctx != NULL && ap_ctx_get((r)->ctx, "ap::http::method") != NULL) ? ((char *)ap_ctx_get((r)->ctx, "ap::http::method")) : "http")
+#define ap_default_port(r) (((r)->ctx != NULL && ap_ctx_get((r)->ctx, "ap::default::port") != NULL) ? atoi((char *)ap_ctx_get((r)->ctx, "ap::default::port")) : DEFAULT_HTTP_PORT)
+#else /* EAPI */
+ #ifdef NETWARE
+ #define ap_http_method(r) ap_os_http_method(r)
+ #else
#define ap_http_method(r) "http"
+ #endif
#define ap_default_port(r) DEFAULT_HTTP_PORT
+#endif /* EAPI */
/* --------- Default user name and group name running standalone ---------- */
/* --- These may be specified as numbers by placing a # before a number --- */
-@@ -356,6 +373,19 @@
+@@ -360,6 +377,19 @@
#define SCOREBOARD_MAINTENANCE_INTERVAL 1000000
#endif
/* Number of requests to try to handle in a single process. If <= 0,
* the children don't die off. That's the default here, since I'm still
* interested in finding and stanching leaks.
-@@ -448,6 +478,9 @@
+@@ -452,6 +482,9 @@
API_EXPORT(const char *) ap_get_server_version(void);
API_EXPORT(void) ap_add_version_component(const char *component);
API_EXPORT(const char *) ap_get_server_built(void);
/* Numeric release version identifier: MMNNFFRBB: major minor fix final beta
* Always increases along the same track as the source branch.
-@@ -851,6 +884,10 @@
+@@ -855,6 +888,10 @@
* record to improve 64bit alignment the next time we need to break
* binary compatibility for some other reason.
*/
};
-@@ -899,6 +936,9 @@
+@@ -903,6 +940,9 @@
char *local_host; /* used for ap_get_server_name when
* UseCanonicalName is set to DNS
* (ignores setting of HostnameLookups) */
};
/* Per-vhost config... */
-@@ -971,6 +1011,10 @@
+@@ -975,6 +1015,10 @@
int limit_req_line; /* limit on size of the HTTP request line */
int limit_req_fieldsize; /* limit on size of any request header field */
int limit_req_fields; /* limit on number of request header fields */
| variables are initialized.
+---------------------------------------------------------------------------
Index: src/main/http_config.c
---- src/main/http_config.c 2001/01/29 19:36:42 1.1.1.11
-+++ src/main/http_config.c 2001/01/29 19:38:39 1.14
+--- src/main/http_config.c 2001/10/16 11:47:13 1.1.1.12
++++ src/main/http_config.c 2001/10/16 11:57:38 1.15
@@ -599,6 +599,20 @@
m->name = tmp;
}
| is added plus the initialization of one more `ctx' variable.
+---------------------------------------------------------------------------
Index: src/main/http_main.c
---- src/main/http_main.c 2001/05/20 08:16:18 1.1.1.14
-+++ src/main/http_main.c 2001/05/20 08:23:02 1.36
-@@ -260,6 +260,9 @@
- int ap_listenbacklog;
+--- src/main/http_main.c 2001/10/16 11:47:14 1.1.1.15
++++ src/main/http_main.c 2001/10/16 11:57:39 1.37
+@@ -280,6 +280,9 @@
+
int ap_dump_settings = 0;
API_VAR_EXPORT int ap_extended_status = 0;
+#ifdef EAPI
/*
* The max child slot ever assigned, preserved across restarts. Necessary
-@@ -442,6 +445,30 @@
+@@ -462,6 +465,30 @@
}
}
#ifndef NETWARE
static APACHE_TLS int volatile exit_after_unblock = 0;
#endif
-@@ -1209,6 +1236,10 @@
+@@ -1435,6 +1462,10 @@
ap_log_transaction(log_req);
}
ap_bsetflag(save_req->connection->client, B_EOUT, 1);
ap_bclose(save_req->connection->client);
-@@ -1217,6 +1248,9 @@
+@@ -1443,6 +1474,9 @@
ap_longjmp(jmpbuffer, 1);
}
else { /* abort the connection */
ap_bsetflag(current_conn->client, B_EOUT, 1);
ap_bclose(current_conn->client);
current_conn->aborted = 1;
-@@ -1282,7 +1316,11 @@
+@@ -1508,7 +1542,11 @@
}
#endif
{
unsigned int old;
-@@ -1518,10 +1556,16 @@
+@@ -1744,10 +1782,16 @@
/* Send any leftover data to the client, but never try to again */
if (ap_bflush(r->connection->client) == -1) {
ap_bsetflag(r->connection->client, B_EOUT, 1);
/* Close our half of the connection --- send the client a FIN */
-@@ -2232,6 +2276,9 @@
+@@ -2475,6 +2519,9 @@
/* Clear the pool - including any registered cleanups */
ap_destroy_pool(pglobal);
#endif
exit(code);
}
-@@ -3226,6 +3273,24 @@
+@@ -3469,6 +3516,24 @@
conn->remote_addr = *remaddr;
conn->remote_ip = ap_pstrdup(conn->pool,
inet_ntoa(conn->remote_addr.sin_addr));
return conn;
}
-@@ -3648,6 +3713,15 @@
+@@ -3891,6 +3956,15 @@
printf("Server's Module Magic Number: %u:%u\n",
MODULE_MAGIC_NUMBER_MAJOR, MODULE_MAGIC_NUMBER_MINOR);
printf("Server compiled with....\n");
+ printf(" -D EAPI_MM_CORE_PATH=\"" EAPI_MM_CORE_PATH "\"\n");
+#endif
+#endif
- #ifdef BIG_SECURITY_HOLE
- printf(" -D BIG_SECURITY_HOLE\n");
+ #ifdef TPF
+ show_os_specific_compile_settings();
#endif
-@@ -3801,6 +3875,22 @@
+@@ -4057,6 +4131,22 @@
ap_server_pre_read_config = ap_make_array(pcommands, 1, sizeof(char *));
ap_server_post_read_config = ap_make_array(pcommands, 1, sizeof(char *));
ap_server_config_defines = ap_make_array(pcommands, 1, sizeof(char *));
}
#ifndef MULTITHREAD
-@@ -4220,6 +4310,9 @@
+@@ -4476,6 +4566,9 @@
ap_sync_scoreboard_image();
if (ap_scoreboard_image->global.running_generation != ap_my_generation) {
ap_bclose(conn_io);
clean_child_exit(0);
}
-@@ -4248,6 +4341,9 @@
+@@ -4504,6 +4597,9 @@
*/
#ifdef NO_LINGCLOSE
ap_bclose(conn_io); /* just close it */
#else
if (r && r->connection
-@@ -4258,6 +4354,9 @@
+@@ -4514,6 +4610,9 @@
lingering_close(r);
}
else {
ap_bsetflag(conn_io, B_EOUT, 1);
ap_bclose(conn_io);
}
-@@ -4982,16 +5081,31 @@
+@@ -5273,16 +5372,31 @@
usage(argv[0]);
}
}
}
child_timeouts = !ap_standalone || one_process;
-@@ -5121,6 +5235,10 @@
+@@ -5413,6 +5527,10 @@
ap_destroy_pool(r->pool);
}
ap_bclose(cio);
}
exit(0);
-@@ -5467,6 +5585,9 @@
+@@ -5759,6 +5877,9 @@
ap_kill_cleanups_for_socket(ptrans, csd);
#ifdef NO_LINGCLOSE
ap_bclose(conn_io); /* just close it */
#else
if (r && r->connection
-@@ -5477,6 +5598,9 @@
+@@ -5769,6 +5890,9 @@
lingering_close(r);
}
else {
ap_bsetflag(conn_io, B_EOUT, 1);
ap_bclose(conn_io);
}
-@@ -7002,6 +7126,10 @@
+@@ -7316,6 +7440,10 @@
if (!conf_specified)
ap_cpystrn(ap_server_confname, SERVER_CONFIG_FILE, sizeof(ap_server_confname));
if (!ap_os_is_path_absolute(ap_server_confname))
ap_cpystrn(ap_server_confname,
ap_server_root_relative(pcommands, ap_server_confname),
-@@ -7043,6 +7171,9 @@
+@@ -7355,6 +7483,9 @@
}
#else /* ndef WIN32 */
server_conf = ap_read_config(pconf, ptrans, ap_server_confname);
| request_rec structures.
+---------------------------------------------------------------------------
Index: src/main/http_protocol.c
---- src/main/http_protocol.c 2001/05/20 08:16:18 1.1.1.13
-+++ src/main/http_protocol.c 2001/05/20 08:23:02 1.13
+--- src/main/http_protocol.c 2001/10/16 11:47:14 1.1.1.14
++++ src/main/http_protocol.c 2001/10/16 11:57:39 1.14
@@ -1110,6 +1110,10 @@
r->status = HTTP_REQUEST_TIME_OUT; /* Until we get a request */
r->the_request = NULL;
| variables from other modules.
+---------------------------------------------------------------------------
Index: src/modules/standard/mod_rewrite.c
---- src/modules/standard/mod_rewrite.c 2001/05/20 08:16:21 1.1.1.11
-+++ src/modules/standard/mod_rewrite.c 2001/05/20 08:23:02 1.9
+--- src/modules/standard/mod_rewrite.c 2001/10/16 11:47:16 1.1.1.12
++++ src/modules/standard/mod_rewrite.c 2001/10/16 11:57:39 1.10
@@ -3678,6 +3678,15 @@
}
#endif /* ndef WIN32 && NETWARE*/
| recognize more schemes by intercepting this processing.
+---------------------------------------------------------------------------
Index: src/modules/proxy/mod_proxy.c
---- src/modules/proxy/mod_proxy.c 2001/01/23 11:35:10 1.1.1.8
-+++ src/modules/proxy/mod_proxy.c 2001/01/23 11:48:07 1.15
+--- src/modules/proxy/mod_proxy.c 2001/10/16 11:47:15 1.1.1.9
++++ src/modules/proxy/mod_proxy.c 2001/10/16 11:57:39 1.16
@@ -215,6 +215,9 @@
static int proxy_fixup(request_rec *r)
{
| to enhance it by intercepting this processing.
+---------------------------------------------------------------------------
Index: src/modules/proxy/proxy_http.c
---- src/modules/proxy/proxy_http.c 2001/02/28 19:40:51 1.1.1.10
-+++ src/modules/proxy/proxy_http.c 2001/02/28 19:44:34 1.18
+--- src/modules/proxy/proxy_http.c 2001/10/16 11:47:15 1.1.1.11
++++ src/modules/proxy/proxy_http.c 2001/10/16 11:57:39 1.19
@@ -190,6 +190,9 @@
const char *urlptr = NULL;
const char *datestr;
projects / packages / apache1.git / commitdiff