You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2012/09/24 11:49:56 UTC
svn commit: r1389266 - in /httpd/httpd/branches/2.4.x: STATUS include/http_core.h include/http_log.h include/mod_core.h modules/proxy/proxy_util.h

Author: jim
Date: Mon Sep 24 09:49:55 2012
New Revision: 1389266

URL: http://svn.apache.org/viewvc?rev=1389266&view=rev
Log:
   * headers: Move *_DECLARE_* macros to beginning of line in headers.
        trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1374963
             2.4.x patch: http://people.apache.org/~fuankg/diffs/httpd-2.4.x_headers.diff
                  +1: fuankg, humbedooh, jim


Modified:
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/include/http_core.h
    httpd/httpd/branches/2.4.x/include/http_log.h
    httpd/httpd/branches/2.4.x/include/mod_core.h
    httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.h

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1389266&r1=1389265&r2=1389266&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Sep 24 09:49:55 2012
@@ -89,10 +89,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * headers: Move *_DECLARE_* macros to beginning of line in headers.
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1374963
-     2.4.x patch: http://people.apache.org/~fuankg/diffs/httpd-2.4.x_headers.diff
-     +1: fuankg, humbedooh, jim
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:

Modified: httpd/httpd/branches/2.4.x/include/http_core.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/http_core.h?rev=1389266&r1=1389265&r2=1389266&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/http_core.h (original)
+++ httpd/httpd/branches/2.4.x/include/http_core.h Mon Sep 24 09:49:55 2012
@@ -741,10 +741,10 @@ typedef struct {
 } ap_mgmt_item_t;
 
 /* Handles for core filters */
-extern AP_DECLARE_DATA ap_filter_rec_t *ap_subreq_core_filter_handle;
-extern AP_DECLARE_DATA ap_filter_rec_t *ap_core_output_filter_handle;
-extern AP_DECLARE_DATA ap_filter_rec_t *ap_content_length_filter_handle;
-extern AP_DECLARE_DATA ap_filter_rec_t *ap_core_input_filter_handle;
+AP_DECLARE_DATA extern ap_filter_rec_t *ap_subreq_core_filter_handle;
+AP_DECLARE_DATA extern ap_filter_rec_t *ap_core_output_filter_handle;
+AP_DECLARE_DATA extern ap_filter_rec_t *ap_content_length_filter_handle;
+AP_DECLARE_DATA extern ap_filter_rec_t *ap_core_input_filter_handle;
 
 /**
  * This hook provdes a way for modules to provide metrics/statistics about

Modified: httpd/httpd/branches/2.4.x/include/http_log.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/http_log.h?rev=1389266&r1=1389265&r2=1389266&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/http_log.h (original)
+++ httpd/httpd/branches/2.4.x/include/http_log.h Mon Sep 24 09:49:55 2012
@@ -263,7 +263,7 @@ static int * const aplog_module_index;
 #define APLOGctrace7(c)             APLOG_C_IS_LEVEL(c,APLOG_TRACE7)
 #define APLOGctrace8(c)             APLOG_C_IS_LEVEL(c,APLOG_TRACE8)
 
-extern int AP_DECLARE_DATA ap_default_loglevel;
+AP_DECLARE_DATA extern int ap_default_loglevel;
 
 /**
  * APLOG_MARK is a convenience macro for use as the first three parameters in

Modified: httpd/httpd/branches/2.4.x/include/mod_core.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/mod_core.h?rev=1389266&r1=1389265&r2=1389266&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/mod_core.h (original)
+++ httpd/httpd/branches/2.4.x/include/mod_core.h Mon Sep 24 09:49:55 2012
@@ -39,11 +39,11 @@ extern "C" {
 #endif
 
 /* Handles for core filters */
-extern AP_DECLARE_DATA ap_filter_rec_t *ap_http_input_filter_handle;
-extern AP_DECLARE_DATA ap_filter_rec_t *ap_http_header_filter_handle;
-extern AP_DECLARE_DATA ap_filter_rec_t *ap_chunk_filter_handle;
-extern AP_DECLARE_DATA ap_filter_rec_t *ap_http_outerror_filter_handle;
-extern AP_DECLARE_DATA ap_filter_rec_t *ap_byterange_filter_handle;
+AP_DECLARE_DATA extern ap_filter_rec_t *ap_http_input_filter_handle;
+AP_DECLARE_DATA extern ap_filter_rec_t *ap_http_header_filter_handle;
+AP_DECLARE_DATA extern ap_filter_rec_t *ap_chunk_filter_handle;
+AP_DECLARE_DATA extern ap_filter_rec_t *ap_http_outerror_filter_handle;
+AP_DECLARE_DATA extern ap_filter_rec_t *ap_byterange_filter_handle;
 
 /*
  * These (input) filters are internal to the mod_core operation.
@@ -88,7 +88,7 @@ AP_DECLARE_NONSTD(int) ap_send_http_trac
 AP_DECLARE(int) ap_send_http_options(request_rec *r);
 
 /* Used for multipart/byteranges boundary string */
-extern AP_DECLARE_DATA const char *ap_multipart_boundary;
+AP_DECLARE_DATA extern const char *ap_multipart_boundary;
 
 /* Init RNG at startup */
 AP_CORE_DECLARE(void) ap_init_rng(apr_pool_t *p);

Modified: httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.h?rev=1389266&r1=1389265&r2=1389266&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.h (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.h Mon Sep 24 09:49:55 2012
@@ -31,9 +31,9 @@ PROXY_DECLARE(int) ap_proxy_is_domainnam
 PROXY_DECLARE(int) ap_proxy_is_hostname(struct dirconn_entry *This, apr_pool_t *p);
 PROXY_DECLARE(int) ap_proxy_is_word(struct dirconn_entry *This, apr_pool_t *p);
 
-extern int PROXY_DECLARE_DATA proxy_lb_workers;
-extern const apr_strmatch_pattern PROXY_DECLARE_DATA *ap_proxy_strmatch_path;
-extern const apr_strmatch_pattern PROXY_DECLARE_DATA *ap_proxy_strmatch_domain;
+PROXY_DECLARE_DATA extern int proxy_lb_workers;
+PROXY_DECLARE_DATA extern const apr_strmatch_pattern *ap_proxy_strmatch_path;
+PROXY_DECLARE_DATA extern const apr_strmatch_pattern *ap_proxy_strmatch_domain;
 
 /**
  * Register optional functions declared within proxy_util.c.