]> granicus.if.org Git - php/log
php
7 years agorestore rev 431e22fb4d2a23f6e522ec5e20503fd6ec7ca1f6
Anatol Belski [Mon, 15 May 2017 15:43:48 +0000 (17:43 +0200)]
restore rev 431e22fb4d2a23f6e522ec5e20503fd6ec7ca1f6

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Mon, 15 May 2017 15:40:14 +0000 (17:40 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  [ci skip] update NEWS

7 years ago[ci skip] update NEWS
Anatol Belski [Mon, 15 May 2017 15:39:31 +0000 (17:39 +0200)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Mon, 15 May 2017 14:36:40 +0000 (16:36 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #74589 __DIR__ wrong for unicode character
  fixing run-tests.php for variables_order="GPCS"

7 years agoFixed bug #74589 __DIR__ wrong for unicode character
Anatol Belski [Mon, 15 May 2017 14:35:22 +0000 (16:35 +0200)]
Fixed bug #74589 __DIR__ wrong for unicode character

7 years agofixing run-tests.php for variables_order="GPCS"
Matt Ficken [Mon, 15 May 2017 09:21:55 +0000 (02:21 -0700)]
fixing run-tests.php for variables_order="GPCS"

7 years agofixing run-tests.php for variables_order="GPCS"
Matt Ficken [Mon, 15 May 2017 09:19:05 +0000 (02:19 -0700)]
fixing run-tests.php for variables_order="GPCS"

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sun, 14 May 2017 00:03:02 +0000 (02:03 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  [ci skip] update NEWS

7 years ago[ci skip] update NEWS
Anatol Belski [Sat, 13 May 2017 23:59:46 +0000 (01:59 +0200)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sat, 13 May 2017 23:54:18 +0000 (01:54 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  revert workaround for bug #74489 as it's fixed in the dependency lib

7 years agorevert workaround for bug #74489 as it's fixed in the dependency lib
Anatol Belski [Sat, 13 May 2017 23:47:40 +0000 (01:47 +0200)]
revert workaround for bug #74489 as it's fixed in the dependency lib

7 years agoRemoved always true condition
Markus Staab [Wed, 10 May 2017 13:28:56 +0000 (15:28 +0200)]
Removed always true condition

Since https://github.com/php/php-src/commit/5a9d8a00b475cbbe758d741df7e706859097309c this can no longer be false

7 years agoMerge branch 'PHP-7.1'
Sara Golemon [Wed, 10 May 2017 23:50:47 +0000 (16:50 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Remove typo from test header

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Sara Golemon [Wed, 10 May 2017 23:50:37 +0000 (16:50 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Remove typo from test header

7 years agoRemove typo from test header
Sara Golemon [Wed, 10 May 2017 23:50:19 +0000 (16:50 -0700)]
Remove typo from test header

7 years agoType hint inheritance check optimization
Dmitry Stogov [Wed, 10 May 2017 19:25:32 +0000 (22:25 +0300)]
Type hint inheritance check optimization

7 years agoConstant class names are already verifyed by PHP compiler.
Dmitry Stogov [Wed, 10 May 2017 11:26:44 +0000 (14:26 +0300)]
Constant class names are already verifyed by PHP compiler.

7 years agospl_autoload_call() optimization
Dmitry Stogov [Wed, 10 May 2017 10:27:49 +0000 (13:27 +0300)]
spl_autoload_call() optimization

7 years agoAvoid useless checks
Dmitry Stogov [Wed, 10 May 2017 10:27:37 +0000 (13:27 +0300)]
Avoid useless checks

7 years agoEnsure number_format() doesn't include sign for zero
Craig Duncan [Thu, 24 Nov 2016 21:56:53 +0000 (21:56 +0000)]
Ensure number_format() doesn't include sign for zero

7 years agotypo
Xinchen Hui [Tue, 9 May 2017 09:15:42 +0000 (17:15 +0800)]
typo

7 years agoMerge branch 'hybrid-vm'
Dmitry Stogov [Tue, 9 May 2017 06:38:34 +0000 (09:38 +0300)]
Merge branch 'hybrid-vm'

* hybrid-vm:
  Cleanup
  Fixed zend_vm_call_opcode_handler(). Make phpdbg work with HYBRID VM.
  Added missing ZEND_VM_HOT define
  Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.

7 years agoCleanup
Dmitry Stogov [Tue, 9 May 2017 06:37:46 +0000 (09:37 +0300)]
Cleanup

7 years agoMerge branch 'PHP-7.1'
Xinchen Hui [Tue, 9 May 2017 03:15:32 +0000 (11:15 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed tests when using cumstom php.ini(session.save_handler)
  Fix Bug #74541 Wrong reflection on session_start()

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Tue, 9 May 2017 03:14:40 +0000 (11:14 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed tests when using cumstom php.ini(session.save_handler)
  Fix Bug #74541 Wrong reflection on session_start()

7 years agoFixed tests when using cumstom php.ini(session.save_handler)
Xinchen Hui [Tue, 9 May 2017 03:13:41 +0000 (11:13 +0800)]
Fixed tests when using cumstom php.ini(session.save_handler)

7 years agoMerge branch 'fix_74541' of https://github.com/villfa/php-src into PHP-7.0
Xinchen Hui [Tue, 9 May 2017 03:04:39 +0000 (11:04 +0800)]
Merge branch 'fix_74541' of https://github.com/villfa/php-src into PHP-7.0

* 'fix_74541' of https://github.com/villfa/php-src:
  Fix Bug #74541 Wrong reflection on session_start()

7 years agoMerge branch 'PHP-7.1'
Xinchen Hui [Tue, 9 May 2017 03:02:02 +0000 (11:02 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fix typo: exectute => execute

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Tue, 9 May 2017 03:01:52 +0000 (11:01 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix typo: exectute => execute

7 years agoMerge branch 'patch-1' of https://github.com/ifdattic/php-src into PHP-7.0
Xinchen Hui [Tue, 9 May 2017 03:01:33 +0000 (11:01 +0800)]
Merge branch 'patch-1' of https://github.com/ifdattic/php-src into PHP-7.0

* 'patch-1' of https://github.com/ifdattic/php-src:
  Fix typo: exectute => execute

7 years agoFix Bug #74541 Wrong reflection on session_start()
Fabien Villepinte [Mon, 8 May 2017 20:42:09 +0000 (22:42 +0200)]
Fix Bug #74541 Wrong reflection on session_start()

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Mon, 8 May 2017 17:41:40 +0000 (19:41 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  sync bin sdk version

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 8 May 2017 17:39:56 +0000 (19:39 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  sync bin sdk version

7 years agosync bin sdk version
Anatol Belski [Mon, 8 May 2017 17:38:48 +0000 (19:38 +0200)]
sync bin sdk version

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Mon, 8 May 2017 11:13:18 +0000 (13:13 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  [ci skip] update libs_versions.txt
  [ci skip] update libs versions file

7 years ago[ci skip] update libs_versions.txt
Anatol Belski [Mon, 8 May 2017 11:11:12 +0000 (13:11 +0200)]
[ci skip] update libs_versions.txt

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 8 May 2017 11:10:48 +0000 (13:10 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  [ci skip] update libs versions file

7 years ago[ci skip] update libs versions file
Anatol Belski [Mon, 8 May 2017 11:09:15 +0000 (13:09 +0200)]
[ci skip] update libs versions file

7 years agoFix typo: exectute => execute
Andrew Marcinkevičius [Mon, 8 May 2017 10:59:05 +0000 (13:59 +0300)]
Fix typo: exectute => execute

7 years agoAdd support for run-tests.php to output all test results
Sara Golemon [Sat, 6 May 2017 23:10:46 +0000 (16:10 -0700)]
Add support for run-tests.php to output all test results

./run-tests.php -W outfile.txt

PASS foo/bar.phpt
FAIL baz/qux.phpt

7 years agoUpdate php.ini-* for deprecated track_errors directive
ekinhbayar [Sat, 6 May 2017 19:25:04 +0000 (22:25 +0300)]
Update php.ini-* for deprecated track_errors directive

7 years agoMerge branch 'PHP-7.1'
Xinchen Hui [Mon, 8 May 2017 03:36:35 +0000 (11:36 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed another potential dangling pointer

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Mon, 8 May 2017 03:36:29 +0000 (11:36 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed another potential dangling pointer

7 years agoFixed another potential dangling pointer
Xinchen Hui [Mon, 8 May 2017 03:36:07 +0000 (11:36 +0800)]
Fixed another potential dangling pointer

7 years agoMerge branch 'PHP-7.1'
Xinchen Hui [Mon, 8 May 2017 03:33:01 +0000 (11:33 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Update NEWS
  Fixed bug #74546 (SIGILL in ZEND_FETCH_CLASS_CONSTANT_SPEC_CONST_CONST_HANDLER())

7 years agoUpdate NEWS
Xinchen Hui [Mon, 8 May 2017 03:32:42 +0000 (11:32 +0800)]
Update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Mon, 8 May 2017 03:32:27 +0000 (11:32 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74546 (SIGILL in ZEND_FETCH_CLASS_CONSTANT_SPEC_CONST_CONST_HANDLER())

7 years agoFixed bug #74546 (SIGILL in ZEND_FETCH_CLASS_CONSTANT_SPEC_CONST_CONST_HANDLER())
Xinchen Hui [Mon, 8 May 2017 03:32:08 +0000 (11:32 +0800)]
Fixed bug #74546 (SIGILL in ZEND_FETCH_CLASS_CONSTANT_SPEC_CONST_CONST_HANDLER())

7 years agoUnused var
Xinchen Hui [Mon, 8 May 2017 02:56:21 +0000 (10:56 +0800)]
Unused var

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sun, 7 May 2017 11:06:33 +0000 (13:06 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  [ci skip] update NEWS
  [ci skip] update NEWS

7 years ago[ci skip] update NEWS
Anatol Belski [Sun, 7 May 2017 11:05:47 +0000 (13:05 +0200)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sun, 7 May 2017 11:05:10 +0000 (13:05 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  [ci skip] update NEWS

7 years ago[ci skip] update NEWS
Anatol Belski [Sun, 7 May 2017 11:04:21 +0000 (13:04 +0200)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sat, 6 May 2017 13:11:06 +0000 (15:11 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #74547 mysqli::change_user() doesn't accept null as $database argument w/strict_types

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sat, 6 May 2017 13:10:16 +0000 (15:10 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74547 mysqli::change_user() doesn't accept null as $database argument w/strict_types

7 years agoFixed bug #74547 mysqli::change_user() doesn't accept null as $database argument...
Anatol Belski [Sat, 6 May 2017 13:06:34 +0000 (15:06 +0200)]
Fixed bug #74547 mysqli::change_user() doesn't accept null as $database argument w/strict_types

7 years agoDon't use zend_try around dtor_obj() and free_obj()
Nikita Popov [Tue, 2 May 2017 20:32:33 +0000 (22:32 +0200)]
Don't use zend_try around dtor_obj() and free_obj()

Without these zend_trys we may
a) leak the object (fine)
b) don't add it to the free list (also fine, we just lose an
   object store bucket)
c) don't remove it from the GC root buffer (also fine, because GC
   explicitly checks for both FREE_CALLED and invalid buckets)

7 years agoDon't double initialize object properties
Nikita Popov [Tue, 2 May 2017 20:16:41 +0000 (22:16 +0200)]
Don't double initialize object properties

7 years agoFixed zend_vm_call_opcode_handler(). Make phpdbg work with HYBRID VM.
Dmitry Stogov [Thu, 4 May 2017 15:56:28 +0000 (18:56 +0300)]
Fixed zend_vm_call_opcode_handler(). Make phpdbg work with HYBRID VM.

7 years agoAdded missing ZEND_VM_HOT define
Dmitry Stogov [Thu, 4 May 2017 14:57:49 +0000 (17:57 +0300)]
Added missing ZEND_VM_HOT define

7 years agoImplemented HYBRID VM instruction dispatch method that takes advantages of both CALL...
Dmitry Stogov [Wed, 3 May 2017 07:01:22 +0000 (10:01 +0300)]
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.

7 years agoIgnore ext/mbstring/oniguruma/oniguruma.h
Sara Golemon [Wed, 3 May 2017 04:48:47 +0000 (21:48 -0700)]
Ignore ext/mbstring/oniguruma/oniguruma.h

This is just copied in from ext/mbstring/oniguruma/src/oniguruma.h
and is hasn't been kept in GIT since Nov 2016.

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Tue, 2 May 2017 12:55:34 +0000 (14:55 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  [ci skip] update NEWS
  [ci skip] update NEWS

7 years ago[ci skip] update NEWS
Anatol Belski [Tue, 2 May 2017 12:54:42 +0000 (14:54 +0200)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 2 May 2017 12:54:17 +0000 (14:54 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  [ci skip] update NEWS

7 years ago[ci skip] update NEWS
Anatol Belski [Tue, 2 May 2017 12:53:32 +0000 (14:53 +0200)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Tue, 2 May 2017 12:47:08 +0000 (14:47 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #51918 Phar::webPhar() does not handle requests sent through PUT and DELETE method

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 2 May 2017 12:46:15 +0000 (14:46 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #51918 Phar::webPhar() does not handle requests sent through PUT and DELETE method

7 years agoFixed bug #51918 Phar::webPhar() does not handle requests sent through PUT and DELETE...
Christian Weiske [Fri, 21 Apr 2017 19:20:00 +0000 (21:20 +0200)]
Fixed bug #51918 Phar::webPhar() does not handle requests sent through PUT and DELETE method

phar: Support DELETE, HEAD and PUT HTTP methods in Phar::webPhar

Up to now only GET and POST requests could be handled with Phar::webPhar(),
which is insufficient for today's REST APIs.
This patch expands the list of supported HTTP methods.

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Tue, 2 May 2017 10:39:54 +0000 (12:39 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  [ci skip] update NEWS
  [ci skip] update NEWS

7 years ago[ci skip] update NEWS
Anatol Belski [Tue, 2 May 2017 10:39:10 +0000 (12:39 +0200)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 2 May 2017 10:38:40 +0000 (12:38 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  [ci skip] update NEWS

7 years ago[ci skip] update NEWS
Anatol Belski [Tue, 2 May 2017 10:38:04 +0000 (12:38 +0200)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Tue, 2 May 2017 10:33:26 +0000 (12:33 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #74510 win32/sendmail.c anchors CC header but not BCC

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 2 May 2017 10:32:40 +0000 (12:32 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74510 win32/sendmail.c anchors CC header but not BCC

7 years agoFixed bug #74510 win32/sendmail.c anchors CC header but not BCC
Anatol Belski [Tue, 2 May 2017 10:31:00 +0000 (12:31 +0200)]
Fixed bug #74510 win32/sendmail.c anchors CC header but not BCC

7 years agoKeep Z_IMMUTABLE*() macros for compatibility
Dmitry Stogov [Tue, 2 May 2017 07:00:54 +0000 (10:00 +0300)]
Keep Z_IMMUTABLE*() macros for compatibility

7 years agoMerge branch 'PHP-7.1'
Joe Watkins [Tue, 2 May 2017 05:25:31 +0000 (06:25 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fix bug #74457 Wrong reflection on XMLReader::expand

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Tue, 2 May 2017 05:24:59 +0000 (06:24 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #74457 Wrong reflection on XMLReader::expand

7 years agoFix bug #74457 Wrong reflection on XMLReader::expand
Fabien Villepinte [Mon, 17 Apr 2017 09:20:47 +0000 (11:20 +0200)]
Fix bug #74457 Wrong reflection on XMLReader::expand

7 years agoMerge branch 'PHP-7.1'
Joe Watkins [Tue, 2 May 2017 05:22:08 +0000 (06:22 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fix bug #74468 wrong reflection on Collator::sortWithSortKeys

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Tue, 2 May 2017 05:21:17 +0000 (06:21 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #74468 wrong reflection on Collator::sortWithSortKeys

7 years agoFix bug #74468 wrong reflection on Collator::sortWithSortKeys
Fabien Villepinte [Tue, 18 Apr 2017 15:03:42 +0000 (17:03 +0200)]
Fix bug #74468 wrong reflection on Collator::sortWithSortKeys

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Mon, 1 May 2017 16:07:05 +0000 (18:07 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Tests to ensure BC with undocumented behavior used in hacks

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 1 May 2017 16:06:09 +0000 (18:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Tests to ensure BC with undocumented behavior used in hacks

7 years agoTests to ensure BC with undocumented behavior used in hacks
Anatol Belski [Mon, 1 May 2017 16:01:05 +0000 (18:01 +0200)]
Tests to ensure BC with undocumented behavior used in hacks

Should become obsolete, once behaviors change.

7 years agoDrop unused variable
Nikita Popov [Mon, 1 May 2017 12:16:26 +0000 (14:16 +0200)]
Drop unused variable

7 years agoFixed bug #61970: Allow a child class to restrict access to ctor
Pedro Magalhães [Fri, 10 Mar 2017 19:08:15 +0000 (20:08 +0100)]
Fixed bug #61970: Allow a child class to restrict access to ctor

7 years agoFixed bug #74269: Strict comparison of initial trait property values
Pedro Magalhães [Mon, 10 Apr 2017 20:04:18 +0000 (22:04 +0200)]
Fixed bug #74269: Strict comparison of initial trait property values

7 years agoSupport showing slow tests in run-tests.php
Nikita Popov [Fri, 21 Apr 2017 10:29:41 +0000 (12:29 +0200)]
Support showing slow tests in run-tests.php

7 years agoAdd trailing comma syntax support for mixed and unmixed group use lists
Sammy Kaye Powers [Thu, 20 Apr 2017 18:08:11 +0000 (13:08 -0500)]
Add trailing comma syntax support for mixed and unmixed group use lists

RFC: https://wiki.php.net/rfc/list-syntax-trailing-commas

7 years agoMerge branch 'PHP-7.1'
Nikita Popov [Mon, 1 May 2017 10:15:49 +0000 (12:15 +0200)]
Merge branch 'PHP-7.1'

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Mon, 1 May 2017 10:15:41 +0000 (12:15 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoFix typo in SplFixedArray has_dimension implementation
Nikita Popov [Mon, 1 May 2017 10:14:53 +0000 (12:14 +0200)]
Fix typo in SplFixedArray has_dimension implementation

7 years agoMerge branch 'PHP-7.1'
Jakub Zelenka [Sun, 30 Apr 2017 19:28:38 +0000 (20:28 +0100)]
Merge branch 'PHP-7.1'

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Sun, 30 Apr 2017 19:27:39 +0000 (20:27 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoFix compiler warnings when compiled against musl libc
Michael Heimpold [Mon, 17 Apr 2017 22:22:34 +0000 (00:22 +0200)]
Fix compiler warnings when compiled against musl libc

musl libc is complaining when <sys/poll.h> is used instead of <poll.h>
so change this.

This issue was reported for OpenWrt/LEDE where musl libc is the standard
C library instead of e.g. glibc, see the following link for the original PR:
https://github.com/openwrt/packages/pull/4263

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
--

v3: refined checks/fallback paths as suggested by @bukka

v2: rebased to resolve merge conflict in main/php_network.h

v1: initial PR

7 years agoMerge branch 'PHP-7.1'
Jakub Zelenka [Sun, 30 Apr 2017 18:47:23 +0000 (19:47 +0100)]
Merge branch 'PHP-7.1'

7 years agoFix bug #73808 (iv length warning too restrictive for aes-128-ccm)
Jakub Zelenka [Sun, 30 Apr 2017 18:46:27 +0000 (19:46 +0100)]
Fix bug #73808 (iv length warning too restrictive for aes-128-ccm)

7 years agoMerge branch 'PHP-7.1'
Andrea Faulds [Sat, 29 Apr 2017 15:12:55 +0000 (16:12 +0100)]
Merge branch 'PHP-7.1'