cvs: php4 /sapi/tux php_tux.c

sebastian Sun Aug 5 01:40:44 2001 EDT Modified files: /php4/sapi/tux php_tux.c Log: Fixed some TSRMLS_CC instances (at least it looked odd to me the way it was before). Index: php4/sapi/tux/php_tux.c diff -u php4/sapi/tux/php_tux.c:1.5 php4/sapi/tux/php_tux.c:1.6 --- php4/sapi/tux/php_tux.c:1.5 Tue Jul 31 02:28:05 2001 +++ php4/sapi/tux/php_tux.c Sun Aug 5 01:40:43 2001 @@ -176,7 +176,7 @@ #define BUF_SIZE 512 #define ADD_STRING(name) \ - php_register_variable(name, buf, track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()CC) + php_register_variable(name, buf, track_vars_array TSRMLS_CC) static void sapi_tux_register_variables(zval *track_vars_array TSRMLS_DC) { @@ -187,14 +187,14 @@ sprintf(buf, "Server: %s", TUXAPI_version); sapi_add_header_ex(buf, strlen(buf), 1, 0 TSRMLS_CC); - php_register_variable("PHP_SELF", SG(request_info).request_uri, track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()CC); - php_register_variable("SERVER_SOFTWARE", TUXAPI_version, track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()CC); - php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()CC); - php_register_variable("REQUEST_METHOD", (char *) SG(request_info).request_method, track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()CC); - php_register_variable("DOCUMENT_ROOT", TUXAPI_docroot, track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()CC); - php_register_variable("SERVER_NAME", TUXAPI_servername, track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()CC); - php_register_variable("REQUEST_URI", SG(request_info).request_uri, track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()CC); - php_register_variable("PATH_TRANSLATED", SG(request_info).path_translated, track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()CC); + php_register_variable("PHP_SELF", SG(request_info).request_uri, track_vars_array TSRMLS_CC); + php_register_variable("SERVER_SOFTWARE", TUXAPI_version, track_vars_array TSRMLS_CC); + php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array TSRMLS_CC); + php_register_variable("REQUEST_METHOD", (char *) SG(request_info).request_method, track_vars_array TSRMLS_CC); + php_register_variable("DOCUMENT_ROOT", TUXAPI_docroot, track_vars_array TSRMLS_CC); + php_register_variable("SERVER_NAME", TUXAPI_servername, track_vars_array TSRMLS_CC); + php_register_variable("REQUEST_URI", SG(request_info).request_uri, track_vars_array TSRMLS_CC); + php_register_variable("PATH_TRANSLATED", SG(request_info).path_translated, track_vars_array TSRMLS_CC); p = inet_ntoa(TG(req)->client_host); /* string representation of IPs are never larger than 512 bytes */ @@ -217,7 +217,7 @@ #define CONDADD(name, field) \ if (TG(req)->field[0]) { \ - php_register_variable(#name, TG(req)->field, track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()C); \ + php_register_variable(#name, TG(req)->field, track_vars_array TSRMLS_CC); \ } CONDADD(HTTP_REFERER, referer); @@ -237,7 +237,7 @@ #if 0 if (TG(hc)->authorization[0]) - php_register_variable("AUTH_TYPE", "Basic", track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()C); + php_register_variable("AUTH_TYPE", "Basic", track_vars_array TSRMLS_CC); #endif } @@ -288,7 +288,7 @@ return; } - php_execute_script(&file_handle TSRMLS_FETCH()CC TSRMLS_FETCH()CC); + php_execute_script(&file_handle TSRMLS_CC); php_request_shutdown(NULL); }