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 ]
#include "zlib.h"
-#include <limits.h> /* for INT_MAX */
-
static const char deflateFilterName[] = "DEFLATE";
module AP_MODULE_DECLARE_DATA deflate_module;
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);
}
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);
}
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);
}
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 : "");
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,
static proxy_worker *find_best_bybusyness(proxy_balancer *balancer,
request_rec *r)
{
-
int i;
proxy_worker **worker;
proxy_worker *mycandidate = NULL;
}
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;
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 =
&age
};
-
static void register_hook(apr_pool_t *p)
{
ap_register_provider(p, PROXY_LBMETHOD, "bybusyness", "0", &bybusyness);
}
/* 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;
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;
}
/*
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;
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 =
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 =
};
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;
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 =
&age
};
-
static void ap_proxy_rr_register_hook(apr_pool_t *p)
{
ap_register_provider(p, PROXY_LBMETHOD, "roundrobin", "0", &roundrobin);
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 */
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);
#ifdef HAVE_SSL_CONF_CMD
SSL_CMD_SRV(OpenSSLConfCmd, TAKE2,
- "OpenSSL configuration command")
+ "OpenSSL configuration command")
#endif
/* Deprecated directives. */
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;
{
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;
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;