From 06624aafe9c6d6f00f4e5998bd737ffe17c2041d Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Wed, 19 Sep 2018 12:51:28 +0000 Subject: [PATCH] Merge r1546860 from trunk: Fix missing spaces in messages Submitted by: jailletc36 Reviewed by: jailletc36, minfrin, jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1841327 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 8 -------- modules/aaa/mod_auth_digest.c | 2 +- modules/aaa/mod_authnz_ldap.c | 16 ++++++++-------- modules/mappers/mod_negotiation.c | 2 +- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/STATUS b/STATUS index 10b74f0cd73..193d676501c 100644 --- a/STATUS +++ b/STATUS @@ -124,14 +124,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) Fix missing spaces in messages - trunk patch: http://svn.apache.org/r1546860 - 2.4.x patch: svn merge -c 1546860 ^/httpd/httpd/trunk . - Merge of server/protocol.c fails but it is not an issue. The - corresponding message has been updated and already backported - in 2.4.x in r1772678. - +1: jailletc36, minfrin, jim - *) Easy patches: synch 2.4.x and trunk - mod_sed: Style only - mod_auth_basic: Clarify a log message + style diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c index a8f2cc52aad..a67f06986f2 100644 --- a/modules/aaa/mod_auth_digest.c +++ b/modules/aaa/mod_auth_digest.c @@ -225,7 +225,7 @@ static apr_status_t cleanup_tables(void *not_used) static void log_error_and_cleanup(char *msg, apr_status_t sts, server_rec *s) { ap_log_error(APLOG_MARK, APLOG_ERR, sts, s, APLOGNO(01760) - "%s - all nonce-count checking and one-time nonces" + "%s - all nonce-count checking and one-time nonces " "disabled", msg); cleanup_tables(NULL); diff --git a/modules/aaa/mod_authnz_ldap.c b/modules/aaa/mod_authnz_ldap.c index 98c48a86096..4634fe96857 100644 --- a/modules/aaa/mod_authnz_ldap.c +++ b/modules/aaa/mod_authnz_ldap.c @@ -1749,17 +1749,17 @@ static const command_rec authnz_ldap_cmds[] = AP_INIT_FLAG("AuthLDAPGroupAttributeIsDN", ap_set_flag_slot, (void *)APR_OFFSETOF(authn_ldap_config_t, group_attrib_is_dn), OR_AUTHCFG, - "If set to 'on', auth_ldap uses the DN that is retrieved from the server for" - "subsequent group comparisons. If set to 'off', auth_ldap uses the string" + "If set to 'on', auth_ldap uses the DN that is retrieved from the server for " + "subsequent group comparisons. If set to 'off', auth_ldap uses the string " "provided by the client directly. Defaults to 'on'."), AP_INIT_TAKE1("AuthLDAPDereferenceAliases", mod_auth_ldap_set_deref, NULL, OR_AUTHCFG, - "Determines how aliases are handled during a search. Can be one of the" + "Determines how aliases are handled during a search. Can be one of the " "values \"never\", \"searching\", \"finding\", or \"always\". " "Defaults to always."), AP_INIT_TAKE1("AuthLDAPCharsetConfig", set_charset_config, NULL, RSRC_CONF, - "Character set conversion configuration file. If omitted, character set" + "Character set conversion configuration file. If omitted, character set " "conversion is disabled."), AP_INIT_TAKE1("AuthLDAPAuthorizePrefix", ap_set_string_slot, @@ -1777,12 +1777,12 @@ static const command_rec authnz_ldap_cmds[] = AP_INIT_FLAG("AuthLDAPSearchAsUser", ap_set_flag_slot, (void *)APR_OFFSETOF(authn_ldap_config_t, search_as_user), OR_AUTHCFG, - "Set to 'on' to perform authorization-based searches with the users credentials, when this module" - " has also performed authentication. Does not affect nested groups lookup."), + "Set to 'on' to perform authorization-based searches with the users credentials, when this module " + "has also performed authentication. Does not affect nested groups lookup."), AP_INIT_FLAG("AuthLDAPCompareAsUser", ap_set_flag_slot, (void *)APR_OFFSETOF(authn_ldap_config_t, compare_as_user), OR_AUTHCFG, - "Set to 'on' to perform authorization-based compares with the users credentials, when this module" - " has also performed authentication. Does not affect nested groups lookups."), + "Set to 'on' to perform authorization-based compares with the users credentials, when this module " + "has also performed authentication. Does not affect nested groups lookups."), {NULL} }; diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c index 1b301fbeab2..da68353fe78 100644 --- a/modules/mappers/mod_negotiation.c +++ b/modules/mappers/mod_negotiation.c @@ -1030,7 +1030,7 @@ static int read_type_map(apr_file_t **map, negotiation_state *neg, *eol = '\0'; if ((mime_info.body = get_body(buffer, &len, tag, *map)) < 0) { ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00685) - "Syntax error in type map, no end tag '%s'" + "Syntax error in type map, no end tag '%s' " "found in %s for Body: content.", tag, r->filename); break; -- 2.47.3