clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-27 12:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,874 Commits 494 Branches 1,367 Tags 781 MiB
5eb8d9d700
Commit Graph

76874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
DQNEO
1b3e2c299d Fix doc (svn -> git) 2013-12-13 23:20:37 +02:00
Xinchen Hui
41eaac3491 Test pushing 2013-12-13 21:32:14 +08:00
Julien Pauli
d67fbaa74d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated release process
 2013-12-13 13:27:45 +01:00
Julien Pauli
47a0722b9f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Updated release process
 2013-12-13 13:27:19 +01:00
Julien Pauli
cbc98df99e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Updated release process
 2013-12-13 13:26:16 +01:00
Julien Pauli
3eb2b1ac40 Updated release process 2013-12-13 13:16:54 +01:00
Xinchen Hui
6f95a07c41 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-13 11:37:43 +08:00
Xinchen Hui
ef73f85079 Use zend_error_noreturn here 2013-12-13 10:56:35 +08:00
Christopher Jones
bc748ba38c OCI8 build change: Fix source variable definition for C89 compatibility 2013-12-12 15:22:55 -08:00
Xinchen Hui
c9d00a23ae Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6 2013-12-13 01:48:17 +08:00
Xinchen Hui
ab12ccd16a Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6 2013-12-13 01:46:28 +08:00
Xinchen Hui
dde552f2ee Add Tests for #65784 in 5.5 2013-12-13 01:45:45 +08:00
Xinchen Hui
54213b462d Disallowed JMP into a finally block. 2013-12-13 01:44:54 +08:00
Julien Pauli
3248b3c4d8 Update NEWS for 5.5.7 release 2013-12-12 17:16:13 +01:00
Xinchen Hui
794a888a48 Fixed bug #65784 (Segfault with finally). 2013-12-13 00:16:08 +08: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
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
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
Anatol Belski
6f739318fd fix dir separator in cve-2013-6420 test 2013-12-11 13:31:29 +01:00
Stanislav Malyshev
8650bbc8dc 5.3.29-dev 2013-12-10 11:32:11 -08:00
Stanislav Malyshev
c1224573c7 Fix CVE-2013-6420 - memory corruption in openssl_x509_parse 2013-12-10 11:03:49 -08: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
Bob Weinand
324291ebf2 Added one more test for constant scalar expressions 2013-12-11 19:17:07 +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
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
Ard Biesheuvel
d6ecc4105a Merge branch 'PHP-5.5' into PHP-5.6 2013-12-11 08:51:10 +01:00
Ard Biesheuvel
bec62af141 Merge branch 'PHP-5.4' into PHP-5.5 2013-12-11 08:50:53 +01:00
Ard Biesheuvel
8f1fee61e2 Zend: fix overflow handling bug in non-x86 fast_add_function() 
The 'result' argument of fast_add_function() may alias with either
of its operands (or both). Take care not to write to 'result' before
reading op1 and op2.
 2013-12-11 08:50:20 +01: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
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
bc8f7761f3 NEWS 2013-12-10 16:10:02 +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
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
73f13f439b Fixed bug #66251 (Constants get statically bound at compile time when Optimized) 2013-12-10 17:04:17 +04:00