Commit 6eb2c81b authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent 4fda58e4

STATUS

+0 −8
Original line number Diff line number Diff line
@@ -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

modules/aaa/mod_auth_digest.c

+1 −1

File changed.

Contains only whitespace changes.

modules/aaa/mod_authnz_ldap.c

+8 −8

File changed.

Contains only whitespace changes.

modules/mappers/mod_negotiation.c

+1 −1

File changed.

Contains only whitespace changes.