fixed merge mistake
Fix unused variable warning in OCI8 2.0
Fixed #65431 (Discarded qualifiers from pointer target warnings when using --enable-dtrace) by Sixd
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'
Fix CVE-2013-4073 - handling of certs with null bytes
Fix CVE-2013-4073 - handling of certs with null bytes
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix CVE-2013-4073 - handling of certs with null bytes
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix CVE-2013-4073 - handling of certs with null bytes
  Fix CVE-2013-4073 - handling of certs with null bytes
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix CVE-2013-4073 - handling of certs with null bytes
  Fix CVE-2013-4073 - handling of certs with null bytes
Fix to file uploads >2G with size overflow

Represent the file size as string when the total size would overflow
LONG_MAX. Otherwise while file itself were uploaded, the size would
be shown wrong. This mostly applies to systems with 32 bit long.
Skip test if SKIP_ONLINE_TESTS set
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Skip test if SKIP_ONLINE_TESTS set
Merge branch 'PHP-5.5'

* PHP-5.5:
  Skip test if SKIP_ONLINE_TESTS set
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.

Conflicts:
	ext/dba/libinifile/inifile.c
Merge branch 'PHP-5.5'

* PHP-5.5:
  Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.

Conflicts:
	ext/gmp/gmp.c
Fixed #65431 in zend_exception.c by Sixd
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'