diff options
| author | Edin Kadribasic <edink@php.net> | 2003-06-03 10:06:45 +0000 |
|---|---|---|
| committer | Edin Kadribasic <edink@php.net> | 2003-06-03 10:06:45 +0000 |
| commit | b7713f411e468c01f4f6a5d3eae5f9441101ca12 (patch) | |
| tree | 3e804969848551714cfe19cf15d8578950205876 | |
| parent | a516171decc62a433d56648e27dfc659f8f481e5 (diff) | |
| download | php-git-b7713f411e468c01f4f6a5d3eae5f9441101ca12.tar.gz | |
Fix for #23902 by Shane.
Removed bogus recommendation from php.ini files.
# Basic authentication is actually possible
# usign IIS + PHP cgi countrary to our current docs
| -rw-r--r-- | main/SAPI.c | 6 | ||||
| -rw-r--r-- | php.ini-dist | 2 | ||||
| -rw-r--r-- | php.ini-recommended | 2 | ||||
| -rw-r--r-- | sapi/cgi/cgi_main.c | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index 94a333c967..43bcef7259 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -456,6 +456,12 @@ static int sapi_extract_response_code(const char *header_line) static void sapi_update_response_code(int ncode TSRMLS_DC) { + /* if the status code did not change, we do not want + to change the status line, and no need to change the code */ + if (SG(sapi_headers).http_response_code == ncode) { + return; + } + if (SG(sapi_headers).http_status_line) { efree(SG(sapi_headers).http_status_line); SG(sapi_headers).http_status_line = NULL; diff --git a/php.ini-dist b/php.ini-dist index 06b49e138c..643588c21e 100644 --- a/php.ini-dist +++ b/php.ini-dist @@ -462,7 +462,7 @@ enable_dl = On ; use when sending HTTP response code. If it's set 0 PHP sends Status: header that ; is supported by Apache. When this option is set to 1 PHP will send ; RFC2616 compliant header. -; Set to 1 if running under IIS. Default is zero. +; Default is zero. ;cgi.rfc2616_headers = 0 diff --git a/php.ini-recommended b/php.ini-recommended index d95fc47e91..21e5c4f59c 100644 --- a/php.ini-recommended +++ b/php.ini-recommended @@ -477,7 +477,7 @@ enable_dl = On ; use when sending HTTP response code. If it's set 0 PHP sends Status: header that ; is supported by Apache. When this option is set to 1 PHP will send ; RFC2616 compliant header. -; Set to 1 if running under IIS. Default is zero. +; Default is zero. ;cgi.rfc2616_headers = 0 diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index d8acfd1c3f..ae9e9ed7cf 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -303,7 +303,7 @@ static int sapi_cgi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC) if (SG(sapi_headers).http_response_code != 200) { int len; - if (rfc2616_headers) { + if (rfc2616_headers && SG(sapi_headers).http_status_line) { len = snprintf(buf, SAPI_CGI_MAX_HEADER_LENGTH, "%s\r\n", SG(sapi_headers).http_status_line); |