com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/s tandard/info.c
| From: | Anatol Belski | Date: | Tue, 16 Dec 2014 07:04:51 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/s tandard/info.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83722@lists.php.net to get a copy of this message | ||
Commit: 209a7a27a5a9a9dc4e32ffa39a2ef971a97d2878
Author: Anatol Belski <ab@php.net> Tue, 16 Dec 2014 08:04:51 +0100
Parents: 64b423d6ed298d4859e85dfe8059f4789c3f7117 caf55214165ed32014aae7863bce621d1cb19a9e
Branches: native-tls
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=209a7a27a5a9a9dc4e32ffa39a2ef971a97d2878
Log:
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
Revert "Removed useless local variable"
Fix the fix for bug #55415
add BC breaks from PHPNG RFC
add include for definition of php_url_encode
Bugs:
https://bugs.php.net/55415
Changed paths:
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
MM ext/standard/info.c
Diff: