granicus.if.org Git

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

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

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

Fix CRLF line-endings in tests

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

commit | commitdiff | tree

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

Merge branch '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

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

Kalle Sommer Nielsen [Sun, 20 Nov 2016 20:25:25 +0000 (21:25 +0100)]

Merge branch 'PHP-7.1'

Merge branch 'PHP-7.0' into PHP-7.1

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

Pedro Magalhães [Sun, 20 Nov 2016 17:37:06 +0000 (18:37 +0100)]

Remove the binary cast from 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

commit | commitdiff | tree

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

Merge branch 'PHP-7.1'

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

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

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

commit | commitdiff | tree

Kalle Sommer Nielsen [Sun, 20 Nov 2016 19:52:22 +0000 (20:52 +0100)]

commit | commitdiff | tree

Kalle Sommer Nielsen [Sun, 20 Nov 2016 19:50:25 +0000 (20:50 +0100)]

Use $(CC) consistently in the Makefile

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

commit | commitdiff | tree

Kalle Sommer Nielsen [Sun, 20 Nov 2016 18:36:48 +0000 (19:36 +0100)]

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

Merge branch 'PHP-7.1'

Merge branch 'PHP-7.0' into PHP-7.1

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

This reverts commit ff5a65d26b139142c5e967582c369ef65b79adf8.

(With zend_ prefix now)

Merge branch 'PHP-7.1'

Merge branch 'PHP-7.0' into PHP-7.1

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

This reverts commit c65d24eaa3671e61db7c2a3f28daeaf7c74ac758.

Merge branch 'PHP-7.1'

Merge branch 'PHP-7.0' into PHP-7.1

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

Cleanup tests version checks

Remove a few unused write warnings

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

Merge branch 'master' of git.php.net:/php-src

Merge branch 'PHP-7.1'

* PHP-7.1:
fix #72180, #73219

Removed not used field

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

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

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

json_encode(): Detect recursion earlier

json_encode() used a peculiar way of apply-count management,
whereby the apply-count was not incremented for the outermost
object/array, so that recursion was only detected after two
levels.

commit | commitdiff | tree

Kalle Sommer Nielsen [Sat, 19 Nov 2016 15:41:02 +0000 (16:41 +0100)]

Update the ini scanner as from Dmitry's commit

commit | commitdiff | tree

Kalle Sommer Nielsen [Sat, 19 Nov 2016 09:47:20 +0000 (10:47 +0100)]

Remove these NetWare leftovers

commit | commitdiff | tree

Kalle Sommer Nielsen [Sat, 19 Nov 2016 09:10:48 +0000 (10:10 +0100)]

Updated the comment regarding what priority modes that are left out for the nice() implementation on Windows

commit | commitdiff | tree

Kalle Sommer Nielsen [Fri, 18 Nov 2016 23:32:07 +0000 (00:32 +0100)]

Remove support for REALTIME_PRIORITY_CLASS in proc_nice() on Windows.

The reasoning for this is because that it requires special permissions and can in the end be dangerous, discovered by Anatol.

commit | commitdiff | tree

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

Merge branch 'PHP-7.1'

* PHP-7.1:
fix test portability

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

Merge branch 'PHP-7.1'

commit | commitdiff | tree

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

Merge branch 'PHP-7.1'

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

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

Merge branch 'PHP-7.1'

Merge branch 'PHP-7.0' into PHP-7.1

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:31:25 +0000 (14:31 +0100)]

Merge branch 'PHP-7.1'

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

commit | commitdiff | tree

