httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1101067 - in /httpd/httpd/trunk: include/ modules/mappers/ modules/proxy/ modules/proxy/balancers/ modules/proxy/examples/ server/
Date Mon, 09 May 2011 15:36:32 GMT
Author: jim
Date: Mon May  9 15:36:32 2011
New Revision: 1101067

URL: http://svn.apache.org/viewvc?rev=1101067&view=rev
Log:
Cleanup... most don't need apr_hooks.h at all...

Modified:
    httpd/httpd/trunk/include/http_config.h
    httpd/httpd/trunk/include/http_connection.h
    httpd/httpd/trunk/include/http_protocol.h
    httpd/httpd/trunk/include/http_request.h
    httpd/httpd/trunk/include/scoreboard.h
    httpd/httpd/trunk/modules/mappers/mod_vhost_alias.c
    httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bybusyness.c
    httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_byrequests.c
    httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bytraffic.c
    httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c
    httpd/httpd/trunk/modules/proxy/examples/mod_lbmethod_rr.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_scgi.c
    httpd/httpd/trunk/server/core.c
    httpd/httpd/trunk/server/core_filters.c
    httpd/httpd/trunk/server/util_filter.c

Modified: httpd/httpd/trunk/include/http_config.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_config.h?rev=1101067&r1=1101066&r2=1101067&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_config.h (original)
+++ httpd/httpd/trunk/include/http_config.h Mon May  9 15:36:32 2011
@@ -26,7 +26,6 @@
 #ifndef APACHE_HTTP_CONFIG_H
 #define APACHE_HTTP_CONFIG_H
 
-#include "apr_hooks.h"
 #include "util_cfgtree.h"
 #include "ap_config.h"
 

Modified: httpd/httpd/trunk/include/http_connection.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_connection.h?rev=1101067&r1=1101066&r2=1101067&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_connection.h (original)
+++ httpd/httpd/trunk/include/http_connection.h Mon May  9 15:36:32 2011
@@ -26,7 +26,6 @@
 #ifndef APACHE_HTTP_CONNECTION_H
 #define APACHE_HTTP_CONNECTION_H
 
-#include "apr_hooks.h"
 #include "apr_network_io.h"
 #include "apr_buckets.h"
 

Modified: httpd/httpd/trunk/include/http_protocol.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_protocol.h?rev=1101067&r1=1101066&r2=1101067&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_protocol.h (original)
+++ httpd/httpd/trunk/include/http_protocol.h Mon May  9 15:36:32 2011
@@ -27,7 +27,6 @@
 #define APACHE_HTTP_PROTOCOL_H
 
 #include "httpd.h"
-#include "apr_hooks.h"
 #include "apr_portable.h"
 #include "apr_mmap.h"
 #include "apr_buckets.h"

Modified: httpd/httpd/trunk/include/http_request.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_request.h?rev=1101067&r1=1101066&r2=1101067&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_request.h (original)
+++ httpd/httpd/trunk/include/http_request.h Mon May  9 15:36:32 2011
@@ -47,7 +47,6 @@
 #ifndef APACHE_HTTP_REQUEST_H
 #define APACHE_HTTP_REQUEST_H
 
-#include "apr_hooks.h"
 #include "apr_optional.h"
 #include "util_filter.h"
 

