]> granicus.if.org Git - php/log
php
10 years agoFixed bug #70111 (Segfault when a function uses both an explicit return type and...
Xinchen Hui [Wed, 22 Jul 2015 14:43:30 +0000 (22:43 +0800)]
Fixed bug #70111 (Segfault when a function uses both an explicit return type and an explicit cast)

10 years agoAlways lowercase function names for lookup in phpdbg -p
Bob Weinand [Wed, 22 Jul 2015 13:33:44 +0000 (15:33 +0200)]
Always lowercase function names for lookup in phpdbg -p

10 years agoFix opcode tests which may generate FCALL instead of ICALL
Bob Weinand [Wed, 22 Jul 2015 11:49:28 +0000 (13:49 +0200)]
Fix opcode tests which may generate FCALL instead of ICALL

10 years agoAdd -e (ZEND_EXT_* generation) option to phpdbg
Bob Weinand [Wed, 22 Jul 2015 11:46:06 +0000 (13:46 +0200)]
Add -e (ZEND_EXT_* generation) option to phpdbg

10 years agoEmit EXT_STMT for each statement
Nikita Popov [Wed, 22 Jul 2015 11:12:54 +0000 (13:12 +0200)]
Emit EXT_STMT for each statement

I'm excluding unticked statements for this (in 5.x they were included)
as this would just result in two consecutive EXT_STMTs.

Also add all class statements to unticked statements, these would
generate superfluous EXT_STMT/TICKS in the parent op_array.

10 years agoFixed opcodes printing.
Xinchen Hui [Wed, 22 Jul 2015 11:13:26 +0000 (19:13 +0800)]
Fixed opcodes printing.

-p"function"
-p"class::"
-p"class::method"

