Commit graph

36549 commits

Author SHA1 Message Date
Derick Rethans
9e62255c62 Merge branch 'PHP-5.6' 2014-10-26 11:07:48 -04:00
Derick Rethans
25e3560546 Merge branch 'PHP-5.5' into PHP-5.6 2014-10-26 10:54:09 -04:00
Derick Rethans
22b9f16e9a - Updated to version 2014.9 (2014i) 2014-10-26 10:54:07 -04:00
Anatol Belski
71a653452f updated libmagic.patch in master 2014-10-25 12:06:17 +02:00
Anatol Belski
7e5bd4ec69 updated libmagic.patch in 5.6 2014-10-25 12:03:49 +02:00
Anatol Belski
270df3ffd6 updated libmagic.patch in 5.5 2014-10-25 12:01:58 +02:00
Remi Collet
1fbc93512f Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
2014-10-25 11:31:54 +02:00
Remi Collet
cefa310cf9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
2014-10-25 11:30:29 +02:00
Remi Collet
5b295bf191 Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
Upstream commit
39c7ac1106

CVE -2014-3710

(cherry picked from commit 1803228597)
2014-10-25 11:29:16 +02:00
STANLEY SUFFICOOL
f35e6a8394 Update PDO_DBLIB README file 2014-10-24 20:30:18 -07:00
STANLEY SUFFICOOL
a1a18fca6e Fixed Bug #52885 - PDO_DBLIB: Binary data may be truncated
Data containing characters in conflict with the server
codepage or containing null char will throw an error.
Implement binary quoting to allow binding of binary values.
2014-10-24 20:10:04 -07:00
Anatol Belski
0a5b7d1316 refix the broken place
typecast from signed to unsigned of a bigger size
2014-10-25 02:13:44 +02:00
Anatol Belski
010f4b7979 fix infinite loop 2014-10-25 00:32:45 +02:00
Anatol Belski
2af99b1866 fix datatype mismatch warnings 2014-10-24 20:50:03 +02:00
Anatol Belski
9ccc3a0c3c fix datatype mismatch warning 2014-10-24 20:50:02 +02:00
Anatol Belski
ff02a1416e fix datatype mismatches 2014-10-24 20:50:01 +02:00
Anatol Belski
4cb58a3936 fix datatype mismatch warnings 2014-10-24 20:50:00 +02:00
Anatol Belski
53560ca06b rework the previous fix for var names with size_t, no ugly casts anymore 2014-10-23 16:50:35 +02:00
Anatol Belski
4fa92438f4 fix datatype mismatches 2014-10-23 16:38:25 +02:00
Anatol Belski
5b9f3a24d6 fix datatype mismatch 2014-10-23 16:31:19 +02:00
Anatol Belski
99e236e3cc fix datatype mismatches 2014-10-23 16:29:02 +02:00
Anatol Belski
744c19eed8 fix datatype mismatches 2014-10-23 16:22:20 +02:00
Anatol Belski
df6aff48a6 fix pack64.phpt related fail on win64 2014-10-23 15:47:47 +02:00
Anatol Belski
f375b530bb fix datatype mismatches 2014-10-23 15:47:46 +02:00
Anatol Belski
4f9bb66e99 fix datatype mismatch 2014-10-23 15:47:45 +02:00
Anatol Belski
29b43af072 exhaust zend_long/size_t potential in levenstein 2014-10-23 15:47:44 +02:00
Anatol Belski
88ca46d92b fix datatype mismatches 2014-10-23 11:45:44 +02:00
Anatol Belski
f010efc924 fix datatype mismatches 2014-10-23 11:36:34 +02:00
Anatol Belski
91652cf3c7 fix datatype mismatches 2014-10-23 11:05:47 +02:00
Anatol Belski
451065a434 fix datatype mismatches 2014-10-23 10:30:05 +02:00
Anatol Belski
0413a6e7a3 fix datatype mismatches 2014-10-23 10:30:04 +02:00
Anatol Belski
c448023bd0 fix datatype mismatches 2014-10-23 10:30:03 +02:00
Anatol Belski
a61f6ab737 fix datatype mismatches 2014-10-23 10:30:02 +02:00
Anatol Belski
50cc4abbf7 fix datatype mismatch 2014-10-23 10:30:00 +02:00
Anatol Belski
303973f076 fix datatype mismatches 2014-10-23 10:29:59 +02:00
Anatol Belski
ddaae1a02c fix datatype mismatch 2014-10-23 10:29:58 +02:00
Anatol Belski
e91b669e23 catch up with the latest key length change 2014-10-23 10:29:55 +02:00
Dmitry Stogov
4fd435abab Embed FETCH_CLASS <string> into the following NEW 2014-10-23 11:52:34 +04:00
STANLEY SUFFICOOL
0282546111 Implement Bug #66063 - pdo_dblib enable timeout parameter 2014-10-22 23:14:23 -07:00
Stanley Sufficool
5ba114e0a6 Merge branch 'master' of https://git.php.net/push/php-src 2014-10-22 20:14:58 -07:00
Stanley Sufficool
83144a7281 Fixed bug #64511 - pdo_dblib segfaults or leaks on nextRowset() 2014-10-22 20:13:22 -07:00
Anatol Belski
958c6d1c5d fix datatype mismatch warning 2014-10-22 20:46:35 +02:00
Anatol Belski
afb65adefa fix datatype mismatches 2014-10-22 20:46:34 +02:00
Anatol Belski
0565a29e4d fix datatype mismatches 2014-10-22 20:46:33 +02:00
Anatol Belski
58b8227240 fix assert, zero diff would be valid, too 2014-10-22 20:46:32 +02:00
Anatol Belski
5b4b0f8368 fix datatype mismatch warning 2014-10-22 20:46:31 +02:00
Anatol Belski
1a727e519b fix datatype mismatch warnings 2014-10-22 20:46:30 +02:00
Anatol Belski
b80853d942 fix datatype mismatches 2014-10-22 20:46:29 +02:00
Dmitry Stogov
62e3998dae Removed useless code 2014-10-22 22:32:06 +04:00
Anatol Belski
9a969fdd3b fix datatype 2014-10-22 17:56:31 +02:00