Modified: httpd/httpd/trunk/include/scoreboard.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/scoreboard.h?rev=1101067&r1=1101066&r2=1101067&view=diff
==============================================================================
--- httpd/httpd/trunk/include/scoreboard.h (original)
+++ httpd/httpd/trunk/include/scoreboard.h Mon May  9 15:36:32 2011
@@ -33,7 +33,6 @@ extern "C" {
 
 #include "ap_config.h"
 #include "http_config.h"
-#include "apr_hooks.h"
 #include "apr_thread_proc.h"
 #include "apr_portable.h"
 #include "apr_shm.h"

Modified: httpd/httpd/trunk/modules/mappers/mod_vhost_alias.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_vhost_alias.c?rev=1101067&r1=1101066&r2=1101067&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_vhost_alias.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_vhost_alias.c Mon May  9 15:36:32 2011
@@ -35,7 +35,7 @@
 
 #include "apr.h"
 #include "apr_strings.h"
-#include "apr_hooks.h"
+#include "ap_hooks.h"
 #include "apr_lib.h"
 
 #define APR_WANT_STRFUNC

Modified: httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bybusyness.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bybusyness.c?rev=1101067&r1=1101066&r2=1101067&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bybusyness.c (original)
+++ httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bybusyness.c Mon May  9 15:36:32
2011
@@ -18,7 +18,7 @@
 #include "scoreboard.h"
 #include "ap_mpm.h"
 #include "apr_version.h"
-#include "apr_hooks.h"
+#include "ap_hooks.h"
 
 module AP_MODULE_DECLARE_DATA lbmethod_bybusyness_module;
 

Modified: httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_byrequests.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_byrequests.c?rev=1101067&r1=1101066&r2=1101067&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_byrequests.c (original)
+++ httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_byrequests.c Mon May  9 15:36:32
2011
@@ -18,7 +18,7 @@
 #include "scoreboard.h"
 #include "ap_mpm.h"
 #include "apr_version.h"
-#include "apr_hooks.h"
+#include "ap_hooks.h"
 
 module AP_MODULE_DECLARE_DATA lbmethod_byrequests_module;
 

Modified: httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bytraffic.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bytraffic.c?rev=1101067&r1=1101066&r2=1101067&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bytraffic.c (original)
+++ httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bytraffic.c Mon May  9 15:36:32
2011
@@ -18,7 +18,7 @@
 #include "scoreboard.h"
 #include "ap_mpm.h"
 #include "apr_version.h"
-#include "apr_hooks.h"
+#include "ap_hooks.h"
 
 module AP_MODULE_DECLARE_DATA lbmethod_bytraffic_module;
 

Modified: httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c?rev=1101067&r1=1101066&r2=1101067&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c (original)
+++ httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c Mon May  9 15:36:32
2011
@@ -18,7 +18,7 @@
 #include "scoreboard.h"
 #include "ap_mpm.h"
 #include "apr_version.h"
-#include "apr_hooks.h"
+#include "ap_hooks.h"
 #include "ap_slotmem.h"
 #include "heartbeat.h"
 

Modified: httpd/httpd/trunk/modules/proxy/examples/mod_lbmethod_rr.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/examples/mod_lbmethod_rr.c?rev=1101067&r1=1101066&r2=1101067&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/examples/mod_lbmethod_rr.c (original)
+++ httpd/httpd/trunk/modules/proxy/examples/mod_lbmethod_rr.c Mon May  9 15:36:32 2011
@@ -25,7 +25,7 @@
 #include "scoreboard.h"
 #include "ap_mpm.h"
 #include "apr_version.h"
-#include "apr_hooks.h"
+#include "ap_hooks.h"
 
 #if APR_HAVE_UNISTD_H
 #include <unistd.h> /* for getpid() */

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c?rev=1101067&r1=1101066&r2=1101067&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c Mon May  9 15:36:32 2011
@@ -20,7 +20,7 @@
 #include "scoreboard.h"
 #include "ap_mpm.h"
 #include "apr_version.h"
-#include "apr_hooks.h"
+#include "ap_hooks.h"
 #include "apr_date.h"
 
 static const char *balancer_mutex_type = "proxy-balancer-shm";

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_scgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_scgi.c?rev=1101067&r1=1101066&r2=1101067&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_scgi.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_scgi.c Mon May  9 15:36:32 2011
@@ -25,7 +25,7 @@
 #define APR_WANT_MEMFUNC
 #define APR_WANT_STRFUNC
 #include "apr_strings.h"
-#include "apr_hooks.h"
+#include "ap_hooks.h"
 #include "apr_optional_hooks.h"
 #include "apr_buckets.h"
 

Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=1101067&r1=1101066&r2=1101067&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Mon May  9 15:36:32 2011
@@ -20,7 +20,6 @@
 #include "apr_fnmatch.h"
 #include "apr_hash.h"
 #include "apr_thread_proc.h"    /* for RLIMIT stuff */
-#include "apr_hooks.h"
 
 #define APR_WANT_IOVEC
 #define APR_WANT_STRFUNC

Modified: httpd/httpd/trunk/server/core_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core_filters.c?rev=1101067&r1=1101066&r2=1101067&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core_filters.c (original)
+++ httpd/httpd/trunk/server/core_filters.c Mon May  9 15:36:32 2011
@@ -25,7 +25,6 @@
 #include "apr_fnmatch.h"
 #include "apr_hash.h"
 #include "apr_thread_proc.h"    /* for RLIMIT stuff */
-#include "apr_hooks.h"
 
 #define APR_WANT_IOVEC
 #define APR_WANT_STRFUNC

Modified: httpd/httpd/trunk/server/util_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_filter.c?rev=1101067&r1=1101066&r2=1101067&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_filter.c (original)
+++ httpd/httpd/trunk/server/util_filter.c Mon May  9 15:36:32 2011
@@ -29,7 +29,7 @@
    so we depend on a global to hold the correct pool
 */
 #define FILTER_POOL     apr_hook_global_pool
-#include "apr_hooks.h"   /* for apr_hook_global_pool */
+#include "ap_hooks.h"   /* for apr_hook_global_pool */
 
 /*
 ** This macro returns true/false if a given filter should be inserted BEFORE



Mime
View raw message