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
e70dce7d99
fix datatype mismatch
2014-10-23 10:29:57 +02:00
Anatol Belski
53797ec1c9
move the more common case up
2014-10-23 10:29:56 +02:00
Anatol Belski
e91b669e23
catch up with the latest key length change
2014-10-23 10:29:55 +02:00
Anatol Belski
f227922446
move key lengths to use size_t as zend_string is used internally anyway
2014-10-23 10:29:54 +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
Dmitry Stogov
8793aa407e
Optimized HashTable size calculation
2014-10-23 00:26:32 +04: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
Dmitry Stogov
8dedd863bc
Get rid of ZEND_FETCH_MAKE_REF
2014-10-22 21:45:02 +04:00
Anatol Belski
d5ccf4d276
eliminate one branch when computing the initial table size
2014-10-22 19:23:29 +02: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
f59daf2104
micro optimized initial hash size calculation
...
most of the calls are with a size <= 8, so don't even bother any
bitshifts. For the bigger sizes, use an intrinsic (should be extended
with gcc ones though).
2014-10-22 17:56:24 +02:00
Anatol Belski
1ea5982d07
fixing datatype mismatches
2014-10-22 17:56:23 +02:00
Anatol Belski
5e24ae321d
all the key_len use uint, fix the warning when using strlen on 64 bit
2014-10-22 17:56:22 +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
Anatol Belski
7959e3faf2
fix datatype mismatches for strings from userspace
2014-10-22 17:56:17 +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
411984c0e9
NEWS
2014-10-22 15:27:21 +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
Dmitry Stogov
779ca61e32
Don't use opline->extended_value for FETCH_CLASS flags where it's unnecessary
2014-10-22 17:22:21 +04:00
Dmitry Stogov
36fa572aaa
ZEND_RECV didn't really use opline->extended_value for FETCH_CLASS flags
2014-10-22 15:22:30 +04:00
Xinchen Hui
c584798b05
Useless assignment
2014-10-22 17:30:19 +08: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
Dmitry Stogov
fe8577efb1
Optimized ASSIGN_DIM and related opcodes
2014-10-21 19:30:43 +04:00
Dmitry Stogov
33645f4f55
micro optimization
2014-10-21 16:18:06 +04:00