diff options
| author | Adam Harvey <aharvey@php.net> | 2014-06-12 17:42:29 -0700 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2014-06-12 17:42:29 -0700 |
| commit | a92e3eb0fec67d0606aa31a11996ee58f584a4ab (patch) | |
| tree | c0d100f9ae8d3e35e4ac9cc0219b58ddb7e4e41c /main | |
| parent | 2b5d25d1fc273247b8521c4bedc80e9f6717be7f (diff) | |
| parent | 82231b5d895b67652c14ecb0ffddc8239777c175 (diff) | |
| download | php-git-a92e3eb0fec67d0606aa31a11996ee58f584a4ab.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Keep 308-399 HTTP response codes when header('Location:') is called.
Diffstat (limited to 'main')
| -rw-r--r-- | main/SAPI.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index 44b6b590f2..03be1e6d76 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -825,7 +825,7 @@ SAPI_API int sapi_header_op(sapi_header_op_enum op, void *arg TSRMLS_DC) "0", sizeof("0") - 1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME); } else if (!STRCASECMP(header_line, "Location")) { if ((SG(sapi_headers).http_response_code < 300 || - SG(sapi_headers).http_response_code > 307) && + SG(sapi_headers).http_response_code > 399) && SG(sapi_headers).http_response_code != 201) { /* Return a Found Redirect if one is not already specified */ if (http_response_code) { /* user specified redirect code */ |