]> granicus.if.org Git - apache/commitdiff
add easy to flub trailing .
authorEric Covener <covener@apache.org>
Tue, 19 Jun 2018 12:10:27 +0000 (12:10 +0000)
committerEric Covener <covener@apache.org>
Tue, 19 Jun 2018 12:10:27 +0000 (12:10 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833829 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index c8cecf5ce34371fbf31fb3fd25d1cf87dd4955bf..e694be3419fb6481b51c53a7f357e269bfb8bbe6 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -195,7 +195,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      'domain=' or 'path=' in the 'Set-Cookie' header.  PR 61560.
      trunk patch: http://svn.apache.org/r1832280
      2.4.x patch: trunk works (module CHANGES)
-                  svn merge -c 1832280 ^/httpd/httpd/trunk
+                  svn merge -c 1832280 ^/httpd/httpd/trunk . 
      +1: jailletc36
      jailletc36: 'ap_proxy_strmatch_domain' and 'ap_proxy_strmatch_path' are
      now useless.  They could be axed, but maybe, not in 2.4.x (even if I
@@ -204,7 +204,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) http: Fix small memory leak per request when handling persistent connections
      trunk patch: http://svn.apache.org/r1833014
      2.4.x patch: trunk works (modulo CHANGES)
-                  svn merge -c 1833014 ^/httpd/httpd/trunk
+                  svn merge -c 1833014 ^/httpd/httpd/trunk . 
      +1: jorton, covener
 
   *) log: add server_rec to some log.c fatal startup errors so they aren't