svn: /php/php-src/trunk/sapi/nsapi/ nsapi.c

From: Date: Thu, 19 Nov 2009 22:13:15 +0000
Subject: svn: /php/php-src/trunk/sapi/nsapi/ nsapi.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-60952@lists.php.net to get a copy of this message
thetaphi Thu, 19 Nov 2009 22:13:15 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=291041 Log: Fix compile error because of wrong merging from 5.3 branch. TODO: Convert $SERVER[] variables to unicode also for NSAPI (see apache2_handler) Changed paths: U php/php-src/trunk/sapi/nsapi/nsapi.c Modified: php/php-src/trunk/sapi/nsapi/nsapi.c =================================================================== --- php/php-src/trunk/sapi/nsapi/nsapi.c 2009-11-19 21:52:48 UTC (rev 291040) +++ php/php-src/trunk/sapi/nsapi/nsapi.c 2009-11-19 22:13:15 UTC (rev 291041) @@ -729,7 +729,7 @@ /* DOCUMENT_ROOT */ if (value = request_translate_uri("/", rc->sn)) { pos = strlen(value); - php_register_variable_safe("DOCUMENT_ROOT", value, pos-1, track_vars_array TSRMLS_CC); + php_register_variable_safe(IS_STRING, ZSTR("DOCUMENT_ROOT"), ZSTR(value), pos-1, track_vars_array TSRMLS_CC); nsapi_free(value); } @@ -753,7 +753,7 @@ efree(value); } } else { - php_register_variable_safe("REQUEST_URI", SG(request_info).request_uri, pos, track_vars_array TSRMLS_CC); + php_register_variable_safe(IS_STRING, ZSTR("REQUEST_URI"), ZSTR(SG(request_info).request_uri), pos, track_vars_array TSRMLS_CC); } if (rc->path_info) { @@ -762,7 +762,7 @@ pos = 0; } } - php_register_variable_safe("SCRIPT_NAME", SG(request_info).request_uri, pos, track_vars_array TSRMLS_CC); + php_register_variable_safe(IS_STRING, ZSTR("SCRIPT_NAME"), ZSTR(SG(request_info).request_uri), pos, track_vars_array TSRMLS_CC); } php_register_variable("SCRIPT_FILENAME", SG(request_info).path_translated, track_vars_array TSRMLS_CC);

« previous php.cvs (#60952) next »