10 years agoMerge branch 'PHP-5.6'
Julien Pauli [Wed, 22 Jul 2015 07:28:59 +0000 (09:28 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  5.6.13 now

Conflicts:
configure.in
main/php_version.h

10 years ago5.6.13 now
Julien Pauli [Wed, 22 Jul 2015 07:27:49 +0000 (09:27 +0200)]
5.6.13 now

10 years ago$argv and $argc may be IS_INDIRECT
Bob Weinand [Tue, 21 Jul 2015 22:22:39 +0000 (00:22 +0200)]
$argv and $argc may be IS_INDIRECT

10 years agoUndefined values may lead to big allocation
Bob Weinand [Tue, 21 Jul 2015 22:02:40 +0000 (00:02 +0200)]
Undefined values may lead to big allocation

10 years agoRemove FAST_CALL_FROM_CATCH
Nikita Popov [Tue, 21 Jul 2015 16:06:19 +0000 (18:06 +0200)]
Remove FAST_CALL_FROM_CATCH

This was generated for a return from a try block with both a catch
and a finally. However at this point no exception can be active,
because it either didn't exist in the first place or was explicitly
discarded using DISCARD_EXCEPTION.

10 years agoFix bug #70106 (Inheritance by anonymous class)
Bob Weinand [Tue, 21 Jul 2015 18:34:06 +0000 (20:34 +0200)]
Fix bug #70106 (Inheritance by anonymous class)

10 years agoAdd an option to not generate INIT_FCALL ops for user functions too
Bob Weinand [Tue, 21 Jul 2015 14:39:22 +0000 (16:39 +0200)]
Add an option to not generate INIT_FCALL ops for user functions too

10 years agoversion up in NEWS
Anatol Belski [Tue, 21 Jul 2015 14:37:43 +0000 (16:37 +0200)]
version up in NEWS

10 years agoremove BOM from NEWS
Anatol Belski [Tue, 21 Jul 2015 14:36:36 +0000 (16:36 +0200)]
remove BOM from NEWS

10 years agoReverted ad4533fdbabcc3e545277e30023b2fdce16297a0
Anatol Belski [Tue, 21 Jul 2015 09:18:36 +0000 (11:18 +0200)]
Reverted ad4533fdbabcc3e545277e30023b2fdce16297a0

The E_ERROR to E_RECOVERABLE_ERROR should be readded with the
proper tests.

10 years agoupdate UPGRADING
Anatol Belski [Tue, 21 Jul 2015 09:12:08 +0000 (11:12 +0200)]
update UPGRADING

10 years agoupdated NEWS
Anatol Belski [Tue, 21 Jul 2015 08:42:06 +0000 (10:42 +0200)]
updated NEWS

10 years agofix comment
Anatol Belski [Sat, 18 Jul 2015 16:28:42 +0000 (18:28 +0200)]
fix comment

10 years agolibwebp support for linux
Anatol Belski [Sat, 18 Jul 2015 16:12:01 +0000 (09:12 -0700)]
libwebp support for linux

10 years agoReplaced libvpx by libwebp (first draft; Windows only)
Christoph M. Becker [Mon, 13 Jul 2015 22:29:05 +0000 (00:29 +0200)]
Replaced libvpx by libwebp (first draft; Windows only)

ext/gd/libgd/gd_webp.c has been taken from libgd[1]. Mainly, gd_error(X) has
been subsituted by zend_error(E_ERROR, X) and BGD_DECLARE(X) by X. Further
modifications are obvious from the diff.

All GD tests are passing, what raises hope, but we need more WebP tests,
anyway.

[1] <https://github.com/libgd/libgd/blob/7ec030c4f1dae75ed5d82c3eed2abe6775742c75/src/gd_webp.c>

10 years agoupdate news with bug #70022
Anatol Belski [Tue, 21 Jul 2015 07:22:45 +0000 (09:22 +0200)]
update news with bug #70022

10 years agoChange E_ERROR and some E_WARNING to E_RECOVERABLE_ERROR.
Yasuo Ohgaki [Tue, 21 Jul 2015 03:59:23 +0000 (12:59 +0900)]
Change E_ERROR and some E_WARNING to E_RECOVERABLE_ERROR.

10 years agoMerge branch 'PHP-5.6'
Christoph M. Becker [Tue, 21 Jul 2015 00:00:16 +0000 (02:00 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Add tests for json_last_error()/json_last_error_msg() failures

10 years agoAdd tests for json_last_error()/json_last_error_msg() failures
Kubo2 [Mon, 20 Jul 2015 11:05:44 +0000 (13:05 +0200)]
Add tests for json_last_error()/json_last_error_msg() failures

10 years agoupdated NEWS
Christoph M. Becker [Mon, 20 Jul 2015 23:24:55 +0000 (01:24 +0200)]
updated NEWS

10 years agoMerge branch 'PHP-5.6'
Christoph M. Becker [Mon, 20 Jul 2015 23:20:02 +0000 (01:20 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  revised bug53156.phpt
  Fix #53156: imagerectangle problem with point ordering

10 years agoupdated NEWS
Christoph M. Becker [Mon, 20 Jul 2015 23:17:51 +0000 (01:17 +0200)]
updated NEWS

10 years agoMerge branch 'pull-request/1425' into PHP-5.6
Christoph M. Becker [Mon, 20 Jul 2015 23:13:04 +0000 (01:13 +0200)]
Merge branch 'pull-request/1425' into PHP-5.6

* pull-request/1425:
  revised bug53156.phpt
  Fix #53156: imagerectangle problem with point ordering

10 years agoExclude opcache from a few opcode related tests
Bob Weinand [Mon, 20 Jul 2015 22:06:10 +0000 (00:06 +0200)]
Exclude opcache from a few opcode related tests

10 years agoupdated NEWS
Christoph M. Becker [Mon, 20 Jul 2015 21:50:40 +0000 (23:50 +0200)]
updated NEWS

10 years agoMerge branch 'PHP-5.6'
Christoph M. Becker [Mon, 20 Jul 2015 21:44:04 +0000 (23:44 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  Fix #66387: Stack overflow with imagefilltoborder

10 years agoupdated NEWS
Christoph M. Becker [Mon, 20 Jul 2015 21:40:23 +0000 (23:40 +0200)]
updated NEWS

10 years agoFix #66387: Stack overflow with imagefilltoborder
Christoph M. Becker [Mon, 20 Jul 2015 21:24:55 +0000 (23:24 +0200)]
Fix #66387: Stack overflow with imagefilltoborder

The stack overflow is caused by the recursive algorithm in combination with a
very large negative coordinate passed to gdImageFillToBorder(). As there is
already a clipping for large positive coordinates to the width and height of
the image, it seems to be consequent to clip to zero also.

10 years agoFix various Windows issues (e.g. dir separators)
Bob Weinand [Mon, 20 Jul 2015 21:25:50 +0000 (23:25 +0200)]
Fix various Windows issues (e.g. dir separators)

10 years agoRemove bogus exception_save() from FETCH_CLASS
Nikita Popov [Mon, 20 Jul 2015 20:56:51 +0000 (22:56 +0200)]
Remove bogus exception_save() from FETCH_CLASS

There can't be no exception at the start of the op. Also would miss
the corresponding exception_restore().

10 years agoFix readline/libedit build
Bob Weinand [Mon, 20 Jul 2015 20:45:05 +0000 (22:45 +0200)]
Fix readline/libedit build

10 years agoDo not use readline when not having a tty
Bob Weinand [Mon, 20 Jul 2015 19:57:00 +0000 (21:57 +0200)]
Do not use readline when not having a tty
This is important for e.g. run-tests.php

10 years agoAdd show_unexecuted option to phpdbg_end_oplog()
Bob Weinand [Mon, 20 Jul 2015 18:41:07 +0000 (20:41 +0200)]
Add show_unexecuted option to phpdbg_end_oplog()

10 years agoMove phpdbg tests to .phpt mechanism
Bob Weinand [Mon, 20 Jul 2015 16:00:32 +0000 (18:00 +0200)]
Move phpdbg tests to .phpt mechanism
Also add a few more in-depth tests related to $argv, breakpoints and uncaught exceptions

10 years agoFix misbehaviors with uncaught exceptions and finally or eval
Bob Weinand [Mon, 20 Jul 2015 15:52:57 +0000 (17:52 +0200)]
Fix misbehaviors with uncaught exceptions and finally or eval

10 years agoPreserve argv consistency over multiple runs
Bob Weinand [Mon, 20 Jul 2015 14:18:30 +0000 (16:18 +0200)]
Preserve argv consistency over multiple runs

10 years agoFix info vars with refs/indirects
Bob Weinand [Mon, 20 Jul 2015 00:18:50 +0000 (02:18 +0200)]
Fix info vars with refs/indirects

10 years agoFix function/method breakpoint case sensitivity issues
Bob Weinand [Sun, 19 Jul 2015 23:17:27 +0000 (01:17 +0200)]
Fix function/method breakpoint case sensitivity issues

10 years agoAlways only halt upon first non-recv opcode in a function
Bob Weinand [Sun, 19 Jul 2015 18:32:46 +0000 (20:32 +0200)]
Always only halt upon first non-recv opcode in a function

10 years agoMake opcode breakpoints work again
Bob Weinand [Sat, 18 Jul 2015 21:55:59 +0000 (23:55 +0200)]
Make opcode breakpoints work again

10 years agoDo never clean stdin buffer away
Bob Weinand [Sat, 18 Jul 2015 21:36:37 +0000 (23:36 +0200)]
Do never clean stdin buffer away

10 years agoFix use of already freed hashtable (wrong variable)
Bob Weinand [Sat, 18 Jul 2015 21:35:59 +0000 (23:35 +0200)]
Fix use of already freed hashtable (wrong variable)

10 years agoDo not show "Script ended normally" upon forced rerun
Bob Weinand [Sat, 18 Jul 2015 18:51:25 +0000 (20:51 +0200)]
Do not show "Script ended normally" upon forced rerun

10 years agoDo not display compilation success / normal script end in -rr mode
Bob Weinand [Sat, 18 Jul 2015 18:37:44 +0000 (20:37 +0200)]
Do not display compilation success / normal script end in -rr mode

10 years agorevised bug53156.phpt
Christoph M. Becker [Mon, 20 Jul 2015 01:05:22 +0000 (03:05 +0200)]
revised bug53156.phpt

10 years agoFix #53156: imagerectangle problem with point ordering
Christoph M. Becker [Mon, 20 Jul 2015 00:11:18 +0000 (02:11 +0200)]
Fix #53156: imagerectangle problem with point ordering

Contrary to imagefilledrectangle(), imagerectangle() has the documented
limitation that the given points have to be the upper left and the lower right
corner, respectively. However, libgd already caters to upper right / lower left
pairs, and not catering to the other two combinations seems to be an oversight.

10 years agoMerge branch 'PHP-5.6'
Christoph M. Becker [Sun, 19 Jul 2015 21:11:11 +0000 (23:11 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Added basic test for imagewebp() and imagecreatefromwebp()

10 years agoAdded basic test for imagewebp() and imagecreatefromwebp()
Christoph M. Becker [Sun, 19 Jul 2015 21:03:02 +0000 (23:03 +0200)]
Added basic test for imagewebp() and imagecreatefromwebp()

10 years agoupdated NEWS
Christoph M. Becker [Sun, 19 Jul 2015 20:44:53 +0000 (22:44 +0200)]
updated NEWS

10 years agoMerge branch 'PHP-5.6'
Christoph M. Becker [Sun, 19 Jul 2015 20:40:49 +0000 (22:40 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  Fix #70102: imagecreatefromwebm() shifts colors

10 years agoupdated NEWS
Christoph M. Becker [Sun, 19 Jul 2015 20:39:18 +0000 (22:39 +0200)]
updated NEWS

10 years agoFix #70102: imagecreatefromwebm() shifts colors
Christoph M. Becker [Sun, 19 Jul 2015 20:21:56 +0000 (22:21 +0200)]
Fix #70102: imagecreatefromwebm() shifts colors

libgd internally uses ARGB format, so we have to decode to ARGB instead of
RGBA.

10 years agoMerge branch 'PHP-5.6'
Christoph M. Becker [Sun, 19 Jul 2015 20:01:20 +0000 (22:01 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fixed Fix #66590, which may segfault

10 years agofixed Fix #66590, which may segfault
Christoph M. Becker [Sun, 19 Jul 2015 19:51:35 +0000 (21:51 +0200)]
fixed Fix #66590, which may segfault

10 years agofix two clang errors on Windows
Anatol Belski [Sun, 19 Jul 2015 18:06:31 +0000 (20:06 +0200)]
fix two clang errors on Windows

10 years agoexclude a non windows test
Anatol Belski [Sun, 19 Jul 2015 17:53:53 +0000 (19:53 +0200)]
exclude a non windows test

10 years agoupdated NEWS
Christoph M. Becker [Sun, 19 Jul 2015 15:48:02 +0000 (17:48 +0200)]
updated NEWS

10 years agoMerge branch 'PHP-5.6'
Christoph M. Becker [Sun, 19 Jul 2015 15:45:16 +0000 (17:45 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  Fix #66590: imagewebp() doesn't pad to even length

10 years agoupdated NEWS
Christoph M. Becker [Sun, 19 Jul 2015 15:43:44 +0000 (17:43 +0200)]
updated NEWS

10 years agoFix #66590: imagewebp() doesn't pad to even length
Christoph M. Becker [Sun, 19 Jul 2015 15:32:53 +0000 (17:32 +0200)]
Fix #66590: imagewebp() doesn't pad to even length

The code in the bundled libgd uses libvpx and writes the riff manually. The
code generates the correct even size, but neglects the padding. It's possible
older versions of libwebp would decode this, but libwebp 0.4.0 does not.

Let's apply the patch supplied by one of the WebP developers.

10 years agowddx_add_vars() returns a bool
Rasmus Lerdorf [Sun, 19 Jul 2015 14:04:40 +0000 (07:04 -0700)]
wddx_add_vars() returns a bool

10 years agoupdated NEWS
Christoph M. Becker [Sat, 18 Jul 2015 20:57:02 +0000 (22:57 +0200)]
updated NEWS

10 years agoMerge branch 'PHP-5.6'
Christoph M. Becker [Sat, 18 Jul 2015 20:52:39 +0000 (22:52 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix #70096: Repeated iptcembed() adds superfluous FF bytes

Conflicts:
ext/standard/iptc.c

10 years agoupdated NEWS
Christoph M. Becker [Sat, 18 Jul 2015 20:50:11 +0000 (22:50 +0200)]
updated NEWS

10 years agoFix #70096: Repeated iptcembed() adds superfluous FF bytes
Christoph M. Becker [Sat, 18 Jul 2015 20:48:54 +0000 (22:48 +0200)]
Fix #70096: Repeated iptcembed() adds superfluous FF bytes

When there is already an APP13 marker segment in the file, iptcembed() doesn't
skip the first byte (0xFF) of this segment, what leads to unnecessary and
potentially invalid duplication of this byte. This patch fixes this issue.

10 years agoCheck mbfl_filt_put_invalid_char return value
Nikita Popov [Sat, 18 Jul 2015 19:24:28 +0000 (21:24 +0200)]
Check mbfl_filt_put_invalid_char return value

And fix some libmbfl warnings

10 years agoDeduplicate usort code
Nikita Popov [Sat, 18 Jul 2015 19:15:18 +0000 (21:15 +0200)]
Deduplicate usort code

10 years agoMerge branch 'PHP-5.6'
Christoph M. Becker [Sat, 18 Jul 2015 19:35:54 +0000 (21:35 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fixed PHPT that is always being skipped or otherwise would fail

10 years agofixed PHPT that is always being skipped or otherwise would fail
Christoph M. Becker [Sat, 18 Jul 2015 19:33:20 +0000 (21:33 +0200)]
fixed PHPT that is always being skipped or otherwise would fail

10 years agoCorrectly handle zend_hash_sort failure
Nikita Popov [Sat, 18 Jul 2015 18:04:22 +0000 (20:04 +0200)]
Correctly handle zend_hash_sort failure

This can't actually happen right now, but should it become possible
we won't be leaking everything anymore.

10 years agoFix usort modification detection
Nikita Popov [Sat, 18 Jul 2015 17:58:42 +0000 (19:58 +0200)]
Fix usort modification detection

This would delref the wrong array, leading to a segfault.

10 years agoRegenerate bison and re2c files in json
Jakub Zelenka [Sat, 18 Jul 2015 16:41:17 +0000 (17:41 +0100)]
Regenerate bison and re2c files in json

10 years agoPartially fix XSLT warnings
Nikita Popov [Fri, 17 Jul 2015 19:08:15 +0000 (21:08 +0200)]
Partially fix XSLT warnings

The two remaining issues seem to be genuine problems. We're treating
node->children as a string, even though it's actually an xmlNode.
The same code exists twice in xpath.c. In all cases gcov shows no
coverage for it.

10 years agoMore warning fixes
Nikita Popov [Fri, 17 Jul 2015 18:48:42 +0000 (20:48 +0200)]
More warning fixes

10 years agoFix simplexml warnings
Nikita Popov [Fri, 17 Jul 2015 18:31:40 +0000 (20:31 +0200)]
Fix simplexml warnings

10 years agofix duplicated line
Anatol Belski [Fri, 17 Jul 2015 18:30:21 +0000 (20:30 +0200)]
fix duplicated line

10 years agoVarious warning fixes
Nikita Popov [Fri, 17 Jul 2015 18:18:25 +0000 (20:18 +0200)]
Various warning fixes

10 years agoFix zlib_filter warnings
Nikita Popov [Fri, 17 Jul 2015 17:48:06 +0000 (19:48 +0200)]
Fix zlib_filter warnings

10 years agoRemove --with-t1lib from travis build
Nikita Popov [Fri, 17 Jul 2015 17:08:08 +0000 (19:08 +0200)]
Remove --with-t1lib from travis build

10 years agoAlways use libtool --silent
Nikita Popov [Fri, 17 Jul 2015 17:02:43 +0000 (19:02 +0200)]
Always use libtool --silent

We don't need this spam for debug builds. Now make --quiet does
something useful for debug builds as well.

10 years agoFix mysqlnd warnings
Nikita Popov [Fri, 17 Jul 2015 15:48:02 +0000 (17:48 +0200)]
Fix mysqlnd warnings

10 years agoFixed signed/unsigned warnings in wddx
Nikita Popov [Fri, 17 Jul 2015 15:19:06 +0000 (17:19 +0200)]
Fixed signed/unsigned warnings in wddx

Also added extra const annotation to zend_memnstr.

10 years agoRemove dead goto label in phpdbg_cmd.c
Nikita Popov [Fri, 17 Jul 2015 14:51:54 +0000 (16:51 +0200)]
Remove dead goto label in phpdbg_cmd.c

10 years agoSwitch asprintf to spprintf in phpdbg opcode dump
Nikita Popov [Fri, 17 Jul 2015 14:49:34 +0000 (16:49 +0200)]
Switch asprintf to spprintf in phpdbg opcode dump

Also use %td where appropriate, a lot of the values are ptrdiff
based.

Fix a leak in phpdbg_frame.c.

10 years agoMake s(tr)pprintf infallible
Nikita Popov [Thu, 16 Jul 2015 21:17:29 +0000 (23:17 +0200)]
Make s(tr)pprintf infallible

spprintf now always creates a buffer and strpprintf always returns
a zend_string. Previously, if the result of the format happened to
be empty, the spprintf buffer would be set to NULL and strpprintf
would return NULL.

10 years agofix file cache path calculation at all the places
Anatol Belski [Fri, 17 Jul 2015 13:14:25 +0000 (15:14 +0200)]
fix file cache path calculation at all the places

moved the corresponding code into a separte function while on that

10 years agofix path handling for the file cache
Anatol Belski [Fri, 17 Jul 2015 11:50:40 +0000 (13:50 +0200)]
fix path handling for the file cache

10 years agoDonot use one_char_string
Xinchen Hui [Fri, 17 Jul 2015 08:09:11 +0000 (16:09 +0800)]
Donot use one_char_string

10 years agoMerge branch 'master' of git.php.net:php-src
Xinchen Hui [Fri, 17 Jul 2015 07:56:28 +0000 (15:56 +0800)]
Merge branch 'master' of git.php.net:php-src

10 years agoFixed bug #70089 (segfault at ZEND_FETCH_DIM_W_SPEC_VAR_CONST_HANDLER ())
Xinchen Hui [Fri, 17 Jul 2015 07:55:34 +0000 (15:55 +0800)]
Fixed bug #70089 (segfault at ZEND_FETCH_DIM_W_SPEC_VAR_CONST_HANDLER ())

10 years agoIgnore getcwd return in zend_compile
Nikita Popov [Thu, 16 Jul 2015 20:48:56 +0000 (22:48 +0200)]
Ignore getcwd return in zend_compile

To do this move the php_ignore_value macro to ZEND_IGNORE_VALUE.

10 years agoExplicitly ignore mblen(NULL, 0) retval
Nikita Popov [Thu, 16 Jul 2015 20:39:11 +0000 (22:39 +0200)]
Explicitly ignore mblen(NULL, 0) retval

10 years agoHandle empty (NULL) stmt in ast_export
nikita2206 [Thu, 9 Jul 2015 14:43:50 +0000 (18:43 +0400)]
Handle empty (NULL) stmt in ast_export

10 years agoMerge remote-tracking branch 'origin/PHP-5.6'
Bob Weinand [Thu, 16 Jul 2015 17:12:38 +0000 (19:12 +0200)]
Merge remote-tracking branch 'origin/PHP-5.6'