09854f1fb9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- add gd changes
Conflicts:
UPGRADING
2013-03-20 12:34:51 +01:00
83e81c40ae
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- update the comment to match the code/features
2013-03-20 12:29:56 +01:00
f0078897c7
- update the comment to match the code/features
2013-03-20 12:29:47 +01:00
2799534296
Merge branch 'master' of git.php.net:php-src
2013-03-20 12:20:32 +01:00
bc7b287a61
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- add imageaffinematrixget and imagematrixconcat
- add affine matrix helper for translate, scale, rotate and shear
- fix unix build
- add new files for interpolation
- config.m4 sync with .w32
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 12:19:46 +01:00
1ec484d3c5
- add imageaffinematrixget and imagematrixconcat
2013-03-20 12:19:03 +01:00
780c6e0a9c
- add affine matrix helper for translate, scale, rotate and shear
2013-03-20 11:01:37 +01:00
a46065ef71
- fix unix build
2013-03-20 09:24:54 +01:00
7daabc42a2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
updated NEWS
Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:15:46 +01:00
0125ec77d2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:14:13 +01:00
06a526be3e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:12:33 +01:00
bb935ff8dc
Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:10:10 +01:00
a7a53d369b
- add new files for interpolation
2013-03-20 08:10:54 +01:00
00a53ca817
- config.m4 sync with .w32
2013-03-20 07:52:23 +01:00
22159fb7b7
- add new interpolation method
...
. imagescale
. imageaffine
. replace imagerotate with new generic and optimized new implementations
. imagesetinterpolationmethod, to set the default interpolation to be
used with the new functions
. add imagepalettetotruecolor
2013-03-20 07:46:59 +01:00
cfd096fd7c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Backported fix for bug #62852
2013-03-19 21:22:09 +01:00
8d199c7c4f
Backported fix for bug #62852
2013-03-19 21:19:55 +01:00
5cea998c5d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix C89 compat
2013-03-19 15:14:03 +01:00
b3d82845db
fix C89 compat
2013-03-19 15:13:27 +01:00
7b876167cf
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix #48358 add() method for SplDoublyLinkedLis
2013-03-19 14:48:05 +01:00
4257469079
Fix #48358 add() method for SplDoublyLinkedLis
2013-03-19 14:46:21 +01:00
48e82b2988
Merge branch 'PHP-5.5'
...
* PHP-5.5:
strlen() returns size_t
2013-03-19 10:45:57 +04:00
f621f0b8e7
strlen() returns size_t
2013-03-19 10:45:38 +04:00
48632d0fc4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Renamed Zend Optimizer+ into Zend OPcache
2013-03-19 10:32:50 +04:00
a62ffb72f4
Renamed Zend Optimizer+ into Zend OPcache
2013-03-19 10:32:24 +04:00
d5174afb89
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add stats to phpinfo
2013-03-19 10:19:01 +04:00
840c0d6091
Add stats to phpinfo
2013-03-19 10:17:44 +04:00
33ea10141d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Avoid trailing line break
2013-03-18 13:36:52 +04:00
5b0879e7c9
Avoid trailing line break
2013-03-18 13:36:31 +04:00
4e4bc3a21b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add oom, wasted, hash and manual restart counters to help identify potential configuration problems
Add optional flag to opcache_get_status()
2013-03-18 13:16:32 +04:00
1fe43d0798
Add oom, wasted, hash and manual restart counters to help identify potential configuration problems
2013-03-18 13:13:35 +04:00
ccf7d7cc93
Add optional flag to opcache_get_status()
2013-03-18 11:23:26 +04:00
92198fa2a5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
merge with 5.4
more test coverage: missing square bracket error message
Fixed bug #61981
2013-03-17 20:53:19 +04:00
c5ba47ac59
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
more test coverage: missing square bracket error message
Fixed bug #61981
2013-03-17 20:52:12 +04:00
85d9d85ce2
more test coverage: missing square bracket error message
2013-03-17 20:40:15 +04:00
719264d1af
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #61981
2013-03-17 20:18:17 +04:00
5d0826e9c3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #61981
2013-03-17 20:02:34 +04:00
b32405053f
Fix bug #61981
2013-03-17 20:00:37 +04:00
ada89863c3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Load "black list" only if O+ is enabled
2013-03-17 12:17:39 +04:00
dcc927d3f2
Load "black list" only if O+ is enabled
2013-03-17 12:17:04 +04:00
513c6e7021
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Made opcache_get_status() return statistics during O+ restart
2013-03-17 11:57:08 +04:00
e66c8681c7
Made opcache_get_status() return statistics during O+ restart
2013-03-17 11:56:04 +04:00
8635900e8e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Enabled O+ build by default (it may be disabled before 5.0.0 release)
2013-03-17 10:59:23 +04:00
930b272d70
Enabled O+ build by default (it may be disabled before 5.0.0 release)
2013-03-17 10:58:30 +04:00
2db4e43436
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Removed files that are neccessary only for standalone pecl branch
setting plausible default value for struct members
2013-03-17 10:42:41 +04:00
07b1eaa609
Removed files that are neccessary only for standalone pecl branch
2013-03-17 10:40:59 +04:00
fa3fc711d3
setting plausible default value for struct members
...
especially for unsigned members so they don't casted to max unsigned
2013-03-16 18:29:50 +01:00
23bf72f7b1
Merge branch 'master' of git.php.net:php-src
2013-03-16 18:27:21 +01:00
79d2657873
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Remove spurious int cast in between two longs
2013-03-16 18:20:24 +01:00
b46897941a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove spurious int cast in between two longs
2013-03-16 18:20:16 +01:00
Pierre Joye