]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Dmitry Stogov [Tue, 22 Nov 2016 10:29:11 +0000 (13:29 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed use after free

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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

8 years agoFixed use after free
commit | commitdiff | tree
Dmitry Stogov [Tue, 22 Nov 2016 10:28:27 +0000 (13:28 +0300)]
Fixed use after free

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Dmitry Stogov [Tue, 22 Nov 2016 09:07:06 +0000 (12:07 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Micro-optimization

8 years agoMicro-optimization
commit | commitdiff | tree
Dmitry Stogov [Tue, 22 Nov 2016 09:06:39 +0000 (12:06 +0300)]
Micro-optimization

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Dmitry Stogov [Tue, 22 Nov 2016 08:51:42 +0000 (11:51 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Removed useless (double) checks for EG(exception). (Bob)

8 years agoRemoved useless (double) checks for EG(exception). (Bob)
commit | commitdiff | tree
Dmitry Stogov [Tue, 22 Nov 2016 08:50:48 +0000 (11:50 +0300)]
Removed useless (double) checks for EG(exception). (Bob)

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Dmitry Stogov [Tue, 22 Nov 2016 08:23:17 +0000 (11:23 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed memory leak (Bob)

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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)

8 years agoFixed memory leak (Bob)
commit | commitdiff | tree
Dmitry Stogov [Tue, 22 Nov 2016 08:22:10 +0000 (11:22 +0300)]
Fixed memory leak (Bob)

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Tue, 22 Nov 2016 02:00:44 +0000 (03:00 +0100)]
Merge branch 'PHP-7.1'

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

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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"

8 years agoRevert "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.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Tue, 22 Nov 2016 01:31:43 +0000 (02:31 +0100)]
Merge branch 'PHP-7.1'

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

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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

8 years agofix 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

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Tue, 22 Nov 2016 00:02:04 +0000 (01:02 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  update NEWS
  update NEWS
  update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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

8 years agoupdate NEWS
commit | commitdiff | tree
Anatol Belski [Tue, 22 Nov 2016 00:01:00 +0000 (01:01 +0100)]
update NEWS

8 years agoupdate NEWS
commit | commitdiff | tree
Anatol Belski [Mon, 21 Nov 2016 23:59:40 +0000 (00:59 +0100)]
update NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
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

8 years agoupdate NEWS
commit | commitdiff | tree
Anatol Belski [Mon, 21 Nov 2016 23:57:18 +0000 (00:57 +0100)]
update NEWS

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Mon, 21 Nov 2016 23:47:30 +0000 (00:47 +0100)]
Merge branch 'PHP-7.1'

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

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
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

8 years agoFix 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

8 years agoAdd a test for bug 73498
commit | commitdiff | tree
Craig Duncan [Mon, 21 Nov 2016 19:49:18 +0000 (19:49 +0000)]
Add a test for bug 73498

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Mon, 21 Nov 2016 23:33:29 +0000 (00:33 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  remove TSRMLS_*

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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_*

8 years agoremove TSRMLS_*
commit | commitdiff | tree
Anatol Belski [Mon, 21 Nov 2016 22:53:37 +0000 (23:53 +0100)]
remove TSRMLS_*

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Mon, 21 Nov 2016 21:59:59 +0000 (22:59 +0100)]
Merge branch 'PHP-7.1'

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

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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

8 years agoupdate php.ini-* 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

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
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

8 years agoupdate 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

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Mon, 21 Nov 2016 19:01:51 +0000 (20:01 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  update NEWS
  update NEWS
  update NEWS

8 years agoupdate NEWS
commit | commitdiff | tree
Anatol Belski [Mon, 21 Nov 2016 19:01:07 +0000 (20:01 +0100)]
update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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

8 years agoupdate NEWS
commit | commitdiff | tree
Anatol Belski [Mon, 21 Nov 2016 18:59:30 +0000 (19:59 +0100)]
update NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
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

8 years agoupdate NEWS
commit | commitdiff | tree
Anatol Belski [Mon, 21 Nov 2016 18:56:09 +0000 (19:56 +0100)]
update NEWS

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Mon, 21 Nov 2016 14:32:38 +0000 (15:32 +0100)]
Merge branch 'PHP-7.1'

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

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
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

8 years agoadd test for bug #73452
commit | commitdiff | tree
Anatol Belski [Mon, 21 Nov 2016 14:25:46 +0000 (15:25 +0100)]
add test for bug #73452

8 years agoRemove more NetWare leftovers
commit | commitdiff | tree
Kalle Sommer Nielsen [Mon, 21 Nov 2016 14:22:30 +0000 (15:22 +0100)]
Remove more NetWare leftovers

8 years agoBackport 15ac4904 to 5.6
commit | commitdiff | tree
Anatol Belski [Mon, 21 Nov 2016 14:20:03 +0000 (15:20 +0100)]
Backport 15ac4904 to 5.6

8 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Kalle Sommer Nielsen [Mon, 21 Nov 2016 14:19:29 +0000 (15:19 +0100)]
Merge branch 'master' of git.php.net:php-src

8 years agoRemove this old obsolete code
commit | commitdiff | tree
Kalle Sommer Nielsen [Mon, 21 Nov 2016 14:18:55 +0000 (15:18 +0100)]
Remove this old obsolete code

8 years agoTurn function into inline
commit | commitdiff | tree
Dmitry Stogov [Mon, 21 Nov 2016 10:13:28 +0000 (13:13 +0300)]
Turn function into inline

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Dmitry Stogov [Mon, 21 Nov 2016 07:39:38 +0000 (10:39 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Regenerated files

8 years agoRegenerated files
commit | commitdiff | tree
Dmitry Stogov [Mon, 21 Nov 2016 07:38:08 +0000 (10:38 +0300)]
Regenerated files

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Xinchen Hui [Mon, 21 Nov 2016 03:46:50 +0000 (11:46 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Update NEWs

8 years agoUpdate NEWs
commit | commitdiff | tree
Xinchen Hui [Mon, 21 Nov 2016 03:46:37 +0000 (11:46 +0800)]
Update NEWs

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Xinchen Hui [Mon, 21 Nov 2016 03:46:13 +0000 (11:46 +0800)]
Merge branch 'PHP-7.1'

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

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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)

8 years agoUpdate NEWS
commit | commitdiff | tree
Xinchen Hui [Mon, 21 Nov 2016 03:45:49 +0000 (11:45 +0800)]
Update NEWS

8 years agoFix memory leak(null coalescing operator with Spl hash)
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.

8 years agoRevert "Added --enable-asm on Windows"
commit | commitdiff | tree
Kalle Sommer Nielsen [Sun, 20 Nov 2016 23:46:04 +0000 (00:46 +0100)]
Revert "Added --enable-asm on Windows"

This reverts commit d711798813d6a1297716174de4382f42695a9e92.

I need a better approach for this and general customized CFLAGS

8 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Kalle Sommer Nielsen [Sun, 20 Nov 2016 22:36:44 +0000 (23:36 +0100)]
Merge branch 'master' of git.php.net:php-src

8 years agoKill some more strlen() calls and fix a possible missing NULL pointer check
commit | commitdiff | tree
Kalle Sommer Nielsen [Sun, 20 Nov 2016 22:36:19 +0000 (23:36 +0100)]
Kill some more strlen() calls and fix a possible missing NULL pointer check

Thanks to Anatol for review

8 years agoRefactor: rename variables to match documentation
commit | commitdiff | tree
Levi Morrison [Sun, 20 Nov 2016 21:50:56 +0000 (14:50 -0700)]
Refactor: rename variables to match documentation

Rename 'arr' to 'pieces'
Rename 'delim' to 'glue'

8 years agoAdded --enable-asm on Windows
commit | commitdiff | tree
Kalle Sommer Nielsen [Sun, 20 Nov 2016 21:49:34 +0000 (22:49 +0100)]
Added --enable-asm on Windows

This argument is disabled by default, but if enabled it will create a sub directory in the output directory called 'asm' and dump each compiled .c file's asm there

8 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Kalle Sommer Nielsen [Sun, 20 Nov 2016 21:40:15 +0000 (22:40 +0100)]
Merge branch 'master' of git.php.net:php-src

8 years agoFix CRLF line-endings in tests
commit | commitdiff | tree
Nikita Popov [Sun, 20 Nov 2016 20:24:51 +0000 (21:24 +0100)]
Fix CRLF line-endings in tests

Also fix a single instance of CRLF in ibase_query.c.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Jakub Zelenka [Sun, 20 Nov 2016 20:39:32 +0000 (20:39 +0000)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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

8 years agoFix bug #73526 (php_json_encode depth issue)
commit | commitdiff | tree
Jakub Zelenka [Sun, 20 Nov 2016 20:36:03 +0000 (20:36 +0000)]
Fix bug #73526 (php_json_encode depth issue)

8 years agoMinor grammar
commit | commitdiff | tree
Kalle Sommer Nielsen [Sun, 20 Nov 2016 20:25:25 +0000 (21:25 +0100)]
Minor grammar

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Nikita Popov [Sun, 20 Nov 2016 20:19:34 +0000 (21:19 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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

8 years agoFix bug #73538
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.

8 years agoRemove the binary cast from unrelated tests
commit | commitdiff | tree
Pedro Magalhães [Sun, 20 Nov 2016 17:37:06 +0000 (18:37 +0100)]
Remove the binary cast from unrelated tests

8 years agoRemove the b prefix from literals on unrelated tests
commit | commitdiff | tree
Pedro Magalhães [Sun, 6 Nov 2016 21:28:42 +0000 (22:28 +0100)]
Remove the b prefix from literals on unrelated tests

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Jakub Zelenka [Sun, 20 Nov 2016 20:08:34 +0000 (20:08 +0000)]
Merge branch 'PHP-7.1'

8 years agoFix bug #73478 (openssl_pkey_new() generates wrong pub/priv keys with Diffie Hellman)
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)

8 years agoNo need to keep the version info for old VC versions we don't even support anymore
commit | commitdiff | tree
Kalle Sommer Nielsen [Sun, 20 Nov 2016 19:56:49 +0000 (20:56 +0100)]
No need to keep the version info for old VC versions we don't even support anymore

8 years agoUpdate inline comment with VS.net 2017 + fix typo
commit | commitdiff | tree
Kalle Sommer Nielsen [Sun, 20 Nov 2016 19:55:02 +0000 (20:55 +0100)]
Update inline comment with VS.net 2017 + fix typo

8 years agoRemove typo
commit | commitdiff | tree
Kalle Sommer Nielsen [Sun, 20 Nov 2016 19:52:22 +0000 (20:52 +0100)]
Remove typo

8 years agoUse $(CC) consistently in the Makefile
commit | commitdiff | tree
Kalle Sommer Nielsen [Sun, 20 Nov 2016 19:50:25 +0000 (20:50 +0100)]
Use $(CC) consistently in the Makefile

8 years agoRemove undefined variable if ext/ftp was built with SSL
commit | commitdiff | tree
Kalle Sommer Nielsen [Sun, 20 Nov 2016 18:37:24 +0000 (19:37 +0100)]
Remove undefined variable if ext/ftp was built with SSL

8 years agoFix typo
commit | commitdiff | tree
Kalle Sommer Nielsen [Sun, 20 Nov 2016 18:36:48 +0000 (19:36 +0100)]
Fix typo

8 years agoShave off a strlen() call in ftp_mkdir()
commit | commitdiff | tree
Kalle Sommer Nielsen [Sun, 20 Nov 2016 18:36:36 +0000 (19:36 +0100)]
Shave off a strlen() call in ftp_mkdir()

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Bob Weinand [Sun, 20 Nov 2016 18:20:48 +0000 (19:20 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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

8 years agoRevert "Revert "Remove a few unused write warning""
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)

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Nikita Popov [Sun, 20 Nov 2016 18:10:29 +0000 (19:10 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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

8 years agoRevert "Remove a few unused write warning (backport from master, oops)s"
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.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Bob Weinand [Sun, 20 Nov 2016 13:19:40 +0000 (14:19 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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

8 years agoRemove a few unused write warning (backport from master, oops)s
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

8 years agoCleanup tests version checks
commit | commitdiff | tree
Tom Van Looy [Sun, 20 Nov 2016 09:08:51 +0000 (10:08 +0100)]
Cleanup tests version checks

8 years agoRemove a few unused write warnings
commit | commitdiff | tree
Bob Weinand [Sun, 20 Nov 2016 13:14:46 +0000 (14:14 +0100)]
Remove a few unused write warnings

8 years agoMerge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
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

8 years agoMerge branch 'master' of git.php.net:/php-src
commit | commitdiff | tree
Joe Watkins [Sun, 20 Nov 2016 08:33:53 +0000 (08:33 +0000)]
Merge branch 'master' of git.php.net:/php-src

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Joe Watkins [Sun, 20 Nov 2016 08:33:26 +0000 (08:33 +0000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix #72180, #73219

8 years agofix #72180, #73219
commit | commitdiff | tree
Joe Watkins [Sun, 20 Nov 2016 08:32:26 +0000 (08:32 +0000)]
fix #72180, #73219

8 years agoRemoved not used field
commit | commitdiff | tree
Xinchen Hui [Sun, 20 Nov 2016 07:52:52 +0000 (15:52 +0800)]
Removed not used field

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Xinchen Hui [Sun, 20 Nov 2016 07:47:54 +0000 (15:47 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Update NEWS
  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
  make it possible to show specific help pages without interactive session

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