* 'master' of git.php.net:php-src: (22 commits)
fix typo
merge news for 5.5.2
Update NEWS
Update NEWS
With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used. DTrace is part of Oracle Linux. See https://oss.oracle.com/projects/DTrace/
fix cve number
New news section
Prepare news for PHP-5.5.2
Remove unused variable
Reduce compiler noise by removing unused variables and labels
Fixed#65431 in zend_exception.c by Sixd
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Skip test if SKIP_ONLINE_TESTS set
Fix to file uploads >2G with size overflow
Fix CVE-2013-4073 - handling of certs with null bytes
Fix CVE-2013-4073 - handling of certs with null bytes
Fixed#65431 (Discarded qualifiers from pointer target warnings when using --enable-dtrace) by Sixd
Fix unused variable warning in OCI8 2.0
removed unused vars
fixed strndup usage in the pgsql ext
...
* 'PHP-5.5' of git.php.net:php-src: (30 commits)
Fix duplicated 5.5.2 NEWS in my tree
fix typo
merge news for 5.5.2
Update NEWS
Update NEWS
With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used. DTrace is part of Oracle Linux. See https://oss.oracle.com/projects/DTrace/
fix cve number
New news section
Prepare news for PHP-5.5.2
Reduce compiler noise by removing unused variables and labels
Fixed#65431 in zend_exception.c by Sixd
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Skip test if SKIP_ONLINE_TESTS set
Fix CVE-2013-4073 - handling of certs with null bytes
Fix CVE-2013-4073 - handling of certs with null bytes
Fixed#65431 (Discarded qualifiers from pointer target warnings when using --enable-dtrace) by Sixd
removed unused vars
fixed strndup usage in the pgsql ext
use mysqlnd, some tests fail otherwise
ensure notices are not ignored when tests need them
...
* PHP-5.5:
With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used. DTrace is part of Oracle Linux. See https://oss.oracle.com/projects/DTrace/
* PHP-5.4:
With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used. DTrace is part of Oracle Linux. See https://oss.oracle.com/projects/DTrace/
Linux are now used. DTrace is part of Oracle Linux. See
https://oss.oracle.com/projects/DTrace/
This patch does not change DTrace linking for non-Solaris/Linux
platforms.
For SystemTap users on Linux, this patch removes the compilation
warning:
Warning: Linking the shared library libphp5.la against the
non-libtool objects Zend/zend_dtrace.d.o is not portable!
