]> granicus.if.org Git - php/log
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'

7 years agoTest ReflectionType support of iterable
Andrea Faulds [Sat, 29 Apr 2017 13:37:35 +0000 (14:37 +0100)]
Test ReflectionType support of iterable

7 years agoDrop ZEND_API from zend_assert_valid_class_name
Andrea Faulds [Sat, 29 Apr 2017 15:09:08 +0000 (16:09 +0100)]
Drop ZEND_API from zend_assert_valid_class_name

This is a convenience function for internal use and shouldn't have been
exported.

7 years agoTest ReflectionType support of iterable
Andrea Faulds [Sat, 29 Apr 2017 13:37:35 +0000 (14:37 +0100)]
Test ReflectionType support of iterable

7 years ago[ci skip] yet more info for new rm
Anatol Belski [Fri, 28 Apr 2017 17:15:32 +0000 (19:15 +0200)]
[ci skip] yet more info for new rm

7 years agouse char* as we don't compile with UNICODE anyway
Anatol Belski [Fri, 28 Apr 2017 12:03:06 +0000 (14:03 +0200)]
use char* as we don't compile with UNICODE anyway

7 years agono vista anymore
Anatol Belski [Fri, 28 Apr 2017 11:41:58 +0000 (13:41 +0200)]
no vista anymore

