Anatol Belski
8d199c7c4f
Backported fix for bug #62852
2013-03-19 21:19:55 +01:00
Carson McDonald
c6f6bf88d8
Fix typos
2013-03-19 15:11:34 +01:00
Anatol Belski
7687b8b81c
fix C90 compat
2013-03-19 14:42:18 +01:00
Dmitry Stogov
7b0993bfb4
Fixed bug #63976 (Parent class incorrectly using child constant in class property)
2013-03-19 16:59:01 +04:00
Dmitry Stogov
984561cfa8
Partial fix for bug #64239
2013-03-19 15:45:48 +04:00
Dmitry Stogov
84630a1109
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62343 (Show class_alias In get_declared_classes())
2013-03-19 14:59:08 +04:00
Dmitry Stogov
4a6291508d
Fixed bug #62343 (Show class_alias In get_declared_classes())
2013-03-19 14:56:53 +04:00
Dmitry Stogov
e62bb03257
Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)
2013-03-19 12:48:23 +04:00
Stanislav Malyshev
e25b2d7ea5
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix NEWS
2013-03-18 00:52:27 -07:00
Stanislav Malyshev
87c8ea15f2
fix NEWS
2013-03-18 00:52:15 -07:00
Stanislav Malyshev
db4d473d53
fix NEWS
2013-03-18 00:51:16 -07:00
Boris Lytochkin
85d9d85ce2
more test coverage: missing square bracket error message
2013-03-17 20:40:15 +04:00
Boris Lytochkin
44197774c0
Fixed bug #61981
2013-03-17 20:29:14 +04:00
Boris Lytochkin
b32405053f
Fix bug #61981
2013-03-17 20:00:37 +04:00
Etienne Kneuss
5de1b08482
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Remove spurious int cast in between two longs
2013-03-16 18:20:06 +01:00
Etienne Kneuss
62364e6e01
Remove spurious int cast in between two longs
2013-03-16 18:19:14 +01:00
Anatol Belski
73c38eca5a
updated NEWS
2013-03-15 19:11:53 +01:00
Anatol Belski
90c8f16c3b
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Backported patch for #64370
2013-03-15 19:08:32 +01:00
Anatol Belski
b903d2d6cd
Backported patch for #64370
2013-03-15 19:04:40 +01:00
Ferenc Kovacs
30eff1a697
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
explain the step updating the git submodule reference in web/php.git
2013-03-15 09:41:34 +01:00
Ferenc Kovacs
9350f45aca
explain the step updating the git submodule reference in web/php.git
2013-03-15 09:40:28 +01:00
Anatol Belski
5df8cf1975
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix zts check
2013-03-14 14:39:09 +01:00
Anatol Belski
e43c5a8395
fix zts check
2013-03-14 14:38:20 +01:00
Andrey Hristov
0777a18703
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
NEWS
2013-03-13 14:24:23 +01:00
Andrey Hristov
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
Anatol Belski
a328cc452e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fixed headers order
2013-03-12 08:34:16 +01:00
Anatol Belski
bdaafe3c7b
fixed headers order
2013-03-12 08:33:36 +01:00
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
