clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 07:46:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,781 Commits 494 Branches 1,367 Tags 810 MiB
c90e95baf6
Commit Graph

31956 Commits

Author SHA1 Message Date
Pierre Joye
533e636a62 php_stream_fopen_tmpfile may file, causing any following stream usage to crash 2013-05-14 09:20:53 +02:00
Anatol Belski
65fda25024 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix heap overflow warnings on win x64 debug crt
 2013-05-13 14:27:12 +02:00
Anatol Belski
e191cb63ba Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix heap overflow warnings on win x64 debug crt
 2013-05-13 14:26:50 +02:00
Anatol Belski
156576fcce Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix heap overflow warnings on win x64 debug crt
 2013-05-13 14:25:25 +02:00
Anatol Belski
fe21accfb4 fix heap overflow warnings on win x64 debug crt 2013-05-13 14:24:21 +02:00
Anatol Belski
39d48c4bfa Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #64825 Invalid free unserializing DateTimeZone
 2013-05-12 21:30:21 +02:00
Anatol Belski
e44849b0f4 Fixed bug #64825 Invalid free unserializing DateTimeZone 2013-05-12 21:29:16 +02:00
Anatol Belski
cf72450c88 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fixed variable corruption under win x64
 2013-05-11 02:48:24 +02:00
Anatol Belski
95ea1e7ca7 fixed variable corruption under win x64 2013-05-11 02:47:48 +02:00
Xinchen Hui
b3f6cc20e0 Merge branch 'PHP-5.4' into PHP-5.5 2013-05-09 15:57:44 +08:00
Xinchen Hui
699dc04c55 Missed SKIPIF 2013-05-09 15:57:25 +08:00
Gustavo Lopes
8687332e08 Fix bug #64506: fix build with --disable-ipv6 2013-05-08 19:58:27 +02:00
Anatol Belski
4091e94660 Fixed bug #64769 mbstring PHPTs crash on Windows x64 
The tricky business going there in oniguruma is saving a pointer
in an int variable, passing that variable into a function and making
it a pointer again. On 64bit windows casting a pointer to a 32 bit
int will truncate that pointer. This kind of things won't work on
Windows x64.

[SNIPPET]
unsigned long ul0[2], ul1, *ul2;

ul0[0] = 42uL;
ul0[0] = 24uL;

ul1 = (unsigned long)ul0;
ul2 = (unsigned long *)ul1;

/* now it's broken, accessing ul2[0] will crash. */
[/SNIPPET]

To make it portable, ULONG_PTR should be used in this case.

In oniguruma this behaviour is to see at least in the following
codepath:

ext/mbstring/oniguruma/enc/unicode.c:10938
ext/mbstring/oniguruma/st.c:308
ext/mbstring/oniguruma/enc/unicode.c:10859
 2013-05-08 19:22:37 +02:00
Remi Collet
36eee5b994 Fixed bug #64785 : restore 5.4 behaviour, libpng is mandatory 2013-05-08 07:37:40 +02:00
jas-
525e27e1e5 Fix for challenge string length pointed out by Kalle Nielsen 2013-05-06 18:43:13 -06:00
jas-
8f56ac8401 Address feature request #38917 for native SPKAC (HTML5 keygen element) support 2013-05-06 16:36:06 -06:00
Xinchen Hui
da07e91c3a Merge branch 'PHP-5.5' 2013-05-09 15:57:56 +08:00
Gustavo Lopes
ab38bf1931 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix bug #64506: fix build with --disable-ipv6
 2013-05-08 19:57:23 +02:00
Gustavo Lopes
6f3c3862ca Fix bug #64506: fix build with --disable-ipv6 2013-05-08 19:56:40 +02:00
Anatol Belski
5490fe2402 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #64769 mbstring PHPTs crash on Windows x64
 2013-05-08 19:18:00 +02:00
Anatol Belski
d2a784baa6 Fixed bug #64769 mbstring PHPTs crash on Windows x64 
The tricky business going there in oniguruma is saving a pointer
in an int variable, passing that variable into a function and making
it a pointer again. On 64bit windows casting a pointer to a 32 bit
int will truncate that pointer. This kind of things won't work on
Windows x64.

[SNIPPET]
unsigned long ul0[2], ul1, *ul2;

ul0[0] = 42uL;
ul0[0] = 24uL;

ul1 = (unsigned long)ul0;
ul2 = (unsigned long *)ul1;

/* now it's broken, accessing ul2[0] will crash. */
[/SNIPPET]

To make it portable, ULONG_PTR should be used in this case.

In oniguruma this behaviour is to see at least in the following
codepath:

ext/mbstring/oniguruma/enc/unicode.c:10938
ext/mbstring/oniguruma/st.c:308
ext/mbstring/oniguruma/enc/unicode.c:10859
 2013-05-08 18:58:32 +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
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
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
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
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
1c8befe893 cut PHP_VERSION_ID - we know API version now 2013-05-03 19:22:21 +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
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
Anatol Belski
aa4762572e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #64770 stream_select() fails with pipes
 2013-05-03 17:03:16 +02:00
Anatol Belski
b1ea0b7a7a Fixed bug #64770 stream_select() fails with pipes 
returned by proc_open() on Windows x64
 2013-05-03 17:01:33 +02:00
Boris Lytochkin
cdba4ee320 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #64159 (Truncated snmpget)
  Fixed bug #64159 (Truncated snmpget)
 2013-05-03 15:47:29 +04:00
Boris Lytochkin
c68f9d5503 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64159 (Truncated snmpget)
 2013-05-03 15:39:57 +04:00
Boris Lytochkin
e36adfe94a Fixed bug #64159 (Truncated snmpget) 2013-05-03 15:35:09 +04:00
Boris Lytochkin
1e5bcd4cf5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  update NEWS
  update NEWS
  Fix bug #64765 (enclose IPv6 address into square brackets)
 2013-05-03 12:26:16 +04:00
Boris Lytochkin
1ce836580d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update NEWS
  Fix bug #64765 (enclose IPv6 address into square brackets)
 2013-05-03 12:19:10 +04:00
Boris Lytochkin
3828f6227b Fix bug #64765 (enclose IPv6 address into square brackets) 2013-05-03 12:13:50 +04:00
Sara Golemon
e836f8e38f Oops 2013-04-30 19:43:52 -07:00
Sara Golemon
e217db8e69 Harden loopback tests 
These tests depend on being able to bind port 31337.
Try a range of ports until one binds or we give up trying.
 2013-04-30 19:30:55 -07:00
Sara Golemon
6aefaad46e Fix race condition when ext/hash/tests run in parallel 2013-04-30 16:28:37 -07:00
Johannes Schlüter
bfb787b16f Merge branch 'PHP-5.5' 2013-04-30 14:28:18 +02:00
Johannes Schlüter
062519ed41 don't include smart_str.h in a too global header, fixes #64718 2013-04-30 14:26:55 +02:00
Dmitry Stogov
13de57c0f4 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  fix #64738, fix implicit type declaration
 2013-04-30 10:27:24 +04:00
Dmitry Stogov
4558533ef3 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  fix #64738, fix implicit type declaration
 2013-04-30 10:26:57 +04:00
Dmitry Stogov
a9679227cf Merge branch 'PHP-5.5' 
* PHP-5.5:
  Added SoapClient constructor option 'ssl_method' to specify ssl method
 2013-04-30 10:26:29 +04:00
Dmitry Stogov
c782cf7fb3 Added SoapClient constructor option 'ssl_method' to specify ssl method 2013-04-30 10:24:49 +04:00
Pierre Joye
fc666bdb83 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix #64738, fix implicit type declaration
 2013-04-30 08:03:46 +02:00
Pierre Joye
83682d8833 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-30 08:01:52 +02:00
Pierre Joye
1a335d20a8 fix #64738, fix implicit type declaration 2013-04-30 07:52:40 +02:00
Dmitry Stogov
05a88447ad Merge branch 'PHP-5.5' 
* PHP-5.5:
  Avoid possible conditional jump depended on uninitialised value
 2013-04-29 10:46:54 +04:00
