httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaillet...@apache.org
Subject svn commit: r1661845 - in /httpd/httpd/branches/2.4.x: ./ modules/filters/ modules/http/ modules/ldap/ modules/proxy/ modules/proxy/balancers/ modules/proxy/examples/ modules/ssl/ server/
Date Tue, 24 Feb 2015 06:22:23 GMT
Author: jailletc36
Date: Tue Feb 24 06:22:22 2015
New Revision: 1661845

URL: http://svn.apache.org/r1661845
Log:
Merge r1611979, r1611725, r1588448, r1642803, r1657949, r1451108 (part of it),
r1643672, r1496178 from trunk

   * Synch with trunk:
        - Add missing APLOGNO.
        - mod_deflate: don't require <limits.h> by using APR_INT32_MAX instead of INT_MAX.
        - Move two variable assignments off the fast path.
        - Fix curly braces style. Remove useless empty lines
        - tab vs space
        - Removed tabs.
        - dump fcgi headers with trace8 instead of debug+compile-time flag.
        - Drop severity of "LDAP: Setting referrals to ON" from DEBUG to TRACE4

Submitted by: jailletc36, ylavic, minfrin, fuankg, covener
Reviewed by: jailletc36, minfrin, ylavic
Backported by: jailletc36

Modified:
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/filters/mod_deflate.c
    httpd/httpd/branches/2.4.x/modules/http/http_filters.c
    httpd/httpd/branches/2.4.x/modules/ldap/util_ldap.c
    httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_bybusyness.c
    httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_byrequests.c
    httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_bytraffic.c
    httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c
    httpd/httpd/branches/2.4.x/modules/proxy/examples/mod_lbmethod_rr.c
    httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c
    httpd/httpd/branches/2.4.x/modules/ssl/mod_ssl.c
    httpd/httpd/branches/2.4.x/server/log.c
    httpd/httpd/branches/2.4.x/server/util_expr_eval.c

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1661845&r1=1661844&r2=1661845&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Feb 24 06:22:22 2015
@@ -119,26 +119,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunks works (modulo CHANGES)
      +1: ylavic, rjung, jailletc36
 
-   * Easy patches - synch with trunk
-        - Add missing APLOGNO.
-        - mod_deflate: don't require <limits.h> by using APR_INT32_MAX instead of INT_MAX.
-        - Move two variable assignments off the fast path.
-        - Fix curly braces style. Remove useless empty lines
-        - tab vs space
-        - Removed tabs.
-        - dump fcgi headers with trace8 instead of debug+compile-time flag.
-        - Drop severity of "LDAP: Setting referrals to ON" from DEBUG to TRACE4
-     trunk patch:
-        http://svn.apache.org/r1611979
-        http://svn.apache.org/r1611725
-        http://svn.apache.org/r1588448
-        http://svn.apache.org/r1642803
-        http://svn.apache.org/r1657949
-        http://svn.apache.org/r1451108 (only one part still has to be applied. Done manually)
-        http://svn.apache.org/r1496178
-     2.4.x patch: http://people.apache.org/~jailletc36/backport11-v2.patch
-     +1: jailletc36, minfrin, ylavic
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_deflate.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_deflate.c?rev=1661845&r1=1661844&r2=1661845&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/mod_deflate.c (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/mod_deflate.c Tue Feb 24 06:22:22 2015
@@ -50,8 +50,6 @@
 
 #include "zlib.h"
 
-#include <limits.h>     /* for INT_MAX */
-
 static const char deflateFilterName[] = "DEFLATE";
 module AP_MODULE_DECLARE_DATA deflate_module;
 
@@ -934,8 +932,8 @@ static apr_status_t deflate_out_filter(a
             apr_bucket_delete(e);
             continue;
         }
-        if (len > INT_MAX) {
-            apr_bucket_split(e, INT_MAX);
+        if (len > APR_INT32_MAX) {
+            apr_bucket_split(e, APR_INT32_MAX);
             apr_bucket_read(e, &data, &len, APR_BLOCK_READ);
         }
 
@@ -1308,8 +1306,8 @@ static apr_status_t deflate_in_filter(ap
             if (!len) {
                 continue;
             }
-            if (len > INT_MAX) {
-                apr_bucket_split(bkt, INT_MAX);
+            if (len > APR_INT32_MAX) {
+                apr_bucket_split(bkt, APR_INT32_MAX);
                 apr_bucket_read(bkt, &data, &len, APR_BLOCK_READ);
             }
 
@@ -1694,8 +1692,8 @@ static apr_status_t inflate_out_filter(a
             apr_bucket_delete(e);
             continue;
         }
-        if (len > INT_MAX) {
-            apr_bucket_split(e, INT_MAX);
+        if (len > APR_INT32_MAX) {
+            apr_bucket_split(e, APR_INT32_MAX);
             apr_bucket_read(e, &data, &len, APR_BLOCK_READ);
         }
 

Modified: httpd/httpd/branches/2.4.x/modules/http/http_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http/http_filters.c?rev=1661845&r1=1661844&r2=1661845&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http/http_filters.c (original)
+++ httpd/httpd/branches/2.4.x/modules/http/http_filters.c Tue Feb 24 06:22:22 2015
@@ -256,7 +256,7 @@ static apr_status_t read_chunked_trailer
     else {
         const char *error_notes = apr_table_get(r->notes,
                                                 "error-notes");
-        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, 
+        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(02656)
                       "Error while reading HTTP trailer: %i%s%s",
                       r->status, error_notes ? ": " : "",
                       error_notes ? error_notes : "");

Modified: httpd/httpd/branches/2.4.x/modules/ldap/util_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ldap/util_ldap.c?rev=1661845&r1=1661844&r2=1661845&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/branches/2.4.x/modules/ldap/util_ldap.c Tue Feb 24 06:22:22 2015
@@ -374,7 +374,7 @@ static int uldap_connection_init(request
 
     if (ldc->ChaseReferrals != AP_LDAP_CHASEREFERRALS_SDKDEFAULT) {
         /* Set options for rebind and referrals. */
-        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, APLOGNO(01278)
+        ap_log_error(APLOG_MARK, APLOG_TRACE4, 0, r->server, APLOGNO(01278)
                 "LDAP: Setting referrals to %s.",
                 ((ldc->ChaseReferrals == AP_LDAP_CHASEREFERRALS_ON) ? "On" : "Off"));
         apr_ldap_set_option(r->pool, ldc->ldap,

Modified: httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_bybusyness.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_bybusyness.c?rev=1661845&r1=1661844&r2=1661845&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_bybusyness.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_bybusyness.c Tue Feb 24
06:22:22 2015
@@ -28,7 +28,6 @@ static int (*ap_proxy_retry_worker_fn)(c
 static proxy_worker *find_best_bybusyness(proxy_balancer *balancer,
                                 request_rec *r)
 {
-
     int i;
     proxy_worker **worker;
     proxy_worker *mycandidate = NULL;
@@ -116,11 +115,11 @@ static proxy_worker *find_best_bybusynes
     }
 
     return mycandidate;
-
 }
 
 /* assumed to be mutex protected by caller */
-static apr_status_t reset(proxy_balancer *balancer, server_rec *s) {
+static apr_status_t reset(proxy_balancer *balancer, server_rec *s)
+{
     int i;
     proxy_worker **worker;
     worker = (proxy_worker **)balancer->workers->elts;
@@ -131,8 +130,9 @@ static apr_status_t reset(proxy_balancer
     return APR_SUCCESS;
 }
 
-static apr_status_t age(proxy_balancer *balancer, server_rec *s) {
-        return APR_SUCCESS;
+static apr_status_t age(proxy_balancer *balancer, server_rec *s)
+{
+    return APR_SUCCESS;
 }
 
 static const proxy_balancer_method bybusyness =
@@ -144,7 +144,6 @@ static const proxy_balancer_method bybus
     &age
 };
 
-
 static void register_hook(apr_pool_t *p)
 {
     ap_register_provider(p, PROXY_LBMETHOD, "bybusyness", "0", &bybusyness);

Modified: httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_byrequests.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_byrequests.c?rev=1661845&r1=1661844&r2=1661845&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_byrequests.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_byrequests.c Tue Feb 24
06:22:22 2015
@@ -149,7 +149,8 @@ static proxy_worker *find_best_byrequest
 }
 
 /* assumed to be mutex protected by caller */
-static apr_status_t reset(proxy_balancer *balancer, server_rec *s) {
+static apr_status_t reset(proxy_balancer *balancer, server_rec *s)
+{
     int i;
     proxy_worker **worker;
     worker = (proxy_worker **)balancer->workers->elts;
@@ -159,8 +160,9 @@ static apr_status_t reset(proxy_balancer
     return APR_SUCCESS;
 }
 
-static apr_status_t age(proxy_balancer *balancer, server_rec *s) {
-        return APR_SUCCESS;
+static apr_status_t age(proxy_balancer *balancer, server_rec *s)
+{
+    return APR_SUCCESS;
 }
 
 /*

Modified: httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_bytraffic.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_bytraffic.c?rev=1661845&r1=1661844&r2=1661845&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_bytraffic.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_bytraffic.c Tue Feb 24
06:22:22 2015
@@ -115,14 +115,14 @@ static proxy_worker *find_best_bytraffic
         ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, APLOGNO(01210)
                      "proxy: bytraffic selected worker \"%s\" : busy %" APR_SIZE_T_FMT,
                      mycandidate->s->name, mycandidate->s->busy);
-
     }
 
     return mycandidate;
 }
 
 /* assumed to be mutex protected by caller */
-static apr_status_t reset(proxy_balancer *balancer, server_rec *s) {
+static apr_status_t reset(proxy_balancer *balancer, server_rec *s)
+{
     int i;
     proxy_worker **worker;
     worker = (proxy_worker **)balancer->workers->elts;
@@ -135,8 +135,9 @@ static apr_status_t reset(proxy_balancer
     return APR_SUCCESS;
 }
 
-static apr_status_t age(proxy_balancer *balancer, server_rec *s) {
-        return APR_SUCCESS;
+static apr_status_t age(proxy_balancer *balancer, server_rec *s)
+{
+    return APR_SUCCESS;
 }
 
 static const proxy_balancer_method bytraffic =

Modified: httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c?rev=1661845&r1=1661844&r2=1661845&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c Tue Feb 24
06:22:22 2015
@@ -342,12 +342,14 @@ static proxy_worker *find_best_hb(proxy_
     return mycandidate;
 }
 
-static apr_status_t reset(proxy_balancer *balancer, server_rec *s) {
-        return APR_SUCCESS;
+static apr_status_t reset(proxy_balancer *balancer, server_rec *s)
+{
+    return APR_SUCCESS;
 }
 
-static apr_status_t age(proxy_balancer *balancer, server_rec *s) {
-        return APR_SUCCESS;
+static apr_status_t age(proxy_balancer *balancer, server_rec *s)
+{
+    return APR_SUCCESS;
 }
 
 static const proxy_balancer_method heartbeat =
@@ -360,7 +362,7 @@ static const proxy_balancer_method heart
 };
 
 static int lb_hb_init(apr_pool_t *p, apr_pool_t *plog,
-                          apr_pool_t *ptemp, server_rec *s)
+                      apr_pool_t *ptemp, server_rec *s)
 {
     apr_size_t size;
     unsigned int num;

Modified: httpd/httpd/branches/2.4.x/modules/proxy/examples/mod_lbmethod_rr.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/examples/mod_lbmethod_rr.c?rev=1661845&r1=1661844&r2=1661845&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/examples/mod_lbmethod_rr.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/examples/mod_lbmethod_rr.c Tue Feb 24 06:22:22
2015
@@ -99,12 +99,14 @@ static proxy_worker *find_best_roundrobi
     return mycandidate;
 }
 
-static apr_status_t reset(proxy_balancer *balancer, server_rec *s) {
-        return APR_SUCCESS;
+static apr_status_t reset(proxy_balancer *balancer, server_rec *s)
+{
+    return APR_SUCCESS;
 }
 
-static apr_status_t age(proxy_balancer *balancer, server_rec *s) {
-        return APR_SUCCESS;
+static apr_status_t age(proxy_balancer *balancer, server_rec *s)
+{
+    return APR_SUCCESS;
 }
 
 static const proxy_balancer_method roundrobin =
@@ -116,7 +118,6 @@ static const proxy_balancer_method round
     &age
 };
 
-
 static void ap_proxy_rr_register_hook(apr_pool_t *p)
 {
     ap_register_provider(p, PROXY_LBMETHOD, "roundrobin", "0", &roundrobin);

Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c?rev=1661845&r1=1661844&r2=1661845&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c Tue Feb 24 06:22:22 2015
@@ -283,17 +283,15 @@ static apr_status_t send_environment(pro
     envarr = apr_table_elts(r->subprocess_env);
     elts = (const apr_table_entry_t *) envarr->elts;
 
-#ifdef FCGI_DUMP_ENV_VARS
-    {
+    if (APLOGrtrace8(r)) {
         int i;
         
         for (i = 0; i < envarr->nelts; ++i) {
-            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01062)
+            ap_log_rerror(APLOG_MARK, APLOG_TRACE8, 0, r, APLOGNO(01062)
                           "sending env var '%s' value '%s'",
                           elts[i].key, elts[i].val);
         }
     }
-#endif
 
     /* Send envvars over in as many FastCGI records as it takes, */
     next_elem = 0; /* starting with the first one */
@@ -573,10 +571,8 @@ static apr_status_t dispatch(proxy_conn_
                 break;
             }
 
-#ifdef FCGI_DUMP_HEADERS
-            ap_log_rdata(APLOG_MARK, APLOG_DEBUG, r, "FastCGI header",
+            ap_log_rdata(APLOG_MARK, APLOG_TRACE8, r, "FastCGI header",
                          farray, AP_FCGI_HEADER_LEN, 0);
-#endif
 
             ap_fcgi_header_fields_from_array(&version, &type, &rid,
                                              &clen, &plen, farray);

Modified: httpd/httpd/branches/2.4.x/modules/ssl/mod_ssl.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ssl/mod_ssl.c?rev=1661845&r1=1661844&r2=1661845&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ssl/mod_ssl.c (original)
+++ httpd/httpd/branches/2.4.x/modules/ssl/mod_ssl.c Tue Feb 24 06:22:22 2015
@@ -270,7 +270,7 @@ static const command_rec ssl_config_cmds
 
 #ifdef HAVE_SSL_CONF_CMD
     SSL_CMD_SRV(OpenSSLConfCmd, TAKE2,
-		"OpenSSL configuration command")
+                "OpenSSL configuration command")
 #endif
 
     /* Deprecated directives. */

Modified: httpd/httpd/branches/2.4.x/server/log.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/log.c?rev=1661845&r1=1661844&r2=1661845&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/log.c (original)
+++ httpd/httpd/branches/2.4.x/server/log.c Tue Feb 24 06:22:22 2015
@@ -1405,7 +1405,7 @@ static void fmt_data(unsigned char *buf,
         unsigned char c = data[*off];
 
         if (apr_isprint(c)
-	    && c != '\\') {  /* backslash will be escaped later, which throws
+            && c != '\\') {  /* backslash will be escaped later, which throws
                               * off the formatting
                               */
             *chars = c;

Modified: httpd/httpd/branches/2.4.x/server/util_expr_eval.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/util_expr_eval.c?rev=1661845&r1=1661844&r2=1661845&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/util_expr_eval.c (original)
+++ httpd/httpd/branches/2.4.x/server/util_expr_eval.c Tue Feb 24 06:22:22 2015
@@ -883,7 +883,7 @@ AP_DECLARE(const char *) ap_expr_str_exe
 {
     ap_expr_eval_ctx_t ctx;
     int dont_vary, rc;
-    const char *tmp_source = NULL, *vary_this = NULL;
+    const char *tmp_source, *vary_this;
     ap_regmatch_t tmp_pmatch[AP_MAX_REG_MATCH];
     const char *result;
 
@@ -895,6 +895,9 @@ AP_DECLARE(const char *) ap_expr_str_exe
         return (const char *)info->root_node->node_arg1;
     }
 
+    tmp_source = NULL;
+    vary_this = NULL;
+
     dont_vary = (info->flags & AP_EXPR_FLAG_DONT_VARY);
 
     ctx.r = r;



Mime
View raw message