From: Jim Jagielski Date: Thu, 11 Jul 2013 12:24:26 +0000 (+0000) Subject: Merge r1406068, r1425777, r1427546, r1462643, r1487530, r1493330 from trunk: X-Git-Tag: 2.4.5~4 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d302ce4d30f340f1af35417ae6eef68c6a6e5b7a;p=apache Merge r1406068, r1425777, r1427546, r1462643, r1487530, r1493330 from trunk: Replace duplicate log tags Check that AsyncRequestWorkerFactor is not negative PR :54254 Submitted by: Jackie Zhang remove unneeded include statements Name pool + concat string at compile time when possible * modules/filters/mod_ratelimit.c (rate_limit_filter): Log the error code. Correct typo in error message Submitted by: sf, jailletc36, jorton, jailletc36 Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1502204 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 8fdc8a6ae9..72d24ad1e6 100644 --- a/CHANGES +++ b/CHANGES @@ -8,6 +8,9 @@ Changes with Apache 2.4.5 URI that is not configured for DAV will trigger a segfault. [Ben Reser ] + *) mpm_event: Check that AsyncRequestWorkerFactor is not negative. PR 54254. + [Jackie Zhang ] + *) mod_proxy: Ensure we don't attempt to amend a table we are iterating through, ensuring that all headers listed by Connection are removed. [Graham Leggett, Co-Advisor ] diff --git a/STATUS b/STATUS index 9d9cca77de..81ef977046 100644 --- a/STATUS +++ b/STATUS @@ -90,21 +90,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * Some easy votes to keep 2.4 in line with trunk - - mod_slotmem_shm: Replace duplicate log tags - - mpm/event: Check that AsyncRequestWorkerFactor is not negative (PR 54254) - - remove unneeded include statements - - mod_cache_disk: Name pool + concat string at compile time when possible - - mod_ratelimit (rate_limit_filter): Log the error code - - mod_authnz_ldap: fix typo - trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1406068 - https://svn.apache.org/viewvc?view=revision&revision=1425777 - https://svn.apache.org/viewvc?view=revision&revision=1427546 - https://svn.apache.org/viewvc?view=revision&revision=1462643 - https://svn.apache.org/viewvc?view=revision&revision=1487530 - https://svn.apache.org/viewvc?view=revision&revision=1493330 - 2.4.x patch: trunk patch works - +1: jailletc36, jj, druggeri PATCHES PROPOSED TO BACKPORT FROM TRUNK: diff --git a/modules/aaa/mod_auth_basic.c b/modules/aaa/mod_auth_basic.c index 19cce78c42..8c1367b30a 100644 --- a/modules/aaa/mod_auth_basic.c +++ b/modules/aaa/mod_auth_basic.c @@ -15,7 +15,6 @@ */ #include "apr_strings.h" -#include "apr_md5.h" /* for apr_password_validate */ #include "apr_lib.h" /* for apr_isspace */ #include "apr_base64.h" /* for apr_base64_decode et al */ #define APR_WANT_STRFUNC /* for strcasecmp */ diff --git a/modules/aaa/mod_auth_form.c b/modules/aaa/mod_auth_form.c index 28045b5dbc..7bba517b80 100644 --- a/modules/aaa/mod_auth_form.c +++ b/modules/aaa/mod_auth_form.c @@ -15,7 +15,6 @@ */ #include "apr_strings.h" -#include "apr_md5.h" /* for apr_password_validate */ #include "apr_lib.h" /* for apr_isspace */ #include "apr_base64.h" /* for apr_base64_decode et al */ #define APR_WANT_STRFUNC /* for strcasecmp */ diff --git a/modules/aaa/mod_authnz_ldap.c b/modules/aaa/mod_authnz_ldap.c index b7b132e011..2c25dbc73f 100644 --- a/modules/aaa/mod_authnz_ldap.c +++ b/modules/aaa/mod_authnz_ldap.c @@ -1443,7 +1443,7 @@ static const char *mod_auth_ldap_set_deref(cmd_parms *cmd, void *config, const c sec->deref = always; } else { - return "Unrecognized value for AuthLDAPAliasDereference directive"; + return "Unrecognized value for AuthLDAPDereferenceAliases directive"; } return NULL; } diff --git a/modules/cache/mod_cache_disk.c b/modules/cache/mod_cache_disk.c index a5699482ae..2b50aef994 100644 --- a/modules/cache/mod_cache_disk.c +++ b/modules/cache/mod_cache_disk.c @@ -80,7 +80,7 @@ static char *header_file(apr_pool_t *p, disk_cache_conf *conf, } if (dobj->prefix) { - return apr_pstrcat(p, dobj->prefix, CACHE_VDIR_SUFFIX, "/", + return apr_pstrcat(p, dobj->prefix, CACHE_VDIR_SUFFIX "/", dobj->hashfile, CACHE_HEADER_SUFFIX, NULL); } else { @@ -98,7 +98,7 @@ static char *data_file(apr_pool_t *p, disk_cache_conf *conf, } if (dobj->prefix) { - return apr_pstrcat(p, dobj->prefix, CACHE_VDIR_SUFFIX, "/", + return apr_pstrcat(p, dobj->prefix, CACHE_VDIR_SUFFIX "/", dobj->hashfile, CACHE_DATA_SUFFIX, NULL); } else { @@ -385,6 +385,7 @@ static int create_entity(cache_handle_t *h, request_rec *r, const char *key, apr dobj->root_len = conf->cache_root_len; apr_pool_create(&pool, r->pool); + apr_pool_tag(pool, "mod_cache (create_entity)"); file_cache_create(conf, &dobj->hdrs, pool); file_cache_create(conf, &dobj->vary, pool); @@ -511,6 +512,7 @@ static int open_entity(cache_handle_t *h, request_rec *r, const char *key) dobj->name = key; apr_pool_create(&pool, r->pool); + apr_pool_tag(pool, "mod_cache (open_entity)"); file_cache_create(conf, &dobj->hdrs, pool); file_cache_create(conf, &dobj->vary, pool); diff --git a/modules/filters/mod_ratelimit.c b/modules/filters/mod_ratelimit.c index 611017875e..939ab8e966 100644 --- a/modules/filters/mod_ratelimit.c +++ b/modules/filters/mod_ratelimit.c @@ -187,7 +187,7 @@ rate_limit_filter(ap_filter_t *f, apr_bucket_brigade *input_bb) rv = apr_brigade_partition(bb, ctx->chunk_size, &stop_point); if (rv != APR_SUCCESS && rv != APR_INCOMPLETE) { ctx->state = RATE_ERROR; - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, APLOGNO(01456) + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, APLOGNO(01456) "rl: partition failed."); break; } diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c index 2c2ead1e70..aac96e23d6 100644 --- a/modules/slotmem/mod_slotmem_shm.c +++ b/modules/slotmem/mod_slotmem_shm.c @@ -647,7 +647,7 @@ static apr_status_t slotmem_fgrab(ap_slotmem_instance_t *slot, unsigned int id) } if (id >= slot->desc.num) { - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(02236) + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(02397) "slotmem(%s) fgrab failed. Num %u/num_free %u", slot->name, slotmem_num_slots(slot), slotmem_num_free_slots(slot)); diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c index d8eaef4767..c64b08f5f4 100644 --- a/server/mpm/event/event.c +++ b/server/mpm/event/event.c @@ -3241,6 +3241,9 @@ static const char *set_worker_factor(cmd_parms * cmd, void *dummy, if (*endptr) return "error parsing value"; + if (val <= 0) + return "AsyncRequestWorkerFactor argument must be a positive number"; + worker_factor = val * WORKER_FACTOR_SCALE; if (worker_factor == 0) worker_factor = 1;