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,783 Commits 494 Branches 1,367 Tags 810 MiB
8b74d46026
Commit Graph

31958 Commits

Author SHA1 Message Date
Pierre Joye
2f01e06786 fix #64898imagerotate is broken with bilinear interpolation 2013-05-27 09:21:41 +02:00
Anatol Belski
6e081f8a82 Merge branch 'PHP-5.5' 
* PHP-5.5:
  reduced the file size even more
 2013-05-25 00:11:09 +02:00
Anatol Belski
b262787ef9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  reduced the file size even more
 2013-05-25 00:10:49 +02:00
Anatol Belski
bcdac7526d reduced the file size even more 
the first second is what at least has to be
 2013-05-25 00:09:32 +02:00
Anatol Belski
3a3828669f Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #64916 finfo testcase contains copyrighted music.
 2013-05-25 00:02:34 +02:00
Anatol Belski
fbdce3b6f6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64916 finfo testcase contains copyrighted music.
 2013-05-25 00:02:09 +02:00
Anatol Belski
2d386db878 Fixed bug #64916 finfo testcase contains copyrighted music. 
I wasn't able to produce a file causing exactly the same crash.
However the first three seconds of the originally reported
file are  pretty enough to repro bug #64830. That reduces its
size to 72k.
 2013-05-24 23:58:31 +02:00
Remi Collet
c50cef1dc5 Fixed bug #64895 Integer overflow in SndToJewish 2013-05-22 08:30:50 +02:00
Remi Collet
88db679742 Merge branch 'PHP-5.5' 
* PHP-5.5:
  NEWS
  NEWS
  Fixed bug #64895 Integer overflow in SndToJewish
 2013-05-22 08:30:00 +02:00
Remi Collet
d64e8dd7a4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed bug #64895 Integer overflow in SndToJewish
 2013-05-22 08:29:30 +02:00
Remi Collet
73eedaf6f7 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #64895 Integer overflow in SndToJewish
 2013-05-22 08:29:08 +02:00
Remi Collet
fc2a9d6e47 Fixed bug #64895 Integer overflow in SndToJewish 2013-05-22 08:28:05 +02:00
Remi Collet
57b35f1b0d Merge branch 'PHP-5.5' 
* PHP-5.5:
  Integer overflow in SndToJewish leads to php hang AT least in (inputDay is long, metonicCycle is int):    metonicCycle = (inputDay + 310) / 6940;
 2013-05-21 18:09:22 +02:00
Remi Collet
4840ff0f05 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Integer overflow in SndToJewish leads to php hang AT least in (inputDay is long, metonicCycle is int):    metonicCycle = (inputDay + 310) / 6940;
 2013-05-21 18:09:02 +02:00
Remi Collet
646ebc2cb9 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Integer overflow in SndToJewish leads to php hang AT least in (inputDay is long, metonicCycle is int):    metonicCycle = (inputDay + 310) / 6940;
 2013-05-21 18:08:45 +02:00
Remi Collet
4828f7343b Integer overflow in SndToJewish leads to php hang 
AT least in (inputDay is long, metonicCycle is int):
   metonicCycle = (inputDay + 310) / 6940;

So large value give strange (negative) results or php hangs.
This is patch already applied in some linux distro.
 2013-05-21 18:04:17 +02:00
Andrey Hristov
e19b7c2b57 Merge branch 'PHP-5.5' 2013-05-21 13:28:09 +02:00
Andrey Hristov
378a5f9bfe updates 2013-05-21 13:27:45 +02:00
Pierre Joye
9ef6b30dc3 Merge branch 'PHP-5.5' 
* PHP-5.5:
  entry for #64214
  other fix for #64214, unmodified file may not have old fp set, causing other possible crashes
 2013-05-17 11:51:18 +02:00
Pierre Joye
40d5458eff Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  entry for #64214
  other fix for #64214, unmodified file may not have old fp set, causing other possible crashes
 2013-05-17 11:50:52 +02:00
Pierre Joye
b142e8825f Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2013-05-17 11:49:45 +02:00
Pierre Joye
aff65a0346 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  entry for #64214
  other fix for #64214, unmodified file may not have old fp set, causing other possible crashes
 2013-05-17 11:49:33 +02:00
Pierre Joye
3eb1745643 other fix for #64214, unmodified file may not have old fp set, causing other possible crashes 2013-05-17 11:45:13 +02:00
Sara Golemon
cfd1045822 Add optional second arg to unserialize() 
Returns the number of bytes consumed by reference for
streaming unserialization.

