Derick Rethans
a3f020a4be
Merge branch 'PHP-5.3' into PHP-5.4
2013-03-03 12:53:23 -05:00
Derick Rethans
c134f2a1a5
- Updated to version 2013.1 (2013a)
2013-03-03 12:53:22 -05:00
Xinchen Hui
fe5ce5cb91
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-03-03 11:25:08 +08:00
Xinchen Hui
9bda6a25a5
Fix test (skip on unable to create socket)
2013-03-03 11:24:45 +08:00
Dmitry Stogov
ecf0cbdf3b
Fixed timestamp update on Phar contents modification.
2013-03-01 19:17:25 +04:00
Dmitry Stogov
b6656d0ec9
Fixed timestamp update on Phar contents modification.
2013-03-01 19:17:08 +04:00
Stanislav Malyshev
03dfa08da9
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
5.4.24-dev
5.3.23RC1
Conflicts:
configure.in
main/php_version.h
2013-02-28 21:29:40 -08:00
Stanislav Malyshev
5c5bc7cf1b
5.4.24-dev
2013-02-28 21:25:36 -08:00
Stanislav Malyshev
8f533d2dfd
5.3.23RC1
2013-02-28 21:22:06 -08:00
Stanislav Malyshev
31a6f8b7f4
5.4.13 branched, now it's 5.4.14
2013-02-26 22:25:33 -08:00
Stanislav Malyshev
7ffb77d243
add news for SOAP fixes
2013-02-26 22:20:21 -08:00
Stanislav Malyshev
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
Mike Willbanks
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
Remi Collet
52d1add0fe
add support for ppc64p7 arch (Power7 optimized)
2013-02-26 14:35:34 +01:00
Xinchen Hui
d24ac6953e
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/spl/spl_fixedarray.c
2013-02-24 12:58:39 +08:00
Xinchen Hui
1b58bd39a6
Fixed bug #64264 (SPLFixedArray toArray problem)
2013-02-24 12:55:53 +08:00
Johannes Schlüter
064c62e4cf
Fix #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs)
2013-02-21 16:49:28 +01:00
Johannes Schlüter
1e9bc56775
Merge branch 'PHP-5.3' into PHP-5.4
2013-02-21 15:10:15 +01:00
Johannes Schlüter
fcd4b5335a
Fix TSRM (after afc1debb
)
2013-02-21 15:08:58 +01:00
Dmitry Stogov
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
Dmitry Stogov
7b113d789d
PHAR should modify entry timestamp when it's modified
2013-02-21 15:55:20 +04:00
Sara Golemon
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
Sara Golemon
bc55a8eb9f
http-stream test requires network connectivity
2013-02-21 03:21:23 -08:00
Xinchen Hui
9a44a9806c
Fixed bug #64235 (Insteadof not work for class method in 5.4.11)
...
As we discussed with stefan, we think previous of allowing use with
classes is a bug, should be forbided, anyway, the error message should
be improved.
2013-02-21 18:18:41 +08:00
Anatol Belski
bae95bd9d4
updated lib versions
2013-02-21 10:27:37 +01:00
Anatol Belski
07a13fd9fa
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
updated lib versions
2013-02-21 10:26:38 +01:00
Anatol Belski
81e9aa6c8d
updated lib versions
2013-02-21 09:46:50 +01:00
Dmitry Stogov
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
Dmitry Stogov
8e76d0404b
Fixed external entity loading
2013-02-20 22:14:59 +04:00
Johannes Schlüter
021f57ef0e
Merge branch 'PHP-5.3' into PHP-5.4
2013-02-20 11:57:11 +01:00
Johannes Schlüter
afc1debb2f
5.3.22 NEWS
2013-02-20 11:56:29 +01:00
Anatol Belski
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
Anatol Belski
558c5dbe65
fix the test for curl 7.29.0+
2013-02-19 09:04:06 +01:00
Dmitry Stogov
42437dd870
Fixed bug #64070 (Inheritance with Traits failed with error)
2013-02-18 16:07:51 +04:00
Stanislav Malyshev
7b0107cc5d
fix bug #61930 : openssl corrupts ssl key resource when using openssl_get_publickey()
2013-02-17 13:28:42 -08:00
Stanislav Malyshev
92b1cb3ca0
update NEWS
2013-02-17 02:37:58 -08:00
Jonh Wendell
59b016192d
Added HTTP codes as of RFC 6585
...
Added descriptions for the new HTTP codes:
- 428 Precondition Required
- 429 Too Many Requests
- 431 Request Header Fields Too Large
- 511 Network Authentication Required
2013-02-17 01:18:40 -08:00
Xinchen Hui
263accb626
Merge branch 'PHP-5.3' into PHP-5.4
2013-02-17 11:05:34 +08:00
Xinchen Hui
01ae5c3c2f
Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS)
2013-02-17 11:04:36 +08:00
Xinchen Hui
375e3c273b
Fix test failed after 0ea83ff847
2013-02-16 22:28:28 +08:00
Boris Lytochkin
68fa6a3eb7
+Fixed bug #64124 (IPv6 malformed). (Boris Lytochkin)
2013-02-14 23:08:08 +04:00
Dmitry Stogov
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
Dmitry Stogov
188c196d4d
Proper bit reset code
2013-02-13 22:06:37 +04:00
Ard Biesheuvel
050aae2860
Fixed bug #64197 (_Offsetof() macro used but not defined on ARM/Clang)
...
Updated the code to test for __ARMCC_VERSION instead of __arm, as
that is a more reliable indicator of whether the ARMCC compiler is
being used.
2013-02-13 12:22:50 +01:00
Remi Collet
e67a2b9e47
Fixed bug #64142 (dval to lval different behavior on ppc64)
...
See discussion on internals
http://marc.info/?t=136042277700003&r=1&w=2
2013-02-11 09:10:51 +01:00
Stanislav Malyshev
bfdb889d4f
update NEWS
2013-02-09 23:02:26 -08:00
Moriyoshi Koizumi
0ea83ff847
mb_split() can now handle empty matches like preg_split() does.
2013-02-10 15:04:23 +09:00
Boris Lytochkin
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
Dmitry Stogov
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
Dmitry Stogov
afe98b7829
Disabled external entities loading
2013-02-07 16:07:05 +04:00