Dmitry Stogov
4b83f4a011 Avoid possible conditional jump depended on uninitialised value 2013-04-29 10:45:31 +04:00
Dmitry Stogov
3f48e8765d Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed compilation warnings (issue #92)
 2013-04-29 10:32:50 +04:00
Dmitry Stogov
a5b4eeb5f0 Fixed compilation warnings (issue #92) 2013-04-29 10:32:08 +04:00
Stanislav Malyshev
4e773c1b92 Revert "Add CURL_WRAPPERS_ENABLE constant" 
This reverts commit d7f709a032.
Since wrappers are deleted from 5.5, no point in adding this constant.
 2013-04-28 22:26:05 -07:00
Pierre Joye
9877773438 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-27 18:00:02 +02:00
Pierre Joye
03ab53b213 Merge branch 'master' of git.php.net:php-src 2013-04-27 17:59:40 +02:00
Pierre Joye
eaec5522ff Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix #64725, wrong res check
 2013-04-27 17:52:38 +02:00
Pierre Joye
25c9f34c9c fix #64725, wrong res check 2013-04-27 17:52:30 +02:00
Xinchen Hui
24a26df1f8 Merge branch 'PHP-5.5' 2013-04-27 23:50:29 +08:00
Xinchen Hui
e60638faca Merge branch 'PHP-5.4' into PHP-5.5 2013-04-27 23:50:23 +08:00
Xinchen Hui
7b9eabaf51 Merge branch 'PHP-5.3' into PHP-5.4 2013-04-27 23:50:02 +08:00
Xinchen Hui
15b554cd9b Also fixed bug #64726 in 5.3 2013-04-27 23:49:43 +08:00
Xinchen Hui
9555531eea Merge branch 'PHP-5.5' 2013-04-27 23:42:34 +08:00
Xinchen Hui
1c07590ed7 Merge branch 'PHP-5.4' into PHP-5.5 2013-04-27 23:41:51 +08:00
Xinchen Hui
8f5a534b21 Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB pointer has closed) 2013-04-27 23:41:31 +08:00
Xinchen Hui
d54432ed98 Merge branch 'PHP-5.3' into PHP-5.4 2013-04-27 23:38:10 +08:00
Xinchen Hui
c7b8368ed5 Fix memory realted to #64726 2013-04-27 23:38:00 +08:00
Anatol Belski
35364cd71d Merge branch 'PHP-5.5' 
* PHP-5.5:
  updated libmagic.patch
 2013-04-27 14:10:09 +02:00
Anatol Belski
ca148c030f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated libmagic.patch
 2013-04-27 14:09:55 +02:00
Anatol Belski
e9b03c412b updated libmagic.patch 2013-04-27 14:09:29 +02:00
Anatol Belski
232f5d0306 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug bug #64713 Compilation warnings in finfo
 2013-04-27 13:51:31 +02:00
Anatol Belski
d72307f1ca Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug bug #64713 Compilation warnings in finfo
 2013-04-27 13:51:12 +02:00
Anatol Belski
cdc1a63790 Fixed bug bug #64713 Compilation warnings in finfo 2013-04-27 13:49:50 +02:00
David Soria Parra
e0e18a2b1d Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix implicit declaration warning for cdf_timestamp_to_timespec
  Fix #64711 ("value computed but not used" in parse_date.c)
  Fix implicit uint* to int* conversion warning
  Fix conversion from unsigned char to char
  Fix #64712 (Obsolete declarations in php_date.c)
 2013-04-26 12:41:08 +02:00
David Soria Parra
cf5d7d9e73 Fix implicit declaration warning for cdf_timestamp_to_timespec 2013-04-26 12:28:58 +02:00
David Soria Parra
b86c85723e Fix #64711 ("value computed but not used" in parse_date.c) 2013-04-26 11:33:54 +02:00
David Soria Parra
75cec90d8c Fix #64712 (Obsolete declarations in php_date.c) 2013-04-26 10:45:08 +02:00
Pierre Joye
bba7f8aa31 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - #64710, check return val
  - #64710, kill unused var
  #64710, kill unused vars
  #64710, kill unused vars
  #64710, kill unused vars
  #64710, kill unused vars
  #64710, kill unused vars
  #64710, Implicit declaration
 2013-04-26 08:16:02 +02:00
Pierre Joye
2809afa119 - #64710, check return val 2013-04-26 08:15:33 +02:00
Pierre Joye
7bd20354a8 - #64710, kill unused var 2013-04-26 08:15:05 +02:00
Pierre Joye
b0afef2d5e #64710, kill unused vars 2013-04-26 08:10:24 +02:00
Pierre Joye
685a6d9aab #64710, kill unused vars 2013-04-26 08:09:19 +02:00
Pierre Joye
7b06189702 #64710, kill unused vars 2013-04-26 08:08:38 +02:00
Pierre Joye
3fffc78ed0 #64710, kill unused vars 2013-04-26 08:07:47 +02:00
Pierre Joye
b5902b6c9d #64710, kill unused vars 2013-04-26 08:06:34 +02:00
Pierre Joye
afe46d4d47 #64710, Implicit declaration 2013-04-26 07:48:11 +02:00
Matt Ficken
67a72ceb93 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix Test Bug #64714
 2013-04-25 11:37:36 -07:00
Matt Ficken
7d0dd957eb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix Test Bug #64714
 2013-04-25 11:37:25 -07:00
Matt Ficken
5adf1be45d Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix Test Bug #64714
 2013-04-25 11:37:09 -07:00
Matt Ficken
bf5506f511 Fix Test Bug #64714 2013-04-25 11:34:57 -07:00
David Soria Parra
e04baf692a Fix curl build on windows 2013-04-25 08:04:30 +02:00
Remi Collet
182fef46a9 Fixed bug #64707 missing declaration after dd0399f 2013-04-25 06:40:55 +02:00
Remi Collet
26bd2cba81 gd: missing headers in previous 2013-04-24 16:15:42 +02:00
Remi Collet
3a8ceed844 allow use of gdImageCreateFromJpegEx with system libgd 2013-04-24 16:15:11 +02:00
Remi Collet
dd0399f5c6 We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex 
The new (Ex) functions are used with the new ignore_warning parameter

The standard functions are used in _php_image_create_from_string,
sent as a function pointer, and call without this optional parameter.
 2013-04-24 16:07:50 +02:00
Remi Collet
7189cc5be8 gd: fix proto comment 2013-04-24 14:44:20 +02:00
Anatol Belski
eb4065b9e1 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-24 14:36:57 +02:00
Remi Collet
aa4b0af20f gd: provide imageflip with system libgd when available 2013-04-24 14:32:03 +02:00
Anatol Belski
8d41f6dab6 Removed fork of ext/zlib/tests/bug_52944.phpt 
The real issue is a bug in asm zlib build, reported here
https://github.com/madler/zlib/issues/41 . Non ASM builds
behave more predictable.
 2013-04-24 14:31:59 +02:00
ptarjan
22f6b6dbec Fix zlib/tests/gzseek to create unique temporary files 
When running tests in parallel these create a race condition.
Race conditions are bad.
 2013-04-24 01:06:55 -07:00
David Soria Parra
4c0746228d Merge branch 'PHP-5.5' 
* PHP-5.5:
  NEWS for RC1
  NEWS for PHP 5.5.0 Beta 4 again
  Fix curl build on windows
 2013-04-25 08:25:10 +02:00
Remi Collet
b0cf340eef Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #64707 missing declaration after dd0399f
 2013-04-25 06:41:01 +02:00
Remi Collet
e12abebf50 Merge branch 'PHP-5.5' 
* PHP-5.5:
  gd: missing headers in previous
  allow use of gdImageCreateFromJpegEx with system libgd
 2013-04-24 16:16:25 +02:00
Remi Collet
5897696a02 Merge branch 'PHP-5.5' 
* PHP-5.5:
  We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex
  gd: fix proto comment
 2013-04-24 16:11:34 +02:00
Remi Collet
7264179eef gd: fix proto comment 2013-04-24 14:43:59 +02:00
Anatol Belski
d07b7c2fc0 Merge branch 'master' of git.php.net:php-src 2013-04-24 14:36:41 +02:00
Anatol Belski
fba7c8491b Merge branch 'PHP-5.5' 
* PHP-5.5:
  Removed fork of ext/zlib/tests/bug_52944.phpt
 2013-04-24 14:35:34 +02:00
Remi Collet
1d72ea493d Merge branch 'PHP-5.5' 
* PHP-5.5:
  gd: provide imageflip with system libgd when available
 2013-04-24 14:32:09 +02:00
Stanislav Malyshev
84e5c8a0e2 update credits 2013-04-23 22:02:57 -07:00
Stanislav Malyshev
50800356af Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix bug #64458 (dns_get_record result with string of length -1)
 2013-04-23 21:46:27 -07:00
Stanislav Malyshev
5e24a6e74d Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #64458 (dns_get_record result with string of length -1)
 2013-04-23 21:45:49 -07:00
Stanislav Malyshev
2a15aed399 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #64458 (dns_get_record result with string of length -1)
 2013-04-23 21:45:10 -07:00
Stanislav Malyshev
f87d2ab893 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #64458 (dns_get_record result with string of length -1)
 2013-04-23 21:43:55 -07:00
Stanislav Malyshev
18fdab5a09 Fix bug #64458 (dns_get_record result with string of length -1) 2013-04-23 21:43:35 -07:00
Pierrick Charron
74394733ed Merge branch 'PHP-5.5' 
* PHP-5.5:
  Remove curl wrappers
 2013-04-23 17:01:50 -04:00
Pierrick Charron
b79e65f268 Remove curl wrappers 2013-04-23 17:01:17 -04:00
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
Sara Golemon
231e2d762a Merge branch 'PHP-5.5' 
* PHP-5.5:
  array_column() - Use entire subject array when NULL passed for second param.
 2013-04-22 16:20:41 -07:00
Sara Golemon
734e165d4e array_column() - Use entire subject array when NULL passed for second param. 
This starts to look like array_values(), except that you can reindex the arrays
using the third parameter.
 2013-04-22 16:19:21 -07:00
Sara Golemon
35df484b5b Merge branch 'PHP-5.5' 
* PHP-5.5:
  Allow array_column() to take -1 as a valid value in third param
 2013-04-22 15:55:38 -07:00
Sara Golemon
1a03bd5dee Allow array_column() to take -1 as a valid value in third param 
Also do some cleanup and simplification to make this code more
readable in the long term.
 2013-04-22 15:54:21 -07:00
Sara Golemon
caff01e751 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Harden array_column_basic.phpt against resource renumbering.
 2013-04-22 13:37:36 -07:00
Sara Golemon
f63db963c4 Harden array_column_basic.phpt against resource renumbering. 
We don't care what resource number it is, so long as there's a
stream resource returned.
 2013-04-22 13:36:40 -07:00
Anatol Belski
8febe2ad08 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed stream_socket_pair() on Windows x64 and
 2013-04-22 18:59:11 +02:00
Anatol Belski
f082d6311b Fixed stream_socket_pair() on Windows x64 and 
improved errorhandling in the socketpair() implementation.
 2013-04-22 18:55:32 +02:00
Derick Rethans
0b2c411323 Merge branch 'PHP-5.3' into PHP-5.4 2013-04-22 17:51:43 +01:00
Derick Rethans
70b67f2e50 - Updated to version 2013.3 (2013c) 2013-04-22 17:51:41 +01:00
Sara Golemon
70c700cf8c Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix handling of double keys in array_column
 2013-04-21 23:33:20 -07:00
Anatol Belski
8645309c4e Merge branch 'PHP-5.5' 
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed stream_socket_pair() on Windows x64 and
 2013-04-22 19:01:07 +02:00
Anatol Belski
f578bb0388 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  Fixed stream_socket_pair() on Windows x64 and
 2013-04-22 19:00:13 +02:00
Derick Rethans
cf0d902a84 Merge branch 'PHP-5.5' 2013-04-22 17:51:50 +01:00
Derick Rethans
0720804e7c Merge branch 'PHP-5.4' into PHP-5.5 2013-04-22 17:51:47 +01: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
Sara Golemon
7b34324f84 Fix handling of double keys in array_column 
Also fix resource test to not localize __FILE__ to cwd.
 2013-04-21 22:35:04 -07:00
Xinchen Hui
b02241b968 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2013-04-21 11:11:02 +08:00
Xinchen Hui
32490673b9 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-21 11:10:41 +08:00
Xinchen Hui
6b1928ba0b Merge branch 'PHP-5.4' into PHP-5.5 2013-04-21 11:09:18 +08:00
Antonio Diaz Ruiz
92bbe6be72 Includes 5 new phpTests to check that the error message DOM_NOT_FOUND is properly raised by the method DOMNode::insertBefore(newNode, [refNode]). 
Each file covers a different test case

    DOMNode_insertBefore_error2.phpt: refNode is a sibling of the node where newNode wanted to be inserted.
    DOMNode_insertBefore_error3.phpt: refNode is the parent of the node where newNode wanted to be inserted.
    DOMNode_insertBefore_error4.phpt: refNode is a brand new node.
    DOMNode_insertBefore_error5.phpt: refNode is a descendant (not child) of the node where newNode wanted to be inserted.
    DOMNode_insertBefore_error6.phpt: refNode is the node where newNode wanted to be inserted.
 2013-04-21 11:05:59 +08:00
Xinchen Hui
0c1ef6898d Merge branch 'master' of https://github.com/dejalatele/php-src 2013-04-21 11:04:27 +08:00
Pierre Joye
3cc81d151d Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-20 18:24:04 +02:00
Pierre Joye
d818fdcc47 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix x64 opcache, still uses fugly fixed addresses, see TODO entry for explanaton
 2013-04-20 18:23:21 +02:00
Pierre Joye
14d9f3450b fix x64 opcache, still uses fugly fixed addresses, see TODO entry for explanaton 2013-04-20 18:22:39 +02:00
Antonio Diaz Ruiz
9bf80bc294 Includes 5 new phpTests to check that the error message DOM_NOT_FOUND is properly raised by the method DOMNode::insertBefore(newNode, [refNode]). 
Each file covers a different test case

    DOMNode_insertBefore_error2.phpt: refNode is a sibling of the node where newNode wanted to be inserted.
    DOMNode_insertBefore_error3.phpt: refNode is the parent of the node where newNode wanted to be inserted.
    DOMNode_insertBefore_error4.phpt: refNode is a brand new node.
    DOMNode_insertBefore_error5.phpt: refNode is a descendant (not child) of the node where newNode wanted to be inserted.
    DOMNode_insertBefore_error6.phpt: refNode is the node where newNode wanted to be inserted.
 2013-04-20 16:28:46 +02:00
Dmitry Stogov
1fe5ee4d6a Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed 5.2 ZTS build
 2013-04-19 21:44:00 +04:00
Dmitry Stogov
c7cf9b68b6 Fixed 5.2 ZTS build 2013-04-19 21:37:24 +04:00
Andrey Hristov
6ce68583be Merge branch 'PHP-5.5' 2013-04-19 16:47:47 +02:00
Andrey Hristov
7b7424c34c Merge branch 'PHP-5.4' into PHP-5.5 2013-04-19 16:29:53 +02:00
Andrey Hristov
39cc08c7e9 Merge branch 'PHP-5.3' into PHP-5.4 2013-04-19 15:55:46 +02:00
Andrey Hristov
0802961bd1 lower the limit, should fit in a byte 2013-04-19 15:54:35 +02:00
Xinchen Hui
676e737f5b Fix other typos & add test script 2013-04-19 11:21:44 +08:00
Xinchen Hui
580d6fe94d Fix typo 2013-04-19 10:55:11 +08:00
Felipe Pena
1192cfa58c - Fixed ZTS build 2013-04-18 19:27:02 -03:00
Dmitry Stogov
3735d96ce0 Disable FCALL optimization pass for PHP older than 5.4 
Added an optimization pass to convert FCALL_BY_NAME into DO_FCALL.
 2013-04-18 22:26:37 +04:00
Dmitry Stogov
60a59d27b4 Disable FCALL optimization pass for PHP older than 5.4 2013-04-18 22:22:48 +04:00
Dmitry Stogov
edfeab8bf2 Added an optimization pass to convert FCALL_BY_NAME into DO_FCALL. 2013-04-18 22:12:31 +04:00
Dmitry Stogov
7deb3d41eb Merge branch 'PHP-5.5' into PHP-5.5-opcache 
* PHP-5.5:
  Fixed compiler warning "cast from pointer to integer of different size"
 2013-04-18 14:19:17 +04:00
Xinchen Hui
0acdeec743 Merge branch 'PHP-5.5' 2013-04-18 17:33:21 +08:00
Xinchen Hui
0704e4badb Fixed compiler warning "cast from pointer to integer of different size" 2013-04-18 17:32:46 +08:00
Dmitry Stogov
745531b120 Merge identical constants (and related cache_slots) in op_array->literals table. 2013-04-18 10:50:40 +04:00
Dmitry Stogov
2bfb523f45 Merge identical constants (and related cache_slots) in op_array->literals table. 2013-04-18 10:48:16 +04:00
Dmitry Stogov
36d343c0c4 Merge branch 'PHP-5.5' into PHP-5.5-opcache 
* PHP-5.5:
  Initialize literals hash_value and cache_slot
  Added curl config test for windows
  updated lib versions
  updated lib versions
  fixed EOL
  updated lib versions
  allow lcov 1.10
  allow lcov 1.10

Conflicts:
	ext/opcache/Optimizer/zend_optimizer.c
 2013-04-17 21:32:08 +04:00
Dmitry Stogov
bc959fbaff Merge branch 'PHP-5.5' 
* PHP-5.5:
  Initialize literals hash_value and cache_slot

Conflicts:
	ext/opcache/Optimizer/zend_optimizer.c
 2013-04-17 21:27:19 +04:00