Commit Graph

33245 Commits

Author SHA1 Message Date
Dmitry Stogov
16e95d9137 Fixed reavlidate_path=1 behavior to avoid caching of symlinks values. 2013-12-18 19:19:53 +04:00
Kalle Sommer Nielsen
aed4b086ac Eliminate the TSRMLS_FETCH() calls in the ticks functions and hook 2013-12-18 09:32:26 +01:00
Kalle Sommer Nielsen
c83598119b Kill a TSRMLS_FETCH() in php_stream_context_set() by passing TSRMLS_CC to it
# For mysqlnd: Relevant PHP_API_VERSION are put in place for cross version compatibility
2013-12-18 09:19:24 +01:00
Kalle Sommer Nielsen
2eb9bd316d Merge branch 'master' of https://git.php.net/push/php-src 2013-12-18 07:27:14 +01:00
Kalle Sommer Nielsen
d14670ccdb Eliminate another TSRMLS_FETCH() in i_zend_is_true()
# Affected extensions have all been updated, ext/opcache and ext/zip
# both have macros for cross version compatibility
2013-12-18 07:25:05 +01:00
Anatol Belski
c0f1e6946d Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed possibly uninitialized value usage
2013-12-17 08:45:49 +01:00
Anatol Belski
beed28844b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fixed possibly uninitialized value usage
2013-12-17 08:45:30 +01:00
Anatol Belski
5e5ecaea6e Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fixed possibly uninitialized value usage
2013-12-17 08:45:07 +01:00
Anatol Belski
2303d0ea22 fixed possibly uninitialized value usage 2013-12-17 08:44:22 +01:00
Xinchen Hui
a9c503bc27 Merge branch 'PHP-5.6' 2013-12-17 15:10:56 +08:00
Xinchen Hui
eeb37c40e6 Save one char compare 2013-12-17 15:09:52 +08:00
Xinchen Hui
ac719610f4 Merge branch 'PHP-5.6' 2013-12-17 15:06:36 +08:00
Xinchen Hui
143ae34f29 Fixed test failed after rev 57c1335f 2013-12-17 15:05:31 +08:00
Stanislav Malyshev
5613d70ee8 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #65873 - Integer overflow in exif_read_data()
2013-12-16 11:38:00 -08:00
Stanislav Malyshev
de4a2c3cbd Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #65873 - Integer overflow in exif_read_data()
2013-12-16 11:37:29 -08:00
Stanislav Malyshev
57408f9c85 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #65873 - Integer overflow in exif_read_data()
2013-12-16 11:36:33 -08:00
Stanislav Malyshev
cbcf6e1880 Fix bug #65873 - Integer overflow in exif_read_data() 2013-12-16 11:34:24 -08:00
Dmitry Stogov
a67c615799 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  Fix tests expecting specific resource IDs
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
  Updated release process
2013-12-16 13:13:29 +04:00
Dmitry Stogov
43f11165b8 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  Fix tests expecting specific resource IDs
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
  Test pushing
  Updated release process
2013-12-16 13:13:18 +04:00
Dmitry Stogov
82d67af60d Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Fix tests expecting specific resource IDs
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
  Fix tests expecting specific resource IDs
  Test pushing
  Updated release process
2013-12-16 13:12:55 +04:00
Xinchen Hui
5eb8d9d700 Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6 2013-12-15 16:55:29 +08:00
Xinchen Hui
7cf6f012b1 Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5 2013-12-15 16:55:11 +08:00
Xinchen Hui
10964b7854 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-15 16:51:32 +08:00
Eric Stenson
330168a247 Fix tests expecting specific resource IDs
When Wincache or APC are installed, the resource IDs are not the same.
This is because Wincache takes a few resource objects for itself.  As a
result, these tests become false positives.

On Windows boxes, the microtime precision is not granular enough
to reliably register a difference if two calls to uniqid() are made
concurrently.  This is a fix to the uniqid() test to avoid the false
positive when run on Windows machines.  Also, added a test to exercise
the 'more_entropy' variant of uniqid().
2013-12-15 16:51:21 +08:00
Xinchen Hui
304d97933f Merge branch 'issue-phpt-resourceid-wincache' of https://github.com/EricSten/php-src 2013-12-15 16:26:11 +08:00
Anatol Belski
fc4761a07c Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
  Test pushing
2013-12-14 20:48:44 +01:00
Anatol Belski
904721189f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
2013-12-14 20:47:37 +01:00
Anatol Belski
509a67d28f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
2013-12-14 20:46:43 +01:00
Anatol Belski
68a73ce3c4 fixed parameter order for zend_throw_exception_ex call 2013-12-14 20:43:02 +01:00
Eric Stenson
50377b5bf2 Fix tests expecting specific resource IDs
When Wincache or APC are installed, the resource IDs are not the same.
This is because Wincache takes a few resource objects for itself.  As a
result, these tests become false positives.

On Windows boxes, the microtime precision is not granular enough
to reliably register a difference if two calls to uniqid() are made
concurrently.  This is a fix to the uniqid() test to avoid the false
positive when run on Windows machines.  Also, added a test to exercise
the 'more_entropy' variant of uniqid().
2013-12-13 10:42:32 -08:00
Dmitry Stogov
af66b20781 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  Use zend_error_noreturn here
  OCI8 build change: Fix source variable definition for C89 compatibility
  Add Tests for #65784 in 5.5
  Disallowed JMP into a finally block.
  Update NEWS for 5.5.7 release
  Fixed bug #65784 (Segfault with finally).
2013-12-13 11:17:50 +04:00
Dmitry Stogov
9b829c92b5 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Use zend_error_noreturn here
  OCI8 build change: Fix source variable definition for C89 compatibility
  Kill another TSRMLS_FETCH() in zend_indent()
  Eliminate another straight forward TSRMLS_FETCH() in zend_startup_module()
  Fix build
  Add Tests for #65784 in 5.5
  Disallowed JMP into a finally block.
  Update NEWS for 5.5.7 release
  Fixed bug #65784 (Segfault with finally).
2013-12-13 11:15:38 +04:00
Christopher Jones
bc748ba38c OCI8 build change: Fix source variable definition for C89 compatibility 2013-12-12 15:22:55 -08:00
Kalle Sommer Nielsen
0fc8e6af0a Eliminate another straight forward TSRMLS_FETCH() in zend_startup_module()
# For THTTPD:
# The code that uses a call to this function is for older versions of PHP anyway so its not covered

# For Zend OpCache:
# Added a new define for 5.6 and wrapped the code around that so its still compatible with older version
2013-12-12 20:30:45 +01:00
Dmitry Stogov
711d8c2c7b Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  fix test
2013-12-12 16:46:49 +04:00
Dmitry Stogov
3bddcc13b5 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  fix test
2013-12-12 16:46:37 +04:00
Dmitry Stogov
fd4a7388d7 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  fix test
2013-12-12 16:46:15 +04:00
Michael Wallner
c0e87e9bb1 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix test
2013-12-12 12:10:08 +01:00
Michael Wallner
1dfbe99ce4 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix test
2013-12-12 12:09:54 +01:00
Michael Wallner
8ee6fe9856 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix test
2013-12-12 12:09:34 +01:00
Michael Wallner
c59f3184a3 fix test 2013-12-12 12:08:50 +01:00
Dmitry Stogov
47f41385e1 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 14:00:03 +04:00
Dmitry Stogov
463dbc3490 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 13:59:51 +04:00
Dmitry Stogov
a23bcba875 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 13:59:37 +04:00
Dmitry Stogov
8738e6d86f Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed tests
  Fixed ext/soap/tests/bugs/bug54911.phpt
2013-12-12 13:55:42 +04:00
Dmitry Stogov
9850d57fd9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed tests
  Fixed ext/soap/tests/bugs/bug54911.phpt
2013-12-12 13:55:23 +04:00
Anatol Belski
58b754ca4a Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 10:46:36 +01:00
Anatol Belski
39a2dcdeac Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 10:46:21 +01:00
Dmitry Stogov
0344e6a429 Fixed tests 2013-12-12 13:35:37 +04:00
Anatol Belski
da62fd5ed8 Fixed bug #65486 mysqli_poll() is broken on Win x64
While this issue is visible in mysqli_poll() functions, the cause
lays deeper in the stream to socket casting API. On Win x64 the
SOCKET datatype is a 64 or 32 bit unsigned, while on Linux/Unix-like
it's 32 bit signed integer. The game of casting 32 bit var to/from
64 bit pointer back and forth is the best way to break it.