7 years agoMerge branch 'PHP-7.1'
Jakub Zelenka [Thu, 27 Apr 2017 14:46:17 +0000 (15:46 +0100)]
Merge branch 'PHP-7.1'

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Thu, 27 Apr 2017 14:45:31 +0000 (15:45 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoFix possible memory leak in openssl_encrypt and openssl_decrypt
Jakub Zelenka [Thu, 27 Apr 2017 14:44:26 +0000 (15:44 +0100)]
Fix possible memory leak in openssl_encrypt and openssl_decrypt

7 years agoMerge branch 'PHP-7.1'
Jakub Zelenka [Thu, 27 Apr 2017 14:13:26 +0000 (15:13 +0100)]
Merge branch 'PHP-7.1'

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Thu, 27 Apr 2017 14:11:52 +0000 (15:11 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoPrefer using DIRECTORY_SEPARATOR in OpenSSL config path
Jakub Zelenka [Thu, 27 Apr 2017 14:10:55 +0000 (15:10 +0100)]
Prefer using DIRECTORY_SEPARATOR in OpenSSL config path

7 years agoAdd oid_section to the testing openssl.cnf
Jakub Zelenka [Thu, 27 Apr 2017 14:09:58 +0000 (15:09 +0100)]
Add oid_section to the testing openssl.cnf

It tests repeated OID addition

7 years agoAvoid unnecessary string copy
Anatol Belski [Thu, 27 Apr 2017 14:03:12 +0000 (16:03 +0200)]
Avoid unnecessary string copy

which is the case when there's no impersonation.

7 years agoget rid of two strlen calls
Anatol Belski [Thu, 27 Apr 2017 13:39:32 +0000 (15:39 +0200)]
get rid of two strlen calls

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Thu, 27 Apr 2017 09:44:26 +0000 (11:44 +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 [Thu, 27 Apr 2017 09:43:13 +0000 (11:43 +0200)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 27 Apr 2017 09:39:14 +0000 (11:39 +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 [Thu, 27 Apr 2017 09:35:00 +0000 (11:35 +0200)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Thu, 27 Apr 2017 09:13:00 +0000 (11:13 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Revert "Detect invalid port in xp_socket parse ip address"
  Revert "Follow up patch regarding bug #74216, see bug #74429"

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 27 Apr 2017 09:11:41 +0000 (11:11 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Revert "Detect invalid port in xp_socket parse ip address"
  Revert "Follow up patch regarding bug #74216, see bug #74429"

7 years agoRevert "Detect invalid port in xp_socket parse ip address"
Anatol Belski [Thu, 27 Apr 2017 00:49:12 +0000 (02:49 +0200)]
Revert "Detect invalid port in xp_socket parse ip address"

This reverts commit bab0b99f376dac9170ac81382a5ed526938d595a.

7 years agoRevert "Follow up patch regarding bug #74216, see bug #74429"
Anatol Belski [Thu, 27 Apr 2017 00:49:01 +0000 (02:49 +0200)]
Revert "Follow up patch regarding bug #74216, see bug #74429"

This reverts commit cda7dcf4cacef3346f9dc2a4dc947e6a74769259.

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Wed, 26 Apr 2017 15:07:37 +0000 (17:07 +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 [Wed, 26 Apr 2017 15:05:56 +0000 (17:05 +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 [Wed, 26 Apr 2017 15:04:29 +0000 (17:04 +0200)]
sync bin sdk version

7 years agoMerge branch 'PHP-7.1'
Jakub Zelenka [Wed, 26 Apr 2017 14:01:27 +0000 (15:01 +0100)]
Merge branch 'PHP-7.1'

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Wed, 26 Apr 2017 14:00:49 +0000 (15:00 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoDo not add already added object to the internal OpenSSL table
Jakub Zelenka [Wed, 3 Aug 2016 19:01:41 +0000 (20:01 +0100)]
Do not add already added object to the internal OpenSSL table

This fixes OpenSSL 1.1 where adding object with OID that has been
already added causes an error - preventing of duplication.

7 years agoMerge branch 'PHP-7.1'
Remi Collet [Wed, 26 Apr 2017 12:42:02 +0000 (14:42 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  rely on bundle config, instead of system one

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Remi Collet [Wed, 26 Apr 2017 12:41:54 +0000 (14:41 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  rely on bundle config, instead of system one

7 years agorely on bundle config, instead of system one
Remi Collet [Wed, 26 Apr 2017 12:41:40 +0000 (14:41 +0200)]
rely on bundle config, instead of system one

7 years agoMerge branch 'PHP-7.1'
Remi Collet [Wed, 26 Apr 2017 12:39:23 +0000 (14:39 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  skip the test on OpenSSL < 1.1 for now

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Remi Collet [Wed, 26 Apr 2017 12:39:14 +0000 (14:39 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  skip the test on OpenSSL < 1.1 for now

7 years agoskip the test on OpenSSL < 1.1 for now
Anatol Belski [Thu, 23 Mar 2017 02:09:30 +0000 (03:09 +0100)]
skip the test on OpenSSL < 1.1 for now

7 years agoMerge branch 'PHP-7.1'
Remi Collet [Wed, 26 Apr 2017 12:38:29 +0000 (14:38 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  bump version after release

7 years agobump version after release
Joe Watkins [Tue, 25 Apr 2017 15:49:20 +0000 (16:49 +0100)]
bump version after release

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

* PHP-7.1:
  move next

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 25 Apr 2017 12:07:36 +0000 (14:07 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  move next

7 years agomove next
Anatol Belski [Tue, 25 Apr 2017 12:06:17 +0000 (14:06 +0200)]
move next

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Tue, 25 Apr 2017 12:01:42 +0000 (14:01 +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, 25 Apr 2017 12:01:00 +0000 (14:01 +0200)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 25 Apr 2017 12:00:10 +0000 (14:00 +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, 25 Apr 2017 11:59:20 +0000 (13:59 +0200)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Tue, 25 Apr 2017 11:00:10 +0000 (13:00 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Follow up patch regarding bug #74216, see bug #74429

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 25 Apr 2017 10:59:22 +0000 (12:59 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Follow up patch regarding bug #74216, see bug #74429

7 years agoFollow up patch regarding bug #74216, see bug #74429
Sara Golemon [Tue, 25 Apr 2017 10:52:48 +0000 (12:52 +0200)]
Follow up patch regarding bug #74216, see bug #74429

While the case in bug #74429 is not documented and is only worky due to
an implementation bug, the strength seems to breach some real world
apps. Given this patch doesn't impact the initial security fix for
bug #74216, it is reasonable to let the apps keep working. As mentioned
in the ticket, this behavior is a subject to change in future versions
and should not be abused.

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Mon, 24 Apr 2017 20:14:30 +0000 (22:14 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  don't backup older deps after upgrades
  update SDK version for AppVeyor

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 24 Apr 2017 20:12:26 +0000 (22:12 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  don't backup older deps after upgrades
  update SDK version for AppVeyor

7 years agodon't backup older deps after upgrades
Anatol Belski [Mon, 24 Apr 2017 20:10:32 +0000 (22:10 +0200)]
don't backup older deps after upgrades

7 years agoupdate SDK version for AppVeyor
Anatol Belski [Mon, 24 Apr 2017 20:08:45 +0000 (22:08 +0200)]
update SDK version for AppVeyor

7 years agoprefer OpenSSL 1.1 with 7.2 as that's what is default
Anatol Belski [Mon, 24 Apr 2017 16:39:04 +0000 (18:39 +0200)]
prefer OpenSSL 1.1 with 7.2 as that's what is default

7 years ago[ci skip] more upgrading notes
Anatol Belski [Mon, 24 Apr 2017 16:14:10 +0000 (18:14 +0200)]
[ci skip] more upgrading notes

7 years ago[ci skip] move item to right section
Anatol Belski [Mon, 24 Apr 2017 16:01:56 +0000 (18:01 +0200)]
[ci skip] move item to right section

7 years agoMerge branch 'PHP-7.1'
Jakub Zelenka [Mon, 24 Apr 2017 16:14:22 +0000 (17:14 +0100)]
Merge branch 'PHP-7.1'

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Mon, 24 Apr 2017 16:12:55 +0000 (17:12 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoFix bug #73833 (null character not allowed in openssl_pkey_get_private)
Jakub Zelenka [Mon, 24 Apr 2017 16:11:36 +0000 (17:11 +0100)]
Fix bug #73833 (null character not allowed in openssl_pkey_get_private)

7 years agoRemove --enable-one-shot as it's dead already for long
Anatol Belski [Mon, 24 Apr 2017 15:54:50 +0000 (17:54 +0200)]
Remove --enable-one-shot as it's dead already for long

The usable option is --with-mp, the implementation is available since 7.0.

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Mon, 24 Apr 2017 14:22:57 +0000 (16:22 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Support also no,shared configure arg vals by default

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 24 Apr 2017 14:22:16 +0000 (16:22 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Support also no,shared configure arg vals by default

7 years agoSupport also no,shared configure arg vals by default
Anatol Belski [Mon, 24 Apr 2017 13:46:22 +0000 (15:46 +0200)]
Support also no,shared configure arg vals by default

This indirectly fixes bug #74398 where --with-extname is expected to be
configured shared with our default dependency package. With a non
default deps, it still can be enforced --with-extname=static

7 years agoMerge branch 'PHP-7.1'
Jakub Zelenka [Sun, 23 Apr 2017 20:07:31 +0000 (21:07 +0100)]
Merge branch 'PHP-7.1'

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Sun, 23 Apr 2017 20:06:45 +0000 (21:06 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoAdd missing NEWS entries for 7.0.19
Jakub Zelenka [Sun, 23 Apr 2017 20:03:35 +0000 (21:03 +0100)]
Add missing NEWS entries for 7.0.19

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sun, 23 Apr 2017 19:35:52 +0000 (21:35 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  extend zlib export required for the recent libpng

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sun, 23 Apr 2017 19:34:31 +0000 (21:34 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  extend zlib export required for the recent libpng

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

7 years agoextend zlib export required for the recent libpng
Anatol Belski [Sun, 23 Apr 2017 19:27:34 +0000 (21:27 +0200)]
extend zlib export required for the recent libpng

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

7 years agoFix bug #73711 (Segfault in openssl_pkey_new when generating DSA or DH key)
Jakub Zelenka [Sun, 23 Apr 2017 19:30:14 +0000 (20:30 +0100)]
Fix bug #73711 (Segfault in openssl_pkey_new when generating DSA or DH key)

7 years agoyet one more export required from newer zlib
Anatol Belski [Sun, 23 Apr 2017 19:29:40 +0000 (21:29 +0200)]
yet one more export required from newer zlib

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sun, 23 Apr 2017 19:29:04 +0000 (21:29 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  extend zlib export required for the recent libpng

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sun, 23 Apr 2017 19:28:26 +0000 (21:28 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  extend zlib export required for the recent libpng

7 years agoextend zlib export required for the recent libpng
Anatol Belski [Sun, 23 Apr 2017 19:27:34 +0000 (21:27 +0200)]
extend zlib export required for the recent libpng

7 years agoAdd some 'New RM' instructions
Sara Golemon [Sun, 23 Apr 2017 19:20:41 +0000 (12:20 -0700)]
Add some 'New RM' instructions

7 years agoFix reflection tests in mysqli extension
Nikita Popov [Sat, 22 Apr 2017 21:57:00 +0000 (23:57 +0200)]
Fix reflection tests in mysqli extension

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sat, 22 Apr 2017 20:42:05 +0000 (22:42 +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 [Sat, 22 Apr 2017 20:41:15 +0000 (22:41 +0200)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sat, 22 Apr 2017 20:40:48 +0000 (22:40 +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 [Sat, 22 Apr 2017 20:39:59 +0000 (22:39 +0200)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sat, 22 Apr 2017 19:59:07 +0000 (21:59 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  #74337 pointer returned by php_stream_fopen_tmpfile not validated in memory.c

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sat, 22 Apr 2017 19:58:10 +0000 (21:58 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  #74337 pointer returned by php_stream_fopen_tmpfile not validated in memory.c

7 years ago#74337 pointer returned by php_stream_fopen_tmpfile not validated in memory.c
Anton Serbulov [Fri, 14 Apr 2017 08:26:13 +0000 (15:26 +0700)]
#74337 pointer returned by php_stream_fopen_tmpfile not validated in memory.c

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sat, 22 Apr 2017 16:35:10 +0000 (18:35 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #74489 readline() immediately returns false in interactive console mode

7 years agoFixed bug #74489 readline() immediately returns false in interactive console mode
Anatol Belski [Sat, 22 Apr 2017 16:33:53 +0000 (18:33 +0200)]
Fixed bug #74489 readline() immediately returns false in interactive console mode

7 years agoDon't leak internal flags in reflection
Nikita Popov [Sat, 22 Apr 2017 14:44:20 +0000 (16:44 +0200)]
Don't leak internal flags in reflection

If someone complains, we may re-expose specific flags while also
adding corresponding class constants for them.

7 years agoFix reflection test after flag removal
Nikita Popov [Sat, 22 Apr 2017 14:31:28 +0000 (16:31 +0200)]
Fix reflection test after flag removal

Reflection is leaking internal flags...

7 years agoRemove the ZEND_ACC_CLONE flag
Nikita Popov [Sat, 22 Apr 2017 13:44:24 +0000 (15:44 +0200)]
Remove the ZEND_ACC_CLONE flag

This one is completely unused

7 years agoDocument which function flags are still free
Nikita Popov [Sat, 22 Apr 2017 13:42:57 +0000 (15:42 +0200)]
Document which function flags are still free

Also clearly separate method and class flags.

7 years agoMerge branch 'PHP-7.1'
Joe Watkins [Thu, 20 Apr 2017 05:42:55 +0000 (06:42 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Avoid exact floating point comparison