]>
granicus.if.org Git - php/log
Nikita Popov [Wed, 28 Sep 2016 19:41:56 +0000 (21:41 +0200)]
Combine code for keyed/unkeyed list()
Nikita Popov [Wed, 28 Sep 2016 19:31:06 +0000 (21:31 +0200)]
Fix segfault when empty entry in keyed array assignment
Anatol Belski [Wed, 28 Sep 2016 18:06:10 +0000 (20:06 +0200)]
fix exports which are now referenced by phpdbg
(cherry picked from commit
cd0f1c8a5ed6d4e677dbf891fc69326e5b05cccc )
Davey Shafik [Wed, 28 Sep 2016 18:23:31 +0000 (11:23 -0700)]
Update UPGRADING to reflect new reality
Davey Shafik [Wed, 28 Sep 2016 18:07:19 +0000 (18:07 +0000)]
Update NEWS for 7.1.0RC4
Davey Shafik [Wed, 28 Sep 2016 17:31:22 +0000 (10:31 -0700)]
Update NEWS
Nikita Popov [Tue, 27 Sep 2016 17:26:50 +0000 (19:26 +0200)]
Don't mark ReflectionType::__toString() as deprecated for now
Nikita Popov [Wed, 21 Sep 2016 19:36:09 +0000 (21:36 +0200)]
Revert ReflectionType::__toString() behavior + deprecate
Nikita Popov [Wed, 28 Sep 2016 17:19:31 +0000 (19:19 +0200)]
Ensure symtable exists before checking it
Bob Weinand [Wed, 28 Sep 2016 11:26:08 +0000 (13:26 +0200)]
Add phpdbg generator command
Nikita Popov [Tue, 27 Sep 2016 17:48:35 +0000 (19:48 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 27 Sep 2016 17:47:48 +0000 (19:47 +0200)]
Fix bug #73181
Anatol Belski [Tue, 27 Sep 2016 10:51:24 +0000 (12:51 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
prepare next
Anatol Belski [Tue, 27 Sep 2016 10:49:52 +0000 (12:49 +0200)]
prepare next
Adam Baratz [Mon, 26 Sep 2016 21:13:50 +0000 (17:13 -0400)]
update NEWS
Adam Baratz [Mon, 26 Sep 2016 21:13:14 +0000 (17:13 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
Ignore potentially misleading dberr values
Adam Baratz [Mon, 26 Sep 2016 21:09:11 +0000 (17:09 -0400)]
update NEWS
Chris Kings-Lynne [Fri, 13 Sep 2013 06:09:08 +0000 (14:09 +0800)]
Ignore potentially misleading dberr values
FreeTDS had a buggy behavior where it would pass invalid values:
https://sourceforge.net/p/freetds/bugs/59/
The fix for this issue --
bc22b2ef817fb5d102bd758111ff3634b39a1319 on their
repo -- was to always use SYBESMSG for dberr. This makes it so the existing
pdo_dblib code would work as is. But by ignoring the dberr value in this
function, it will behave correctly, even with older versions of FreeTDS.
Anatol Belski [Mon, 26 Sep 2016 17:55:43 +0000 (19:55 +0200)]
update NEWS
Anatol Belski [Mon, 26 Sep 2016 17:55:05 +0000 (19:55 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
Anatol Belski [Mon, 26 Sep 2016 17:54:10 +0000 (19:54 +0200)]
update NEWS
Anatol Belski [Mon, 26 Sep 2016 16:55:08 +0000 (18:55 +0200)]
Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
Anatol Belski [Mon, 26 Sep 2016 16:54:43 +0000 (18:54 +0200)]
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
Anatol Belski [Mon, 26 Sep 2016 16:49:40 +0000 (18:49 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73172 parse error: Invalid numeric literal
Anatol Belski [Mon, 26 Sep 2016 16:47:30 +0000 (18:47 +0200)]
Fixed bug #73172 parse error: Invalid numeric literal
Christoph M. Becker [Mon, 26 Sep 2016 16:45:05 +0000 (18:45 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Mon, 26 Sep 2016 16:43:03 +0000 (18:43 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 26 Sep 2016 16:16:50 +0000 (18:16 +0200)]
Fix #53745: cgi.discard_path option is missing from php.ini
Also cgi.check_shebang_line has been missing.
Anatol Belski [Mon, 26 Sep 2016 13:42:32 +0000 (15:42 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update libs_versions.txt
update libs_versions.txt
Anatol Belski [Mon, 26 Sep 2016 13:41:41 +0000 (15:41 +0200)]
update libs_versions.txt
Anatol Belski [Mon, 26 Sep 2016 13:41:16 +0000 (15:41 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update libs_versions.txt
Anatol Belski [Mon, 26 Sep 2016 13:39:01 +0000 (15:39 +0200)]
update libs_versions.txt
Dmitry Stogov [Mon, 26 Sep 2016 13:16:07 +0000 (16:16 +0300)]
On PHP-7.1 and above we have to check CALL_INFO instead of symbol_table.
Dmitry Stogov [Mon, 26 Sep 2016 11:17:27 +0000 (14:17 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73156 (segfault on undefined function)
Dmitry Stogov [Mon, 26 Sep 2016 11:14:57 +0000 (14:14 +0300)]
Fixed bug #73156 (segfault on undefined function)
Anatol Belski [Sun, 25 Sep 2016 18:57:30 +0000 (20:57 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Add an include path for freetype which is relevant for cmake builds
Anatol Belski [Sun, 25 Sep 2016 18:55:13 +0000 (20:55 +0200)]
Add an include path for freetype which is relevant for cmake builds
Nikita Popov [Sun, 25 Sep 2016 10:30:32 +0000 (12:30 +0200)]
Use SEND_USER for CONST|TMP as well
Otherwise we're missing the "expected to be a reference, value
given" warning that appears for ordinary calls to call_user_func().
Also update an UPGRADING note with recent changes wrt
call_user_func().
Christoph M. Becker [Sun, 25 Sep 2016 08:49:43 +0000 (10:49 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sun, 25 Sep 2016 08:46:44 +0000 (10:46 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sun, 25 Sep 2016 08:30:48 +0000 (10:30 +0200)]
Fix test_image_equals_file() wrt. palette images
The recently introduced test_image_equals_file() doesn't properly work for
palette images, because in this case only the palette indexes are compared,
what can lead to false positives and negatives as shown in the added test.
To fix that we convert palette images to truecolor, what is supposed to be
faster than calling imagecolorsforindex() for each pixel.
We furthermore rely on PHP's refcounting to free unused images; after all,
this is not C.
Nikita Popov [Sat, 24 Sep 2016 19:26:17 +0000 (21:26 +0200)]
Fix a couple of ASSIGN_DIM/OBJ inference bugs
Account for possible null return values better.
Nikita Popov [Sat, 24 Sep 2016 19:03:13 +0000 (21:03 +0200)]
Add range inference for ZEND_STRLEN
On 32-bit systems we conservatively allow negative lengths.
On 64-bit systems, the range could additionally be restricted to
the canonical 48-bit size.
Christoph M. Becker [Sat, 24 Sep 2016 16:18:34 +0000 (18:18 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 24 Sep 2016 16:05:21 +0000 (18:05 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 24 Sep 2016 15:52:15 +0000 (17:52 +0200)]
Merge branch 'pull-request/2120' into PHP-5.6
Nikita Popov [Sat, 24 Sep 2016 11:22:00 +0000 (13:22 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 24 Sep 2016 11:18:43 +0000 (13:18 +0200)]
Fixed bug #73163
Christoph M. Becker [Sat, 24 Sep 2016 10:46:20 +0000 (12:46 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 24 Sep 2016 10:39:56 +0000 (12:39 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 24 Sep 2016 10:36:54 +0000 (12:36 +0200)]
Fix #73161: imagecreatefromgd2() may leak memory
Christoph M. Becker [Sat, 24 Sep 2016 09:36:50 +0000 (11:36 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 24 Sep 2016 09:31:11 +0000 (11:31 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 24 Sep 2016 09:28:20 +0000 (11:28 +0200)]
Fix #73159: imagegd2(): unrecognized formats may result in corrupted files
We must not apply the format correction twice for truecolor images.
Christoph M. Becker [Sat, 24 Sep 2016 08:57:30 +0000 (10:57 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 24 Sep 2016 08:47:11 +0000 (10:47 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 23 Sep 2016 22:46:35 +0000 (00:46 +0200)]
Fix #73155: imagegd2() writes wrong chunk sizes on boundaries
Christoph M. Becker [Fri, 23 Sep 2016 22:37:37 +0000 (00:37 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 23 Sep 2016 22:36:53 +0000 (00:36 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 23 Sep 2016 22:35:24 +0000 (00:35 +0200)]
Fix #73157 (again): imagegd2() ignores 3rd param if 4 are given
Obviously, there was a bad merge.
Christoph M. Becker [Fri, 23 Sep 2016 22:07:11 +0000 (00:07 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Adam Baratz [Fri, 23 Sep 2016 21:53:24 +0000 (17:53 -0400)]
update NEWS
Christoph M. Becker [Fri, 23 Sep 2016 21:44:02 +0000 (23:44 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 23 Sep 2016 21:23:45 +0000 (23:23 +0200)]
Fix #73157: imagegd2() ignores 3rd param if 4 are given
We must initialize `q` for *more* than three parameters, too.
Anatol Belski [Fri, 23 Sep 2016 16:48:14 +0000 (18:48 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"
Anatol Belski [Fri, 23 Sep 2016 16:46:51 +0000 (18:46 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"
Anatol Belski [Fri, 23 Sep 2016 16:45:03 +0000 (18:45 +0200)]
Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"
This reverts commit
f9a699f6c3aa7acea922242a0f14731f6b829742 .
Anatol Belski [Fri, 23 Sep 2016 16:10:55 +0000 (18:10 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
skip this test for now as it seems to have issues running dev server
Fixed bug #73037 SoapServer reports Bad Request when gzipped
Anatol Belski [Fri, 23 Sep 2016 16:10:07 +0000 (18:10 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
skip this test for now as it seems to have issues running dev server
Fixed bug #73037 SoapServer reports Bad Request when gzipped
Anatol Belski [Fri, 23 Sep 2016 16:07:08 +0000 (18:07 +0200)]
skip this test for now as it seems to have issues running dev server
Anatol Belski [Fri, 23 Sep 2016 14:02:50 +0000 (16:02 +0200)]
Fixed bug #73037 SoapServer reports Bad Request when gzipped
(cherry picked from commit
410c68788ae4826807e8ced3f4a02e676142b22a )
Christoph M. Becker [Fri, 23 Sep 2016 14:26:54 +0000 (16:26 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 23 Sep 2016 14:25:21 +0000 (16:25 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 23 Sep 2016 14:23:58 +0000 (16:23 +0200)]
Update NEWS
Anatol Belski [Fri, 23 Sep 2016 14:07:12 +0000 (16:07 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73037 SoapServer reports Bad Request when gzipped
Anatol Belski [Fri, 23 Sep 2016 14:02:50 +0000 (16:02 +0200)]
Fixed bug #73037 SoapServer reports Bad Request when gzipped
Christoph M. Becker [Fri, 23 Sep 2016 13:22:45 +0000 (15:22 +0200)]
Fix FreeType tests using UTF-8 font file names
UTF-8 font file names are not yet supported on Windows[1], so we're skipping
the respective tests on this platform, but enable them on other platforms.
[1] <http://news.php.net/php.internals.win/1142>
Julien Pauli [Fri, 23 Sep 2016 11:54:22 +0000 (13:54 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Formatting. Fix possible memory corruption in FPM SHM management
fix every work call mmap
Conflicts:
sapi/fpm/fpm/fpm_scoreboard.c
Julien Pauli [Fri, 23 Sep 2016 11:53:22 +0000 (13:53 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Formatting. Fix possible memory corruption in FPM SHM management
fix every work call mmap
Julien Pauli [Fri, 23 Sep 2016 11:24:31 +0000 (13:24 +0200)]
Formatting. Fix possible memory corruption in FPM SHM management
tom916 [Fri, 16 Sep 2016 14:37:09 +0000 (22:37 +0800)]
fix every work call mmap
fix fpm_scoreboard_free
Christoph M. Becker [Fri, 23 Sep 2016 10:55:13 +0000 (12:55 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 23 Sep 2016 10:29:37 +0000 (12:29 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 22 Sep 2016 09:52:10 +0000 (11:52 +0200)]
Rework FreeType related tests
Firstly, there is no fundamental difference between running the tests on
freetype before and after 2.4.10, so we re-join the respective test cases.
Secondly, there are some minor differences in the results depending on
architecture, freetype versions and config options, so we cater to that
by allowing small deviations from the expectations.
Anatol Belski [Fri, 23 Sep 2016 09:26:03 +0000 (11:26 +0200)]
update NEWS
Anatol Belski [Fri, 23 Sep 2016 09:25:33 +0000 (11:25 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
phpdbg next command must stop when leaving function
Anatol Belski [Fri, 23 Sep 2016 09:24:55 +0000 (11:24 +0200)]
update NEWS
Bob Weinand [Fri, 23 Sep 2016 01:29:37 +0000 (03:29 +0200)]
phpdbg next command must stop when leaving function
Anatol Belski [Thu, 22 Sep 2016 23:55:17 +0000 (01:55 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390
Anatol Belski [Thu, 22 Sep 2016 23:52:42 +0000 (01:52 +0200)]
Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390
Anatol Belski [Thu, 22 Sep 2016 15:03:49 +0000 (17:03 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update libs versions
update libs versions
Anatol Belski [Thu, 22 Sep 2016 15:03:12 +0000 (17:03 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update libs versions
Anatol Belski [Thu, 22 Sep 2016 15:02:54 +0000 (17:02 +0200)]
update libs versions
Anatol Belski [Thu, 22 Sep 2016 15:01:02 +0000 (17:01 +0200)]
update libs versions
Nikita Popov [Thu, 22 Sep 2016 10:50:29 +0000 (12:50 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 22 Sep 2016 10:48:38 +0000 (12:48 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Márcio Almada [Mon, 19 Sep 2016 16:42:07 +0000 (12:42 -0400)]
fix bug related to #865
In case USE_KEY flag is active, RegexIterator->accept() should keep it's
old behavior which is to accept keys mapping arrays.
This broke after PHP 5.5 but was not noticed due to lack of tests for USE_KEY.
Nikita Popov [Thu, 22 Sep 2016 10:38:48 +0000 (12:38 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
John Boehr [Thu, 22 Sep 2016 03:09:45 +0000 (20:09 -0700)]
Fix bug #69579
Nikita Popov [Thu, 22 Sep 2016 10:34:55 +0000 (12:34 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1