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
Ferenc Kovacs
c03b6e1701
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
Fixed Bug #65171 imagescale() fails
Revert "Bug #41631 : Observe socket read timeouts in SSL streams"
2014-10-15 19:43:30 +02:00
Ferenc Kovacs
cfa1028d7e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed Bug #65171 imagescale() fails
Revert "Bug #41631 : Observe socket read timeouts in SSL streams"
Conflicts:
ext/openssl/xp_ssl.c
2014-10-15 19:42:51 +02:00
Ferenc Kovacs
d2ab6e1d15
Merge branch 'PHP-5.6'
...
* PHP-5.6:
removing the NEWS entry as we had to revert this fix for now
Revert "Merge branch 'PHP-5.5' into PHP-5.6"
Revert "fix TS build"
Revert "Merge branch 'PHP-5.4' into PHP-5.5"
Revert "Bug #67965 : Fix blocking behavior in non-blocking crypto streams"
Revert "Bug #41631 : Fix regression from first attempt (6569db8
2014-10-15 19:41:27 +02:00
Ferenc Kovacs
feadaaed56
Revert "Merge branch 'PHP-5.5' into PHP-5.6"
...
This reverts commit 98e67add152cdc1a2b74
2014-10-15 19:34:07 +02:00
Ferenc Kovacs
4fb998d42f
Revert "fix TS build"
...
This reverts commit 84a4041ba4
2014-10-15 19:33:47 +02:00
Ferenc Kovacs
7b8222aa44
Revert "Merge branch 'PHP-5.4' into PHP-5.5"
...
This reverts commit 30a73658c67fac56e072
2014-10-15 19:33:31 +02:00
Ferenc Kovacs
528e4166a6
Revert "Bug #67965 : Fix blocking behavior in non-blocking crypto streams"
...
This reverts commit f86b2193a4
2014-10-15 19:32:46 +02:00
Ferenc Kovacs
ff91a48f6e
Revert "Bug #41631 : Fix regression from first attempt ( 6569db8)"
...
This reverts commit 372844918a
2014-10-15 19:32:14 +02:00
Remi Collet
2728e6f017
Fixed Bug #65171 imagescale() fails
...
Third param (height) is set as optional,
but default value = -1 is incorrect
Compute correct height to preserve ratio.
2014-10-15 19:13:25 +02:00
Tjerk Meesters
7e116a3baa
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #68234
2014-10-15 21:13:13 +08:00
