From: hawk Date: Tue, 18 Oct 2005 08:55:14 +0000 (+0000) Subject: - merged mod_ssl 2.8.25-1.3.34 updates from HEAD X-Git-Tag: apache-1_3_34-1~1 X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=a7e135a5e1f676db2425390e39c8d54a2d614da3;p=packages%2Fapache.git - merged mod_ssl 2.8.25-1.3.34 updates from HEAD Changed files: apache-mod_ssl-addon.patch -> 1.7.2.3 apache-mod_ssl-eapi.patch -> 1.9.2.5 --- diff --git a/apache-mod_ssl-addon.patch b/apache-mod_ssl-addon.patch index 8c51a07..7a22a71 100644 --- a/apache-mod_ssl-addon.patch +++ b/apache-mod_ssl-addon.patch @@ -8,7 +8,7 @@ ## ## Annotated patch file: addon.patch ## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved. -## Created on: 11-May-2004 +## Created on: 18-Oct-2005 ## ## This file assembles changes to existing Apache source files ## between the original Apache and the patched variant. It can be @@ -139,8 +139,8 @@ Index: htdocs/manual/mod/index.html.en | Add a hyperlink for the Define directives. +--------------------------------------------------------------------------- Index: htdocs/manual/mod/directives.html.en ---- htdocs/manual/mod/directives.html.en 11 May 2004 18:28:01 -0000 1.1.1.6 -+++ htdocs/manual/mod/directives.html.en 11 May 2004 18:32:14 -0000 1.7 +--- htdocs/manual/mod/directives.html.en 18 Oct 2005 06:26:16 -0000 1.1.1.7 ++++ htdocs/manual/mod/directives.html.en 18 Oct 2005 06:27:33 -0000 1.8 @@ -228,6 +228,8 @@
  • DefaultType
    • diff --git a/apache-mod_ssl-eapi.patch b/apache-mod_ssl-eapi.patch index d5f9c17..a4b3147 100644 --- a/apache-mod_ssl-eapi.patch +++ b/apache-mod_ssl-eapi.patch @@ -7,7 +7,7 @@ ## ## Annotated patch file: eapi.patch ## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved. -## Created on: 02-Sep-2005 +## Created on: 18-Oct-2005 ## ## This file assembles changes to existing Apache source files ## between the original Apache and the patched variant. It can be @@ -56,8 +56,8 @@ Index: src/Configuration.tmpl | Patch in implementation of the EAPI rule. +--------------------------------------------------------------------------- Index: src/Configure ---- src/Configure 30 Oct 2004 13:42:25 -0000 1.1.1.25 -+++ src/Configure 30 Oct 2004 13:44:00 -0000 1.28 +--- src/Configure 18 Oct 2005 06:26:22 -0000 1.1.1.26 ++++ src/Configure 18 Oct 2005 06:27:34 -0000 1.29 @@ -1867,6 +1867,72 @@ fi @@ -152,8 +152,8 @@ Index: src/ap/Makefile.tmpl | Add the build support for the ap_hook.c and ap_ctx.c sources (Win32) +--------------------------------------------------------------------------- Index: src/ap/ap.mak ---- src/ap/ap.mak 18 Jul 2003 15:44:30 -0000 1.1.1.10 -+++ src/ap/ap.mak 18 Jul 2003 15:56:58 -0000 1.10 +--- src/ap/ap.mak 18 Oct 2005 06:26:22 -0000 1.1.1.11 ++++ src/ap/ap.mak 18 Oct 2005 06:27:34 -0000 1.11 @@ -44,6 +44,9 @@ -@erase "$(INTDIR)\ap_cpystrn.obj" -@erase "$(INTDIR)\ap_fnmatch.obj" @@ -200,10 +200,10 @@ Index: src/ap/ap.mak | EAPI-aware modules and standard modules. +--------------------------------------------------------------------------- Index: src/include/ap_mmn.h ---- src/include/ap_mmn.h 11 May 2004 18:28:12 -0000 1.1.1.13 -+++ src/include/ap_mmn.h 11 May 2004 18:32:15 -0000 1.13 -@@ -205,7 +205,23 @@ - * in core_dir_config. +--- src/include/ap_mmn.h 18 Oct 2005 06:26:23 -0000 1.1.1.14 ++++ src/include/ap_mmn.h 18 Oct 2005 06:27:34 -0000 1.14 +@@ -206,7 +206,23 @@ + * 19990320.18 - trace_enable member added to core server_config */ +/* @@ -379,8 +379,8 @@ Index: src/include/http_conf_globals.h | function. +--------------------------------------------------------------------------- Index: src/include/httpd.h ---- src/include/httpd.h 30 Oct 2004 13:42:25 -0000 1.1.1.25 -+++ src/include/httpd.h 30 Oct 2004 13:44:00 -0000 1.35 +--- src/include/httpd.h 18 Oct 2005 06:26:24 -0000 1.1.1.26 ++++ src/include/httpd.h 18 Oct 2005 06:27:34 -0000 1.36 @@ -27,7 +27,19 @@ /* Headers in which EVERYONE has an interest... */ @@ -1120,8 +1120,8 @@ Index: src/main/http_config.c | is added plus the initialization of one more `ctx' variable. +--------------------------------------------------------------------------- Index: src/main/http_main.c ---- src/main/http_main.c 22 Oct 2004 10:15:50 -0000 1.1.1.23 -+++ src/main/http_main.c 6 Jul 2005 12:29:22 -0000 1.46 +--- src/main/http_main.c 18 Oct 2005 06:26:25 -0000 1.1.1.24 ++++ src/main/http_main.c 18 Oct 2005 06:27:34 -0000 1.47 @@ -242,6 +242,9 @@ int ap_dump_settings = 0; @@ -1163,7 +1163,7 @@ Index: src/main/http_main.c #ifndef NETWARE static APACHE_TLS int volatile exit_after_unblock = 0; #endif -@@ -1542,6 +1569,9 @@ +@@ -1543,6 +1570,9 @@ } ap_bsetflag(save_req->connection->client, B_EOUT, 1); @@ -1173,7 +1173,7 @@ Index: src/main/http_main.c ap_bclose(save_req->connection->client); if (!ap_standalone) -@@ -1550,6 +1580,9 @@ +@@ -1551,6 +1581,9 @@ } else { /* abort the connection */ ap_bsetflag(current_conn->client, B_EOUT, 1); @@ -1183,7 +1183,7 @@ Index: src/main/http_main.c ap_bclose(current_conn->client); current_conn->aborted = 1; } -@@ -1851,10 +1884,16 @@ +@@ -1852,10 +1885,16 @@ /* Send any leftover data to the client, but never try to again */ if (ap_bflush(r->connection->client) == -1) { @@ -1200,7 +1200,7 @@ Index: src/main/http_main.c ap_bsetflag(r->connection->client, B_EOUT, 1); /* Close our half of the connection --- send the client a FIN */ -@@ -2553,6 +2592,9 @@ +@@ -2554,6 +2593,9 @@ /* Clear the pool - including any registered cleanups */ ap_destroy_pool(pglobal); #endif @@ -1210,7 +1210,7 @@ Index: src/main/http_main.c exit(code); } -@@ -3623,6 +3665,24 @@ +@@ -3624,6 +3666,24 @@ conn->remote_addr = *remaddr; conn->remote_ip = ap_pstrdup(conn->pool, inet_ntoa(conn->remote_addr.sin_addr)); @@ -1235,7 +1235,7 @@ Index: src/main/http_main.c return conn; } -@@ -4133,6 +4193,15 @@ +@@ -4134,6 +4194,15 @@ printf("Server's Module Magic Number: %u:%u\n", MODULE_MAGIC_NUMBER_MAJOR, MODULE_MAGIC_NUMBER_MINOR); printf("Server compiled with....\n"); @@ -1251,7 +1251,7 @@ Index: src/main/http_main.c #ifdef TPF show_os_specific_compile_settings(); #endif -@@ -4307,6 +4376,22 @@ +@@ -4308,6 +4377,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 *)); @@ -1274,7 +1274,7 @@ Index: src/main/http_main.c } #ifndef MULTITHREAD -@@ -4808,6 +4893,9 @@ +@@ -4809,6 +4894,9 @@ ap_sync_scoreboard_image(); if (ap_scoreboard_image->global.running_generation != ap_my_generation) { @@ -1284,7 +1284,7 @@ Index: src/main/http_main.c ap_bclose(conn_io); clean_child_exit(0); } -@@ -4836,6 +4924,9 @@ +@@ -4837,6 +4925,9 @@ */ #ifdef NO_LINGCLOSE @@ -1294,7 +1294,7 @@ Index: src/main/http_main.c ap_bclose(conn_io); /* just close it */ #else if (r && r->connection -@@ -4846,6 +4937,9 @@ +@@ -4847,6 +4938,9 @@ lingering_close(r); } else { @@ -1304,7 +1304,7 @@ Index: src/main/http_main.c ap_bsetflag(conn_io, B_EOUT, 1); ap_bclose(conn_io); } -@@ -5629,16 +5723,31 @@ +@@ -5630,16 +5724,31 @@ usage(argv[0]); } } @@ -1336,7 +1336,7 @@ Index: src/main/http_main.c } child_timeouts = !ap_standalone || one_process; -@@ -5786,6 +5895,10 @@ +@@ -5787,6 +5896,10 @@ ap_destroy_pool(r->pool); } @@ -1347,7 +1347,7 @@ Index: src/main/http_main.c ap_bclose(cio); } exit(0); -@@ -6162,6 +6275,9 @@ +@@ -6163,6 +6276,9 @@ ap_kill_cleanups_for_socket(ptrans, csd); #ifdef NO_LINGCLOSE @@ -1357,7 +1357,7 @@ Index: src/main/http_main.c ap_bclose(conn_io); /* just close it */ #else if (r && r->connection -@@ -6172,6 +6288,9 @@ +@@ -6173,6 +6289,9 @@ lingering_close(r); } else { @@ -1367,7 +1367,7 @@ Index: src/main/http_main.c ap_bsetflag(conn_io, B_EOUT, 1); ap_bclose(conn_io); } -@@ -7747,6 +7866,10 @@ +@@ -7748,6 +7867,10 @@ if (!conf_specified) ap_cpystrn(ap_server_confname, SERVER_CONFIG_FILE, sizeof(ap_server_confname)); @@ -1378,7 +1378,7 @@ Index: src/main/http_main.c if (!ap_os_is_path_absolute(ap_server_confname)) ap_cpystrn(ap_server_confname, ap_server_root_relative(pcommands, ap_server_confname), -@@ -7787,6 +7910,9 @@ +@@ -7788,6 +7911,9 @@ #else /* ndef WIN32 */ server_conf = ap_read_config(pconf, ptrans, ap_server_confname); #endif @@ -1413,8 +1413,8 @@ Index: src/main/http_request.c | request_rec structures. +--------------------------------------------------------------------------- Index: src/main/http_protocol.c ---- src/main/http_protocol.c 22 Oct 2004 10:15:51 -0000 1.1.1.21 -+++ src/main/http_protocol.c 22 Oct 2004 10:18:59 -0000 1.21 +--- src/main/http_protocol.c 18 Oct 2005 06:26:26 -0000 1.1.1.22 ++++ src/main/http_protocol.c 18 Oct 2005 06:27:34 -0000 1.22 @@ -1172,6 +1172,10 @@ r->status = HTTP_REQUEST_TIME_OUT; /* Until we get a request */ r->the_request = NULL; @@ -1426,7 +1426,7 @@ Index: src/main/http_protocol.c #ifdef CHARSET_EBCDIC ap_bsetflag(r->connection->client, B_ASCII2EBCDIC, r->ebcdic.conv_in = 1); ap_bsetflag(r->connection->client, B_EBCDIC2ASCII, r->ebcdic.conv_out = 1); -@@ -1328,6 +1332,11 @@ +@@ -1340,6 +1344,11 @@ rnew->read_body = REQUEST_NO_BODY; rnew->main = (request_rec *) r; @@ -1628,9 +1628,9 @@ Index: src/modules/standard/mod_status.c | recognize more schemes by intercepting this processing. +--------------------------------------------------------------------------- Index: src/modules/proxy/mod_proxy.c ---- src/modules/proxy/mod_proxy.c 11 May 2004 18:28:16 -0000 1.1.1.14 -+++ src/modules/proxy/mod_proxy.c 11 May 2004 18:32:15 -0000 1.21 -@@ -175,6 +175,9 @@ +--- src/modules/proxy/mod_proxy.c 18 Oct 2005 06:26:27 -0000 1.1.1.15 ++++ src/modules/proxy/mod_proxy.c 18 Oct 2005 06:27:34 -0000 1.22 +@@ -176,6 +176,9 @@ static int proxy_fixup(request_rec *r) { char *url, *p; @@ -1640,7 +1640,7 @@ Index: src/modules/proxy/mod_proxy.c if (r->proxyreq == NOT_PROXY || strncmp(r->filename, "proxy:", 6) != 0) return DECLINED; -@@ -182,6 +185,14 @@ +@@ -183,6 +186,14 @@ url = &r->filename[6]; /* canonicalise each specific scheme */ @@ -1655,7 +1655,7 @@ Index: src/modules/proxy/mod_proxy.c if (strncasecmp(url, "http:", 5) == 0) return ap_proxy_http_canon(r, url + 5, "http", DEFAULT_HTTP_PORT); else if (strncasecmp(url, "ftp:", 4) == 0) -@@ -197,9 +208,44 @@ +@@ -198,9 +209,44 @@ static void proxy_init(server_rec *r, pool *p) { ap_proxy_garbage_init(r, p); @@ -1701,7 +1701,7 @@ Index: src/modules/proxy/mod_proxy.c /* Send a redirection if the request contains a hostname which is not */ /* fully qualified, i.e. doesn't have a domain name appended. Some proxy */ -@@ -331,6 +377,14 @@ +@@ -364,6 +410,14 @@ * CONNECT is a special method that bypasses the normal proxy * code. */ @@ -1716,7 +1716,7 @@ Index: src/modules/proxy/mod_proxy.c if (r->method_number == M_CONNECT) rc = ap_proxy_connect_handler(r, cr, url, ents[i].hostname, ents[i].port); -@@ -340,6 +394,9 @@ +@@ -373,6 +427,9 @@ ents[i].port); else rc = DECLINED; @@ -1726,7 +1726,7 @@ Index: src/modules/proxy/mod_proxy.c /* an error or success */ if (rc != DECLINED && rc != HTTP_BAD_GATEWAY) -@@ -354,6 +411,14 @@ +@@ -387,6 +444,14 @@ */ /* handle the scheme */ @@ -1741,7 +1741,7 @@ Index: src/modules/proxy/mod_proxy.c if (r->method_number == M_CONNECT) { return ap_proxy_connect_handler(r, cr, url, NULL, 0); } -@@ -951,4 +1016,10 @@ +@@ -984,4 +1049,10 @@ NULL, /* child_init */ NULL, /* child_exit */ proxy_detect /* post read-request */ @@ -1758,8 +1758,8 @@ Index: src/modules/proxy/mod_proxy.c | to enhance it by intercepting this processing. +--------------------------------------------------------------------------- Index: src/modules/proxy/proxy_http.c ---- src/modules/proxy/proxy_http.c 22 Oct 2004 10:15:57 -0000 1.1.1.18 -+++ src/modules/proxy/proxy_http.c 22 Oct 2004 10:18:59 -0000 1.26 +--- src/modules/proxy/proxy_http.c 18 Oct 2005 06:26:27 -0000 1.1.1.19 ++++ src/modules/proxy/proxy_http.c 18 Oct 2005 06:27:34 -0000 1.27 @@ -127,6 +127,9 @@ const char *datestr, *urlstr; int result, major, minor;