]> granicus.if.org Git - php/log
php
8 years ago[ci skip] update NEWS
Anatol Belski [Thu, 27 Apr 2017 09:43:13 +0000 (11:43 +0200)]
[ci skip] update NEWS

8 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

8 years ago[ci skip] update NEWS
Anatol Belski [Thu, 27 Apr 2017 09:35:00 +0000 (11:35 +0200)]
[ci skip] update NEWS

8 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"

8 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.

8 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.

8 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

8 years agosync bin sdk version
Anatol Belski [Wed, 26 Apr 2017 15:04:29 +0000 (17:04 +0200)]
sync bin sdk version

8 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

8 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.

8 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

8 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

8 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

8 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

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

8 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

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

8 years ago[ci skip] update NEWS
Anatol Belski [Tue, 25 Apr 2017 12:01:00 +0000 (14:01 +0200)]
[ci skip] update NEWS

8 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

8 years ago[ci skip] update NEWS
Anatol Belski [Tue, 25 Apr 2017 11:59:20 +0000 (13:59 +0200)]
[ci skip] update NEWS

8 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

8 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.

8 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

8 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

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

8 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

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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

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

8 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

8 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

8 years ago[ci skip] update NEWS
Anatol Belski [Sat, 22 Apr 2017 20:41:15 +0000 (22:41 +0200)]
[ci skip] update NEWS

8 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

8 years ago[ci skip] update NEWS
Anatol Belski [Sat, 22 Apr 2017 20:39:59 +0000 (22:39 +0200)]
[ci skip] update NEWS

8 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

8 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

8 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

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

* PHP-7.0:
  Avoid exact floating point comparison

