delta/php-git.git/sapi/cli, branch immutable-date git.php.net: repository/php-src.git Merge branch 'PHP-5.4' into PHP-5.5 2013-01-02T05:20:35+00:00 Stanislav Malyshev stas@php.net 2013-01-02T05:20:35+00:00 80a9a80a52d1eb0281cd2894be05c685e4d526a0 * PHP-5.4: Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected. fix NEWS Conflicts: main/main.c 
* PHP-5.4:
  Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.
  fix NEWS

Conflicts:
	main/main.c
Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected. 2013-01-02T05:18:59+00:00 Stanislav Malyshev stas@php.net 2013-01-02T04:14:44+00:00 36e19c9cab6cce4e44782563f590c6c4560fb187 Without this fix, a webpage using eval() may return code 500. That might display fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause problems. 
Without this fix, a webpage using eval() may return code 500.  That might display
fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause problems.
Happy New Year 2013-01-01T08:37:09+00:00 Xinchen Hui laruence@php.net 2013-01-01T08:37:09+00:00 a666285bc2488b7f7362368c388e41428610ad1d 






Happy New Year
2013-01-01T08:28:54+00:00

Xinchen Hui
laruence@php.net

2013-01-01T08:28:54+00:00

0a7395e009b2df94c2a3f05aef69fb1779edf8f8












Merge branch 'PHP-5.4' into PHP-5.5
2012-12-14T13:56:25+00:00

Lars Strojny
lstrojny@php.net

2012-12-14T13:56:25+00:00

aaa5e42177c2b8eac77ff25b7b4335a1c2b9f214












update test for supported Mime Types checking
2012-12-14T12:59:06+00:00

pascalc
pascal.chevrel@free.fr

2012-12-11T15:05:12+00:00

d813af06187c42d89b68d49ba1acf0c207026e8f












update list of common Mime Types in PHP development server to support Web audio/video formats (Webm ,and Ogg containers) + have jpeg mime types listed together
2012-12-14T12:59:01+00:00

pascalc
pascal.chevrel@free.fr

2012-12-11T11:45:00+00:00

e5b1ebc082416330cd6f6b8f457d825aab2674eb












Merge branch 'PHP-5.4' into PHP-5.5
2012-11-14T15:23:36+00:00

Anatoliy Belsky
ab@php.net

2012-11-14T15:23:36+00:00

01f189419429bb84b298dd9630fa9a63b67fe041

* PHP-5.4:
  Fixed test sapi/cli/tests/006.phpt





* PHP-5.4:
  Fixed test sapi/cli/tests/006.phpt







Fixed test sapi/cli/tests/006.phpt
2012-11-14T15:20:59+00:00

Anatoliy Belsky
ab@php.net

2012-11-14T15:20:59+00:00

3d82f16c7de1bf89d0e618f113e361fe13abe697

Third param in preg_match_all() is optional for a while )





Third param in preg_match_all() is optional for a while )







Implemented FR #63242 (Default error page in PHP built-in web server uses outdated html/css)
2012-10-10T09:23:30+00:00

Xinchen Hui
laruence@php.net

2012-10-10T09:23:30+00:00

ea441bd08dc1d9f5bd167f3f495321c5225909b6