From: Jim Jagielski Date: Tue, 14 Aug 2012 20:57:43 +0000 (+0000) Subject: Merge r1361801 from trunk: X-Git-Tag: 2.4.3~42 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2071a9f88894abd7ce779b1152ecf63e3478ff17;p=apache Merge r1361801 from trunk: Various code clean up Submitted by: Christophe JAILLET PR: 52893 Submitted by: sf Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1373092 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 2be7d50006..31afce3083 100644 --- a/STATUS +++ b/STATUS @@ -93,13 +93,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4.x patch: trunk patch works +1: rjung, humbedooh, trawick (needs CHANGES entry) - * Various code clean up. - Submitted by: Christophe JAILLET - PR: 52893 - trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1361801 - 2.4.x patch: trunk patch works, except for mod_policy (ignore) - +1: rjung, trawick, jim - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/modules/aaa/mod_authz_core.c b/modules/aaa/mod_authz_core.c index d87928254c..9b7173c8a8 100644 --- a/modules/aaa/mod_authz_core.c +++ b/modules/aaa/mod_authz_core.c @@ -629,12 +629,9 @@ static int authz_core_check_section(apr_pool_t *p, server_rec *s, if (ret != OK) { ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, APR_SUCCESS, s, APLOGNO(01624) - "%s", - apr_pstrcat(p, (is_conf - ? ", , or similar" - : format_authz_command(p, section)), - " directive contains only negative " - "authorization directives", NULL)); + "%s directive contains only negative authorization directives", + is_conf ? ", , or similar" + : format_authz_command(p, section)); } return ret; diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c index 7cbe769a87..2f78612303 100644 --- a/modules/http/http_protocol.c +++ b/modules/http/http_protocol.c @@ -799,11 +799,9 @@ AP_DECLARE(const char *) ap_get_status_line(int status) } /* Build the Allow field-value from the request handler method mask. - * Note that we always allow TRACE, since it is handled below. */ static char *make_allow(request_rec *r) { - char *list; apr_int64_t mask; apr_array_header_t *allow = apr_array_make(r->pool, 10, sizeof(char *)); apr_hash_index_t *hi = apr_hash_first(r->pool, methods_registry); @@ -831,25 +829,15 @@ static char *make_allow(request_rec *r) if (conf->trace_enable != AP_TRACE_DISABLE) *(const char **)apr_array_push(allow) = "TRACE"; - list = apr_array_pstrcat(r->pool, allow, ','); - /* ### this is rather annoying. we should enforce registration of ### these methods */ if ((mask & (AP_METHOD_BIT << M_INVALID)) && (r->allowed_methods->method_list != NULL) && (r->allowed_methods->method_list->nelts != 0)) { - int i; - char **xmethod = (char **) r->allowed_methods->method_list->elts; - - /* - * Append all of the elements of r->allowed_methods->method_list - */ - for (i = 0; i < r->allowed_methods->method_list->nelts; ++i) { - list = apr_pstrcat(r->pool, list, ",", xmethod[i], NULL); - } + apr_array_cat(allow, r->allowed_methods->method_list); } - return list; + return apr_array_pstrcat(r->pool, allow, ','); } AP_DECLARE(int) ap_send_http_options(request_rec *r) diff --git a/modules/lua/mod_lua.c b/modules/lua/mod_lua.c index 18553eb212..c63508d0dc 100644 --- a/modules/lua/mod_lua.c +++ b/modules/lua/mod_lua.c @@ -456,16 +456,15 @@ static const char *register_named_block_function_hook(const char *name, { cr_ctx ctx; - char buf[32]; lua_State *lvm; char *tmp; int rv; ap_directive_t **current; hack_section_baton *baton; - apr_snprintf(buf, sizeof(buf), "%u", cmd->config_file->line_number); - spec->file_name = apr_pstrcat(cmd->pool, cmd->config_file->name, ":", - buf, NULL); + spec->file_name = apr_psprintf(cmd->pool, "%s:%u", + cmd->config_file->name, + cmd->config_file->line_number); if (function) { spec->function_name = (char *) function; } diff --git a/modules/proxy/mod_proxy_ftp.c b/modules/proxy/mod_proxy_ftp.c index dbfcd09b47..33237d6ff7 100644 --- a/modules/proxy/mod_proxy_ftp.c +++ b/modules/proxy/mod_proxy_ftp.c @@ -1725,7 +1725,7 @@ static int proxy_ftp_handler(request_rec *r, proxy_worker *worker, if (len != 0) buf = apr_pstrcat(p, "LIST ", path, CRLF, NULL); else if (cwd == NULL || strchr(cwd, '/') != NULL) - buf = apr_pstrcat(p, "LIST -lag", CRLF, NULL); + buf = "LIST -lag" CRLF; else buf = "LIST" CRLF; } diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index 6863a3e26a..4aaaf9bc42 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -373,7 +373,7 @@ PROXY_DECLARE(int) ap_proxyerror(request_rec *r, int statuscode, const char *mes NULL)); /* Allow "error-notes" string to be printed by ap_send_error_response() */ - apr_table_setn(r->notes, "verbose-error-to", apr_pstrdup(r->pool, "*")); + apr_table_setn(r->notes, "verbose-error-to", "*"); r->status_line = apr_psprintf(r->pool, "%3.3u Proxy Error", statuscode); ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00898) "%s returned by %s", message, diff --git a/modules/session/mod_session.c b/modules/session/mod_session.c index e053619a3c..7f855c7277 100644 --- a/modules/session/mod_session.c +++ b/modules/session/mod_session.c @@ -373,7 +373,7 @@ static apr_status_t session_identity_decode(request_rec * r, session_rec * z) } /* decode what we have */ - encoded = apr_pstrcat(r->pool, z->encoded, NULL); + encoded = apr_pstrdup(r->pool, z->encoded); pair = apr_strtok(encoded, sep, &last); while (pair && pair[0]) { char *plast = NULL; diff --git a/server/core.c b/server/core.c index c7a9df061d..03137577de 100644 --- a/server/core.c +++ b/server/core.c @@ -996,7 +996,7 @@ AP_DECLARE(const char *) ap_get_server_name_for_url(request_rec *r) #if APR_HAVE_IPV6 if (ap_strchr_c(plain_server_name, ':')) { /* IPv6 literal? */ - return apr_psprintf(r->pool, "[%s]", plain_server_name); + return apr_pstrcat(r->pool, "[", plain_server_name, "]", NULL); } #endif return plain_server_name; @@ -1509,7 +1509,7 @@ static const char *set_error_document(cmd_parms *cmd, void *conf_, * a msg and a (local) path. */ conf->response_code_strings[index_number] = (what == MSG) ? - apr_pstrcat(cmd->pool, "\"",msg,NULL) : + apr_pstrcat(cmd->pool, "\"", msg, NULL) : apr_pstrdup(cmd->pool, msg); } } diff --git a/server/provider.c b/server/provider.c index ade0f4e9a2..a102dd851b 100644 --- a/server/provider.c +++ b/server/provider.c @@ -136,7 +136,7 @@ AP_DECLARE(apr_array_header_t *) ap_list_provider_names(apr_pool_t *pool, ap_list_provider_names_t *entry; apr_hash_t *provider_group_hash, *h; apr_hash_index_t *hi; - char *val, *key; + char *val; if (global_providers_names == NULL) { return ret; @@ -157,7 +157,7 @@ AP_DECLARE(apr_array_header_t *) ap_list_provider_names(apr_pool_t *pool, } for (hi = apr_hash_first(pool, h); hi; hi = apr_hash_next(hi)) { - apr_hash_this(hi, (void *)&key, NULL, (void *)&val); + apr_hash_this(hi, NULL, NULL, (void *)&val); entry = apr_array_push(ret); entry->provider_name = apr_pstrdup(pool, val); }