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

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