From edacc908790775d2b134fe32425b0c7605171713 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 22 Oct 2007 23:06:22 +0000 Subject: [PATCH] - adjust chunks for 1.3.39 (or should this file be updated from mod_ssl?) Changed files: apache1-mod_ssl-eapi.patch -> 1.10 --- apache1-mod_ssl-eapi.patch | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/apache1-mod_ssl-eapi.patch b/apache1-mod_ssl-eapi.patch index 0eefaa0..c596168 100644 --- a/apache1-mod_ssl-eapi.patch +++ b/apache1-mod_ssl-eapi.patch @@ -1251,10 +1251,10 @@ Index: src/main/http_main.c #ifdef TPF show_os_specific_compile_settings(); #endif -@@ -4339,6 +4408,22 @@ - ap_server_pre_read_config = ap_make_array(pcommands, 1, sizeof(char *)); +@@ -4468,6 +4468,22 @@ ap_server_post_read_config = ap_make_array(pcommands, 1, sizeof(char *)); ap_server_config_defines = ap_make_array(pcommands, 1, sizeof(char *)); + pid_table = ap_make_table(pglobal, HARD_SERVER_LIMIT); + +#ifdef EAPI + ap_hook_init(); @@ -1591,38 +1591,35 @@ Index: src/modules/standard/mod_rewrite.c return ap_pstrdup(r->pool, ""); } -+--------------------------------------------------------------------------- -| Add an EAPI hook to allow other modules to add content to -| the status HTML page. -+--------------------------------------------------------------------------- -Index: src/modules/standard/mod_status.c ---- src/modules/standard/mod_status.c 28 Jul 2006 13:55:27 -0000 1.1.1.17 -+++ src/modules/standard/mod_status.c 28 Jul 2006 13:56:29 -0000 1.14 -@@ -652,12 +678,23 @@ +--- src/modules/standard/mod_status.c~ 2007-10-23 01:33:07.000000000 +0300 ++++ src/modules/standard/mod_status.c 2007-10-23 01:45:00.186221317 +0300 +@@ -679,6 +679,18 @@ ap_rprintf(r, "??..reading.. \n\n"); else +#ifndef NO_PRETTYPRINT + ap_rprintf(r, -+ "%s" -+ "%s" -+ "%s" -+ "\n\n", -+ score_record.client, -+ vhost ? vhost->server_hostname : "(unavailable)", -+ ap_escape_html(r->pool, score_record.request)); ++ "%s" ++ "%s" ++ "%s" ++ "\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, ++ ap_escape_logitem(r->pool, score_record.request))); +#else ap_rprintf(r, "%s%s%s\n\n", ap_escape_html(r->pool, score_record.client), - vhost ? ap_escape_html(r->pool, +@@ -686,6 +698,7 @@ vhost->server_hostname) : "(unavailable)", - ap_escape_html(r->pool, score_record.request)); + ap_escape_html(r->pool, + ap_escape_logitem(r->pool, score_record.request))); +#endif } /* no_table_report */ } /* !short_report */ } /* if () */ - +--------------------------------------------------------------------------- | Add hooks to the scheme processing to allow other modules to | recognize more schemes by intercepting this processing. -- 2.44.0