1
0
mirror of https://github.com/php/php-src.git synced 2026-04-05 07:02:33 +02:00
Commit Graph

36514 Commits

Author SHA1 Message Date
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
Anatol Belski
a5e4f1f598 fix several datatype mismatches 2014-10-22 17:56:30 +02:00
Anatol Belski
cccd538512 fix dir separator in test 2014-10-22 17:56:29 +02:00
Anatol Belski
f58edcd996 fix datatype warnings 2014-10-22 17:56:28 +02:00
Anatol Belski
09a01a834e this should be uint32 2014-10-22 17:56:26 +02:00
Anatol Belski
36ce467402 fix datatype mismatches 2014-10-22 17:56:25 +02:00
Anatol Belski
1ea5982d07 fixing datatype mismatches 2014-10-22 17:56:23 +02:00
Anatol Belski
80163b4a2b fix datatype mismatch warnings 2014-10-22 17:56:21 +02:00
Anatol Belski
2a7f9dcf5b fix datatype mismatch and warning 2014-10-22 17:56:20 +02:00
Anatol Belski
944d2c65e1 fix datatype mismatches 2014-10-22 17:56:19 +02:00
Anatol Belski
f37b4cdb8f use zend_bool where zend_long isn't needed
spare at least 24 bytes per globals item on 64 bit
2014-10-22 17:56:18 +02:00
Remi Collet
d8686473c2 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  Fix bug #68224 buffer-overflow in /ext/fileinfo/libmagic/readcdf.c caught by AddressSanitizer
2014-10-22 15:27:54 +02:00
Remi Collet
ef2a2fa3a1 Fix bug #68224 buffer-overflow in /ext/fileinfo/libmagic/readcdf.c caught by AddressSanitizer
Upstream commit
f28fbb947e
2014-10-22 15:24:59 +02:00
Dmitry Stogov
534d854fb2 Embed FETCH_CLASS <string> into the following INSTANCEOF 2014-10-22 17:23:43 +04:00
Xinchen Hui
f03100cb80 Better convert 2014-10-22 17:25:41 +08:00
Xinchen Hui
d53c8bab83 Better zval copying 2014-10-22 17:18:15 +08:00
Xinchen Hui
b6d5e8d8d7 Fixed zval copying 2014-10-22 17:08:35 +08:00
Xinchen Hui
a58e9c4188 Fixed zval copying 2014-10-22 17:07:44 +08:00
Stanley Sufficool
09cf64678a Fix bug #67134 (PDO_DBLIB Missing null string terminator) 2014-10-20 21:44:47 -07:00
Xinchen Hui
baddb1c73a Extra comma 2014-10-21 11:02:15 +08:00
Anatol Belski
7a1a0f39d0 Merge branch 'PHP-5.6'
* PHP-5.6:
  initialize lineno before calling compile file file in phar
  News entry for new curl constants
2014-10-20 15:55:05 +02:00
Anatol Belski
e0b247bc87 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  initialize lineno before calling compile file file in phar
  News entry for new curl constants
2014-10-20 15:54:33 +02:00
Anatol Belski
37d5a2b18f initialize lineno before calling compile file file in phar 2014-10-20 15:53:32 +02:00
Dmitry Stogov
ab539e177e Removed old irrelevant comment 2014-10-20 13:52:28 +04:00
Dmitry Stogov
fb85d0322d Fixed compilation 2014-10-17 19:25:43 +04:00
Dmitry Stogov
7471c21781 Optimized property access handlers. Removed EG(std_property_info). 2014-10-17 19:10:05 +04:00
Matteo Beccati
9935bf7df7 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads)
  News entry for new curl constants
2014-10-17 16:48:58 +02:00
Matteo Beccati
8c5e2e66bc Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads) 2014-10-17 16:22:52 +02:00
Dmitry Stogov
35dc0a2e30 array_pop/array_shift optimization 2014-10-17 12:30:27 +04:00
Anatol Belski
1f6bd98143 check for zlib headers as well as lib for mysqlnd 2014-10-17 10:09:40 +02:00
Anatol Belski
35d703d00a a realpath cache key can be int or float, catching this 2014-10-17 10:09:39 +02:00
Rasmus Lerdorf
2a8f7f8824 Merge branch 'PHP-5.6'
* PHP-5.6:
  TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
2014-10-16 21:28:49 -07:00
Rasmus Lerdorf
5606466624 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
2014-10-16 21:28:20 -07:00
Rasmus Lerdorf
2b5bffe6c7 TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247 2014-10-16 21:25:29 -07:00
Nikita Popov
fc6ce7d1c1 Fix array_keys() on $GLOBALS 2014-10-16 14:44:35 +02:00
Nikita Popov
cf5920e8aa Fix procedural finfo calls in methods
getThis() will return the $this of the calling method.
2014-10-16 14:24:23 +02:00