cvs: php4 /sapi/pi3web pi3web_sapi.c
| From: | Holger Zimmermann | Date: | Sun, 18 Jun 2000 19:01:54 +0000 |
| Subject: | cvs: php4 /sapi/pi3web pi3web_sapi.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-361@lists.php.net to get a copy of this message | ||
holger Sun Jun 18 12:01:54 2000 EDT
Modified files:
/php4/sapi/pi3web pi3web_sapi.c
Log:
Changed strtok_r to php_strtok_r
Index: php4/sapi/pi3web/pi3web_sapi.c
diff -u php4/sapi/pi3web/pi3web_sapi.c:1.1 php4/sapi/pi3web/pi3web_sapi.c:1.2
--- php4/sapi/pi3web/pi3web_sapi.c:1.1 Sun Jun 18 03:21:20 2000
+++ php4/sapi/pi3web/pi3web_sapi.c Sun Jun 18 12:01:54 2000
@@ -21,7 +21,7 @@
*/
/*
-** $Id: pi3web_sapi.c,v 1.1 2000/06/18 10:21:20 sas Exp $
+** $Id: pi3web_sapi.c,v 1.2 2000/06/18 19:01:54 holger Exp $
*/
#if WIN32|WINNT
@@ -85,7 +85,7 @@
PUTS("<table border=5 width=600>\n");
PUTS("<tr><th colspan=2 bgcolor=\"" PHP_HEADER_COLOR
"\">Pi3Web Server Information</th></tr>\n");
php_info_print_table_header(2, "Information Field", "Value");
- php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.1
2000/06/18 10:21:20 sas Exp $");
+ php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.2
2000/06/18 19:01:54 holger Exp $");
php_info_print_table_row(2, "Server Name Stamp", HTTPCore_getServerStamp());
snprintf(variable_buf, 511, "%d", HTTPCore_debugEnabled());
php_info_print_table_row(2, "Debug Enabled", variable_buf);
@@ -348,7 +348,7 @@
return;
}
}
- variable = strtok_r(variable_buf, "\r\n", &strtok_buf);
+ variable = php_strtok_r(variable_buf, "\r\n", &strtok_buf);
while (variable) {
char *colon = strchr(variable, ':');
@@ -368,7 +368,7 @@
zend_hash_add(&EG(symbol_table), variable, strlen(variable)+1, &entry, sizeof(zval *),
NULL);
*colon = ':';
}
- variable = strtok_r(NULL, "\r\n", &strtok_buf);
+ variable = php_strtok_r(NULL, "\r\n", &strtok_buf);
}
if (variable_buf!=static_variable_buf) {
efree(variable_buf);