diff options
| author | Xinchen Hui <laruence@php.net> | 2012-04-30 12:15:43 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-04-30 12:15:43 +0800 |
| commit | fd518ffc7e37a884ced4d34088a6b6c507fd88c2 (patch) | |
| tree | c7c3a4b162b2c1c58b0056e06534b3ccb8c88ca4 /ext/json/php_json.h | |
| parent | b336af29e11fbb31d2737cb7f2e42149e8de4208 (diff) | |
| parent | bae56a87f81b91cd815604b0f404f616b0d73c2b (diff) | |
| download | php-git-fd518ffc7e37a884ced4d34088a6b6c507fd88c2.tar.gz | |
Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4
* origin/PHP-5.3:
Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi).
- BFN
Conflicts:
sapi/cli/php_cli.c
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions