]> granicus.if.org Git - php/log
php
9 years agoMake opcode breakpoints work again
Bob Weinand [Sat, 18 Jul 2015 21:55:59 +0000 (23:55 +0200)]
Make opcode breakpoints work again

9 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

9 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)

9 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

9 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

9 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()

9 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()

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

9 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

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

9 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.

9 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

9 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

9 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

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

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

9 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

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

9 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.

9 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

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

9 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

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

9 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.

9 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

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

9 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

9 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

9 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.

9 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.

9 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

9 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.

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

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

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

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

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

9 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

9 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.

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

9 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.

9 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

9 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.

9 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.

9 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

9 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

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

9 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

9 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 ())

9 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.

9 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

9 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

9 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'

9 years agoforked test for windows
Anatol Belski [Thu, 16 Jul 2015 13:04:41 +0000 (15:04 +0200)]
forked test for windows

9 years agoFixed bug #70079 (Segmentation fault after more than 100 SoapClient calls)
Xinchen Hui [Thu, 16 Jul 2015 10:32:42 +0000 (18:32 +0800)]
Fixed bug #70079 (Segmentation fault after more than 100 SoapClient calls)

9 years agoCleanup exception displaying code in phpdbg
Bob Weinand [Thu, 16 Jul 2015 08:28:59 +0000 (10:28 +0200)]
Cleanup exception displaying code in phpdbg

9 years agoFix test; this should properly emit a fatal error, just as every other by-ref assignm...
Bob Weinand [Thu, 16 Jul 2015 07:29:43 +0000 (09:29 +0200)]
Fix test; this should properly emit a fatal error, just as every other by-ref assignment to an overloaded object

9 years agoFix test; this should properly throw an Error, just as every other by-ref assignment...
Bob Weinand [Thu, 16 Jul 2015 07:24:57 +0000 (09:24 +0200)]
Fix test; this should properly throw an Error, just as every other by-ref assignment to an overloaded object

9 years agoMore OCI8 diff fixes (Rajendra)
Christopher Jones [Thu, 16 Jul 2015 03:06:35 +0000 (13:06 +1000)]
More OCI8 diff fixes (Rajendra)

9 years agoBackport fix for bug #70083 to PHP-5.6
Bob Weinand [Wed, 15 Jul 2015 20:46:53 +0000 (22:46 +0200)]
Backport fix for bug #70083 to PHP-5.6

9 years agoFixed bug #70083 (Use after free with assign by ref on overloaded objects)
Bob Weinand [Wed, 15 Jul 2015 20:36:42 +0000 (22:36 +0200)]
Fixed bug #70083 (Use after free with assign by ref on overloaded objects)

9 years agoFix crash on non-debug for phpdbg_end_oplog()
Bob Weinand [Wed, 15 Jul 2015 20:30:12 +0000 (22:30 +0200)]
Fix crash on non-debug for phpdbg_end_oplog()

9 years agounserialize() takes a 2nd optional arg and it can't be a bool
Rasmus Lerdorf [Wed, 15 Jul 2015 16:59:31 +0000 (09:59 -0700)]
unserialize() takes a 2nd optional arg and it can't be a bool

9 years agoImprove the conditions(save one comparison)
Xinchen Hui [Wed, 15 Jul 2015 02:55:41 +0000 (10:55 +0800)]
Improve the conditions(save one comparison)

9 years agoFixed segfault if opcache is disabled and with file_cache
Xinchen Hui [Wed, 15 Jul 2015 02:38:23 +0000 (10:38 +0800)]
Fixed segfault if opcache is disabled and with file_cache

9 years agoFixed bug #70067 (Cross-compile failure in opcache when SIZEOF_ZEND_LONG < SIZEOF_SIZE_T)
Xinchen Hui [Tue, 14 Jul 2015 10:58:43 +0000 (18:58 +0800)]
Fixed bug #70067 (Cross-compile failure in opcache when SIZEOF_ZEND_LONG < SIZEOF_SIZE_T)

9 years agoFormat alignment (needed for news2html)
Lior Kaplan [Tue, 14 Jul 2015 09:00:26 +0000 (12:00 +0300)]
Format alignment (needed for news2html)

9 years agoFormat alignment (needed for news2html)
Lior Kaplan [Tue, 14 Jul 2015 08:28:39 +0000 (11:28 +0300)]
Format alignment (needed for news2html)

