Remi Collet
92a1640694
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix copy/paste in error message
2013-04-23 13:53:07 +02:00
Remi Collet
2005a15caa
fix copy/paste in error message
2013-04-23 13:53:00 +02:00
Remi Collet
2fa178fa41
Merge branch 'PHP-5.5'
...
* PHP-5.5:
enable WebP with system libgd when available
(re)allow WBMP detection with system libgd provide getbmi and skipheader not exported functions in gd_compat.
2013-04-23 13:46:24 +02:00
Remi Collet
9819d81ddf
enable WebP with system libgd when available
2013-04-23 13:46:10 +02:00
Remi Collet
eb50789910
(re)allow WBMP detection with system libgd
...
provide getbmi and skipheader not exported functions in gd_compat.
2013-04-23 13:43:57 +02:00
Remi Collet
41ef288ced
Merge branch 'PHP-5.5'
...
* PHP-5.5:
temporary disable WBM detection with system libgd, as gdGetC, getmbi and skipheader not exported
2013-04-22 17:48:43 +02:00
Remi Collet
ec1678dd7c
temporary disable WBM detection with system libgd, as gdGetC, getmbi and skipheader not exported
2013-04-22 17:48:28 +02:00
Remi Collet
149cf2650a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
overflow2 is not exported by system libgd
2013-04-22 17:39:54 +02:00
Remi Collet
6889a0d1f5
overflow2 is not exported by system libgd
2013-04-22 17:39:35 +02:00
Pierre Joye
e2f3c7f2bc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
lucky that the name is not used, fix name of encoder
2013-04-11 07:08:58 +02:00
Pierre Joye
e71b794569
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
lucky that the name is not used, fix name of encoder
2013-04-11 07:08:39 +02:00
Pierre Joye
684f4d5272
lucky that the name is not used, fix name of encoder
2013-04-11 06:42:38 +02:00
Pierre Joye
ca1962949e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:14:00 +02:00
Pierre Joye
87f5d9aa1b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:13:46 +02:00
Pierre Joye
c480bf3fb2
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:13:18 +02:00
Pierre Joye
224a67fb9f
add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:12:25 +02:00
Pierre Joye
d0cd049312
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix possible NULL deref
2013-04-09 10:09:54 +02:00
Pierre Joye
24f1045d55
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix possible NULL deref
2013-04-09 10:09:47 +02:00
Pierre Joye
aab5659357
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix possible NULL deref
2013-04-09 10:09:36 +02:00
Pierre Joye
88b3cdc4e9
fix possible NULL deref
2013-04-09 10:09:17 +02:00
Pierre Joye
f4308084d8
Merge branch 'PHP-5.5'
...
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.5:
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 10:04:41 +02:00
Pierre Joye
4d6c367177
Merge branch 'PHP-5.4' into PHP-5.5
...
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.4:
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 10:04:32 +02:00
Pierre Joye
10d62de4aa
Merge branch 'PHP-5.3' into PHP-5.4
...
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.3:
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 10:04:17 +02:00
Pierre Joye
4d4adf47e0
fix null deref
2013-04-09 10:04:01 +02:00
Pierre Joye
396b1109cf
Merge branch 'PHP-5.5'
...
* PHP-5.5:
ws and comment for recommended aa method
2013-04-09 07:05:03 +02:00
Pierre Joye
83500123d0
ws and comment for recommended aa method
2013-04-09 07:04:52 +02:00
Pierre Joye
21cfbdf42c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix some unitialized values and typo
2013-04-09 06:45:24 +02:00
Pierre Joye
85ad65ef40
fix some unitialized values and typo
2013-04-09 06:44:45 +02:00
Pierre Joye
95f830bc81
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix BELL constant declaration
2013-03-28 22:14:50 +01:00
Pierre Joye
ac0b66f160
fix BELL constant declaration
2013-03-28 22:14:34 +01:00
Pierre Joye
33e834aab8
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add WebP support in phpinfo
2013-03-27 17:39:05 +01:00
Pierre Joye
e7d88a63fa
add WebP support in phpinfo
2013-03-27 17:38:57 +01:00
Pierre Joye
705ab20252
Merge branch 'PHP-5.5'
...
* PHP-5.5:
FALSE on error
2013-03-27 05:13:42 +01:00
Pierre Joye
f3ebb40ad6
FALSE on error
2013-03-27 05:13:30 +01:00
Pierre Joye
8a85da4a61
merging conflict left over
2013-03-26 17:46:29 +01:00
Pierre Joye
111123af4f
conflict
2013-03-26 11:24:00 +01:00
Pierre Joye
5ae6f582fb
fix regression, take #2 (merge issue due to git 1.8 default setting changes)
2013-03-26 11:23:15 +01:00
Stanislav Malyshev
c1ac5a20a5
fix typo
2013-03-24 20:04:24 -07:00
Stanislav Malyshev
504ef64c7b
fix typo
2013-03-24 20:03:57 -07:00
Pierre Joye
f21f37bb4c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
remove comments
2013-03-25 03:14:40 +01:00
Pierre Joye
1b34ab8ff8
remove comments
2013-03-25 03:14:27 +01:00
Pierre Joye
94c083ba64
fix conflict
2013-03-24 16:54:55 +01:00
Pierre Joye
be3e2bb295
fix generic rotation and 90 degrees & multiples rotation, take #2
2013-03-24 16:52:20 +01:00
Pierre Joye
dd9e4b34d6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- fix regression (imagerotate_overflow.phpt), fix for all cases
2013-03-22 09:30:32 +01:00
Pierre Joye
f39a23696b
- fix regression (imagerotate_overflow.phpt), fix for all cases
2013-03-22 09:30:23 +01:00
Pierre Joye
672f8525fb
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- fix regression bug24155.phpt and bug39366.phpt
2013-03-22 09:21:23 +01:00
Pierre Joye
f05972ddbf
- fix regression bug24155.phpt and bug39366.phpt
2013-03-22 09:21:11 +01:00
Pierre Joye
2a8a9c0007
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- fix regression (imagerotate_overflow.phpt)
2013-03-22 08:28:25 +01:00
Pierre Joye
4e6d54f5a7
- fix regression (imagerotate_overflow.phpt)
2013-03-22 08:28:11 +01:00
Pierre Joye
09854f1fb9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- add gd changes
Conflicts:
UPGRADING
2013-03-20 12:34:51 +01:00
