SOURCES: apache1-mod_ssl-eapi.patch, apache1-mod_ssl-addon.patch -...
qboosh
qboosh at pld-linux.org
Sun Nov 4 18:04:55 CET 2007
Author: qboosh Date: Sun Nov 4 17:04:54 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated from mod_ssl 3.8.30-1.3.39 to clean messy mod_status changes
---- Files affected:
SOURCES:
apache1-mod_ssl-eapi.patch (1.10 -> 1.11) , apache1-mod_ssl-addon.patch (1.8 -> 1.9)
---- Diffs:
================================================================
Index: SOURCES/apache1-mod_ssl-eapi.patch
diff -u SOURCES/apache1-mod_ssl-eapi.patch:1.10 SOURCES/apache1-mod_ssl-eapi.patch:1.11
--- SOURCES/apache1-mod_ssl-eapi.patch:1.10 Tue Oct 23 01:06:22 2007
+++ SOURCES/apache1-mod_ssl-eapi.patch Sun Nov 4 18:04:49 2007
@@ -6,8 +6,8 @@
## ____________________________________________________________________________
##
## Annotated patch file: eapi.patch
-## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved.
-## Created on: 28-Jul-2006
+## Copyright (c) 1998-2007 Ralf S. Engelschall, All Rights Reserved.
+## Created on: 12-Sep-2007
##
## This file assembles changes to existing Apache source files
## between the original Apache and the patched variant. It can be
@@ -56,8 +56,8 @@
| Patch in implementation of the EAPI rule.
+---------------------------------------------------------------------------
Index: src/Configure
---- src/Configure 28 Jul 2006 13:55:21 -0000 1.1.1.29
-+++ src/Configure 28 Jul 2006 13:56:29 -0000 1.32
+--- src/Configure 10 Sep 2007 20:30:32 -0000 1.1.1.30
++++ src/Configure 10 Sep 2007 20:33:10 -0000 1.33
@@ -1868,6 +1868,72 @@
fi
@@ -379,8 +379,8 @@
| function.
+---------------------------------------------------------------------------
Index: src/include/httpd.h
---- src/include/httpd.h 28 Jul 2006 13:55:32 -0000 1.1.1.29
-+++ src/include/httpd.h 28 Jul 2006 13:56:29 -0000 1.39
+--- src/include/httpd.h 10 Sep 2007 20:30:33 -0000 1.1.1.30
++++ src/include/httpd.h 10 Sep 2007 20:33:10 -0000 1.40
@@ -28,7 +28,19 @@
/* Headers in which EVERYONE has an interest... */
@@ -1120,8 +1120,8 @@
| is added plus the initialization of one more `ctx' variable.
+---------------------------------------------------------------------------
Index: src/main/http_main.c
---- src/main/http_main.c 28 Jul 2006 13:55:34 -0000 1.1.1.26
-+++ src/main/http_main.c 28 Jul 2006 13:56:29 -0000 1.49
+--- src/main/http_main.c 10 Sep 2007 20:30:35 -0000 1.1.1.27
++++ src/main/http_main.c 10 Sep 2007 20:33:10 -0000 1.50
@@ -243,6 +243,9 @@
int ap_dump_settings = 0;
@@ -1132,7 +1132,7 @@
/*
* The max child slot ever assigned, preserved across restarts. Necessary
-@@ -436,6 +439,30 @@
+@@ -471,6 +474,30 @@
}
}
@@ -1163,7 +1163,7 @@
#ifndef NETWARE
static APACHE_TLS int volatile exit_after_unblock = 0;
#endif
-@@ -1551,6 +1578,9 @@
+@@ -1586,6 +1613,9 @@
}
ap_bsetflag(save_req->connection->client, B_EOUT, 1);
@@ -1173,7 +1173,7 @@
ap_bclose(save_req->connection->client);
if (!ap_standalone)
-@@ -1559,6 +1589,9 @@
+@@ -1594,6 +1624,9 @@
}
else { /* abort the connection */
ap_bsetflag(current_conn->client, B_EOUT, 1);
@@ -1183,7 +1183,7 @@
ap_bclose(current_conn->client);
current_conn->aborted = 1;
}
-@@ -1880,10 +1913,16 @@
+@@ -1915,10 +1948,16 @@
/* Send any leftover data to the client, but never try to again */
if (ap_bflush(r->connection->client) == -1) {
@@ -1200,7 +1200,7 @@
ap_bsetflag(r->connection->client, B_EOUT, 1);
/* Close our half of the connection --- send the client a FIN */
-@@ -2582,6 +2621,9 @@
+@@ -2617,6 +2656,9 @@
/* Clear the pool - including any registered cleanups */
ap_destroy_pool(pglobal);
#endif
@@ -1210,7 +1210,7 @@
exit(code);
}
-@@ -3655,6 +3697,24 @@
+@@ -3711,6 +3753,24 @@
conn->remote_addr = *remaddr;
conn->remote_ip = ap_pstrdup(conn->pool,
inet_ntoa(conn->remote_addr.sin_addr));
@@ -1235,7 +1235,7 @@
return conn;
}
-@@ -4165,6 +4225,15 @@
+@@ -4221,6 +4281,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 @@
#ifdef TPF
show_os_specific_compile_settings();
#endif
-@@ -4468,6 +4468,22 @@
+@@ -4396,6 +4465,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);
@@ -1274,7 +1274,7 @@
}
#ifndef MULTITHREAD
-@@ -4835,6 +4920,9 @@
+@@ -4892,6 +4977,9 @@
ap_sync_scoreboard_image();
if (ap_scoreboard_image->global.running_generation != ap_my_generation) {
@@ -1284,7 +1284,7 @@
ap_bclose(conn_io);
clean_child_exit(0);
}
-@@ -4863,6 +4951,9 @@
+@@ -4920,6 +5008,9 @@
*/
#ifdef NO_LINGCLOSE
@@ -1294,7 +1294,7 @@
ap_bclose(conn_io); /* just close it */
#else
if (r && r->connection
-@@ -4873,6 +4964,9 @@
+@@ -4930,6 +5021,9 @@
lingering_close(r);
}
else {
@@ -1304,7 +1304,7 @@
ap_bsetflag(conn_io, B_EOUT, 1);
ap_bclose(conn_io);
}
-@@ -5656,16 +5750,31 @@
+@@ -5730,16 +5824,31 @@
usage(argv[0]);
}
}
@@ -1336,7 +1336,7 @@
}
child_timeouts = !ap_standalone || one_process;
-@@ -5813,6 +5922,10 @@
+@@ -5887,6 +5996,10 @@
ap_destroy_pool(r->pool);
}
@@ -1347,7 +1347,7 @@
ap_bclose(cio);
}
exit(0);
-@@ -6189,6 +6302,9 @@
+@@ -6263,6 +6376,9 @@
ap_kill_cleanups_for_socket(ptrans, csd);
#ifdef NO_LINGCLOSE
@@ -1357,7 +1357,7 @@
ap_bclose(conn_io); /* just close it */
#else
if (r && r->connection
-@@ -6199,6 +6315,9 @@
+@@ -6273,6 +6389,9 @@
lingering_close(r);
}
else {
@@ -1367,7 +1367,7 @@
ap_bsetflag(conn_io, B_EOUT, 1);
ap_bclose(conn_io);
}
-@@ -7774,6 +7893,10 @@
+@@ -7848,6 +7967,10 @@
if (!conf_specified)
ap_cpystrn(ap_server_confname, SERVER_CONFIG_FILE, sizeof(ap_server_confname));
@@ -1378,7 +1378,7 @@
if (!ap_os_is_path_absolute(ap_server_confname))
ap_cpystrn(ap_server_confname,
ap_server_root_relative(pcommands, ap_server_confname),
-@@ -7814,6 +7937,9 @@
+@@ -7888,6 +8011,9 @@
#else /* ndef WIN32 */
server_conf = ap_read_config(pconf, ptrans, ap_server_confname);
#endif
@@ -1591,35 +1591,27 @@
return ap_pstrdup(r->pool, "");
}
---- 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,
- "<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"
-+ "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%s"
-+ "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%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,
-+ ap_escape_logitem(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),
-@@ -686,6 +698,7 @@
- vhost->server_hostname) : "(unavailable)",
- ap_escape_html(r->pool,
- ap_escape_logitem(r->pool, score_record.request)));
-+#endif
- } /* no_table_report */
- } /* !short_report */
- } /* if (<active child>) */
++---------------------------------------------------------------------------
+| 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 10 Sep 2007 20:30:37 -0000 1.1.1.18
++++ src/modules/standard/mod_status.c 12 Sep 2007 05:32:20 -0000
+@@ -698,6 +735,12 @@
+ #endif
+ }
+
++#ifdef EAPI
++ ap_hook_use("ap::mod_status::display",
++ AP_HOOK_SIG4(void,ptr,int,int), AP_HOOK_ALL,
++ r, no_table_report, short_report);
++#endif
++
+ } else {
+
+ if (!short_report) {
+
+---------------------------------------------------------------------------
| Add hooks to the scheme processing to allow other modules to
| recognize more schemes by intercepting this processing.
================================================================
Index: SOURCES/apache1-mod_ssl-addon.patch
diff -u SOURCES/apache1-mod_ssl-addon.patch:1.8 SOURCES/apache1-mod_ssl-addon.patch:1.9
--- SOURCES/apache1-mod_ssl-addon.patch:1.8 Sun Jul 30 15:23:28 2006
+++ SOURCES/apache1-mod_ssl-addon.patch Sun Nov 4 18:04:49 2007
@@ -7,8 +7,8 @@
## ____________________________________________________________________________
##
## Annotated patch file: addon.patch
-## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved.
-## Created on: 28-Jul-2006
+## Copyright (c) 1998-2007 Ralf S. Engelschall, All Rights Reserved.
+## Created on: 12-Sep-2007
##
## This file assembles changes to existing Apache source files
## between the original Apache and the patched variant. It can be
@@ -40,8 +40,8 @@
| Add more beautiful optic to the status page table..
+---------------------------------------------------------------------------
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
+--- src/modules/standard/mod_status.c 10 Sep 2007 20:30:37 -0000 1.1.1.18
++++ src/modules/standard/mod_status.c 12 Sep 2007 05:32:20 -0000
@@ -442,12 +442,33 @@
if (no_table_report)
ap_rputs("<p><hr><h2>Server Details</h2>\n\n", r);
@@ -76,7 +76,7 @@
}
for (i = 0; i < HARD_SERVER_LIMIT; ++i) {
-@@ -575,6 +596,11 @@
+@@ -576,6 +597,11 @@
vhost->server_hostname) : "(unavailable)");
}
else { /* !no_table_report */
@@ -88,7 +88,7 @@
if (score_record.status == SERVER_DEAD)
#ifdef TPF
if (kill(ps_record.pid, 0) == 0) {
-@@ -587,12 +613,12 @@
+@@ -588,12 +614,12 @@
} else
#endif /* TPF */
ap_rprintf(r,
@@ -103,19 +103,31 @@
i, (int) ps_record.generation,
(int) ps_record.pid, (int) conn_lres,
my_lres, lres);
-@@ -696,6 +733,12 @@
- #endif
- }
-
-+#ifdef EAPI
-+ ap_hook_use("ap::mod_status::display",
-+ AP_HOOK_SIG4(void,ptr,int,int), AP_HOOK_ALL,
-+ r, no_table_report, short_report);
+@@ -653,6 +679,16 @@
+ 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),
+@@ -660,6 +696,7 @@
+ vhost->server_hostname) : "(unavailable)",
+ ap_escape_html(r->pool,
+ ap_escape_logitem(r->pool, score_record.request)));
+#endif
-+
- } else {
-
- if (!short_report) {
+ } /* no_table_report */
+ } /* !short_report */
+ } /* if (<active child>) */
+---------------------------------------------------------------------------
| Add a hyperlink to the mod_define.html document.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/apache1-mod_ssl-eapi.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/apache1-mod_ssl-addon.patch?r1=1.8&r2=1.9&f=u
More information about the pld-cvs-commit
mailing list