Further more, while socket and file descriptors are always integers
on Linux, those are different things using different APIs on Windows.
Even though using integer instead of SOCKET might work on Windows, this
issue might need to be revamped more carefully later. By this time
this patch is tested well with phpt and apps and shows no regressions,
neither in mysqli_poll() nor in any other parts.
2013-12-12 10:17:01 +01:00
Dmitry Stogov
1886292ec9 Fixed ext/soap/tests/bugs/bug54911.phpt 2013-12-12 13:02:50 +04:00
Adam Harvey
b97156113e Merge branch 'PHP-5.6'
* PHP-5.6:
  Switch to using freetype-config for freetype detection.
2013-12-07 19:42:00 -08:00
Anatol Belski
fa1802381f Merge branch 'PHP-5.6'
* PHP-5.6:
  added missing prototype
2013-12-11 14:16:22 +01:00
Anatol Belski
f0cf312d8c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  added missing prototype
2013-12-11 14:16:07 +01:00
Anatol Belski
edf601a41f added missing prototype 2013-12-11 14:15:40 +01:00
Anatol Belski
2f707bf246 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix dir separator in cve-2013-6420 test
2013-12-11 13:33:59 +01:00
Anatol Belski
e9efc16660 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix dir separator in cve-2013-6420 test
2013-12-11 13:33:37 +01:00
Anatol Belski
b6bcae5c10 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix dir separator in cve-2013-6420 test
2013-12-11 13:33:16 +01:00
Anatol Belski
ff89066b3d Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  fix dir separator in cve-2013-6420 test
2013-12-11 13:32:49 +01:00
Anatol Belski
6f739318fd fix dir separator in cve-2013-6420 test 2013-12-11 13:31:29 +01:00
Stanislav Malyshev
35b8f57906 Merge branch 'PHP-5.6'
* PHP-5.6:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
2013-12-10 11:36:33 -08:00
Stanislav Malyshev
293984ac33 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
2013-12-10 11:36:06 -08:00
Stanislav Malyshev
41cd533298 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
2013-12-10 11:35:26 -08:00
Stanislav Malyshev
b1b23abc86 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
  Fixed Bug #66218 zend_register_functions breaks reflection
2013-12-10 11:34:45 -08:00
Stanislav Malyshev
71daf3229b Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse

Conflicts:
	configure.in
	main/php_version.h
2013-12-10 11:34:35 -08:00
Stanislav Malyshev
c1224573c7 Fix CVE-2013-6420 - memory corruption in openssl_x509_parse 2013-12-10 11:03:49 -08:00
Remi Collet
8e29235b6c Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  Fixed Bug #66218 zend_register_functions breaks reflection
2013-12-10 16:10:48 +01:00
Remi Collet
45d8802441 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  Fixed Bug #66218 zend_register_functions breaks reflection
2013-12-10 16:10:20 +01:00
Remi Collet
9f4d1ee51c Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed Bug #66218 zend_register_functions breaks reflection
2013-12-10 16:09:41 +01:00
Remi Collet
3e963f8eb4 Fixed Bug #66218 zend_register_functions breaks reflection
Functions registered using zend_register_functions instead of zend_module_entry.functions are not seen on reflection.

Ex: additional_functions from api_module_entry.
Ex: in CLI, dl, cli_set_process_title and cli_get_process_title

Note:
- also affects functions overrided in extension
  (should be be reported in extension, where overrided, not in original extension)
- also allow extension to call zend_register_functions for various list
  (instead of having a single bug list)
2013-12-10 16:07:16 +01:00
Dmitry Stogov
ad4f0c7812 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at)
2013-12-10 17:59:20 +04:00
Dmitry Stogov
fe93347ba0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at)

Conflicts:
	NEWS
2013-12-10 17:58:22 +04:00
Dmitry Stogov
552e8b2b4c Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at) 2013-12-10 17:57:05 +04:00
Dmitry Stogov
d439b3970a Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66251 (Constants get statically bound at compile time when Optimized)
2013-12-10 17:05:23 +04:00
Dmitry Stogov
73f13f439b Fixed bug #66251 (Constants get statically bound at compile time when Optimized) 2013-12-10 17:04:17 +04:00
Dmitry Stogov
6b6a4e466a Merge branch 'PHP-5.6'
* PHP-5.6:
  Arguments passed to user function have to be properly allocated on heap
