archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Change reentrancy API to always use the php prefix.

Browse source 
Check for the declaration of reentrant functions, so that we can use
them in non-ZTS mode on all platforms.
This commit is contained in:
Sascha Schumann 2000-05-04 10:38:17 +00:00
parent b6e4841ec7
commit d0f3764ee2
16 changed files with 121 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

14
main/php_variables.c
View file

@ -192,7 +192,7 @@ SAPI_POST_HANDLER_FUNC(php_std_post_handler)
ELS_FETCH();
PLS_FETCH();
var = strtok_r(SG(request_info).post_data, "&", &strtok_buf);
var = php_strtok_r(SG(request_info).post_data, "&", &strtok_buf);
while (var) {
val = strchr(var, '=');
@ -203,7 +203,7 @@ SAPI_POST_HANDLER_FUNC(php_std_post_handler)
php_url_decode(val, strlen(val));
php_register_variable(var, val, array_ptr ELS_CC PLS_CC);
}
var = strtok_r(NULL, "&", &strtok_buf);
var = php_strtok_r(NULL, "&", &strtok_buf);
}
}
@ -274,11 +274,11 @@ void php_treat_data(int arg, char *str ELS_DC PLS_DC SLS_DC)
}
if (arg == PARSE_COOKIE) {
var = strtok_r(res, ";", &strtok_buf);
var = php_strtok_r(res, ";", &strtok_buf);
} else if (arg == PARSE_POST) {
var = strtok_r(res, "&", &strtok_buf);
var = php_strtok_r(res, "&", &strtok_buf);
} else {
var = strtok_r(res, PG(arg_separator), &strtok_buf);
var = php_strtok_r(res, PG(arg_separator), &strtok_buf);
}
while (var) {
@ -291,9 +291,9 @@ void php_treat_data(int arg, char *str ELS_DC PLS_DC SLS_DC)
php_register_variable(var, val, array_ptr ELS_CC PLS_CC);
}
if (arg == PARSE_COOKIE) {
var = strtok_r(NULL, ";", &strtok_buf);
var = php_strtok_r(NULL, ";", &strtok_buf);
} else {
var = strtok_r(NULL, PG(arg_separator), &strtok_buf);
var = php_strtok_r(NULL, PG(arg_separator), &strtok_buf);
}
}
if (free_buffer) {