]>
granicus.if.org Git - php/log
Anatol Belski [Mon, 8 Jun 2015 11:28:53 +0000 (13:28 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fixed test related to fix for bug #67805
Anatol Belski [Mon, 8 Jun 2015 11:28:23 +0000 (13:28 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fixed test related to fix for bug #67805
Anatol Belski [Mon, 8 Jun 2015 11:27:22 +0000 (13:27 +0200)]
fixed test related to fix for bug #67805
Anatol Belski [Mon, 8 Jun 2015 10:13:12 +0000 (12:13 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
Fix bug #67805 - SplFileObject setMaxLineLength.
Anatol Belski [Mon, 8 Jun 2015 10:12:24 +0000 (12:12 +0200)]
updated NEWS
Anatol Belski [Mon, 8 Jun 2015 10:11:58 +0000 (12:11 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
Fix bug #67805 - SplFileObject setMaxLineLength.
Anatol Belski [Mon, 8 Jun 2015 10:11:29 +0000 (12:11 +0200)]
updated NEWS
Willian Gustavo Veiga [Sat, 6 Jun 2015 00:31:33 +0000 (21:31 -0300)]
Fix bug #67805 - SplFileObject setMaxLineLength.
Willian Gustavo Veiga [Sat, 6 Jun 2015 00:31:33 +0000 (21:31 -0300)]
Fix bug #67805 - SplFileObject setMaxLineLength.
Anatol Belski [Mon, 8 Jun 2015 09:29:04 +0000 (11:29 +0200)]
fix dir separator in test
Anatol Belski [Mon, 8 Jun 2015 08:15:03 +0000 (10:15 +0200)]
updated UPGRADING and NEWS
Christoph M. Becker [Wed, 3 Jun 2015 23:06:32 +0000 (01:06 +0200)]
added LIBXML_BIGLINES constant
Christoph M. Becker [Wed, 3 Jun 2015 22:59:41 +0000 (00:59 +0200)]
added tests for bug #54138
Christoph M. Becker [Wed, 3 Jun 2015 22:32:28 +0000 (00:32 +0200)]
replaced / in filename with DIRECTORY_SEPARATOR according to performance warning on DOMDocument::load man page
Christoph M. Becker [Wed, 3 Jun 2015 22:30:49 +0000 (00:30 +0200)]
added SKIPIF conditional to check for DOM availability
Christoph M. Becker [Wed, 3 Jun 2015 21:14:23 +0000 (23:14 +0200)]
added XFAIL test for bug #69753
Matteo Beccati [Mon, 8 Jun 2015 06:49:15 +0000 (08:49 +0200)]
Merge remote-tracking branch 'mbeccati/reflection-typehints-sth-v5'
* mbeccati/reflection-typehints-sth-v5:
Reflection support for type hints and return types
Merge remote-tracking branch 'pollita/reflection.typehint'
As discussed on https://github.com/php/php-src/pull/1190
Matteo Beccati [Mon, 8 Jun 2015 06:32:18 +0000 (08:32 +0200)]
Reflection support for type hints and return types
Sara Golemon [Sun, 15 Feb 2015 08:05:38 +0000 (09:05 +0100)]
Merge remote-tracking branch 'pollita/reflection.typehint'
Conflicts:
ext/reflection/php_reflection.c
ext/reflection/tests/ReflectionExtension_getClasses_basic.phpt
Christoph M. Becker [Sun, 7 Jun 2015 15:07:52 +0000 (17:07 +0200)]
fixed language dependent Windows socket tests
Anatol Belski [Tue, 2 Jun 2015 18:30:08 +0000 (20:30 +0200)]
add error message
Xinchen Hui [Mon, 8 Jun 2015 04:36:54 +0000 (12:36 +0800)]
Also reflects the case change
Xinchen Hui [Mon, 8 Jun 2015 03:47:22 +0000 (11:47 +0800)]
Fixed bug #69767 (Default parameter value with wrong type segfaults)
Jakub Zelenka [Sun, 7 Jun 2015 14:22:09 +0000 (15:22 +0100)]
Improve json parser code
Andrea Faulds [Sat, 6 Jun 2015 14:29:56 +0000 (15:29 +0100)]
Fix typo in Unicode escape test
Anatol Belski [Fri, 5 Jun 2015 15:59:39 +0000 (17:59 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS for bug #69642
updated NEWS for bug #69642 fix
Anatol Belski [Fri, 5 Jun 2015 15:59:08 +0000 (17:59 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS for bug #69642 fix
Anatol Belski [Fri, 5 Jun 2015 15:58:39 +0000 (17:58 +0200)]
updated NEWS for bug #69642
Anatol Belski [Fri, 5 Jun 2015 15:56:57 +0000 (17:56 +0200)]
updated NEWS for bug #69642 fix
Dmitry Stogov [Fri, 5 Jun 2015 10:54:57 +0000 (13:54 +0300)]
Use better zend_hash_* functions
Dmitry Stogov [Fri, 5 Jun 2015 10:54:10 +0000 (13:54 +0300)]
Fixed incorrect ZEND_FILE_LINE_CC usage
Xinchen Hui [Fri, 5 Jun 2015 10:42:21 +0000 (18:42 +0800)]
Improve the fix for bug #69756
Dmitry Stogov [Fri, 5 Jun 2015 07:04:58 +0000 (10:04 +0300)]
Fixed bug #69756 (Fatal error: Nesting level too deep - recursive dependency? with ===)
Xinchen Hui [Fri, 5 Jun 2015 03:54:53 +0000 (11:54 +0800)]
Merge branch 'master' of git.php.net:php-src
Xinchen Hui [Fri, 5 Jun 2015 03:54:22 +0000 (11:54 +0800)]
Fixed bug #69758 (Item added to array not being removed by array_pop/shift)
Dmitry Stogov [Thu, 4 Jun 2015 22:53:32 +0000 (01:53 +0300)]
Delay checks for undefined CV variables after checks for fast paths.
Dmitry Stogov [Thu, 4 Jun 2015 16:14:16 +0000 (19:14 +0300)]
Convert "switch" into series of "if". This allows better fast-path placement, additional specialization and makes final code less.
Dmitry Stogov [Thu, 4 Jun 2015 16:13:40 +0000 (19:13 +0300)]
Avoid useless copying and duplication
Dmitry Stogov [Thu, 4 Jun 2015 14:20:37 +0000 (17:20 +0300)]
Specialize out useless checks. Only IS_VAR may be EG(error).
Bob Weinand [Thu, 4 Jun 2015 14:09:22 +0000 (16:09 +0200)]
fix bitwise object operations
Xinchen Hui [Thu, 4 Jun 2015 13:09:06 +0000 (21:09 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Thu, 4 Jun 2015 13:08:57 +0000 (21:08 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Thu, 4 Jun 2015 13:08:36 +0000 (21:08 +0800)]
Fixed invalid read druing apache reload
Dmitry Stogov [Thu, 4 Jun 2015 06:38:22 +0000 (09:38 +0300)]
Fixed bug #69755 (segfault in ZEND_CONCAT_SPEC_TMPVAR_CONST_HANDLER)
Bob Weinand [Wed, 3 Jun 2015 21:59:59 +0000 (23:59 +0200)]
Fix Bug #69754 (Compile failure with ::class in array)
Dmitry Stogov [Wed, 3 Jun 2015 19:23:06 +0000 (22:23 +0300)]
Removed useless code (there is nothing to free for string offsets).
Dmitry Stogov [Wed, 3 Jun 2015 16:29:03 +0000 (19:29 +0300)]
Removed dead code (IS_CONST operand can't be IS_OBJECT)
Dmitry Stogov [Wed, 3 Jun 2015 15:44:25 +0000 (18:44 +0300)]
Separate rare used increment/decrement/assign_op of overloaded properies into non inlined functions.
Dmitry Stogov [Wed, 3 Jun 2015 14:20:47 +0000 (17:20 +0300)]
Reorder conditions to check for fast paths first
Dmitry Stogov [Wed, 3 Jun 2015 13:27:38 +0000 (16:27 +0300)]
isset() micro-optimisation
Dmitry Stogov [Wed, 3 Jun 2015 11:49:29 +0000 (14:49 +0300)]
Removed commented code
Dmitry Stogov [Wed, 3 Jun 2015 10:43:05 +0000 (13:43 +0300)]
micro-optimization
Dmitry Stogov [Wed, 3 Jun 2015 08:15:28 +0000 (11:15 +0300)]
CONCAT optimization
Bob Weinand [Wed, 3 Jun 2015 00:57:16 +0000 (02:57 +0200)]
Use CG(one_char_string) if possible in bitwise string operations
emalloc() is not cheap... Also, a good part of bitwise string ops out there are on single bytes.
Anatol Belski [Mon, 1 Jun 2015 19:52:35 +0000 (21:52 +0200)]
introduced DllMain for the main php DLL
The particular need on this is because of the current situation
with determining the background functionality for the
gettimeofday. DllMain allows to initialize stuff before the DLL
can be actually used. Thus, we use different time API on win7
and win8 and later, so the function pointer needs to be
initialized before anything in the DLL could even demand it.
The change also opens the door for the further optimizations,
as now we're able to do the very basic initializations for the
whole DLL before it could ever start to live. Fe on this way the
TLS initialization could be done, when utilizing the
DLL_THREAD_ATTACH/DETACH case. Whether it's really usable in
portable way should be synced with other platforms.
Be aware that it's dangerous as it possibly causes dead locks.
So to use with care. One willing to add items to DllMain should
better read the documentation twice and even then try to defer
the necessary action.
Anatol Belski [Sun, 31 May 2015 21:50:29 +0000 (23:50 +0200)]
a bit more clearness fir --with-mp
Dmitry Stogov [Tue, 2 Jun 2015 09:03:34 +0000 (12:03 +0300)]
Call zend_array_dup() instead of zval_copy_ctor().
Dmitry Stogov [Tue, 2 Jun 2015 09:01:34 +0000 (12:01 +0300)]
Avoid useless duplication. Constant values have to be duplicated only for internal constants in ZTS build, to prevent simultaneous modification of reference counters from different threads.
Stanislav Malyshev [Tue, 2 Jun 2015 06:58:19 +0000 (23:58 -0700)]
fix test
Stanislav Malyshev [Tue, 2 Jun 2015 05:57:05 +0000 (22:57 -0700)]
Merge branch 'pull-request/1310'
* pull-request/1310:
Fix GD tests #69698
Stanislav Malyshev [Tue, 2 Jun 2015 05:55:16 +0000 (22:55 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug #69737 - Segfault when SplMinHeap::compare produces fatal error
Conflicts:
ext/spl/spl_heap.c
Stanislav Malyshev [Tue, 2 Jun 2015 05:53:08 +0000 (22:53 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #69737 - Segfault when SplMinHeap::compare produces fatal error
Stanislav Malyshev [Tue, 2 Jun 2015 05:06:16 +0000 (22:06 -0700)]
Fix bug #69737 - Segfault when SplMinHeap::compare produces fatal error
Dmitry Stogov [Mon, 1 Jun 2015 14:22:04 +0000 (17:22 +0300)]
Reorder conditions to check for fast paths first.
Dmitry Stogov [Mon, 1 Jun 2015 09:21:48 +0000 (12:21 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #69732 (can induce segmentation fault with basic php code).
Dmitry Stogov [Mon, 1 Jun 2015 09:17:32 +0000 (12:17 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #69732 (can induce segmentation fault with basic php code).
Conflicts:
Zend/zend_vm_execute.h
Dmitry Stogov [Mon, 1 Jun 2015 08:40:14 +0000 (11:40 +0300)]
Fixed bug #69732 (can induce segmentation fault with basic php code).
Dmitry Stogov [Mon, 1 Jun 2015 07:51:06 +0000 (10:51 +0300)]
Fixed integer overflow during HashTable size calculation
Stanislav Malyshev [Mon, 1 Jun 2015 02:40:31 +0000 (19:40 -0700)]
Merge branch 'pull-request/1314'
* pull-request/1314:
Fixed typos in UPGRADING.INTERNALS
Stanislav Malyshev [Mon, 1 Jun 2015 02:37:56 +0000 (19:37 -0700)]
set initialized flag after actual initialization happened
Andrew Murray [Mon, 1 Jun 2015 01:13:09 +0000 (11:13 +1000)]
Fixed typos in UPGRADING.INTERNALS
Stanislav Malyshev [Mon, 1 Jun 2015 00:30:41 +0000 (17:30 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
improve fix for Bug #69545
Stanislav Malyshev [Mon, 1 Jun 2015 00:30:29 +0000 (17:30 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
improve fix for Bug #69545
Stanislav Malyshev [Mon, 1 Jun 2015 00:29:53 +0000 (17:29 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
improve fix for Bug #69545
Stanislav Malyshev [Mon, 1 Jun 2015 00:23:06 +0000 (17:23 -0700)]
improve fix for Bug #69545
Stanislav Malyshev [Sun, 31 May 2015 21:52:08 +0000 (14:52 -0700)]
FIx darwin build
Anatol Belski [Sun, 31 May 2015 21:04:11 +0000 (23:04 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix phpize mode for manifest embedding
Anatol Belski [Sun, 31 May 2015 21:03:47 +0000 (23:03 +0200)]
fix phpize mode for manifest embedding
Anatol Belski [Sun, 31 May 2015 21:02:01 +0000 (23:02 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix phpize mode for manifest embedding
Anatol Belski [Sun, 31 May 2015 21:01:21 +0000 (23:01 +0200)]
fix phpize mode for manifest embedding
Christoph M. Becker [Sun, 31 May 2015 19:35:21 +0000 (21:35 +0200)]
split simplexml tests for 7
Anatol Belski [Sun, 31 May 2015 19:32:04 +0000 (21:32 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
split the original test to check behaviour diff on 32- and 64-bit
recovered original meaning of SXE xpath test
Anatol Belski [Sun, 31 May 2015 19:30:46 +0000 (21:30 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
split the original test to check behaviour diff on 32- and 64-bit
recovered original meaning of SXE xpath test
Christoph M. Becker [Sun, 31 May 2015 19:28:44 +0000 (21:28 +0200)]
split the original test to check behaviour diff on 32- and 64-bit
Christoph M. Becker [Sat, 30 May 2015 16:09:51 +0000 (18:09 +0200)]
recovered original meaning of SXE xpath test
Anatol Belski [Sun, 31 May 2015 17:33:34 +0000 (19:33 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
backport the basic code to properly recognize win 8.1 and 10
backport the manifest changes for makefile
backport the manifest changes in js
add default manifest
add test
Anatol Belski [Sun, 31 May 2015 17:32:21 +0000 (19:32 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
backport the basic code to properly recognize win 8.1 and 10
backport the manifest changes for makefile
backport the manifest changes in js
add default manifest
add test
Anatol Belski [Sun, 31 May 2015 17:01:58 +0000 (19:01 +0200)]
backport the basic code to properly recognize win 8.1 and 10
Anatol Belski [Sun, 31 May 2015 16:59:00 +0000 (18:59 +0200)]
backport the manifest changes for makefile
Anatol Belski [Sun, 31 May 2015 16:53:51 +0000 (18:53 +0200)]
backport the manifest changes in js
Anatol Belski [Sun, 31 May 2015 16:17:58 +0000 (18:17 +0200)]
add default manifest
Anatol Belski [Sun, 31 May 2015 16:13:33 +0000 (18:13 +0200)]
add test
Xinchen Hui [Sun, 31 May 2015 05:35:01 +0000 (13:35 +0800)]
Fixed Bug #69733 (PHP fails to build with --enable-phpdbg-debug)
Stanislav Malyshev [Sun, 31 May 2015 04:19:05 +0000 (21:19 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Update PCRE version (bug #69689)
move test
NEWS 5.4
fix new test
Fixed Bug #69667 segfault in php_pgsql_meta_data
5.4.42 next
Stanislav Malyshev [Sun, 31 May 2015 04:18:50 +0000 (21:18 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Update PCRE version (bug #69689)
move test
NEWS 5.4
fix new test
Fixed Bug #69667 segfault in php_pgsql_meta_data
5.4.42 next
Stanislav Malyshev [Sun, 31 May 2015 04:18:28 +0000 (21:18 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update PCRE version (bug #69689)
move test
NEWS 5.4
fix new test
Fixed Bug #69667 segfault in php_pgsql_meta_data
5.4.42 next
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Sun, 31 May 2015 04:17:16 +0000 (21:17 -0700)]
Update PCRE version (bug #69689)
Anatol Belski [Sat, 30 May 2015 07:43:10 +0000 (09:43 +0200)]
run credits script
Anatol Belski [Sat, 30 May 2015 07:37:08 +0000 (09:37 +0200)]
updated UPGRADING
Anatol Belski [Sat, 30 May 2015 07:26:40 +0000 (09:26 +0200)]
removed sapi/nsapi