2013-12-10 13:03:24 +04:00
Dmitry Stogov
5ad1117419 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Arguments passed to user function have to be properly allocated on heap
2013-12-10 13:03:09 +04:00
Dmitry Stogov
a6516653b7 Arguments passed to user function have to be properly allocated on heap 2013-12-10 13:00:45 +04:00
Adam Harvey
d40a5a2797 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Switch to using freetype-config for freetype detection.
2013-12-07 19:41:44 -08:00
Adam Harvey
d7a45a67be Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Switch to using freetype-config for freetype detection.
2013-12-07 19:41:23 -08:00
Adam Harvey
a0955f351c Switch to using freetype-config for freetype detection.
This fixes GD compilation against libfreetype 2.5.1 and later after they made
the rather interesting decision to change their include directory layout in a
point release.

The original suggestion in the bug was to use pkg-config, but my inclination is
to use freetype-config instead: we should be able to get the same configuration
information without actually needing pkg-config installed, since pkg-config is
by no means guaranteed to exist on many Unices and distros, whereas
freetype-config should always be present if a libfreetype build environment is
installed. Let's try it out and see what happens.

Fixes bug #64405 (Use freetype-config for determining freetype2 dir(s)).
2013-12-07 19:39:40 -08:00
Michael Wallner
01a13bb8c1 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value
  Use 'user@example.com' rather than 'user@company.com' in tests
2013-12-06 10:34:11 +01:00
Michael Wallner
9ea2489f5c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value
2013-12-06 10:33:47 +01:00
Michael Wallner
a48d82d238 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value
2013-12-06 10:33:10 +01:00
Michael Wallner
098d2a5d0f fix possibly uninitialized value 2013-12-06 10:27:33 +01:00
Sara Golemon
9adfcea241 Use 'user@example.com' rather than 'user@company.com' in tests
Using some arbitrary 3rd party's domain name is clowny,
even if it never tries to send.
2013-12-04 07:51:43 -08:00
Michael Wallner
44ff944b37 Merge branch 'dba'
* dba:
  fix bug #62490
  more test fixes
  fix test
  fix php_stream_copy_to_stream_ex usage
  add missing clean section
  remove test for already removed feature
2013-12-05 11:27:26 +01:00
Michael Wallner
5a420c8680 fix bug #62490
inifiles delete handler did not return false if the key was not found
2013-12-05 11:04:25 +01:00
Andrey Hristov
0cb38a3d26 Merge branch 'master' of git.php.net:php-src
Conflicts:
	NEWS
2013-12-04 18:32:32 +02:00
Sara Golemon
f0248bdce5 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Use 'user@example.com' rather than 'user@company.com' in tests
2013-12-04 07:50:45 -08:00
Sara Golemon
32a4cc8353 Use 'user@example.com' rather than 'user@company.com' in tests
Using some arbitrary 3rd party's domain name is clowny,
even if it never tries to send.
2013-12-04 07:49:16 -08:00
Andrey Hristov
406d5a5ecc Merge branch 'PHP-5.6'
Conflicts:
	NEWS
	UPGRADING
2013-12-04 16:20:03 +02:00
Andrey Hristov
97909ef4ef Merge branch 'PHP-5.5' into PHP-5.6 2013-12-04 12:39:11 +02:00
Andrey Hristov
ceb1b7e20f Merge branch 'PHP-5.4' into PHP-5.5 2013-12-04 12:07:18 +02:00
Andrey Hristov
86aad97979 Fix loss of precision 2013-12-04 12:06:59 +02:00
Adam Harvey
8f11f7f179 Merge branch 'PHP-5.6'
* PHP-5.6:
  Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
2013-12-03 14:54:24 -08:00
Adam Harvey
44697c115b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
2013-12-03 14:52:35 -08:00
Adam Harvey
6f52f566f3 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
2013-12-03 14:51:03 -08:00
Adam Harvey
d1314893fd Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
These were returned to the general allocation pool by RFC 3330, and hence
shouldn't cause an IP address validation failure due to being reserved. At
least 128.0.0.0/16 is in use on the public Internet today.

Fixes bug #66229 (128.0.0.0/16 isn't reserved any longer).
2013-12-03 14:46:15 -08:00
Michael Wallner
f0c85fab45 more test fixes 2013-12-03 18:18:40 +01:00