clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 05:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,612 Commits 494 Branches 1,367 Tags 786 MiB
8059ec1832
Commit Graph

74612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Johannes Schlüter
7cf806a033 Merge branch 'PHP-5.5' 2013-05-08 18:03:53 +02:00
Remi Collet
70e0118b1b Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #64785 : restore 5.4 behaviour, libpng is mandatory
 2013-05-08 07:37:46 +02:00
Ard Biesheuvel
046594caad Merge branch 'PHP-5.5' 2013-05-07 22:08:24 +02:00
Remi Collet
f5973141af Merge branch 'PHP-5.5' 
* PHP-5.5:
  gd: fix 2 failed tests (bundled lib) due to arithmetic precision (allow minor diff).
 2013-05-06 10:25:41 +02:00
Remi Collet
de7415ea55 gd: fix 2 failed tests (bundled lib) due to arithmetic precision (allow minor diff). 2013-05-06 10:25:36 +02:00
Remi Collet
9b30ee7e0b Merge branch 'PHP-5.5' 
* PHP-5.5:
  gd: fix previous (bad include)
 2013-05-06 10:07:11 +02:00
Remi Collet
96a575123d gd: fix previous (bad include) 2013-05-06 10:07:06 +02:00
Remi Collet
03091c834c Merge branch 'PHP-5.5' 
* PHP-5.5:
  Revert removal of overflow2 use in gd.c Function provided by gd_security with bundled libgd Function provided by gd_compat with system libgd
 2013-05-06 10:02:34 +02:00
Remi Collet
9480de29db Revert removal of overflow2 use in gd.c 
Function provided by gd_security with bundled libgd
Function provided by gd_compat with system libgd

This fix failed test imageloadfont_invalid.phpt
This test now also pass with system libgd
 2013-05-06 10:00:45 +02:00
Remi Collet
76665ca070 Merge branch 'PHP-5.5' 
* PHP-5.5:
  gd: fix include...
 2013-05-05 10:39:37 +02:00
Remi Collet
4cea61a0fa gd: fix include... 2013-05-05 10:39:33 +02:00
Remi Collet
87de7b353b Merge branch 'PHP-5.5' 
* PHP-5.5:
  Move (back) missing functions in system libgd to gd_compat - display libPng version in all cases - gd_compat.c in ext/gd (nothing in ext/gd/libgd)
 2013-05-05 09:56:52 +02:00
Remi Collet
0cae9a15d7 Move (back) missing functions in system libgd to gd_compat 
- display libPng version in all cases
- gd_compat.c in ext/gd (nothing in ext/gd/libgd)
 2013-05-05 09:54:27 +02:00
Remi Collet
e7ffb77341 Merge branch 'PHP-5.5' 
* PHP-5.5:
  gd: don't include png.h (breaks build on some old version), so report libPNG version only with external libgd
 2013-05-05 08:35:34 +02:00
Remi Collet
9a48b6506c gd: don't include png.h (breaks build on some old version), so report libPNG version only with external libgd 2013-05-05 08:35:29 +02:00
Remi Collet
a47c5ed855 Merge branch 'PHP-5.5' 
* PHP-5.5:
  gd: missing comma
 2013-05-05 06:52:35 +02:00
Remi Collet
54d6f8b34e gd: missing comma 2013-05-05 06:52:28 +02:00
Remi Collet
dca2cd2f98 Merge branch 'PHP-5.5' 
* PHP-5.5:
  gd: fix typo and cleanups
 2013-05-04 20:36:42 +02:00
Remi Collet
2ab270011d gd: fix typo and cleanups 2013-05-04 20:36:32 +02:00
Remi Collet
71e76816ce Merge branch 'PHP-5.5' 
* PHP-5.5:
  NEWS
  fix build with bundled libgd
  Move png and jpeg version functions to gd.c so the external library build doesn't include anything from libgd/.
  Remove extra unused functions from gd_compat.h
  Rewrite Xpm library check so it doesn't break on MultiArch systems
  Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef
  * Remove overflow2, getmbi and skipheaders from gd_compat.h * Add missing return in _php_ctx_getmbi * Reintroduce imagecreatefromxbm by checking for gdCreateImageFromXbm
  Remove overflow2, getmbi and skipheader, since they are not needed anymore.
  Allow to use new GD-2.1.0 function from system library
 2013-05-04 16:54:46 +02:00
Remi Collet
d981c191d4 NEWS 2013-05-04 16:54:22 +02:00
Remi Collet
00b097d2a3 fix build with bundled libgd 2013-05-04 16:51:56 +02:00
Ondřej Surý
2a2ac5f2be Move png and jpeg version functions to gd.c so the external library build doesn't include anything from libgd/. 2013-05-04 16:50:13 +02:00
Ondřej Surý
e6704501f8 Remove extra unused functions from gd_compat.h 2013-05-04 16:50:11 +02:00
Ondřej Surý
5e9c6c3b64 Rewrite Xpm library check so it doesn't break on MultiArch systems 2013-05-04 16:50:08 +02:00
Ondřej Surý
8a90aad35b Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef 2013-05-04 16:50:06 +02:00
Ondřej Surý
2fc17d83cb * Remove overflow2, getmbi and skipheaders from gd_compat.h * Add missing return in _php_ctx_getmbi * Reintroduce imagecreatefromxbm by checking for gdCreateImageFromXbm 2013-05-04 16:50:03 +02:00
Ondřej Surý
8a07908215 Remove overflow2, getmbi and skipheader, since they are not needed anymore. 2013-05-04 16:49:59 +02:00
Ondřej Surý
6aedadce0a Allow to use new GD-2.1.0 function from system library 2013-05-04 16:49:35 +02:00
Xinchen Hui
d6de58d7e4 Merge branch 'PHP-5.5' 2013-05-04 20:45:07 +08:00
Xinchen Hui
9155d17fef Fix #64749 (warning: cast from pointer to integer of different size) 2013-05-04 20:43:42 +08:00
Anatol Belski
a14a809aff Merge branch 'PHP-5.5' 
* PHP-5.5:
  better fix for bug #64770
  better fix for bug #64770
 2013-05-04 12:20:36 +02:00
Anatol Belski
b2ef8672c7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  better fix for bug #64770
  better fix for bug #64770
 2013-05-04 12:20:19 +02:00
Anatol Belski
ec4388158d better fix for bug #64770 2013-05-04 12:19:52 +02:00
Anatol Belski
f1e5127e7a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  better fix for bug #64770
 2013-05-04 12:18:06 +02:00
Anatol Belski
5c701d19ac better fix for bug #64770 2013-05-04 12:16:38 +02:00
Boris Lytochkin
98063b6531 Merge branch 'PHP-5.5' 
* PHP-5.5:
  remove OS-specific OIDs from 'WALK multiple on single OID with OID suffix as keys' test part
 2013-05-04 00:06:15 +04:00
Boris Lytochkin
67d83de11c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  remove OS-specific OIDs from 'WALK multiple on single OID with OID suffix as keys' test part
 2013-05-04 00:06:06 +04:00
Boris Lytochkin
8c3b8f39aa remove OS-specific OIDs from 
'WALK multiple on single OID with OID suffix as keys' test part
 2013-05-04 00:04:52 +04:00
Boris Lytochkin
7f5a4cd70a Merge branch 'PHP-5.5' 
* PHP-5.5:
  re-work walkaround for net-snmp BUGid 2027834, no need to detect it anymore add test for Bug #64159 bump default buffer size for values(32->512): do not reallocate buffers in 99% cases
  cut PHP_VERSION_ID - we know API version now
 2013-05-03 23:22:27 +04:00
Boris Lytochkin
eff60f993c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  re-work walkaround for net-snmp BUGid 2027834, no need to detect it anymore add test for Bug #64159 bump default buffer size for values(32->512): do not reallocate buffers in 99% cases
 2013-05-03 23:10:11 +04:00
Boris Lytochkin
c34274acb8 re-work walkaround for net-snmp BUGid 2027834, no need to detect it anymore 
add test for Bug #64159
bump default buffer size for values(32->512): do not reallocate buffers in 99% cases
 2013-05-03 23:06:34 +04:00
Boris Lytochkin
86fbf51ac1 Merge branch 'master' of https://git.php.net/push/php-src 
* 'master' of https://git.php.net/push/php-src:
  updated NEWS
  updated NEWS
  Fixed bug #64770 stream_select() fails with pipes
 2013-05-03 19:25:33 +04:00
Boris Lytochkin
3a413f216a Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4 
* 'PHP-5.4' of https://git.php.net/push/php-src:
  updated NEWS
  Fixed bug #64770 stream_select() fails with pipes
 2013-05-03 19:24:24 +04:00
Boris Lytochkin
f1269d80c5 Merge branch 'PHP-5.3' of https://git.php.net/push/php-src into PHP-5.3 
* 'PHP-5.3' of https://git.php.net/push/php-src:
  Fixed bug #64770 stream_select() fails with pipes
 2013-05-03 19:23:46 +04:00
Boris Lytochkin
1c8befe893 cut PHP_VERSION_ID - we know API version now 2013-05-03 19:22:21 +04:00
Boris Lytochkin
74ef9b6cea 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:
  updated NEWS
  updated NEWS
  Fixed bug #64770 stream_select() fails with pipes
 2013-05-03 19:10:22 +04:00
Anatol Belski
88c83469b5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #64770 stream_select() fails with pipes
 2013-05-03 17:06:16 +02:00
Anatol Belski
f7830e4f98 updated NEWS 2013-05-03 17:05:54 +02:00
Anatol Belski
6d41711fd9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  Fixed bug #64770 stream_select() fails with pipes
 2013-05-03 17:04:53 +02:00