thetaphi Mon Sep 20 09:29:45 2004 EDT Modified files: (Branch: PHP_5_0) /php-src/sapi/nsapi nsapi.c Log: changed order of processing of ini entries http://cvs.php.net/diff.php/php-src/sapi/nsapi/nsapi.c?r1=1.63.2.1&r2=1.63.2.2&ty=u Index: php-src/sapi/nsapi/nsapi.c diff -u php-src/sapi/nsapi/nsapi.c:1.63.2.1 php-src/sapi/nsapi/nsapi.c:1.63.2.2 --- php-src/sapi/nsapi/nsapi.c:1.63.2.1 Wed Sep 15 17:27:10 2004 +++ php-src/sapi/nsapi/nsapi.c Mon Sep 20 09:29:44 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: nsapi.c,v 1.63.2.1 2004/09/15 21:27:10 thetaphi Exp $ */ +/* $Id: nsapi.c,v 1.63.2.2 2004/09/20 13:29:44 thetaphi Exp $ */ /* * PHP includes @@ -310,7 +310,7 @@ PHP_MINFO_FUNCTION(nsapi) { php_info_print_table_start(); - php_info_print_table_row(2, "NSAPI Module Revision", "$Revision: 1.63.2.1 $"); + php_info_print_table_row(2, "NSAPI Module Revision", "$Revision: 1.63.2.2 $"); php_info_print_table_row(2, "Server Software", system_version()); php_info_print_table_row(2, "Sub-requests with nsapi_virtual()", (nsapi_servact_service)?((zend_ini_long("zlib.output_compression", sizeof("zlib.output_compression"), 0))?"not supported with zlib.output_compression":"enabled"):"not supported on this platform" ); @@ -933,9 +933,9 @@ SG(request_info).content_length = (content_length == NULL) ? 0 : strtoul(content_length, 0, 0); SG(sapi_headers).http_response_code = (error_directive) ? rq->status_num : 200; - if (!PG(safe_mode)) php_handle_auth_data(pblock_findval("authorization", rq->headers) TSRMLS_CC); - nsapi_php_ini_entries(NSLS_C TSRMLS_CC); + + if (!PG(safe_mode)) php_handle_auth_data(pblock_findval("authorization", rq->headers) TSRMLS_CC); file_handle.type = ZEND_HANDLE_FILENAME; file_handle.filename = SG(request_info).path_translated;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php