You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/10/02 21:52:43 UTC
cvs commit: apache-2.0/src/main http_connection.c http_core.c
rbb 00/10/02 12:52:41
Modified: src/include http_connection.h
src/main http_connection.c http_core.c
Log:
Move where the CORE_IN filter is added to the server. We used to do this
in ap_new_connection, but that is bogus, because then other modules can't
put their own filter in. Now, we do this in a new pre-connection hook
function. Later, we will want to add some checking to make sure that this
is really an HTTP request that we are adding the filter for.
Revision Changes Path
1.23 +9 -1 apache-2.0/src/include/http_connection.h
Index: http_connection.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/http_connection.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- http_connection.h 2000/08/02 05:25:28 1.22
+++ http_connection.h 2000/10/02 19:52:33 1.23
@@ -101,7 +101,15 @@
CORE_EXPORT(void) ap_process_connection(conn_rec *);
/**
- * The http protocol handler. This makes Apache server http requests
+ * The http pre-protocol handler. This makes sets up Apache to serve http
+ * requests
+ * @param c The connection on which the request is read
+ * @return OK or DECLINED
+ */
+int ap_pre_http_connection(conn_rec *);
+
+/**
+ * The http protocol handler. This makes Apache serve http requests
* @param c The connection on which the request is read
* @return OK or DECLINED
*/
1.47 +6 -2 apache-2.0/src/main/http_connection.c
Index: http_connection.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_connection.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- http_connection.c 2000/10/02 00:47:28 1.46
+++ http_connection.c 2000/10/02 19:52:36 1.47
@@ -214,6 +214,12 @@
}
+int ap_pre_http_connection(conn_rec *c)
+{
+ ap_add_input_filter("CORE_IN", NULL, c);
+ return OK;
+}
+
int ap_process_http_connection(conn_rec *c)
{
request_rec *r;
@@ -275,8 +281,6 @@
inet_ntoa(conn->remote_addr.sin_addr));
conn->id = id;
-
- ap_add_input_filter("CORE_IN", NULL, conn);
return conn;
}
1.138 +2 -0 apache-2.0/src/main/http_core.c
Index: http_core.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- http_core.c 2000/10/02 00:47:28 1.137
+++ http_core.c 2000/10/02 19:52:37 1.138
@@ -3467,6 +3467,8 @@
{
ap_hook_post_config(core_post_config,NULL,NULL,AP_HOOK_REALLY_FIRST);
ap_hook_translate_name(ap_core_translate,NULL,NULL,AP_HOOK_REALLY_LAST);
+ ap_hook_pre_connection(ap_pre_http_connection,NULL,NULL,
+ AP_HOOK_REALLY_LAST);
ap_hook_process_connection(ap_process_http_connection,NULL,NULL,
AP_HOOK_REALLY_LAST);
ap_hook_http_method(core_method,NULL,NULL,AP_HOOK_REALLY_LAST);