Keyur Govande [Fri, 29 Mar 2013 14:47:11 +0000 (14:47 +0000)]
Merge branch 'master' of https://git.php.net/push/php-src
* 'master' of https://git.php.net/push/php-src:
fix BELL constant declaration
merging conflict left over
fix typo
add definition for 5.5
fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs
- fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
- fix regression (imagerotate_overflow.phpt), fix for all cases
- fix regression bug24155.phpt and bug39366.phpt
- fix regression (imagerotate_overflow.phpt)
fix memory leak
- ws
- add gd changes
- update the comment to match the code/features
setting plausible default value for struct members
Fixed test after nick previous fix
Keyur Govande [Fri, 29 Mar 2013 14:44:35 +0000 (14:44 +0000)]
Merge branch 'PHP-5.5'
* PHP-5.5: (276 commits)
Patch for Bug #64544. The process title change module keeps track of the locally allocated environ, so it doesn't need to worry about when environ changes underneath it, for example by putenv()/setenv()
Fix "passing NULL to non-pointer argument" warnings in intl
Remove support for cloning generators
Removed deprecated check
Fix whitespace issue in the SOAP test
Fix SOAP test
Forgot to fix the test on 5.4
Exclude Travis build for 5.3 and 5.4
Fix tests after addition of ^ (xor) operator to ini
Fix Bug #64545: PHP Error in ef93a93ee21bce9218188
Attempt to fix SKIP
This will PHP 5.3.25
Typo fix (greater then => greater than)
don't optimize script if it's not going to be cached
Reimplemented OPcache restart trigger. Now, if memory or hash are full the restart is scheduled only in case the amount of wasted memory is above opcache.max_wasted_percentage. Otherwise OPcahce continue serving the following requests using already cached files, but doesn't try to add new files (the cache is full anyway).
With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
Fixed issue #78 (incorrect file path validation)
Fix test on Mac (\D shows up)
Add test for #64529
will be 5.4.15
...
Keyur Govande [Fri, 29 Mar 2013 14:42:16 +0000 (14:42 +0000)]
Merge branch 'pull-request/313' into PHP-5.5
* pull-request/313:
Patch for Bug #64544. The process title change module keeps track of the locally allocated environ, so it doesn't need to worry about when environ changes underneath it, for example by putenv()/setenv()
Keyur Govande [Fri, 29 Mar 2013 14:35:45 +0000 (14:35 +0000)]
Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/push/php-src: (266 commits)
Fix "passing NULL to non-pointer argument" warnings in intl
Remove support for cloning generators
Removed deprecated check
Fix whitespace issue in the SOAP test
Fix SOAP test
Forgot to fix the test on 5.4
Exclude Travis build for 5.3 and 5.4
Fix tests after addition of ^ (xor) operator to ini
Fix Bug #64545: PHP Error in ef93a93ee21bce9218188
Attempt to fix SKIP
This will PHP 5.3.25
Typo fix (greater then => greater than)
don't optimize script if it's not going to be cached
Reimplemented OPcache restart trigger. Now, if memory or hash are full the restart is scheduled only in case the amount of wasted memory is above opcache.max_wasted_percentage. Otherwise OPcahce continue serving the following requests using already cached files, but doesn't try to add new files (the cache is full anyway).
With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
Fixed issue #78 (incorrect file path validation)
Fix test on Mac (\D shows up)
Add test for #64529
will be 5.4.15
fix NEWS
...
Keyur Govande [Fri, 29 Mar 2013 14:27:36 +0000 (14:27 +0000)]
Patch for Bug #64544.
The process title change module keeps track of the locally allocated
environ, so it doesn't need to worry about when environ changes
underneath it, for example by putenv()/setenv()
Dmitry Stogov [Thu, 28 Mar 2013 09:48:18 +0000 (13:48 +0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
Dmitry Stogov [Thu, 28 Mar 2013 09:48:00 +0000 (13:48 +0400)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
Dmitry Stogov [Thu, 28 Mar 2013 09:47:38 +0000 (13:47 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
don't optimize script if it's not going to be cached
Reimplemented OPcache restart trigger. Now, if memory or hash are full the restart is scheduled only in case the amount of wasted memory is above opcache.max_wasted_percentage. Otherwise OPcahce continue serving the following requests using already cached files, but doesn't try to add new files (the cache is full anyway).
Dmitry Stogov [Thu, 28 Mar 2013 09:34:59 +0000 (13:34 +0400)]
Reimplemented OPcache restart trigger. Now, if memory or hash are full the restart is scheduled only in case the amount of wasted memory is above opcache.max_wasted_percentage. Otherwise OPcahce continue serving the following requests using already cached files, but doesn't try to add new files (the cache is full anyway).
projects / php / log