Actual unserialization behavior is not modified at all.

The need for this came up while trying to parse SplDoublyLinkedList's
serialization format which uses a non-standard stream of serialized values.
 2013-05-16 15:18:35 -07:00
Anatol Belski
bc656cde04 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed error handling for ext/sockets under win
 2013-05-16 19:29:42 +02:00
Anatol Belski
d565e8f0eb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed error handling for ext/sockets under win
 2013-05-16 19:29:25 +02:00
Anatol Belski
8dec06ea2a Fixed error handling for ext/sockets under win 
WSAGetLastError() must be the very next call after a socket
function had an invalid return. Any function call inbetween
will clear the error information.
 2013-05-16 19:23:31 +02:00
David Soria Parra
c5841f8cb7 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix array_colum segfault
 2013-05-15 14:43:03 +02:00
David Soria Parra
139e9824ad Fix array_colum segfault 
Separate zval to avoid gc from freeing
 2013-05-15 14:42:39 +02:00
Anatol Belski
8fa8591cfa Merge branch 'PHP-5.5' 
* PHP-5.5:
  fixe preprocessor definition
 2013-05-15 14:24:46 +02:00
Anatol Belski
082ee90b9b fixe preprocessor definition 2013-05-15 14:24:21 +02:00
Anatol Belski
d8e44e3d70 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix unitialized vars when sql.safe_mode=1
  more check for php_stream_fopen_tmpfile failure
 2013-05-15 11:17:57 +02:00
Anatol Belski
077b575d51 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix unitialized vars when sql.safe_mode=1
  more check for php_stream_fopen_tmpfile failure
 2013-05-15 11:17:18 +02:00
Anatol Belski
de82e7edf7 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix unitialized vars when sql.safe_mode=1
  more check for php_stream_fopen_tmpfile failure
 2013-05-15 11:14:58 +02:00
Anatol Belski
86db5fb4c2 Fix unitialized vars when sql.safe_mode=1 
which can break the subsequent mysqlnd_connect() call
 2013-05-15 11:12:17 +02:00
Pierre Joye
ba1af29805 more check for php_stream_fopen_tmpfile failure 2013-05-14 16:45:11 +02:00
Andrey Hristov
1f97fde89e Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5 2013-05-14 13:01:18 +02:00
Andrey Hristov
09cc4484a2 Merge branch 'master' of ssh://git.php.net/php-src 2013-05-14 12:57:19 +02:00
Andrey Hristov
47c5ba4c0c Merge branch 'PHP-5.5' 
Conflicts:
	NEWS
 2013-05-14 12:57:02 +02:00
Andrey Hristov
9d2dda9058 Fix for Bug #64394 MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS undeclared when using Connector/C 2013-05-14 11:26:35 +02:00
Anatol Belski
b1480987f9 Merge branch 'PHP-5.5' 
* PHP-5.5:
  updated libmagic.patch after fix for #64830
 2013-05-14 11:16:17 +02:00
Anatol Belski
75ee1a6113 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated libmagic.patch after fix for #64830
 2013-05-14 11:16:01 +02:00
Anatol Belski
1a46a102d9 updated libmagic.patch after fix for #64830 2013-05-14 11:14:37 +02:00
Anatol Belski
8c36156070 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2013-05-14 09:45:02 +02:00
Anatol Belski
ad210f2c10 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-05-14 09:44:48 +02:00
Anatol Belski
4206e2d870 Merge branch 'master' of git.php.net:php-src 2013-05-14 09:44:36 +02:00
Anatol Belski
1f2e0cb8f5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  updated NEWS
  Fixed bug #64830 mimetype detection segfaults on mp3 file
 2013-05-14 09:42:57 +02:00
Anatol Belski
933e01bbac Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64830 mimetype detection segfaults on mp3 file
 2013-05-14 09:41:38 +02:00
Anatol Belski
74555e7c26 Fixed bug #64830 mimetype detection segfaults on mp3 file 2013-05-14 09:40:43 +02:00
Pierre Joye
bb5f8626eb Merge branch 'PHP-5.5' 
* PHP-5.5:
  php_stream_fopen_tmpfile may file, causing any following stream usage to crash
 2013-05-14 09:21:38 +02:00
Pierre Joye
362402d748 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  php_stream_fopen_tmpfile may file, causing any following stream usage to crash
 2013-05-14 09:21:30 +02:00
Pierre Joye
f37c54ab27 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  php_stream_fopen_tmpfile may file, causing any following stream usage to crash
 2013-05-14 09:21:17 +02:00
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