f893b18544
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS entry for #67713
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:46:31 +02:00
d649b785d6
NEWS entry for #67713
2014-07-30 10:45:35 +02:00
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
d18b16244c
update the exception message to better match the actual check
2014-07-30 10:16:01 +02:00
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
8ad3445713
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed usage after free
2014-07-30 10:40:32 +04:00
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
aa3ddda8e5
Fixed usage after free
2014-07-30 10:39:25 +04:00
0e04d542e9
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Undo inadvertent commit of php_version
Corrected patch for bug #60616
2014-07-30 02:47:44 +00:00
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
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
ab6c1d21f9
Undo inadvertent commit of php_version
2014-07-30 02:34:21 +00:00
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
0120a9ca4b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Wildcards should only be used in the first name component; fixed comment style
2014-07-29 19:15:20 +08:00
a7dad26c4b
Wildcards should only be used in the first name component; fixed comment style
2014-07-29 19:15:01 +08:00
e7df0af6bd
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields)
2014-07-28 23:17:23 +00:00
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
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
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
fcd195aa64
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix SOAP for uninitialzed object
2014-07-28 11:38:20 -07:00
180db42a90
fix SOAP for uninitialzed object
2014-07-28 11:38:06 -07:00
f281a315f7
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix NEWS
Fix missing type checks in various functions
2014-07-28 00:39:24 -07:00
7f865ffdd8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix NEWS
2014-07-28 00:39:00 -07:00
f782ea5b42
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix NEWS
2014-07-28 00:38:50 -07:00
3e167ba990
fix NEWS
2014-07-28 00:38:10 -07:00
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
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
b4a4db467b
Fix missing type checks in various functions
2014-07-27 02:42:49 -07:00
47a12117c3
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix SPL objects initialization checks
2014-07-26 19:37:37 -07:00
90a0d58af8
Fix SPL objects initialization checks
2014-07-26 18:59:16 -07:00
faaa0ffdc4
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Add object initialization checks for sqlite3 classes
2014-07-26 16:58:09 -07:00
403eca4173
Add object initialization checks for sqlite3 classes
2014-07-26 16:57:45 -07:00
03dcdf5742
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Revert "Fix bug #66568 : the second arg for unserialize is optional." as we already reverted the introduction of the second arg.
2014-07-25 13:16:31 +02:00
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
2014-07-25 13:15:27 +02:00
7abaac41fd
Merge branch 'PHP-5.6'
...
* PHP-5.6:
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:59:01 -07:00
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
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
d0a244f1f3
update NEWS
2014-07-24 22:55:39 -07:00
51c38a0997
Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
2014-07-24 22:54:14 -07:00
61e0f8599d
Fixed Bug #67538 (SPL Iterators use-after-free)
2014-07-24 22:53:46 -07:00
ec441ff4ed
Merge branch 'PHP-5.6'
2014-07-25 10:52:57 +08:00
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
235d0241d1
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-25 10:52:41 +08:00
4ae1d5d1bd
Add CVE no
2014-07-25 10:52:27 +08:00
0ac3d8d4f4
Merge branch 'PHP-5.6'
2014-07-24 18:02:00 +02:00
8d1ec3814e
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-24 18:01:35 +02:00
acfa8c770c
BFN
2014-07-24 18:00:58 +02:00
432bd117a9
Merge branch 'PHP-5.4' into PHP-5.5
2014-07-24 18:00:06 +02:00
d491b2f916
Fix bug #67496 Save command history when exiting interactive shell with control-c
2014-07-24 17:58:39 +02:00
6fdbb4601f
Merge branch 'PHP-5.6'
2014-07-24 16:59:37 +02:00
Ferenc Kovacs