Re: cvs: php-src / php.ini-dist php.ini-recommended /sapi/cgi cgi_main.c

What does nph stand for? Can you think of a more verbose name? Andi At 12:02 AM 2/10/2004 +0000, Ilia Alshanetsky wrote:

iliaa           Mon Feb  9 19:02:39 2004 EDT

Modified files:

    /php-src    php.ini-dist php.ini-recommended
    /php-src/sapi/cgi   cgi_main.c

Log: Fixed bug #27026 (Added cgi.nph that allows forcing of the Status: 200 header that is not normally needed). http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.205&r2=1.206&ty=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.205 php-src/php.ini-dist:1.206 --- php-src/php.ini-dist:1.205 Sun Jan 25 23:15:04 2004

+++ php-src/php.ini-dist        Mon Feb  9 19:02:37 2004

@@ -445,6 +445,10 @@ ; **You CAN safely turn this off for IIS, in fact, you MUST.** ; cgi.force_redirect = 1 +; if cgi.nph is enabled it will force cgi to always sent Status: 200 with +; every request. +; cgi.nph = 1 + ; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape ; (iPlanet) web servers, you MAY need to set an environment variable name that PHP ; will look for to know it is OK to continue execution. Setting this variable MAY http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.150&r2=1.151&ty=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.150 php-src/php.ini-recommended:1.151 --- php-src/php.ini-recommended:1.150 Sun Jan 25 23:15:04 2004 +++ php-src/php.ini-recommended Mon Feb 9 19:02:38 2004 @@ -464,6 +464,10 @@ ; **You CAN safely turn this off for IIS, in fact, you MUST.** ; cgi.force_redirect = 1 +; if cgi.nph is enabled it will force cgi to always sent Status: 200 with +; every request. +; cgi.nph = 1 + ; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape ; (iPlanet) web servers, you MAY need to set an environment variable name that PHP ; will look for to know it is OK to continue execution. Setting this variable MAY http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.244&r2=1.245&ty=u Index: php-src/sapi/cgi/cgi_main.c diff -u php-src/sapi/cgi/cgi_main.c:1.244 php-src/sapi/cgi/cgi_main.c:1.245 --- php-src/sapi/cgi/cgi_main.c:1.244 Thu Jan 8 03:18:08 2004 +++ php-src/sapi/cgi/cgi_main.c Mon Feb 9 19:02:38 2004 @@ -20,7 +20,7 @@

    +----------------------------------------------------------------------+

*/ -/* $Id: cgi_main.c,v 1.244 2004/01/08 08:18:08 andi Exp $ */ +/* $Id: cgi_main.c,v 1.245 2004/02/10 00:02:38 iliaa Exp $ */ #include "php.h" #include "php_globals.h" @@ -289,7 +289,7 @@

        char buf[SAPI_CGI_MAX_HEADER_LENGTH];
        sapi_header_struct *h;
        zend_llist_position pos;
-       long rfc2616_headers = 0;
+       long rfc2616_headers = 0, nph = 0;

        if(SG(request_info).no_headers == 1) {
                return  SAPI_HEADER_SENT_SUCCESSFULLY;

@@ -303,7 +303,11 @@

                rfc2616_headers = 0;
        }

-       if (SG(sapi_headers).http_response_code != 200) {
+       if (cfg_get_long("cgi.nph", &nph) == FAILURE) {
+               nph = 0;
+       }

+

+       if (nph || SG(sapi_headers).http_response_code != 200) {
                int len;

                if (rfc2616_headers && SG(sapi_headers).http_status_line) {

-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php