clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 23:36:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,614 Commits 494 Branches 1,367 Tags 809 MiB
458f02c471
Commit Graph

31860 Commits

Author SHA1 Message Date
Dmitry Stogov
458f02c471 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed crash during search in empty persistent HashTable
 2013-05-29 00:01:35 +04:00
Dmitry Stogov
6008ac8e32 Fixed crash during search in empty persistent HashTable 2013-05-28 23:45:36 +04:00
Pierre Joye
8059ec1832 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix #64898imagerotate is broken with bilinear interpolation
 2013-05-27 09:22:00 +02:00
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
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