9 years agoMerge branch 'PHP-5.6'
Christoph M. Becker [Tue, 14 Jul 2015 08:11:50 +0000 (10:11 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix #53840: Misleading extension entries in php.ini

9 years agoFix #53840: Misleading extension entries in php.ini
Christoph M. Becker [Tue, 14 Jul 2015 08:09:29 +0000 (10:09 +0200)]
Fix #53840: Misleading extension entries in php.ini

As of PHP 5.3.0 the php_pspell.dll is not delivered anymore with the Windows
binaries, and according to bug #47464 that's highly unlike to change. So it's
appropriate to remove the respective extension entry from php.ini.

9 years agoMerge branch 'master' of http://git.php.net/repository/php-src
Christoph M. Becker [Tue, 14 Jul 2015 08:02:25 +0000 (10:02 +0200)]
Merge branch 'master' of http://git.php.net/repository/php-src

# By Bob Weinand (5) and others
# Via Bob Weinand
* 'master' of http://git.php.net/repository/php-src:
  We want to track phpdbg bugs in official bug tracker now; updated URL
  Show also runtime-bound functions/classes/methods with phpdbg -p
  One less comparison
  Fix potential segfault
  Closures only have {closure}() as method name Prefixing a class name does not make sense as they may be rebound to another scope, where this will be confusing
  Fix __METHOD__ in functions nested into methods
  Init variable to NULL before passing to zpp
  Format alignment
  PHP 7 OCI8: fix bug57702.phpt regression

9 years agoWe want to track phpdbg bugs in official bug tracker now; updated URL
Bob Weinand [Tue, 14 Jul 2015 06:31:44 +0000 (08:31 +0200)]
We want to track phpdbg bugs in official bug tracker now; updated URL

9 years agoShow also runtime-bound functions/classes/methods with phpdbg -p
Bob Weinand [Tue, 14 Jul 2015 04:28:15 +0000 (06:28 +0200)]
Show also runtime-bound functions/classes/methods with phpdbg -p

9 years agoOne less comparison
Rasmus Lerdorf [Tue, 14 Jul 2015 02:44:51 +0000 (19:44 -0700)]
One less comparison

9 years agoFix potential segfault
Rasmus Lerdorf [Tue, 14 Jul 2015 02:38:55 +0000 (19:38 -0700)]
Fix potential segfault

9 years agoClosures only have {closure}() as method name
Bob Weinand [Tue, 14 Jul 2015 00:52:09 +0000 (02:52 +0200)]
Closures only have {closure}() as method name
Prefixing a class name does not make sense as they may be rebound to another scope, where this will be confusing

9 years agoFix __METHOD__ in functions nested into methods
Bob Weinand [Tue, 14 Jul 2015 00:37:35 +0000 (02:37 +0200)]
Fix __METHOD__ in functions nested into methods

9 years agoInit variable to NULL before passing to zpp
Bob Weinand [Mon, 13 Jul 2015 23:55:32 +0000 (01:55 +0200)]
Init variable to NULL before passing to zpp

9 years agoFormat alignment
Lior Kaplan [Mon, 13 Jul 2015 23:43:11 +0000 (02:43 +0300)]
Format alignment

9 years agoPHP 7 OCI8: fix bug57702.phpt regression
Christopher Jones [Mon, 13 Jul 2015 22:39:59 +0000 (08:39 +1000)]
PHP 7 OCI8: fix bug57702.phpt regression

9 years agoMerge branch 'master' of http://git.php.net/repository/php-src
Christoph M. Becker [Mon, 13 Jul 2015 22:30:17 +0000 (00:30 +0200)]
Merge branch 'master' of http://git.php.net/repository/php-src

# By Anatol Belski
# Via Anatol Belski
* 'master' of http://git.php.net/repository/php-src:
  remove #ifdef
  remove comment, it's not right

9 years agoremove #ifdef
Anatol Belski [Mon, 13 Jul 2015 22:12:35 +0000 (00:12 +0200)]
remove #ifdef

9 years agoremove comment, it's not right
Anatol Belski [Mon, 13 Jul 2015 21:42:40 +0000 (23:42 +0200)]
remove comment, it's not right

9 years agoMerge branch 'master' of http://git.php.net/repository/php-src
Christoph M. Becker [Mon, 13 Jul 2015 20:39:12 +0000 (22:39 +0200)]
Merge branch 'master' of http://git.php.net/repository/php-src

# By Christoph M. Becker (6) and others
* 'master' of http://git.php.net/repository/php-src:
  updated NEWS
  updated NEWS
  Fix #66882: imagerotate by -90 degrees truncates image by 1px
  update NEWS
  Fixed bug #70065 curl_getinfo() returns corrupted values
  Revert SplFileInfo BC break while keeping fix for assertion removal
  Fix issue with SplFileInfo::getExtension() on files with only a leading '.' character
  updated NEWS
  updated NEWS
  Fix #70064: imagescale(..., IMG_BICUBIC) leaks memory

9 years agoupdated NEWS
Christoph M. Becker [Mon, 13 Jul 2015 20:33:43 +0000 (22:33 +0200)]
updated NEWS

9 years agoMerge branch 'PHP-5.6'
Christoph M. Becker [Mon, 13 Jul 2015 20:30:43 +0000 (22:30 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  Fix #66882: imagerotate by -90 degrees truncates image by 1px

9 years agoupdated NEWS
Christoph M. Becker [Mon, 13 Jul 2015 20:29:10 +0000 (22:29 +0200)]
updated NEWS

9 years agoFix #66882: imagerotate by -90 degrees truncates image by 1px
Christoph M. Becker [Mon, 13 Jul 2015 20:14:13 +0000 (22:14 +0200)]
Fix #66882: imagerotate by -90 degrees truncates image by 1px

Contrary to the external libgd, the bundled libgd doesn't use optimized
rotation algorithms for negative square angles. We fix that now.

There are other improvements in gdImageRotateInterpolated() in the external
libgd. I'll leave them out for now, in the hope that we'll be able to rejoin
the two libraries rather soon.

9 years agoFix #66882: imagerotate by -90 degrees truncates image by 1px
Christoph M. Becker [Mon, 13 Jul 2015 20:14:13 +0000 (22:14 +0200)]
Fix #66882: imagerotate by -90 degrees truncates image by 1px

Contrary to the external libgd, the bundled libgd doesn't use optimized
rotation algorithms for negative square angles. We fix that now.

There are other improvements in gdImageRotateInterpolated() in the external
libgd. I'll leave them out for now, in the hope that we'll be able to rejoin
the two libraries rather soon.

9 years agoupdate NEWS
Anatol Belski [Mon, 13 Jul 2015 19:48:45 +0000 (21:48 +0200)]
update NEWS

9 years agoFixed bug #70065 curl_getinfo() returns corrupted values
Anatol Belski [Mon, 13 Jul 2015 19:46:51 +0000 (21:46 +0200)]
Fixed bug #70065 curl_getinfo() returns corrupted values

9 years agoRevert SplFileInfo BC break while keeping fix for assertion removal
Anthony Ferrara [Mon, 13 Jul 2015 17:27:06 +0000 (13:27 -0400)]
Revert SplFileInfo BC break while keeping fix for assertion removal

This reverts the minor bc-break where .test would return an empty extension. This is different from 5.x's behavior.

In 7, it would result in an assertion failure crash. The fix for the removal of this assertion is kept, keeping BC with 5.x.

9 years agoFix issue with SplFileInfo::getExtension() on files with only a leading '.' character
Anthony Ferrara [Mon, 13 Jul 2015 17:12:45 +0000 (13:12 -0400)]
Fix issue with SplFileInfo::getExtension() on files with only a leading '.' character

Currently, there is an assert() that fails on files like .gitignore crashing PHP. This patch fixes that.
Instead, now an empty string is returned (since the file has no extension). A test has been added to test this behavior.

9 years agoupdated NEWS
Christoph M. Becker [Mon, 13 Jul 2015 16:39:11 +0000 (18:39 +0200)]
updated NEWS

9 years agoMerge branch 'PHP-5.6'
Christoph M. Becker [Mon, 13 Jul 2015 16:36:15 +0000 (18:36 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  Fix #70064: imagescale(..., IMG_BICUBIC) leaks memory

9 years agoupdated NEWS
Christoph M. Becker [Mon, 13 Jul 2015 16:34:40 +0000 (18:34 +0200)]
updated NEWS

9 years agoFix #70064: imagescale(..., IMG_BICUBIC) leaks memory
Christoph M. Becker [Mon, 13 Jul 2015 16:30:33 +0000 (18:30 +0200)]
Fix #70064: imagescale(..., IMG_BICUBIC) leaks memory

A temporary image (tmp_im) is created with gdImageTrueColor() and freed with
gdFree() instead of gdImageDestroy(). Let's fix that.

9 years agoMerge branch 'master' of http://git.php.net/repository/php-src
Christoph M. Becker [Mon, 13 Jul 2015 15:50:26 +0000 (17:50 +0200)]
Merge branch 'master' of http://git.php.net/repository/php-src

# By Christoph M. Becker (3) and Bob Weinand (2)
* 'master' of http://git.php.net/repository/php-src:
  updated NEWS
  updated NEWS
  Fix #69024: imagescale segfault with palette based image
  Fix weird asm instruction order with gcc by marking as volatile in phpdbg
  Preserve return value in zend_vm_call_opcode_handler with global opline/ex registers enabled

9 years agoupdated NEWS
Christoph M. Becker [Mon, 13 Jul 2015 13:59:40 +0000 (15:59 +0200)]
updated NEWS

9 years agoMerge branch 'PHP-5.6'
Christoph M. Becker [Mon, 13 Jul 2015 13:56:39 +0000 (15:56 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  Fix #69024: imagescale segfault with palette based image