You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2014/07/18 13:35:24 UTC
svn commit: r1611597 - /httpd/httpd/branches/2.2.x/STATUS
Author: covener
Date: Fri Jul 18 11:35:24 2014
New Revision: 1611597
URL: http://svn.apache.org/r1611597
Log:
Update porposal -- Ruediger spotted the hand-merge error:
+ if (!apr_is_empty_table(rp->trailers_in)) {
+ apr_table_do(add_trailers, rp->trailers_out,
^
+ rp->trailers_in, NULL);
+ apr_table_clear(rp->trailers_in);
+ }
Modified:
httpd/httpd/branches/2.2.x/STATUS
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1611597&r1=1611596&r2=1611597&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Jul 18 11:35:24 2014
@@ -113,7 +113,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
trunk patch: http://svn.apache.org/r1610814
http://svn.apache.org/r1610686 (mod_log_config ^XX support)
http://svn.apache.org/r1610707 (mod_log_cofnig ^XX support)
- 2.2.x patch: http://people.apache.org/~covener/patches/httpd-2.2.x-trailers.diff
+ 2.2.x patch: http://people.apache.org/~covener/patches/httpd-2.2.x-trailers-2.diff
+1: covener
* mod_proxy: Don't reuse a SSL backend connection whose SNI differs. PR 55782.