git.ipfire.org Git - thirdparty/apache/httpd.git/commit

author	Eric Covener <covener@apache.org>
	Fri, 18 Jul 2014 11:35:24 +0000 (11:35 +0000)
committer	Eric Covener <covener@apache.org>
	Fri, 18 Jul 2014 11:35:24 +0000 (11:35 +0000)
commit	42358ee189870bf55b8df3c2f585a438bf70dfda
tree	1c828a657e9cb3f63d5f1101cb918449f235836d	tree \| snapshot
parent	abf1036c41403f35dfb99bec2f920f1b105fafff	commit \| diff

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);
+                    }

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1611597 13f79535-47bb-0310-9956-ffa450edef68