com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend.c Zend/zend.h Zend/zend_alloc.c Zend/zend_com pile.c
Zend/zend_execute_API.c ext/gmp/gmp.c ex t/opcache/ZendAccelerator.c ext/phar/phar.c ext/standar d/assert.c ext/standard/basic_functions.h ext/standar
d/dir.c ext/tidy/tidy.c
| From: | Anatol Belski | Date: | Fri, 24 Oct 2014 20:28:32 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend.c Zend/zend.h Zend/zend_alloc.c Zend/zend_com pile.c Zend/zend_execute_API.c ext/gmp/gmp.c ex t/opcache/ZendAccelerator.c ext/phar/phar.c ext/standar d/assert.c ext/standard/basic_functions.h ext/standar d/dir.c ext/tidy/tidy.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82644@lists.php.net to get a copy of this message | ||
Commit: c51a42076c0f92988115a25068b8ab01dfb8a6ff
Author: Anatol Belski <ab@php.net> Fri, 24 Oct 2014 22:28:32 +0200
Parents: 9cbdf3e66a76895861b6f39e1b1ef5cc46d76654 1b4fd5825a820873e4ed0f326bcb890e660dc39c
Branches: native-tls
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c51a42076c0f92988115a25068b8ab01dfb8a6ff
Log:
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (214 commits)
fix datatype mismatch warnings
fix datatype mismatches
fix datatype mismatches
fix datatype mismatches
fix datatype mismatch warnings
fix datatype mismatch warnings
fix datatype mismatch warnings
fix datatype mismatch warning
fix datatype mismatches
fix datatype mismatch warnings
Re-add phpdbg to travis
Added some NEWS
Make xml valid (missing space between attrs)
Fix info classes file name in xml
Add note about <eval> tag for errors in xml.md
Name the tag <eval> if the error id during ev cmd
Do not print out xml as PHP print...
Fix output to wrong function
Fixed parameter order on %.*s
Too much copypaste...
...
Changed paths:
MM Zend/zend.c
MM Zend/zend.h
MM Zend/zend_alloc.c
MM Zend/zend_compile.c
MM Zend/zend_execute_API.c
MM ext/gmp/gmp.c
MM ext/opcache/ZendAccelerator.c
MM ext/phar/phar.c
MM ext/standard/assert.c
MM ext/standard/basic_functions.h
MM ext/standard/dir.c
MM ext/tidy/tidy.c
Diff: