diff options
author | Sara Golemon <pollita@php.net> | 2014-08-19 13:22:14 -0700 |
---|---|---|
committer | Sara Golemon <pollita@php.net> | 2014-08-19 13:22:14 -0700 |
commit | a309dda7771503b5972b5faec2f3234ed0637781 (patch) | |
tree | 6dba86bc5c7a340f28844571808025950c1d7c27 /sapi/apache2handler/php_functions.c | |
parent | fae17a00f556b7c1a2221289c46403bfb4367034 (diff) | |
parent | ac4569621dc8762862dca6d39adf4ceb39e7e00b (diff) | |
download | php-git-a309dda7771503b5972b5faec2f3234ed0637781.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Switch use of strtok() to gd_strtok_r()
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions