Derick Rethans
98bb5f4798
Merge branch 'PHP-5.3' into PHP-5.4
2013-03-11 21:36:37 +00:00
Derick Rethans
50ad2af503
- Updated to version 2013.2 (2013b)
2013-03-11 21:36:36 +00:00
Xinchen Hui
0444708c5c
Disable zend_always_inline in debug build
...
it will be much more easier for debuging
2013-03-11 15:15:22 +08:00
Xinchen Hui
7197f0ffcc
Fixed confused exception message while user threw exception
2013-03-09 23:08:14 +08:00
Xinchen Hui
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
Xinchen Hui
6fece94369
Fix date
2013-03-09 11:37:41 +08:00
Stanislav Malyshev
38847482c8
fix NEWS
2013-03-06 00:44:43 -08:00
Anatol Belski
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
Stephen A. Zarkos
b6fdb60ecf
Fixed PCRE locale crash in Windows/TS
2013-03-04 09:09:45 +01:00
Stanislav Malyshev
2578f7bcc0
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
rename NEWS back
updated NEWS
2013-03-03 13:20:57 -08:00
Stanislav Malyshev
656fcb67f1
rename NEWS back
2013-03-03 13:18:58 -08:00
Anatol Belski
d95faef1a1
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:php-src:
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
2013-03-03 19:22:35 +01:00
Anatol Belski
fe2612d71e
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
...
* 'PHP-5.3' of git.php.net:php-src:
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
2013-03-03 19:21:45 +01:00
Anatol Belski
00ecc12c0f
updated NEWS
2013-03-03 19:14:50 +01:00
Anatol Belski
faf14e9b2e
Merge commit 'NEWS' into PHP-5.4
...
* commit 'NEWS':
This commit was manufactured by cvs2svn to create tag 'NEWS'.
2013-03-03 19:14:17 +01:00
Anatol Belski
e1023affc1
updated NEWS
2013-03-03 19:13:38 +01:00
Derick Rethans
6c2564766f
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
2013-03-03 13:09:52 -05:00
Derick Rethans
206cce0d8b
Merge branch 'PHP-5.3' into PHP-5.4
2013-03-03 13:09:31 -05:00
Derick Rethans
b36df28dca
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
2013-03-03 13:08:19 -05:00
Anatol Belski
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
Anatol Belski
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
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
