]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b336af2 bae56a8)
Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Mon, 30 Apr 2012 04:15:43 +0000 (12:15 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 30 Apr 2012 04:15:43 +0000 (12:15 +0800)
commitfd518ffc7e37a884ced4d34088a6b6c507fd88c2
treec7c3a4b162b2c1c58b0056e06534b3ccb8c88ca4tree | snapshot
parentb336af29e11fbb31d2737cb7f2e42149e8de4208commit | diff
parentbae56a87f81b91cd815604b0f404f616b0d73c2bcommit | diff
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
NEWS diff1 | diff2 | blob | history
sapi/cli/php_cli.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.