]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r729586, r732504 from trunk:
authorJim Jagielski <jim@apache.org>
Mon, 12 Jan 2009 13:59:56 +0000 (13:59 +0000)
committerJim Jagielski <jim@apache.org>
Mon, 12 Jan 2009 13:59:56 +0000 (13:59 +0000)
commitd066ba3e9291dd6922df03ab5e90ee17c94fac30
treedc3ab9d53fc1f2f7cc3fa4484a297fb3a64744a3
parent936301d26509a53703966d1fce4259a3c70bfaaf
Merge r729586, r732504 from trunk:

CGI: return 504 (Gateway timeout) rather than 500 when a script
times out before returning status line/headers.
PR 42190

Improve canned 504 error message in the light of r729586 and covener's comment.

Submitted by: niq
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@733757 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
modules/http/http_protocol.c
server/util_script.c