46e612ada4
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-03 11:25:29 +08:00
fe5ce5cb91
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-03-03 11:25:08 +08:00
9bda6a25a5
Fix test (skip on unable to create socket)
2013-03-03 11:24:45 +08:00
2413fa6fbb
Fix test after the convert_to_long be improved, see #64290
2013-03-03 11:13:52 +08:00
505c6ca486
Fixed bug #64290 (behavior change of converting to long)
...
convert_to_long behavior has been improved
As Cataphrace said in IRC, the test should be fixed.
2013-03-03 10:59:15 +08:00
f2246f352f
Fixed Bug #64340 (sockets tests failed) Patch by Reeze
...
Add __APPLE_USE_RFC_3542 for OS X 10.7 because IPv6 options are incompatible with RFC 2292.
2013-03-03 10:51:04 +08:00
207d0ee08a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #52861 : unset fails with ArrayObject and deep arrays
2013-02-26 22:13:01 -08:00
7c08232509
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Bug #52861 : unset fails with ArrayObject and deep arrays
2013-02-26 22:12:36 -08:00
61099f8585
Bug #52861 : unset fails with ArrayObject and deep arrays
...
When checking to make into a reference write, readwrite are checked but not unset
2013-02-26 22:11:52 -08:00
e75804c34e
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-24 12:59:10 +08:00
d24ac6953e
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/spl/spl_fixedarray.c
2013-02-24 12:58:39 +08:00
1b58bd39a6
Fixed bug #64264 (SPLFixedArray toArray problem)
2013-02-24 12:55:53 +08:00
59ec22b370
sendrecvmsg_shutdown function moved to mshutdown
...
The function php_socket_sendrecvmsg_shutdown() should have been called in
MSHUTDOWN, not RSHUTDOWN.
Bug only on TSRM builds.
Should fix bug #64287 .
2013-02-24 03:50:38 +01:00
189fbfd53b
Fix ext/sockets build with phpize
...
Fixes bug #64285
2013-02-24 00:49:25 +01:00
97f22702c4
Fix ext/intl build with phpize
...
Fixes bug #64284 .
2013-02-24 00:49:01 +01:00
64a2a8a753
relax the check
2013-02-22 13:50:04 +01:00
1643d4ed56
Add some parameter checks
2013-02-22 13:17:46 +01:00
b479c2bffb
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-21 16:50:59 +01:00
064c62e4cf
Fix #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs)
2013-02-21 16:49:28 +01:00
7b719235b3
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-21 15:10:47 +01:00
1e9bc56775
Merge branch 'PHP-5.3' into PHP-5.4
2013-02-21 15:10:15 +01:00
fcd4b5335a
Fix TSRM (after afc1debb)
2013-02-21 15:08:58 +01:00
8b7222e22f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
PHAR should modify entry timestamp when it's modified
2013-02-21 16:08:07 +04:00
b5d267aa95
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
PHAR should modify entry timestamp when it's modified
2013-02-21 15:57:26 +04:00
7b113d789d
PHAR should modify entry timestamp when it's modified
2013-02-21 15:55:20 +04:00
ead2e1708d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
http-stream test requires network connectivity
2013-02-21 03:22:09 -08:00
c16d6befd4
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
http-stream test requires network connectivity
2013-02-21 03:21:49 -08:00
bc55a8eb9f
http-stream test requires network connectivity
2013-02-21 03:21:23 -08:00
d39554ac08
Merge branch 'bug49348' into PHP-5.5
...
* bug49348:
fix tests
fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
2013-02-21 00:52:46 -08:00
20c623c9be
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed external entity loading
2013-02-20 22:30:59 +04:00
c737b89473
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed external entity loading
Conflicts:
ext/libxml/libxml.c
ext/libxml/php_libxml.h
2013-02-20 22:27:41 +04:00
8e76d0404b
Fixed external entity loading
2013-02-20 22:14:59 +04:00
43664e656d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix the test for curl 7.29.0+
2013-02-19 09:05:27 +01:00
cc34dfce16
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix the test for curl 7.29.0+
2013-02-19 09:04:52 +01:00
558c5dbe65
fix the test for curl 7.29.0+
2013-02-19 09:04:06 +01:00
0c6d903ce7
fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
2013-02-18 20:56:02 -08:00
91538e4e13
Cleanup some multicast code; fix for mac os x?
...
When I moved some stuff from sockets.c to multicast.c, I did not copy
some conditional defines for systems without the RFC 3678 API.
I moved such defines to multicast.h so both sockets.c and multicast.c
can benefit from them and I prefixed them with PHP_ so that it's less
confusing: now PHP_MCAST_* are defined to either the MCAST_* RFC 3678
APIs or to legacy APIs and MCAST_* always mean the (possibly undefined)
system definitions.
2013-02-17 22:42:58 +01:00
17c6389e9e
fix protos
2013-02-17 13:33:48 -08:00
0841eca580
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #61930 : openssl corrupts ssl key resource when using openssl_get_publickey()
2013-02-17 13:29:34 -08:00
7b0107cc5d
fix bug #61930 : openssl corrupts ssl key resource when using openssl_get_publickey()
2013-02-17 13:28:42 -08:00
432d59ab55
fix free vs. curl_free
2013-02-17 20:29:20 +01:00
d3291de51a
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-17 11:06:33 +08:00
263accb626
Merge branch 'PHP-5.3' into PHP-5.4
2013-02-17 11:05:34 +08:00
01ae5c3c2f
Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS)
2013-02-17 11:04:36 +08:00
69b80a93de
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-16 22:29:14 +08:00
375e3c273b
Fix test failed after 0ea83ff847
2013-02-16 22:28:28 +08:00
1bde2b4fc9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Proper bit reset code
2013-02-13 22:07:57 +04:00
4b900f4831
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Proper bit reset code
2013-02-13 22:07:21 +04:00
188c196d4d
Proper bit reset code
2013-02-13 22:06:37 +04:00
5bfdf4f069
build fixes
2013-02-11 12:07:10 +01:00
Xinchen Hui