clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,916 Commits 494 Branches 1,367 Tags 801 MiB
858c076810
Commit Graph

79916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ferenc Kovacs
858c076810 add NEWS block for the next RC 2014-07-30 10:51:28 +02:00
Ferenc Kovacs
d649b785d6 NEWS entry for #67713 2014-07-30 10:45:35 +02:00
Ferenc Kovacs
89b54c2aa5 Merge branch 'newInstanceWithoutConstructor' into PHP-5.6 
* newInstanceWithoutConstructor:
  update the exception message to better match the actual check
  ReflectionClass::newInstanceWithoutConstructor() should be allowed to instantiate every class except those internal classes with a final __construct()
 2014-07-30 10:23:29 +02:00
Ferenc Kovacs
d18b16244c update the exception message to better match the actual check 2014-07-30 10:16:01 +02:00
Ferenc Kovacs
d586441d90 ReflectionClass::newInstanceWithoutConstructor() should be allowed to instantiate every class except those internal classes with a final __construct() 2014-07-30 10:08:56 +02:00
Dmitry Stogov
43e956a9a1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed usage after free
 2014-07-30 10:40:06 +04:00
Dmitry Stogov
aa3ddda8e5 Fixed usage after free 2014-07-30 10:39:25 +04:00
Keyur Govande
f0278589e1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Undo inadvertent commit of php_version
  Corrected patch for bug #60616
 2014-07-30 02:41:01 +00:00
Keyur Govande
ab4c4c3970 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Undo inadvertent commit of php_version
  Corrected patch for bug #60616
 2014-07-30 02:34:46 +00:00
Keyur Govande
ab6c1d21f9 Undo inadvertent commit of php_version 2014-07-30 02:34:21 +00:00
Keyur Govande
65364fe7d0 Corrected patch for bug #60616 
For unixODBC, use ODBC version as defined by it (as of v2.2.14 it is 3.5).
This allows us to use newer features like SQL_DESC_OCTET_LENGTH (which
returns the number of bytes required to store the data). This fixes the issue
in #60616. If the newer version is not available, over-allocate to accomodate
4-byte Unicode characters for CHAR and VARCHAR datatypes (and their Wide
counterparts).
version.
Fixed a couple of failing tests.
 2014-07-30 02:28:31 +00:00
Tjerk Meesters
a7dad26c4b Wildcards should only be used in the first name component; fixed comment style 2014-07-29 19:15:01 +08:00
Keyur Govande
9720d92c67 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields)
 2014-07-28 23:16:52 +00:00
Keyur Govande
90f99d47c0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields)
 2014-07-28 23:16:20 +00:00
Keyur Govande
00546bc9b7 Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields) 
The ODBC extension did not support WVARCHAR. WVARCHAR ends up being handled by
the default handler where vallen is set by the driver to the actual bytes
needed for the field. If it is larger than default-lrl then the output is
corrupted (reading past the buffer) because the return functions don't expect
that to happen. The patch add support to handle WVARCHAR just like a regular
VARCHAR.
 2014-07-28 23:15:23 +00:00
Stanislav Malyshev
180db42a90 fix SOAP for uninitialzed object 2014-07-28 11:38:06 -07:00
Stanislav Malyshev
7f865ffdd8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix NEWS
 2014-07-28 00:39:00 -07:00
Stanislav Malyshev
f782ea5b42 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix NEWS
 2014-07-28 00:38:50 -07:00
Stanislav Malyshev
3e167ba990 fix NEWS 2014-07-28 00:38:10 -07:00
Stanislav Malyshev
c41ca94824 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix missing type checks in various functions

Conflicts:
	ext/openssl/openssl.c
 2014-07-28 00:37:32 -07:00
Stanislav Malyshev
531be9662f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix missing type checks in various functions
 2014-07-28 00:34:27 -07:00
Stanislav Malyshev
b4a4db467b Fix missing type checks in various functions 2014-07-27 02:42:49 -07:00
Stanislav Malyshev
90a0d58af8 Fix SPL objects initialization checks 2014-07-26 18:59:16 -07:00
Stanislav Malyshev
403eca4173 Add object initialization checks for sqlite3 classes 2014-07-26 16:57:45 -07:00
Ferenc Kovacs
a68ef0a117 Revert "Fix bug #66568: the second arg for unserialize is optional." as we already reverted the introduction of the second arg. 
This reverts commit aefc8f22b3.

Conflicts:
	NEWS
 2014-07-25 13:15:27 +02:00
Stanislav Malyshev
3345722354 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
  Fixed Bug #67538 (SPL Iterators use-after-free)
 2014-07-24 22:58:29 -07:00
Stanislav Malyshev
fedc799344 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update NEWS
  Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
  Fixed Bug #67538 (SPL Iterators use-after-free)
 2014-07-24 22:58:06 -07:00
Stanislav Malyshev
d0a244f1f3 update NEWS 2014-07-24 22:55:39 -07:00
Xinchen Hui
51c38a0997 Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting) 2014-07-24 22:54:14 -07:00
Xinchen Hui
61e0f8599d Fixed Bug #67538 (SPL Iterators use-after-free) 2014-07-24 22:53:46 -07:00
Xinchen Hui
bad5502ca9 Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6 2014-07-25 10:52:46 +08:00
Xinchen Hui
235d0241d1 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-25 10:52:41 +08:00
Xinchen Hui
4ae1d5d1bd Add CVE no 2014-07-25 10:52:27 +08:00
Johannes Schlüter
8d1ec3814e Merge branch 'PHP-5.5' into PHP-5.6 2014-07-24 18:01:35 +02:00
Johannes Schlüter
acfa8c770c BFN 2014-07-24 18:00:58 +02:00
Johannes Schlüter
432bd117a9 Merge branch 'PHP-5.4' into PHP-5.5 2014-07-24 18:00:06 +02:00
Dmitry Saprykin
d491b2f916 Fix bug #67496 Save command history when exiting interactive shell with control-c 2014-07-24 17:58:39 +02:00
Johannes Schlüter
210315d5a5 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-24 16:58:50 +02:00
Johannes Schlüter
899b369e15 BFN 2014-07-24 16:58:05 +02:00
Johannes Schlüter
ffc1d25b37 Merge branch 'PHP-5.4' into PHP-5.5 2014-07-24 16:56:05 +02:00
Johannes Schlüter
71d3a69425 Fix bug #55496 Interactive mode doesn't force a newline before the prompt 2014-07-24 16:53:51 +02:00
Tjerk Meesters
aab23cf38e Updated NEWS for #67666 2014-07-24 14:39:18 +08:00
Tjerk Meesters
38e714ece5 Fixed #67666 - Subject altName doesn't match wildcards 2014-07-24 14:36:31 +08:00
Dmitry Stogov
ea1d5dcacb Removed second zval_copy_ctor() 2014-07-24 01:16:00 +04:00
Dmitry Stogov
d909b6330e Fixed crash on self-referencing constant expression (part of a constant AST) 2014-07-24 00:37:15 +04:00
Dmitry Stogov
c49a06168e Fixed support for constant arrays in context of "const" statement (Zend/tests/constant_expressions_arrays.phpt failed when opcache.protect_memort was set) 2014-07-23 22:47:58 +04:00
Anatol Belski
a6ecb873b9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix nmake snap when ext name is different in target dll
 2014-07-21 14:47:40 +02:00
Anatol Belski
6fcd8e5865 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix nmake snap when ext name is different in target dll
 2014-07-21 14:46:57 +02:00
Anatol Belski
dc3a5d783f fix nmake snap when ext name is different in target dll 2014-07-21 14:45:49 +02:00
Anatol Belski
f6d941e4b4 force atoll macro usage on windows 2014-07-21 09:52:52 +02:00