com php-src: Merge branch 'PHP-7.0' into PHP-7.1: TSRM/tsrm_w in32.c
| From: | Anatol Belski | Date: | Thu, 18 Aug 2016 14:01:23 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: TSRM/tsrm_w in32.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93974@lists.php.net to get a copy of this message | ||
Commit: 2f430a4b6cf1e12b9629d451ce5e203c58b9eb72
Author: Anatol Belski <ab@php.net> Thu, 18 Aug 2016 16:01:23 +0200
Parents: 5818b09a45a016f40ed910a0279c626ce54278fc 98d8794eae787571e061b3f07bbd196fa373fa48
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2f430a4b6cf1e12b9629d451ce5e203c58b9eb72
Log:
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
avoid other efforts if memory mapping fails
Changed paths:
MM TSRM/tsrm_win32.c
Diff: