]> granicus.if.org Git - apache/commit
projects / apache / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 159cd4f) | patch
Merge r1311174 from trunk:
authorJim Jagielski <jim@apache.org>
Fri, 27 Apr 2012 13:07:45 +0000 (13:07 +0000)
committerJim Jagielski <jim@apache.org>
Fri, 27 Apr 2012 13:07:45 +0000 (13:07 +0000)
commit3f1921ee5cc58c0e309cba8e0a886ff1b282cf59
treebfe5b77099ee4921a277e2e4a10242a03c0610b5tree | snapshot
parent159cd4f9a5151f6a1b5a6415627bacd5da12809ccommit | diff
Merge r1311174 from trunk:

Fix error handling in ap_scan_script_header_err_brigade() if there
is no EOS bucket in the brigade:

Also don't loop if there is a timeout when discarding the script output.

Thanks to Edgar Frank for the analysis.

PR: 48272 (partial fix)

Submitted by: sf
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1331414 13f79535-47bb-0310-9956-ffa450edef68
STATUS diff | blob | history
server/util_script.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.