From: Uwe Schindler <thetaphi@php.net>
Date: Thu, 19 Nov 2009 22:13:15 +0000 (+0000)
Subject: Fix compile error because of wrong merging from 5.3 branch.
X-Git-Tag: php-5.4.0alpha1~191^2~2375
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e958fb22d6c2a5c2ba528967e7f6504de9a6a5d;p=php

Fix compile error because of wrong merging from 5.3 branch.
TODO: Convert $SERVER[] variables to unicode also for NSAPI (see apache2_handler)
---

diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index 09154d60cb..6f6d7864e6 100644
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -729,7 +729,7 @@ static void sapi_nsapi_register_server_variables(zval *track_vars_array TSRMLS_D
 	/* 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 @@ static void sapi_nsapi_register_server_variables(zval *track_vars_array TSRMLS_D
 				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 @@ static void sapi_nsapi_register_server_variables(zval *track_vars_array TSRMLS_D
 				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);