Dmitry Stogov [Fri, 18 Nov 2016 13:20:24 +0000 (16:20 +0300)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Regenerated scanner

commit | commitdiff | tree

Dmitry Stogov [Fri, 18 Nov 2016 13:20:09 +0000 (16:20 +0300)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Regenerated scanner

commit | commitdiff | tree

Dmitry Stogov [Fri, 18 Nov 2016 13:19:46 +0000 (16:19 +0300)]

commit | commitdiff | tree

Dmitry Stogov [Fri, 18 Nov 2016 13:19:00 +0000 (16:19 +0300)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fixed memory leaks in parse_ini_file()

commit | commitdiff | tree

Dmitry Stogov [Fri, 18 Nov 2016 13:18:22 +0000 (16:18 +0300)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed memory leaks in parse_ini_file()

commit | commitdiff | tree

Dmitry Stogov [Fri, 18 Nov 2016 13:17:52 +0000 (16:17 +0300)]

Fixed memory leaks in parse_ini_file()

commit | commitdiff | tree

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

Fix #64526: Add missing mysqlnd.* parameters to php.ini-*

commit | commitdiff | tree

Anatol Belski [Fri, 18 Nov 2016 11:00:36 +0000 (12:00 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
extend skipif

commit | commitdiff | tree

Anatol Belski [Fri, 18 Nov 2016 11:00:02 +0000 (12:00 +0100)]

commit | commitdiff | tree

Dmitry Stogov [Fri, 18 Nov 2016 10:22:54 +0000 (13:22 +0300)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Disabled PHP call tracing by default (it makes significant overhead). This may be enabled again using envirionment variable USE_ZEND_DTRACE=1.

commit | commitdiff | tree

Dmitry Stogov [Fri, 18 Nov 2016 10:21:22 +0000 (13:21 +0300)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Disabled PHP call tracing by default (it makes significant overhead). This may be enabled again using envirionment variable USE_ZEND_DTRACE=1.

commit | commitdiff | tree

Dmitry Stogov [Fri, 18 Nov 2016 10:19:30 +0000 (13:19 +0300)]

Disabled PHP call tracing by default (it makes significant overhead).
This may be enabled again using envirionment variable USE_ZEND_DTRACE=1.

commit | commitdiff | tree

Dmitry Stogov [Fri, 18 Nov 2016 09:53:49 +0000 (12:53 +0300)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Revert "Introduced zend.enable_dtrace INI directive to enable/disable PHP call tracing"

commit | commitdiff | tree

Dmitry Stogov [Fri, 18 Nov 2016 09:52:46 +0000 (12:52 +0300)]

Revert "Introduced zend.enable_dtrace INI directive to enable/disable PHP call tracing"

This reverts commit 01239b0effbc1839aca6d03cdd4c3a0c1a509798.

commit | commitdiff | tree

Dmitry Stogov [Fri, 18 Nov 2016 09:24:47 +0000 (12:24 +0300)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Introduced zend.enable_dtrace INI directive to enable/disable PHP call tracing

commit | commitdiff | tree

Dmitry Stogov [Fri, 18 Nov 2016 09:23:48 +0000 (12:23 +0300)]

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

* 'PHP-7.1' of git.php.net:php-src:
extend skipif
add vc15 to the list

commit | commitdiff | tree

Dmitry Stogov [Fri, 18 Nov 2016 09:23:10 +0000 (12:23 +0300)]

Introduced zend.enable_dtrace INI directive to enable/disable PHP call tracing

commit | commitdiff | tree

Anatol Belski [Fri, 18 Nov 2016 01:26:44 +0000 (02:26 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
extend skipif

commit | commitdiff | tree

Anatol Belski [Fri, 18 Nov 2016 01:23:17 +0000 (02:23 +0100)]

extend skipif

This test won't pass on Windows. The main reason is that the multiline
input is not really possible to create on cmd. But also, because of the
single quotes. And without multiline data piping, it doesn't make sense.

commit | commitdiff | tree

Anatol Belski [Thu, 17 Nov 2016 22:47:08 +0000 (23:47 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
add vc15 to the list

commit | commitdiff | tree

Anatol Belski [Thu, 17 Nov 2016 22:46:49 +0000 (23:46 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
add vc15 to the list

commit | commitdiff | tree

Anatol Belski [Thu, 17 Nov 2016 22:43:32 +0000 (23:43 +0100)]

add vc15 to the list

Revert "Remove PDOStatement::activeQueryString()"

This reverts commit 552c95750052a5c4879a9c67e2f2ec126567222c.

commit | commitdiff | tree

Dmitry Stogov [Thu, 17 Nov 2016 13:00:07 +0000 (16:00 +0300)]

Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed test
  Updated NEWS
  Improvement for bug73297
  Simplify ext/standard/tests/http/bug73297.phpt
  http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
  Add failing test for bug#73297
  Updated NEWS
  Improvement for bug73297
  Simplify ext/standard/tests/http/bug73297.phpt
  http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
  Add failing test for bug#73297

commit | commitdiff | tree

Dmitry Stogov [Thu, 17 Nov 2016 12:59:35 +0000 (15:59 +0300)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed test
  Updated NEWS
  Improvement for bug73297
  Simplify ext/standard/tests/http/bug73297.phpt
  http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
  Add failing test for bug#73297
  Updated NEWS
  Improvement for bug73297
  Simplify ext/standard/tests/http/bug73297.phpt
  http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
  Add failing test for bug#73297

commit | commitdiff | tree

Dmitry Stogov [Thu, 17 Nov 2016 12:58:38 +0000 (15:58 +0300)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed test
  Updated NEWS
  Improvement for bug73297
  Simplify ext/standard/tests/http/bug73297.phpt
  http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
  Add failing test for bug#73297

commit | commitdiff | tree

Dmitry Stogov [Thu, 17 Nov 2016 12:57:40 +0000 (15:57 +0300)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Dmitry Stogov [Thu, 17 Nov 2016 11:07:11 +0000 (14:07 +0300)]

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

* 'PHP-7.0' of git.php.net:php-src:
  Updated NEWS
  Improvement for bug73297
  Simplify ext/standard/tests/http/bug73297.phpt
  http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
  Add failing test for bug#73297

commit | commitdiff | tree

Dmitry Stogov [Thu, 17 Nov 2016 11:06:56 +0000 (14:06 +0300)]

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

* 'PHP-7.1' of git.php.net:php-src:
  Updated NEWS
  Improvement for bug73297
  Simplify ext/standard/tests/http/bug73297.phpt
  http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
  Add failing test for bug#73297

commit | commitdiff | tree

Dmitry Stogov [Thu, 17 Nov 2016 11:06:35 +0000 (14:06 +0300)]

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Improvement for bug73297
  Simplify ext/standard/tests/http/bug73297.phpt
  http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
  Add failing test for bug#73297

commit | commitdiff | tree

Dmitry Stogov [Thu, 17 Nov 2016 11:06:09 +0000 (14:06 +0300)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fixed 64-bit build

commit | commitdiff | tree

Dmitry Stogov [Thu, 17 Nov 2016 11:05:48 +0000 (14:05 +0300)]