## ____________________________________________________________________________
##
## 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: 08-Feb-2008
##
## This file assembles changes to existing Apache source files
## between the original Apache and the patched variant. It can be
| 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 8 Feb 2008 11:15:36 -0000 1.1.1.31
++++ src/Configure 8 Feb 2008 11:17:39 -0000 1.34
@@ -1868,6 +1868,72 @@
fi
| 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 8 Feb 2008 11:15:38 -0000 1.1.1.31
++++ src/include/httpd.h 8 Feb 2008 11:17:39 -0000 1.41
@@ -28,7 +28,19 @@
/* Headers in which EVERYONE has an interest... */
| 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 8 Feb 2008 11:15:39 -0000 1.1.1.28
++++ src/main/http_main.c 8 Feb 2008 11:17:39 -0000 1.51
@@ -243,6 +243,9 @@
int ap_dump_settings = 0;
/*
* The max child slot ever assigned, preserved across restarts. Necessary
-@@ -436,6 +439,30 @@
+@@ -479,6 +482,30 @@
}
}
#ifndef NETWARE
static APACHE_TLS int volatile exit_after_unblock = 0;
#endif
-@@ -1551,6 +1578,9 @@
+@@ -1594,6 +1621,9 @@
}
ap_bsetflag(save_req->connection->client, B_EOUT, 1);
ap_bclose(save_req->connection->client);
if (!ap_standalone)
-@@ -1559,6 +1589,9 @@
+@@ -1602,6 +1632,9 @@
}
else { /* abort the connection */
ap_bsetflag(current_conn->client, B_EOUT, 1);
ap_bclose(current_conn->client);
current_conn->aborted = 1;
}
-@@ -1880,10 +1913,16 @@
+@@ -1923,10 +1956,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 */
-@@ -2582,6 +2621,9 @@
+@@ -2625,6 +2664,9 @@
/* Clear the pool - including any registered cleanups */
ap_destroy_pool(pglobal);
#endif
exit(code);
}
-@@ -3655,6 +3697,24 @@
+@@ -3722,6 +3764,24 @@
conn->remote_addr = *remaddr;
conn->remote_ip = ap_pstrdup(conn->pool,
inet_ntoa(conn->remote_addr.sin_addr));
return conn;
}
-@@ -4165,6 +4225,15 @@
+@@ -4232,6 +4292,15 @@
printf("Server's Module Magic Number: %u:%u\n",
MODULE_MAGIC_NUMBER_MAJOR, MODULE_MAGIC_NUMBER_MINOR);
printf("Server compiled with....\n");
#ifdef TPF
show_os_specific_compile_settings();
#endif
-@@ -4468,6 +4468,22 @@
+@@ -4407,6 +4476,23 @@
+ 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 *));
- pid_table = ap_make_table(pglobal, HARD_SERVER_LIMIT);
+
+#ifdef EAPI
+ ap_hook_init();
+
+ ap_global_ctx = ap_ctx_new(NULL);
+#endif /* EAPI */
- }
-
- #ifndef MULTITHREAD
-@@ -4835,6 +4920,9 @@
++
+ /* overkill since static */
+ for (i = 0; i < HARD_SERVER_LIMIT; i++) {
+ pid_table[i] = 0;
+@@ -4907,6 +4993,9 @@
ap_sync_scoreboard_image();
if (ap_scoreboard_image->global.running_generation != ap_my_generation) {
ap_bclose(conn_io);
clean_child_exit(0);
}
-@@ -4863,6 +4951,9 @@
+@@ -4935,6 +5024,9 @@
*/
#ifdef NO_LINGCLOSE
ap_bclose(conn_io); /* just close it */
#else
if (r && r->connection
-@@ -4873,6 +4964,9 @@
+@@ -4945,6 +5037,9 @@
lingering_close(r);
}
else {
ap_bsetflag(conn_io, B_EOUT, 1);
ap_bclose(conn_io);
}
-@@ -5656,16 +5750,31 @@
+@@ -5745,16 +5840,31 @@
usage(argv[0]);
}
}
}
child_timeouts = !ap_standalone || one_process;
-@@ -5813,6 +5922,10 @@
+@@ -5902,6 +6012,10 @@
ap_destroy_pool(r->pool);
}
ap_bclose(cio);
}
exit(0);
-@@ -6189,6 +6302,9 @@
+@@ -6278,6 +6392,9 @@
ap_kill_cleanups_for_socket(ptrans, csd);
#ifdef NO_LINGCLOSE
ap_bclose(conn_io); /* just close it */
#else
if (r && r->connection
-@@ -6199,6 +6315,9 @@
+@@ -6288,6 +6405,9 @@
lingering_close(r);
}
else {
ap_bsetflag(conn_io, B_EOUT, 1);
ap_bclose(conn_io);
}
-@@ -7774,6 +7893,10 @@
+@@ -7863,6 +7983,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),
-@@ -7814,6 +7937,9 @@
+@@ -7903,6 +8027,9 @@
#else /* ndef WIN32 */
server_conf = ap_read_config(pconf, ptrans, ap_server_confname);
#endif
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 8 Feb 2008 11:15:41 -0000 1.1.1.19
++++ src/modules/standard/mod_status.c 8 Feb 2008 11:17:39 -0000 1.16
+@@ -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);
++#endif
++
+ } else {
+
+ if (!short_report) {
+
+---------------------------------------------------------------------------
| Add hooks to the scheme processing to allow other modules to
| recognize more schemes by intercepting this processing.
projects / packages / apache1.git / blobdiff