8 years agoAvoid exact floating point comparison
Steve Walk [Tue, 18 Apr 2017 15:43:03 +0000 (08:43 -0700)]
Avoid exact floating point comparison

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Thu, 20 Apr 2017 05:39:26 +0000 (06:39 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Update php_network.h

8 years agoUpdate php_network.h
Alexander Ilyin [Tue, 18 Apr 2017 09:44:34 +0000 (02:44 -0700)]
Update php_network.h

```
In file included from /usr/local/include/php/main/php_network.h:124:0,
                 from /var/www/html/php-ext-handlersocketi-0.0.1/hs_response.c:3:
/usr/include/sys/poll.h:1:2: warning: #warning redirecting incorrect #include <sys/poll.h> to <poll.h> [-Wcpp]
 #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
  ^
```

8 years agoMerge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
Xinchen Hui [Mon, 17 Apr 2017 12:27:07 +0000 (20:27 +0800)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1

* 'PHP-7.1' of git.php.net:/php-src:
  Fix loop identification

8 years agoFixed bug #74456 (Segmentation error while running a script in CLI mode)
Xinchen Hui [Mon, 17 Apr 2017 12:24:39 +0000 (20:24 +0800)]
Fixed bug #74456 (Segmentation error while running a script in CLI mode)

Instead of make update_op1_by_const supports FETCH_LIST(CASE), I think
disable it is more safe for 7.1

8 years agoFix loop identification
Nikita Popov [Mon, 17 Apr 2017 10:17:32 +0000 (12:17 +0200)]
Fix loop identification

When assigning loop headers, we should treat already detected
loops as collapsed to their loop header, instead of ignoring them.

This fixes the loop header of BB2 in mandel2 if live-range CFG
splitting is enabled.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Mon, 17 Apr 2017 07:12:02 +0000 (08:12 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  ext/gettext: respect passed in library directory for all checks

8 years agoext/gettext: respect passed in library directory for all checks
Michael Heimpold [Thu, 13 Apr 2017 20:43:26 +0000 (22:43 +0200)]
ext/gettext: respect passed in library directory for all checks

A directory given to configure by --with-gettext=dir is only
used within the very first AC_CHECK_LIB. This is because the
temporary modified LDFLAGS variable is reset too early.

This results in functions not detected properly.

The original issue and patch was reported for OpenWrt/LEDE
distribution by @Dimazhan at:
https://github.com/openwrt/packages/issues/4250

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Mon, 17 Apr 2017 07:09:05 +0000 (08:09 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74080 Add datetime constant for RFC7231

8 years agoFixed bug #74080 Add datetime constant for RFC7231
Craig Duncan [Sat, 1 Apr 2017 16:56:31 +0000 (17:56 +0100)]
Fixed bug #74080 Add datetime constant for RFC7231

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Mon, 17 Apr 2017 06:57:07 +0000 (07:57 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74439 Wrong reflection on the Locale methods

8 years agoFixed bug #74439 Wrong reflection on the Locale methods
Fabien Villepinte [Fri, 14 Apr 2017 12:08:26 +0000 (14:08 +0200)]
Fixed bug #74439 Wrong reflection on the Locale methods

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sun, 16 Apr 2017 12:55:51 +0000 (14:55 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  [ci skip] update NEWS

8 years ago[ci skip] update NEWS
Anatol Belski [Sun, 16 Apr 2017 12:55:31 +0000 (14:55 +0200)]
[ci skip] update NEWS

8 years ago[ci skip] update NEWS
Anatol Belski [Sun, 16 Apr 2017 12:54:19 +0000 (14:54 +0200)]
[ci skip] update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sat, 15 Apr 2017 17:35:13 +0000 (19:35 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  improve/fix error handling

8 years agoimprove/fix error handling
Anatol Belski [Sat, 15 Apr 2017 17:30:30 +0000 (19:30 +0200)]
improve/fix error handling

GetLastError() should not be called, if the function didn't fail.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sat, 15 Apr 2017 16:25:31 +0000 (18:25 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix error handling

8 years agofix error handling
Anatol Belski [Sat, 15 Apr 2017 16:14:25 +0000 (18:14 +0200)]
fix error handling

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 15 Apr 2017 16:15:33 +0000 (18:15 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoImprove accuracy of opline lineno information
Nikita Popov [Sat, 15 Apr 2017 16:06:42 +0000 (18:06 +0200)]
Improve accuracy of opline lineno information

If compile_var() was used instead of compile_expr() we did not
update the current lineno.

8 years agoextend error map
Anatol Belski [Sat, 15 Apr 2017 15:27:45 +0000 (17:27 +0200)]
extend error map

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 15 Apr 2017 10:35:53 +0000 (12:35 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFix compact_literals of INIT_METHOD_CALL with CONST op1
Nikita Popov [Sat, 15 Apr 2017 10:35:09 +0000 (12:35 +0200)]
Fix compact_literals of INIT_METHOD_CALL with CONST op1

8 years agoImprove fix for bug #74442
Nikita Popov [Fri, 14 Apr 2017 23:39:33 +0000 (01:39 +0200)]
Improve fix for bug #74442

Make the check less conservative to be consistent with the other
cases.

8 years agoFixed bug #74444: multiple catch freezes in some cases
David Matejka [Fri, 14 Apr 2017 22:20:06 +0000 (00:20 +0200)]
Fixed bug #74444: multiple catch freezes in some cases

zend_emit_jump() may reallocate, so reload the opline.

8 years agoCredit goes to Eric Norris for this one
Rasmus Lerdorf [Fri, 14 Apr 2017 22:48:24 +0000 (15:48 -0700)]
Credit goes to Eric Norris for this one

8 years agoFixed bug #74442
Nikita Popov [Fri, 14 Apr 2017 20:20:32 +0000 (22:20 +0200)]
Fixed bug #74442

8 years agoFixed bug #74431
Nikita Popov [Fri, 14 Apr 2017 19:58:35 +0000 (21:58 +0200)]
Fixed bug #74431

If the last instruction in a block is a NOP, then `new_opline`
here won't be a copy of `opline`, it will be a copy of the last
non-NOP opline. Avoid performing a spurious update by explicitly
checking for NOP.

8 years agoTest for bug 74431
ekinhbayar [Fri, 14 Apr 2017 14:28:57 +0000 (17:28 +0300)]
Test for bug 74431

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Johannes Schlüter [Fri, 14 Apr 2017 14:30:51 +0000 (16:30 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoAdd support for MySQL 8's Unicode types
Johannes Schlüter [Fri, 14 Apr 2017 14:30:10 +0000 (16:30 +0200)]
Add support for MySQL 8's Unicode types

8 years agomissing news entry from 7.1.3
Joe Watkins [Fri, 14 Apr 2017 06:56:12 +0000 (07:56 +0100)]
missing news entry from 7.1.3

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Thu, 13 Apr 2017 12:21:17 +0000 (13:21 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74433 Wrong reflection on the Normalizer methods

8 years agoFixed bug #74433 Wrong reflection on the Normalizer methods
Fabien Villepinte [Thu, 13 Apr 2017 11:25:13 +0000 (13:25 +0200)]
Fixed bug #74433 Wrong reflection on the Normalizer methods

8 years agoNEWS
Remi Collet [Thu, 13 Apr 2017 05:11:06 +0000 (07:11 +0200)]
NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Remi Collet [Thu, 13 Apr 2017 05:10:47 +0000 (07:10 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  NEWS

8 years agoNEWS
Remi Collet [Thu, 13 Apr 2017 05:10:37 +0000 (07:10 +0200)]
NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Remi Collet [Thu, 13 Apr 2017 05:07:43 +0000 (07:07 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74416 Wrong reflection on DOMNode::cloneNode

8 years agoFixed bug #74416 Wrong reflection on DOMNode::cloneNode
Fabien Villepinte [Tue, 11 Apr 2017 15:26:03 +0000 (17:26 +0200)]
Fixed bug #74416 Wrong reflection on DOMNode::cloneNode

8 years agoAdd missing NEWS
Christopher Jones [Wed, 12 Apr 2017 04:04:24 +0000 (14:04 +1000)]
Add missing NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Wed, 12 Apr 2017 04:03:34 +0000 (14:03 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFixed uninitialized data causing random crash (Dmitry)
Christopher Jones [Wed, 12 Apr 2017 04:02:46 +0000 (14:02 +1000)]
Fixed uninitialized data causing random crash (Dmitry)

8 years agoAdd missing NEWS
Christopher Jones [Wed, 12 Apr 2017 03:23:19 +0000 (13:23 +1000)]
Add missing NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 11 Apr 2017 11:49:19 +0000 (13:49 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix misleading typo in identifiers

8 years agoFix misleading typo in identifiers
Anatol Belski [Tue, 11 Apr 2017 11:48:04 +0000 (13:48 +0200)]
Fix misleading typo in identifiers

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Tue, 11 Apr 2017 11:14:40 +0000 (12:14 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fixed bug #74413 wrong reflection on SQLite3::enableExceptions

8 years agofixed bug #74413 wrong reflection on SQLite3::enableExceptions
Joe Watkins [Tue, 11 Apr 2017 11:13:21 +0000 (12:13 +0100)]
fixed bug #74413 wrong reflection on SQLite3::enableExceptions

8 years agoUpdate NEWS
Xinchen Hui [Tue, 11 Apr 2017 10:46:57 +0000 (18:46 +0800)]
Update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Tue, 11 Apr 2017 10:46:41 +0000 (18:46 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74408 (Endless loop bypassing execution time limit)

8 years agoFixed bug #74408 (Endless loop bypassing execution time limit)
Xinchen Hui [Tue, 11 Apr 2017 10:46:16 +0000 (18:46 +0800)]
Fixed bug #74408 (Endless loop bypassing execution time limit)

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 11 Apr 2017 09:37:03 +0000 (11:37 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix re2c version comparison

8 years agofix re2c version comparison
Anatol Belski [Tue, 11 Apr 2017 08:59:45 +0000 (10:59 +0200)]
fix re2c version comparison

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Matt Ficken [Tue, 11 Apr 2017 08:56:54 +0000 (01:56 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix #74410 by calling WaitForMultipleObjects() instead of MsgWaitForMultipleObjects()

8 years agoFix #74410 by calling WaitForMultipleObjects() instead of
Matt Ficken [Tue, 11 Apr 2017 08:54:57 +0000 (01:54 -0700)]
Fix #74410 by calling WaitForMultipleObjects() instead of
MsgWaitForMultipleObjects()

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Sebastian Bergmann [Tue, 11 Apr 2017 06:28:55 +0000 (08:28 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1