granicus.if.org Git

Stanislav Malyshev [Fri, 25 Nov 2016 23:31:22 +0000 (15:31 -0800)]

Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1

* 'PHP-7.1' of git.php.net:php-src:
Fix #73582: Failing ext/gd/tests/imagettftext_charmap_order.phpt

commit | commitdiff | tree

Christoph M. Becker [Fri, 25 Nov 2016 22:27:13 +0000 (23:27 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Christoph M. Becker [Fri, 25 Nov 2016 22:16:18 +0000 (23:16 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

Christoph M. Becker [Fri, 25 Nov 2016 22:02:34 +0000 (23:02 +0100)]

Fix #73582: Failing ext/gd/tests/imagettftext_charmap_order.phpt

This test is not supposed to work with JIS-mapped Japanese font support
enabled.

commit | commitdiff | tree

Stanislav Malyshev [Fri, 25 Nov 2016 21:43:59 +0000 (13:43 -0800)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fix int/size_t confusion in isValidPharFilename (bug #73580)

commit | commitdiff | tree

Stanislav Malyshev [Fri, 25 Nov 2016 21:42:35 +0000 (13:42 -0800)]

Fix int/size_t confusion in isValidPharFilename (bug #73580)

commit | commitdiff | tree

Anatol Belski [Thu, 24 Nov 2016 18:27:50 +0000 (19:27 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
add test for bug #57547

commit | commitdiff | tree

Anatol Belski [Thu, 24 Nov 2016 18:25:47 +0000 (19:25 +0100)]

add test for bug #57547

commit | commitdiff | tree

Derick Rethans [Thu, 24 Nov 2016 10:40:15 +0000 (10:40 +0000)]

Updated to version 2016.10 (2016j)

commit | commitdiff | tree

Derick Rethans [Thu, 24 Nov 2016 10:40:15 +0000 (10:40 +0000)]

commit | commitdiff | tree

Derick Rethans [Thu, 24 Nov 2016 10:40:14 +0000 (10:40 +0000)]

Updated to version 2016.10 (2016j)

commit | commitdiff | tree

Derick Rethans [Thu, 24 Nov 2016 10:40:13 +0000 (10:40 +0000)]

commit | commitdiff | tree

Derick Rethans [Thu, 24 Nov 2016 10:40:11 +0000 (10:40 +0000)]

Updated to version 2016.10 (2016j)

commit | commitdiff | tree

Xinchen Hui [Thu, 24 Nov 2016 04:04:03 +0000 (12:04 +0800)]

commit | commitdiff | tree

Xinchen Hui [Thu, 24 Nov 2016 04:03:23 +0000 (12:03 +0800)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed bug #73585 (Logging of "Internal Zend error - Missing class information" missing class name)

commit | commitdiff | tree

Xinchen Hui [Thu, 24 Nov 2016 04:02:02 +0000 (12:02 +0800)]

Fixed bug #73585 (Logging of "Internal Zend error - Missing class information" missing class name)

Actually, I doubt how thing bug could be triggered

commit | commitdiff | tree

Ferenc Kovacs [Thu, 24 Nov 2016 00:58:46 +0000 (01:58 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Ferenc Kovacs [Thu, 24 Nov 2016 00:57:42 +0000 (01:57 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

Ferenc Kovacs [Thu, 24 Nov 2016 00:54:23 +0000 (01:54 +0100)]

commit | commitdiff | tree

Remi Collet [Wed, 23 Nov 2016 13:56:39 +0000 (14:56 +0100)]

CS (no leading space in comment for config option)

commit | commitdiff | tree

Xinchen Hui [Wed, 23 Nov 2016 06:24:46 +0000 (14:24 +0800)]

Fixed bug #73583 (Segfaults when conditionally declared class and function have the same name)

bug was introduced in rev 88eae43f , and the runtime defined key is not
merged-able

commit | commitdiff | tree

Nikita Popov [Tue, 22 Nov 2016 18:25:53 +0000 (19:25 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Nikita Popov [Tue, 22 Nov 2016 18:25:31 +0000 (19:25 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

Nikita Popov [Fri, 18 Nov 2016 15:41:13 +0000 (16:41 +0100)]

Make php_url_parse_ex() respect length argument

This should fix all out-of-bounds reads that could previously
occur if the string passed to php_url_parse_ex() is not NUL
terminated.

commit | commitdiff | tree

Nikita Popov [Fri, 18 Nov 2016 16:00:56 +0000 (17:00 +0100)]

Cleanup parse_url() query/fragment handling

The query/fragment handling was pretty convoluted, with many parts
being duplicated. Simplify by checking for fragment, then for query,
then for path.

commit | commitdiff | tree

Nikita Popov [Thu, 17 Nov 2016 22:18:05 +0000 (23:18 +0100)]

Cleanup parse_url() gotos

Simplify some unnecessarily complicated code. In particular the
length updates are unnecessary (length is only used at the very
start) and we're goto'ing around a bit too much.

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 11:44:06 +0000 (12:44 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
update libs_versions.txt
update libs versions.txt

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 11:42:57 +0000 (12:42 +0100)]

update libs_versions.txt

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 11:42:20 +0000 (12:42 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
update libs versions.txt

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 11:36:51 +0000 (12:36 +0100)]

update libs versions.txt

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 10:56:16 +0000 (11:56 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
move dev to next

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 10:49:09 +0000 (11:49 +0100)]

commit | commitdiff | tree

Dmitry Stogov [Tue, 22 Nov 2016 10:28:49 +0000 (13:28 +0300)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed use after free

commit | commitdiff | tree

Dmitry Stogov [Tue, 22 Nov 2016 10:28:27 +0000 (13:28 +0300)]

Fixed use after free

commit | commitdiff | tree

Dmitry Stogov [Tue, 22 Nov 2016 09:06:39 +0000 (12:06 +0300)]

commit | commitdiff | tree

Dmitry Stogov [Tue, 22 Nov 2016 08:50:48 +0000 (11:50 +0300)]

Removed useless (double) checks for EG(exception). (Bob)

commit | commitdiff | tree

Dmitry Stogov [Tue, 22 Nov 2016 08:22:55 +0000 (11:22 +0300)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed memory leak (Bob)

commit | commitdiff | tree

Dmitry Stogov [Tue, 22 Nov 2016 08:22:10 +0000 (11:22 +0300)]

Fixed memory leak (Bob)

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 01:59:17 +0000 (02:59 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Revert "fix invalid read, follow up on 97b65cc9"

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 01:52:23 +0000 (02:52 +0100)]

Revert "fix invalid read, follow up on 97b65cc9"

This reverts commit b52fa5882a276c9397d108cd690721a006acd827.

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 01:30:16 +0000 (02:30 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
fix invalid read, follow up on 97b65cc9

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 01:28:45 +0000 (02:28 +0100)]

fix invalid read, follow up on 97b65cc9

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 00:01:18 +0000 (01:01 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
update NEWS
update NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 00:01:00 +0000 (01:01 +0100)]

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 23:59:40 +0000 (00:59 +0100)]

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 23:59:07 +0000 (00:59 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
update NEWS

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 23:57:18 +0000 (00:57 +0100)]

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 23:46:54 +0000 (00:46 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fix bug #73498
Add a test for bug 73498

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 23:46:03 +0000 (00:46 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
Fix bug #73498
Add a test for bug 73498

commit | commitdiff | tree

Craig Duncan [Sun, 20 Nov 2016 20:48:21 +0000 (20:48 +0000)]

Fix bug #73498

Postgres uses the DELIMITER keyword since 7.3
And WITH is no longer required/used

commit | commitdiff | tree

Craig Duncan [Mon, 21 Nov 2016 19:49:18 +0000 (19:49 +0000)]

Add a test for bug 73498

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 23:32:42 +0000 (00:32 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
remove TSRMLS_*

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 22:53:37 +0000 (23:53 +0100)]

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 21:59:30 +0000 (22:59 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
update php.ini-* for bug #69090
update php.ini-* according to changes for bug #69090

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 21:58:23 +0000 (22:58 +0100)]

update php.ini-* for bug #69090

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 21:56:46 +0000 (22:56 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
update php.ini-* according to changes for bug #69090

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 21:52:03 +0000 (22:52 +0100)]

update php.ini-* according to changes for bug #69090

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 19:01:07 +0000 (20:01 +0100)]

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 19:00:39 +0000 (20:00 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
update NEWS
update NEWS

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 18:59:30 +0000 (19:59 +0100)]

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 18:58:54 +0000 (19:58 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
update NEWS

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 18:56:09 +0000 (19:56 +0100)]

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 14:31:34 +0000 (15:31 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
add test for bug #73452
Backport 15ac4904 to 5.6

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 14:29:44 +0000 (15:29 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
add test for bug #73452
Backport 15ac4904 to 5.6

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 14:25:46 +0000 (15:25 +0100)]

add test for bug #73452

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 14:20:03 +0000 (15:20 +0100)]

Backport 15ac4904 to 5.6

commit | commitdiff | tree

Dmitry Stogov [Mon, 21 Nov 2016 07:38:08 +0000 (10:38 +0300)]

commit | commitdiff | tree

Xinchen Hui [Mon, 21 Nov 2016 03:46:37 +0000 (11:46 +0800)]

commit | commitdiff | tree

Xinchen Hui [Mon, 21 Nov 2016 03:46:03 +0000 (11:46 +0800)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Update NEWS
Fix memory leak(null coalescing operator with Spl hash)

commit | commitdiff | tree

Xinchen Hui [Mon, 21 Nov 2016 03:45:49 +0000 (11:45 +0800)]

commit | commitdiff | tree

Tyson Andre [Sun, 20 Nov 2016 23:18:32 +0000 (15:18 -0800)]

Fix memory leak(null coalescing operator with Spl hash)

The SEPARATE_ARG_IF_REF macro increased the refcount of the object passed as a
key.
However, when the key did not exist in the ArrayAccess implementation,
the code returned early without trying to decrement the refcount.

Add a test of `??` succeeding+failing on a SplObjectStorage instance.

commit | commitdiff | tree

Jakub Zelenka [Sun, 20 Nov 2016 20:38:34 +0000 (20:38 +0000)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Jakub Zelenka [Sun, 20 Nov 2016 20:36:03 +0000 (20:36 +0000)]

Fix bug #73526 (php_json_encode depth issue)

commit | commitdiff | tree

Nikita Popov [Sun, 20 Nov 2016 20:18:48 +0000 (21:18 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Craig Duncan [Sun, 20 Nov 2016 17:41:14 +0000 (17:41 +0000)]

Fix bug #73538

Remove any previous default headers and replace with the specified
ones, as documented, and as is the case when a single header is
passed.

commit | commitdiff | tree

Jakub Zelenka [Sun, 20 Nov 2016 20:06:39 +0000 (20:06 +0000)]

Fix bug #73478 (openssl_pkey_new() generates wrong pub/priv keys with Diffie Hellman)

commit | commitdiff | tree

Bob Weinand [Sun, 20 Nov 2016 18:20:09 +0000 (19:20 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Bob Weinand [Sun, 20 Nov 2016 18:18:50 +0000 (19:18 +0100)]

Revert "Revert "Remove a few unused write warning""

This reverts commit ff5a65d26b139142c5e967582c369ef65b79adf8.

(With zend_ prefix now)

commit | commitdiff | tree

Nikita Popov [Sun, 20 Nov 2016 18:10:03 +0000 (19:10 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Nikita Popov [Sun, 20 Nov 2016 18:02:40 +0000 (19:02 +0100)]

Revert "Remove a few unused write warning (backport from master, oops)s"

This reverts commit c65d24eaa3671e61db7c2a3f28daeaf7c74ac758.

commit | commitdiff | tree

Bob Weinand [Sun, 20 Nov 2016 13:18:54 +0000 (14:18 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Bob Weinand [Sun, 20 Nov 2016 13:14:46 +0000 (14:14 +0100)]

Remove a few unused write warning (backport from master, oops)s

commit | commitdiff | tree

Joe Watkins [Sun, 20 Nov 2016 08:34:16 +0000 (08:34 +0000)]

Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1

commit | commitdiff | tree

Joe Watkins [Sun, 20 Nov 2016 08:32:26 +0000 (08:32 +0000)]

commit | commitdiff | tree

Xinchen Hui [Sun, 20 Nov 2016 07:47:39 +0000 (15:47 +0800)]

commit | commitdiff | tree

Xinchen Hui [Sun, 20 Nov 2016 07:46:53 +0000 (15:46 +0800)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #73483 (Segmentation fault on pcre_replace_callback)
  Fix #73219 (fix acinclude when / is present)
  make it possible to show specific help pages without interactive session

Conflicts:
acinclude.m4

commit | commitdiff | tree

Xinchen Hui [Sun, 20 Nov 2016 07:44:27 +0000 (15:44 +0800)]

Fixed bug #73483 (Segmentation fault on pcre_replace_callback)

commit | commitdiff | tree

Joe Watkins [Sun, 20 Nov 2016 05:34:08 +0000 (05:34 +0000)]

Fix #73219 (fix acinclude when / is present)

commit | commitdiff | tree

Joe Watkins [Sun, 20 Nov 2016 05:24:14 +0000 (05:24 +0000)]

make it possible to show specific help pages without interactive session

commit | commitdiff | tree

Joe Watkins [Sun, 20 Nov 2016 05:24:14 +0000 (05:24 +0000)]

make it possible to show specific help pages without interactive session

commit | commitdiff | tree

Anatol Belski [Fri, 18 Nov 2016 21:11:25 +0000 (22:11 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
fix test portability

commit | commitdiff | tree

Anatol Belski [Fri, 18 Nov 2016 21:10:41 +0000 (22:10 +0100)]

fix test portability

commit | commitdiff | tree

Nikita Popov [Fri, 18 Nov 2016 20:41:10 +0000 (21:41 +0100)]

commit | commitdiff | tree

Anatol Belski [Fri, 18 Nov 2016 17:21:28 +0000 (18:21 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
don't fail miserably, when an unknown vc version is used

commit | commitdiff | tree

Anatol Belski [Fri, 18 Nov 2016 17:19:47 +0000 (18:19 +0100)]

don't fail miserably, when an unknown vc version is used

commit | commitdiff | tree

Nikita Popov [Fri, 18 Nov 2016 16:56:28 +0000 (17:56 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Nikita Popov [Fri, 18 Nov 2016 16:56:16 +0000 (17:56 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

Mitch Hagstrand [Fri, 11 Nov 2016 23:40:30 +0000 (15:40 -0800)]

Fix the lchwon error test for Travis CI.

The E_WARNING message from the PHP function lchown is passed
from the system function lchown. The error message returned
from lchown can be filesystem dependent.

commit | commitdiff | tree

Christoph M. Becker [Fri, 18 Nov 2016 13:30:30 +0000 (14:30 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Christoph M. Becker [Fri, 18 Nov 2016 13:29:28 +0000 (14:29 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom