More hooky stuff.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83435 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/connection.c b/server/connection.c
index fbfda3402cc21edf8f6af2358ed508893aa490e5..daf7ed6ef9e977a972544ed38560ed9d7e2e1716 100644 (file)
--- a/server/connection.c
+++ b/server/connection.c
@@ -194,7 +194,7 @@ CORE_EXPORT(void) ap_process_connection(conn_rec *c)
 
     ap_update_vhost_given_ip(c);
 
-    run_pre_connection(c);
+    ap_run_pre_connection(c);
 
     /*
      * Read and process each request found on our connection

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 0d61eb90cd7cd5891ed0f35b4dabfab9d1c970a1..d4a2d5bcf9a210c1f6f666a9bf0787301666b998 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -179,8 +179,6 @@ char tpf_server_name[INETD_SERVNAME_LENGTH+1];
 
 static scoreboard *ap_scoreboard_image = NULL;
 
-static int volatile exit_after_unblock = 0;
-
 #ifdef GPROF
 /* 
  * change directory for gprof to plop the gmon.out file
@@ -1490,6 +1488,7 @@ void ap_time_process_request(int child_num, int status)
     put_scoreboard_info(child_num, ss);
 }
 
+/*
 static void increment_counts(int child_num, request_rec *r)
 {
     long int bs = 0;
@@ -1513,6 +1512,7 @@ static void increment_counts(int child_num, request_rec *r)
 
     put_scoreboard_info(child_num, ss);
 }
+*/
 
 static int find_child_by_pid(int pid)
 {
@@ -3093,6 +3093,5 @@ module MODULE_VAR_EXPORT mpm_prefork_module = {
     NULL,                      /* type_checker */
     NULL,                      /* pre-run fixups */
     NULL,                      /* logger */
-    NULL,                      /* header parser */
-    NULL                       /* post_read_request */
+    NULL                       /* register hooks */
 };