com php-src: Merge branch 'PHP-7.1' into PHP-7.2: main/streams/userspace.c
| From: | Sara Golemon | Date: | Wed, 19 Jul 2017 18:01:18 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.1' into PHP-7.2: main/streams/userspace.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98642@lists.php.net to get a copy of this message | ||
Commit: bb02f99e7186a31aeb328eae4a9eeba1431a3e8f
Author: Sara Golemon <pollita@php.net> Wed, 19 Jul 2017 14:01:18 -0400
Parents: d25049cc1b74ae445d6521997a421a7462f1ad5b a9e8239f4521a353765880fb3b1e719cc9d3fc99
Branches: PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bb02f99e7186a31aeb328eae4a9eeba1431a3e8f
Log:
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Do not allow using traits/interfaces/abstract classes as stream wrappers
Add oci8_failover.c to config.w32, follow up for commit 1b797f7a
Changed paths:
MM main/streams/userspace.c
Diff: