]>
granicus.if.org Git - php/log
Xinchen Hui [Thu, 28 Mar 2013 05:54:04 +0000 (13:54 +0800)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Xinchen Hui [Thu, 28 Mar 2013 05:45:42 +0000 (13:45 +0800)]
Add test for #64529
Stanislav Malyshev [Wed, 27 Mar 2013 20:59:29 +0000 (13:59 -0700)]
will be 5.4.15
Stanislav Malyshev [Wed, 27 Mar 2013 20:57:53 +0000 (13:57 -0700)]
fix NEWS
Dmitry Stogov [Wed, 27 Mar 2013 20:03:40 +0000 (00:03 +0400)]
Fixed bug #64529 (Ran out of opcode space)
Xinchen Hui [Tue, 26 Mar 2013 03:50:47 +0000 (11:50 +0800)]
Update test script
Xinchen Hui [Tue, 26 Mar 2013 03:44:57 +0000 (11:44 +0800)]
Fixed bug #64515 (Memoryleak when using the same variablename 2times in function declaration)
Dmitry Stogov [Mon, 25 Mar 2013 11:23:49 +0000 (15:23 +0400)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)
Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Dmitry Stogov [Mon, 25 Mar 2013 11:07:27 +0000 (15:07 +0400)]
Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)
Johannes Schlüter [Sun, 24 Mar 2013 16:32:30 +0000 (17:32 +0100)]
Document embedded server options in manpage
Johannes Schlüter [Sun, 24 Mar 2013 16:32:00 +0000 (17:32 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Sun, 24 Mar 2013 16:31:29 +0000 (17:31 +0100)]
It's 2013, even for a manpage
Pierre Joye [Sun, 24 Mar 2013 12:27:00 +0000 (13:27 +0100)]
- add reminder for checking return values
Pierre Joye [Sat, 23 Mar 2013 09:18:31 +0000 (10:18 +0100)]
- fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
Signed-off-by: Anatol Belski <ab@php.net>
Anatol Belski [Sat, 23 Mar 2013 19:59:47 +0000 (20:59 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Reworked the changes for bug #64452
Anatol Belski [Sat, 23 Mar 2013 19:57:59 +0000 (20:57 +0100)]
Reworked the changes for bug #64452
Anatol Belski [Sat, 23 Mar 2013 16:47:39 +0000 (17:47 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed possible precision loss in microtime
Anatol Belski [Sat, 23 Mar 2013 16:40:06 +0000 (17:40 +0100)]
Fixed possible precision loss in microtime
This is related to the fix for bug #64370. MSVC natively supports __int64 type,
so calculating with 32 bit ints is neither necessary nor reliable. Therefore
an older piece of code is reused.
Xinchen Hui [Thu, 21 Mar 2013 13:29:02 +0000 (21:29 +0800)]
Fix bug in reflectionClass relate to #64239
Xinchen Hui [Thu, 21 Mar 2013 13:09:30 +0000 (21:09 +0800)]
Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or 5.4.11)
Xinchen Hui [Sat, 16 Mar 2013 15:14:06 +0000 (23:14 +0800)]
Xinchen Hui [Thu, 21 Mar 2013 03:14:10 +0000 (11:14 +0800)]
Fixed bug #64432 (more empty delimiter warning in strX methods)
Anatol Belski [Wed, 20 Mar 2013 08:13:13 +0000 (09:13 +0100)]
updated NEWS
Anatol Belski [Wed, 20 Mar 2013 08:12:33 +0000 (09:12 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #64452 Zip PHPTs crash intermittently
Anatol Belski [Wed, 20 Mar 2013 08:10:10 +0000 (09:10 +0100)]
Fixed bug #64452 Zip PHPTs crash intermittently
Anatol Belski [Tue, 19 Mar 2013 20:22:09 +0000 (21:22 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Backported fix for bug #62852
Anatol Belski [Tue, 19 Mar 2013 20:19:55 +0000 (21:19 +0100)]
Backported fix for bug #62852
Carson McDonald [Tue, 12 Mar 2013 08:15:50 +0000 (04:15 -0400)]
Fix typos
Anatol Belski [Tue, 19 Mar 2013 13:42:18 +0000 (14:42 +0100)]
fix C90 compat
Dmitry Stogov [Tue, 19 Mar 2013 12:59:01 +0000 (16:59 +0400)]
Fixed bug #63976 (Parent class incorrectly using child constant in class property)
Dmitry Stogov [Tue, 19 Mar 2013 11:45:48 +0000 (15:45 +0400)]
Partial fix for bug #64239
Dmitry Stogov [Tue, 19 Mar 2013 10:59:08 +0000 (14:59 +0400)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #62343 (Show class_alias In get_declared_classes())
Dmitry Stogov [Tue, 19 Mar 2013 10:56:53 +0000 (14:56 +0400)]
Fixed bug #62343 (Show class_alias In get_declared_classes())
Dmitry Stogov [Tue, 19 Mar 2013 08:48:23 +0000 (12:48 +0400)]
Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)
Stanislav Malyshev [Mon, 18 Mar 2013 07:52:27 +0000 (00:52 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fix NEWS
Stanislav Malyshev [Mon, 18 Mar 2013 07:52:15 +0000 (00:52 -0700)]
fix NEWS
Stanislav Malyshev [Mon, 18 Mar 2013 07:51:16 +0000 (00:51 -0700)]
fix NEWS
Boris Lytochkin [Sun, 17 Mar 2013 16:40:15 +0000 (20:40 +0400)]
more test coverage: missing square bracket error message
Boris Lytochkin [Sun, 17 Mar 2013 16:29:14 +0000 (20:29 +0400)]
Fixed bug #61981
Boris Lytochkin [Sun, 17 Mar 2013 16:00:37 +0000 (20:00 +0400)]
Fix bug #61981
Etienne Kneuss [Sat, 16 Mar 2013 17:20:06 +0000 (18:20 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Remove spurious int cast in between two longs
Etienne Kneuss [Sat, 16 Mar 2013 17:19:14 +0000 (18:19 +0100)]
Remove spurious int cast in between two longs
Anatol Belski [Fri, 15 Mar 2013 18:11:53 +0000 (19:11 +0100)]
updated NEWS
Anatol Belski [Fri, 15 Mar 2013 18:08:32 +0000 (19:08 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Backported patch for #64370
Anatol Belski [Fri, 15 Mar 2013 18:04:40 +0000 (19:04 +0100)]
Backported patch for #64370
Ferenc Kovacs [Fri, 15 Mar 2013 08:41:34 +0000 (09:41 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
explain the step updating the git submodule reference in web/php.git
Ferenc Kovacs [Fri, 15 Mar 2013 08:40:28 +0000 (09:40 +0100)]
explain the step updating the git submodule reference in web/php.git
Anatol Belski [Thu, 14 Mar 2013 13:39:09 +0000 (14:39 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fix zts check
Anatol Belski [Thu, 14 Mar 2013 13:38:20 +0000 (14:38 +0100)]
fix zts check
Andrey Hristov [Wed, 13 Mar 2013 13:24:23 +0000 (14:24 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
NEWS
Andrey Hristov [Wed, 13 Mar 2013 12:37:51 +0000 (13:37 +0100)]
fix for bug #63530 mysqlnd_stmt::bind_one_parameter uses wrong alloc for stmt->param_bind
Anatol Belski [Tue, 12 Mar 2013 07:34:16 +0000 (08:34 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fixed headers order
Anatol Belski [Tue, 12 Mar 2013 07:33:36 +0000 (08:33 +0100)]
fixed headers order
Derick Rethans [Mon, 11 Mar 2013 21:36:37 +0000 (21:36 +0000)]
Merge branch 'PHP-5.3' into PHP-5.4
Derick Rethans [Mon, 11 Mar 2013 21:36:36 +0000 (21:36 +0000)]
- Updated to version 2013.2 (2013b)
Xinchen Hui [Mon, 11 Mar 2013 07:15:22 +0000 (15:15 +0800)]
Disable zend_always_inline in debug build
it will be much more easier for debuging
Xinchen Hui [Sat, 9 Mar 2013 15:08:14 +0000 (23:08 +0800)]
Fixed confused exception message while user threw exception
Xinchen Hui [Sat, 9 Mar 2013 15:00:58 +0000 (23:00 +0800)]
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
Xinchen Hui [Sat, 9 Mar 2013 03:37:41 +0000 (11:37 +0800)]
Fix date
Stanislav Malyshev [Wed, 6 Mar 2013 08:44:43 +0000 (00:44 -0800)]
fix NEWS
Anatol Belski [Mon, 4 Mar 2013 08:14:14 +0000 (09:14 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed PCRE locale crash in Windows/TS
Stephen A. Zarkos [Mon, 4 Mar 2013 08:09:45 +0000 (09:09 +0100)]
Fixed PCRE locale crash in Windows/TS
Stanislav Malyshev [Sun, 3 Mar 2013 21:20:57 +0000 (13:20 -0800)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
rename NEWS back
updated NEWS
Stanislav Malyshev [Sun, 3 Mar 2013 21:18:58 +0000 (13:18 -0800)]
rename NEWS back
Anatol Belski [Sun, 3 Mar 2013 18:22:35 +0000 (19:22 +0100)]
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.
Anatol Belski [Sun, 3 Mar 2013 18:21:45 +0000 (19:21 +0100)]
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.
Anatol Belski [Sun, 3 Mar 2013 18:14:50 +0000 (19:14 +0100)]
updated NEWS
Anatol Belski [Sun, 3 Mar 2013 18:14:17 +0000 (19:14 +0100)]
Merge commit 'NEWS' into PHP-5.4
* commit 'NEWS':
This commit was manufactured by cvs2svn to create tag 'NEWS'.
Anatol Belski [Sun, 3 Mar 2013 18:13:38 +0000 (19:13 +0100)]
updated NEWS
Derick Rethans [Sun, 3 Mar 2013 18:09:52 +0000 (13:09 -0500)]
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
Derick Rethans [Sun, 3 Mar 2013 18:09:31 +0000 (13:09 -0500)]
Merge branch 'PHP-5.3' into PHP-5.4
Derick Rethans [Sun, 3 Mar 2013 18:08:19 +0000 (13:08 -0500)]
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
Anatol Belski [Sun, 3 Mar 2013 18:07:49 +0000 (19:07 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
merged PCRE 8.32
Anatol Belski [Sun, 3 Mar 2013 18:06:22 +0000 (19:06 +0100)]
merged PCRE 8.32
- defined HAVE_CONFIG_H to simplify the future merges
- PCRE NEWS http://pcre.org/news.txt
Derick Rethans [Sun, 3 Mar 2013 17:53:23 +0000 (12:53 -0500)]
Merge branch 'PHP-5.3' into PHP-5.4
Derick Rethans [Sun, 3 Mar 2013 17:53:22 +0000 (12:53 -0500)]
- Updated to version 2013.1 (2013a)
Xinchen Hui [Sun, 3 Mar 2013 03:25:08 +0000 (11:25 +0800)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Xinchen Hui [Sun, 3 Mar 2013 03:24:45 +0000 (11:24 +0800)]
Fix test (skip on unable to create socket)
Dmitry Stogov [Fri, 1 Mar 2013 15:17:25 +0000 (19:17 +0400)]
Fixed timestamp update on Phar contents modification.
Dmitry Stogov [Fri, 1 Mar 2013 15:17:08 +0000 (19:17 +0400)]
Fixed timestamp update on Phar contents modification.
Stanislav Malyshev [Fri, 1 Mar 2013 05:29:40 +0000 (21:29 -0800)]
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
Stanislav Malyshev [Fri, 1 Mar 2013 05:25:36 +0000 (21:25 -0800)]
5.4.24-dev
Stanislav Malyshev [Fri, 1 Mar 2013 05:22:06 +0000 (21:22 -0800)]
5.3.23RC1
Stanislav Malyshev [Wed, 27 Feb 2013 06:25:33 +0000 (22:25 -0800)]
5.4.13 branched, now it's 5.4.14
Stanislav Malyshev [Wed, 27 Feb 2013 06:20:21 +0000 (22:20 -0800)]
add news for SOAP fixes
Stanislav Malyshev [Wed, 27 Feb 2013 06:12:15 +0000 (22:12 -0800)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Bug #52861: unset fails with ArrayObject and deep arrays
Mike Willbanks [Fri, 22 Feb 2013 21:05:38 +0000 (13:05 -0800)]
Bug #52861: unset fails with ArrayObject and deep arrays
When checking to make into a reference write, readwrite are checked but not unset
Remi Collet [Tue, 26 Feb 2013 13:35:34 +0000 (14:35 +0100)]
add support for ppc64p7 arch (Power7 optimized)
Xinchen Hui [Sun, 24 Feb 2013 04:58:39 +0000 (12:58 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
ext/spl/spl_fixedarray.c
Xinchen Hui [Sun, 24 Feb 2013 04:55:46 +0000 (12:55 +0800)]
Fixed bug #64264 (SPLFixedArray toArray problem)
Johannes Schlüter [Thu, 21 Feb 2013 15:49:28 +0000 (16:49 +0100)]
Fix #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs)
Johannes Schlüter [Thu, 21 Feb 2013 14:10:15 +0000 (15:10 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Thu, 21 Feb 2013 14:08:58 +0000 (15:08 +0100)]
Fix TSRM (after
afc1debb )
Dmitry Stogov [Thu, 21 Feb 2013 11:57:26 +0000 (15:57 +0400)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
PHAR should modify entry timestamp when it's modified
Dmitry Stogov [Thu, 21 Feb 2013 11:55:20 +0000 (15:55 +0400)]
PHAR should modify entry timestamp when it's modified
Sara Golemon [Thu, 21 Feb 2013 11:21:49 +0000 (03:21 -0800)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
http-stream test requires network connectivity
Sara Golemon [Thu, 21 Feb 2013 11:21:23 +0000 (03:21 -0800)]
http-stream test requires network connectivity
Xinchen Hui [Thu, 21 Feb 2013 10:18:41 +0000 (18:18 +0800)]
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.
Anatol Belski [Thu, 21 Feb 2013 09:27:37 +0000 (10:27 +0100)]
updated lib versions
Anatol Belski [Thu, 21 Feb 2013 09:26:38 +0000 (10:26 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
updated lib versions