0777a18703
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
NEWS
2013-03-13 14:24:23 +01:00
f1e2edff8b
fix for bug #63530 mysqlnd_stmt::bind_one_parameter uses wrong alloc for stmt->param_bind
2013-03-13 13:37:51 +01:00
a328cc452e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fixed headers order
2013-03-12 08:34:16 +01:00
bdaafe3c7b
fixed headers order
2013-03-12 08:33:36 +01:00
98bb5f4798
Merge branch 'PHP-5.3' into PHP-5.4
2013-03-11 21:36:37 +00:00
50ad2af503
- Updated to version 2013.2 (2013b)
2013-03-11 21:36:36 +00:00
f52b2e6a65
Fixed bug #64354 (Unserialize array of objects whose class can't be autoloaded fail)
...
about the __sleep one, since php_serialize_* are all void function,
so,,only check exception at the very begining
2013-03-09 23:00:58 +08:00
4e46a87392
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed PCRE locale crash in Windows/TS
2013-03-04 09:14:14 +01:00
b6fdb60ecf
Fixed PCRE locale crash in Windows/TS
2013-03-04 09:09:45 +01:00
ca4a3e6138
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
merged PCRE 8.32
2013-03-03 19:07:49 +01:00
357ab3cbad
merged PCRE 8.32
...
- defined HAVE_CONFIG_H to simplify the future merges
- PCRE NEWS http://pcre.org/news.txt
2013-03-03 19:06:22 +01:00
a3f020a4be
Merge branch 'PHP-5.3' into PHP-5.4
2013-03-03 12:53:23 -05:00
c134f2a1a5
- Updated to version 2013.1 (2013a)
2013-03-03 12:53:22 -05: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
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
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
064c62e4cf
Fix #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs)
2013-02-21 16:49:28 +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
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
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
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
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
7b0107cc5d
fix bug #61930 : openssl corrupts ssl key resource when using openssl_get_publickey()
2013-02-17 13:28:42 -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
375e3c273b
Fix test failed after 0ea83ff847
2013-02-16 22:28:28 +08: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
0ea83ff847
mb_split() can now handle empty matches like preg_split() does.
2013-02-10 15:04:23 +09:00
92a7924c1a
Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
2013-02-07 21:43:37 +04:00
1a18e84822
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Disabled external entities loading
2013-02-07 16:09:12 +04:00
afe98b7829
Disabled external entities loading
2013-02-07 16:07:05 +04:00
ed6763420c
fix bug #64124 (IPv6 malformed)
...
hostname returned from zend_parse_parameters() was modified in
netsnmp_session_init() that caused imput parameter modification along with
unpredictable changes when parameter is a constant sctring.
One typo in comment was fixed.
2013-02-07 14:48:28 +04:00
702b436ef4
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Check if soap.wsdl_cache_dir confirms to open_basedir
2013-02-07 13:10:04 +04:00
cc4c318b0c
Check if soap.wsdl_cache_dir confirms to open_basedir
2013-02-07 13:04:47 +04:00
740b823be8
check the validity of the parameter
2013-02-04 14:27:56 +01:00
643ce95b5b
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
2013-02-04 14:15:58 +01:00
0110662ae9
Move macro back to .c file
...
Because it depends on a static function on that .c file.
2013-02-02 18:32:38 +01:00
ac6342bbc0
Fix wrong blocking state being set
2013-02-02 15:29:18 +01:00
40663ede83
Fix tests (Windows)
2013-02-02 15:29:18 +01:00
9283b8aea4
Move & improve PHP_SOCKET_ERROR def
2013-02-02 15:29:11 +01:00
97d656fc82
Move some declarations to sockets.c
2013-02-02 14:06:23 +01:00
Andrey Hristov