]>
granicus.if.org Git - php/log
Dmitry Stogov [Tue, 7 Oct 2014 13:54:24 +0000 (17:54 +0400)]
Remove useless parts of EX(old_error_reporting)
Dmitry Stogov [Tue, 7 Oct 2014 13:12:12 +0000 (17:12 +0400)]
Merged EX(frame_kind) and EX(flags) into single word
Nikita Popov [Mon, 6 Oct 2014 18:38:05 +0000 (20:38 +0200)]
Fix bug #68162: isset($$varname) always true
Nikita Popov [Mon, 6 Oct 2014 18:14:30 +0000 (20:14 +0200)]
Drop convert_to usage in zend_exceptions
To make everything work correctly with refs.
I'm unsure whether the GET_PROPERTY_SILENT distinction is really
necessary, because the choice seemed pretty random, but kept it
around.
Nikita Popov [Mon, 6 Oct 2014 16:56:23 +0000 (18:56 +0200)]
Fix isset/unset on by-ref names as well
Nikita Popov [Mon, 6 Oct 2014 16:45:08 +0000 (18:45 +0200)]
Fix bug #68163
Anatol Belski [Mon, 6 Oct 2014 13:51:57 +0000 (15:51 +0200)]
bring back the correct php_version.h
Anatol Belski [Mon, 6 Oct 2014 13:44:43 +0000 (15:44 +0200)]
fix the empty_strings SAPI shutdown leak in TS build
still the NTS variant is somewhat different as it needs
zend_new_interned_string_int because the normal callbacks might
be not initialized, but at least no leaks anymore and some more
structure
Dmitry Stogov [Mon, 6 Oct 2014 12:32:15 +0000 (16:32 +0400)]
Use fastcall calling convention for heap functions
Anatol Belski [Mon, 6 Oct 2014 11:38:13 +0000 (13:38 +0200)]
fix leaking the empty_string in TS builds
Anatol Belski [Mon, 6 Oct 2014 09:45:23 +0000 (11:45 +0200)]
remove successive assignment
Timm Friebe [Sun, 5 Oct 2014 12:27:21 +0000 (14:27 +0200)]
Add tests verifying calls work inside echo, concatenation and array access
Tjerk Meesters [Sun, 5 Oct 2014 21:54:32 +0000 (05:54 +0800)]
Updated NEWS and UPGRADING
PHP RFC: Catchable "call to a member function of a non-object"
Tjerk Meesters [Sun, 5 Oct 2014 21:52:43 +0000 (05:52 +0800)]
Merge branch 'pr/647'
* pr/647: (33 commits)
zend_uint -> uint32_t
Fix nesting for *non*-compile-time-resolveable functions See https://github.com/thekid/php-src/commit/
a1a4ba95117cca77b6a669d01b1cf97ea4fcb507 #commitcomment-
7414223
Add tests for calls to nested, *non*-compile-time-resolveable functions See https://github.com/thekid/php-src/commit/
a1a4ba95117cca77b6a669d01b1cf97ea4fcb507 #commitcomment-
7414362
Make list of opcodes used for nesting calculation consistent with `zend_do_convert_call_user_func()` in Zend/zend_compile.c
Rewrite code to use ZEND_VM_JMP() instead of repeated ZEND_VM_INC_OPCODE() calls
QA: Simplify code to find matching ZEND_DO_FCALL_BY_NAME CG(context).nested_calls is stored inside the initializer's result.num and inside the finalizer's op2.num, by comparing these we don't need to count manually, and are thus safer from future expansion with specialized opcodes e.g.
Fix expected fatal error, now is catchable fatal
Adjust expected fatal error message Now also includes "on [TYPE]" after merge from master
Check for memory leaks when not using return value
Adjust expected fatal error message Now also includes "on [TYPE]" after merge from master
Add tests with arrays as parameters
Handle ZEND_NEW nesting
Also verify nesting with dynamically called static methods
Handle ZEND_INIT_NS_FCALL_BY_NAME nesting
QA: Refactor: Split tests a bit to make them more comprehendable
Support nested static calls
Handle ZEND_EXT_FCALL_END, skipping if necessary Verified with running tests with new "-e" run-tests arg: $ make test TESTS=Zend/tests/*-on-non-objects-*phpt TEST_PHP_ARGS=-e # Tests passed : 11 (100.0%)
Add support for PHP's 'extended information for debugger/profiler' mode
Verify non-CV-operands also work See discussion https://github.com/php/php-src/pull/647#issuecomment-
48050551
Only allocate NULL return value if it's actually used
...
Conflicts:
ext/date/tests/bug67118.phpt
Nikita Popov [Sun, 5 Oct 2014 21:38:59 +0000 (23:38 +0200)]
Fix $this CV init for include/eval
Fixes bug #68148
Nikita Popov [Sun, 5 Oct 2014 21:11:17 +0000 (23:11 +0200)]
Fix dynamic calls to static methods with fci->object
func may already be freed at the time the static flag was checked.
Nikita Popov [Sun, 5 Oct 2014 20:58:40 +0000 (22:58 +0200)]
Fix $arr =& $arr[0]
value_ptr can be invalidated by the ptr_dtor, so backup the
zend_reference in an extra variable.
Nikita Popov [Sun, 5 Oct 2014 20:06:34 +0000 (22:06 +0200)]
Add UPGRADING stubs for a number of recent changes
Nikita Popov [Sun, 5 Oct 2014 19:59:46 +0000 (21:59 +0200)]
Regenerate tokenizer data
Also fix the tokenizer_data_gen.sh script after 64bit changes.
Nikita Popov [Sun, 5 Oct 2014 19:58:38 +0000 (21:58 +0200)]
Fix unused variable warning
Nikita Popov [Tue, 9 Sep 2014 21:14:19 +0000 (23:14 +0200)]
Remove <% and <script language="php"> tags
As per https://wiki.php.net/rfc/remove_alternative_php_tags.
Removes:
* <% opening tag
* %> closing tag
* <%= short opening tag
* /<script\s+language\s*=\s*(php|"php"|'php')\s*>/i opening tag
* /</script>/i closing tag
* asp_tags ini directive
Anatol Belski [Sun, 5 Oct 2014 11:20:27 +0000 (13:20 +0200)]
properly export tsrm_strtok_r()
for this particular case fixing phar shared build, but for the
general usage anyway
Dmitry Stogov [Sun, 5 Oct 2014 09:02:58 +0000 (13:02 +0400)]
Fixed list() behavior inconsistency (string handling is disabled for all cases, ArrayAccess objects handling is enabled for all cases, ZEND_FETCH_DIM_TMP_VAR opcode is renamed into ZEND_FETCH_LIST, ZEND_FETCH_ADD_LOCK flag is removed).
Johannes Schlüter [Sat, 4 Oct 2014 18:07:00 +0000 (20:07 +0200)]
Merge branch 'PHP-5.6'
Johannes Schlüter [Sat, 4 Oct 2014 18:06:44 +0000 (20:06 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Johannes Schlüter [Sat, 4 Oct 2014 18:06:02 +0000 (20:06 +0200)]
Fix accidental edit in previous commit
Johannes Schlüter [Sat, 4 Oct 2014 18:00:40 +0000 (20:00 +0200)]
Merge branch 'PHP-5.6'
Johannes Schlüter [Sat, 4 Oct 2014 18:00:10 +0000 (20:00 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Johannes Schlüter [Sat, 4 Oct 2014 17:59:21 +0000 (19:59 +0200)]
Fix arginfo
Florian MARGAINE [Sat, 20 Sep 2014 21:16:39 +0000 (23:16 +0200)]
DateTimeZone::getOffset() now accepts a DateTimeInterface
Fixes #68062
Should be backported to PHP-5.6 and PHP-5.5.
Conflicts:
ext/date/tests/bug67118.phpt
Derick Rethans [Sat, 4 Oct 2014 15:00:29 +0000 (16:00 +0100)]
Merge branch 'PHP-5.6'
Derick Rethans [Sat, 4 Oct 2014 14:59:17 +0000 (15:59 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Sat, 4 Oct 2014 14:58:40 +0000 (15:58 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Florian MARGAINE [Mon, 22 Sep 2014 21:35:29 +0000 (23:35 +0200)]
DateTimeZone::getOffset() now accepts a DateTimeInterface
Fixes #68062
Dmitry Stogov [Sat, 4 Oct 2014 10:55:44 +0000 (14:55 +0400)]
Moved checks and error reporting related to static methods from DO_FCALL inti INTI_FCALL* opcodes that may really deal with static methods. (In some rare cases it may lead to different order of warning messages).
Nikita Popov [Fri, 3 Oct 2014 22:32:32 +0000 (00:32 +0200)]
Fix test gc_029_zts.phpt
In ZTS the default properties are duplicated (instead of copied),
so the array has one lower RC than on NTS and as such gets destroyed
during GC, increasing the cycle count by 3. PHP 5.6 didn't always
copy default properties on ZTS, which is where the difference comes
from.
George Wang [Fri, 3 Oct 2014 20:43:58 +0000 (16:43 -0400)]
Merge branch 'master' of git.php.net:php-src
George Wang [Fri, 3 Oct 2014 20:43:35 +0000 (16:43 -0400)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
George Wang [Fri, 3 Oct 2014 20:43:08 +0000 (16:43 -0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
George Wang [Fri, 3 Oct 2014 20:41:32 +0000 (16:41 -0400)]
Fixed a bug that causes crash when environment variable is access while parsing php.ini
George Wang [Fri, 3 Oct 2014 20:41:32 +0000 (16:41 -0400)]
Fixed a bug that causes crash when environment variable is access while parsing php.ini
George Wang [Fri, 3 Oct 2014 20:41:32 +0000 (16:41 -0400)]
Fixed a bug that causes crash when environment variable is access while parsing php.ini
Anatol Belski [Fri, 3 Oct 2014 20:17:02 +0000 (22:17 +0200)]
fix asinh delivering -0 when the arg is 0
Nikita Popov [Fri, 3 Oct 2014 19:55:03 +0000 (21:55 +0200)]
Mark test for full GC root buffer as XFAIL
Nikita Popov [Fri, 3 Oct 2014 19:49:44 +0000 (21:49 +0200)]
Fix two date tests
New behavior seems much more reasonable - nothing should be able
to touch the $this value like that.
Nikita Popov [Fri, 3 Oct 2014 19:46:14 +0000 (21:46 +0200)]
Mark three foreach tests as XFAIL
A lot of work is needed to properly handle all foreach edge cases,
which is not going to happen anytime soon. So marking these tests
as XFAIL for now.
Anatol Belski [Fri, 3 Oct 2014 19:45:51 +0000 (21:45 +0200)]
reveal some newer libcurl features in MINFO
Nikita Popov [Fri, 3 Oct 2014 19:42:35 +0000 (21:42 +0200)]
Merge branch 'PHP-5.6'
Nikita Popov [Fri, 3 Oct 2014 19:42:11 +0000 (21:42 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Fri, 3 Oct 2014 19:41:58 +0000 (21:41 +0200)]
Fix bug number
Nikita Popov [Fri, 3 Oct 2014 19:30:06 +0000 (21:30 +0200)]
Merge branch 'PHP-5.6'
Conflicts:
Zend/zend_object_handlers.c
Nikita Popov [Fri, 3 Oct 2014 19:26:51 +0000 (21:26 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Fri, 3 Oct 2014 19:24:28 +0000 (21:24 +0200)]
Fix bug #68188
Nikita Popov [Fri, 3 Oct 2014 19:06:26 +0000 (21:06 +0200)]
Fix bug #68133 and bug #68135
Anatol Belski [Fri, 3 Oct 2014 17:38:40 +0000 (19:38 +0200)]
remove the remains of dsp files handling
Anatol Belski [Fri, 3 Oct 2014 17:16:53 +0000 (19:16 +0200)]
fix EX usage
Anatol Belski [Thu, 2 Oct 2014 11:50:46 +0000 (13:50 +0200)]
remove misprint parentheses
Anatol Belski [Thu, 2 Oct 2014 11:48:26 +0000 (13:48 +0200)]
remove misprint parentheses
Dmitry Stogov [Fri, 3 Oct 2014 15:32:46 +0000 (19:32 +0400)]
Replaced EG(This) and EX(object) with EX(This).
Internal functions now recieves zend_execute_data as the first argument.
Xinchen Hui [Fri, 3 Oct 2014 11:07:02 +0000 (19:07 +0800)]
And this one...
Xinchen Hui [Fri, 3 Oct 2014 10:35:47 +0000 (18:35 +0800)]
It should be in extern c
Xinchen Hui [Fri, 3 Oct 2014 10:35:18 +0000 (18:35 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Fri, 3 Oct 2014 10:35:05 +0000 (18:35 +0800)]
Remove useless condition
Ferenc Kovacs [Fri, 3 Oct 2014 09:40:05 +0000 (11:40 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS entry for previous commit
NEWS entry for previous commit
add IPv6 support to php-fpm
Ferenc Kovacs [Fri, 3 Oct 2014 09:39:53 +0000 (11:39 +0200)]
NEWS entry for previous commit
Ferenc Kovacs [Fri, 3 Oct 2014 09:39:09 +0000 (11:39 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS entry for previous commit
add IPv6 support to php-fpm
Ferenc Kovacs [Fri, 3 Oct 2014 09:38:32 +0000 (11:38 +0200)]
NEWS entry for previous commit
Robin Gloster [Fri, 3 Oct 2014 09:35:27 +0000 (11:35 +0200)]
add IPv6 support to php-fpm
Dmitry Stogov [Fri, 3 Oct 2014 08:18:15 +0000 (12:18 +0400)]
Micro optimization for the most frequency case
Sara Golemon [Fri, 3 Oct 2014 01:55:39 +0000 (18:55 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Add hash to EXTENSIONS file
Sara Golemon [Fri, 3 Oct 2014 01:55:29 +0000 (18:55 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Add hash to EXTENSIONS file
Sara Golemon [Fri, 3 Oct 2014 01:55:14 +0000 (18:55 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Add hash to EXTENSIONS file
Sara Golemon [Fri, 3 Oct 2014 01:54:46 +0000 (18:54 -0700)]
Add hash to EXTENSIONS file
Johannes Schlüter [Fri, 3 Oct 2014 00:12:09 +0000 (02:12 +0200)]
Remove extensions which are long gone
Ferenc Kovacs [Thu, 2 Oct 2014 20:33:10 +0000 (22:33 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
we also have xz release tarballs since 5.5
5.5.19 now
Ferenc Kovacs [Thu, 2 Oct 2014 20:32:18 +0000 (22:32 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
we also have xz release tarballs since 5.5
5.5.19 now
Conflicts:
configure.in
main/php_version.h
Ferenc Kovacs [Thu, 2 Oct 2014 20:28:19 +0000 (22:28 +0200)]
we also have xz release tarballs since 5.5
Nikita Popov [Thu, 2 Oct 2014 19:58:29 +0000 (21:58 +0200)]
Fix ZTS build
Anatol Belski [Thu, 2 Oct 2014 10:15:34 +0000 (12:15 +0200)]
improved file size computation in stat()
On 32 bit it's still overwlowing, so nothing is changed there. But
the usage of LARGE_INTEGER instead of bit shifting is a better way
to go.
Dmitry Stogov [Thu, 2 Oct 2014 09:37:44 +0000 (13:37 +0400)]
Fixed incorrect compilation
Julien Pauli [Wed, 1 Oct 2014 14:16:05 +0000 (16:16 +0200)]
5.5.19 now
Dmitry Stogov [Wed, 1 Oct 2014 12:37:21 +0000 (16:37 +0400)]
Expose zend_throw_exception_internal()
Dmitry Stogov [Wed, 1 Oct 2014 12:35:56 +0000 (16:35 +0400)]
Use inline finction for OBJ_RELEASE() macro
Ferenc Kovacs [Wed, 1 Oct 2014 09:16:40 +0000 (11:16 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
update NEWS about the release date of 5.6.1
Ferenc Kovacs [Wed, 1 Oct 2014 09:15:59 +0000 (11:15 +0200)]
update NEWS about the release date of 5.6.1
Remi Collet [Wed, 1 Oct 2014 08:15:13 +0000 (10:15 +0200)]
only no_NO.ISO-8859-1 have to be ignored (merged)
Remi Collet [Wed, 1 Oct 2014 08:14:14 +0000 (10:14 +0200)]
only no_NO.ISO-8859-1 have to be ignored
krakjoe [Thu, 21 Aug 2014 09:03:48 +0000 (10:03 +0100)]
remove bogus locale use from test
Remi Collet [Wed, 1 Oct 2014 07:27:18 +0000 (09:27 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
use $PHP_LIBDIR instread of "lib" in skel example
Remi Collet [Wed, 1 Oct 2014 07:26:46 +0000 (09:26 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
use $PHP_LIBDIR instread of "lib" in skel example
Remi Collet [Wed, 1 Oct 2014 07:26:21 +0000 (09:26 +0200)]
use $PHP_LIBDIR instread of "lib" in skel example
Dmitry Stogov [Wed, 1 Oct 2014 06:46:13 +0000 (10:46 +0400)]
Removed zend_execute_data->prev_nested_call. Reuse prev_execute_data instead.
Dmitry Stogov [Tue, 30 Sep 2014 11:19:51 +0000 (15:19 +0400)]
Micro optimization
Nikita Popov [Mon, 29 Sep 2014 20:59:57 +0000 (22:59 +0200)]
Drop unused INIT_STRING opcode
INIT_STRING has been implemented as an UNUSED op1 to ADD_* for
some time now.
Nikita Popov [Mon, 29 Sep 2014 20:50:56 +0000 (22:50 +0200)]
Drop unused RAISE_ABSTRACT_ERROR opcode
Abstract methods are being prevented from being called in DO_FCALL
etc.
Nikita Popov [Sun, 28 Sep 2014 21:17:29 +0000 (23:17 +0200)]
CT substitute unqualified true/false/null in namespaces
Substituation now always happens on the resolved name and
unqualified usages of true/false/null in namespaced code are
substituted as well.
Nikita Popov [Sun, 28 Sep 2014 19:30:49 +0000 (21:30 +0200)]
Fix a couple compile warnings
Anatol Belski [Mon, 29 Sep 2014 18:31:02 +0000 (20:31 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix test filename
Anatol Belski [Mon, 29 Sep 2014 18:30:43 +0000 (20:30 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix test filename
Anatol Belski [Mon, 29 Sep 2014 18:30:18 +0000 (20:30 +0200)]
fix test filename