Dmitry Stogov
aa3ddda8e5
Fixed usage after free
2014-07-30 10:39:25 +04: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
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
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
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
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
4ae1d5d1bd
Add CVE no
2014-07-25 10:52:27 +08: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
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
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
Lior Kaplan
842fde2827
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Enable $ replacement in exif, ldap, pdo_pgsql and tidy
Update NEWS
2014-07-21 01:47:19 +03:00
Lior Kaplan
0678dc8d91
Enable $ replacement in exif, ldap, pdo_pgsql and tidy
2014-07-21 01:45:36 +03:00
Remi Collet
658f7d77f9
See bug #67635
...
Improve previous fix:
- also rely on pkg-config for systemd < 209
- always check for header
- comments
2014-07-20 11:14:43 +02:00
Remi Collet
a051d7264d
NEWS
2014-07-19 18:46:17 +02:00
Remi Collet
144a083954
improve previous, add message during configure
2014-07-19 18:42:40 +02:00
Remi Collet
7b60315672
Fixed bug #67635 php links to systemd libraries without using pkg-config
...
Patch from pacho at gentoo dot org
Rely on pkg-config for systemd >= 209
Failback on old check
2014-07-19 18:40:20 +02:00
Xinchen Hui
8ff00e6e85
Improve fix for #66608
2014-07-19 17:19:01 +08:00
Xinchen Hui
9ce1a36af2
Fixed segfault with empty break
2014-07-19 15:30:50 +08:00
Xinchen Hui
629c1ecd4f
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
2014-07-19 13:12:26 +08:00
Xinchen Hui
f604b61e39
New added opcodes don't need to be resloved
2014-07-19 12:53:34 +08:00
Yasuo Ohgaki
9b30b04b32
Update NEWS
2014-07-19 10:12:28 +09:00
Yasuo Ohgaki
ad744263ca
Update NEWS
2014-07-19 10:11:42 +09:00
Yasuo Ohgaki
f83a6c33b4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #66827 Session raises E_NOTICE when session name variable is array
2014-07-19 09:53:04 +09:00
Yasuo Ohgaki
e946de29d2
Fixed bug #66827 Session raises E_NOTICE when session name variable is array
2014-07-19 09:52:31 +09:00
Anatol Belski
982342b057
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
implemented copy libs of core exts in phpize mode
2014-07-18 18:40:09 +02:00
Anatol Belski
c5ccaf1d04
implemented copy libs of core exts in phpize mode
2014-07-18 18:38:57 +02:00
Anatol Belski
f304fb848f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix copy the ext dll into the prefix path in phpize mode
fix default prefix in phpize mode
fix file with zero size usage in phpize mode
2014-07-18 11:40:53 +02:00
Anatol Belski
35b077f53e
fix copy the ext dll into the prefix path in phpize mode
2014-07-18 11:39:38 +02:00
Anatol Belski
8044d0680b
fix default prefix in phpize mode
2014-07-18 11:36:44 +02:00
Anatol Belski
a8e0a623ec
fix file with zero size usage in phpize mode
2014-07-18 11:35:32 +02:00
Xinchen Hui
ba1cf321f3
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
2014-07-18 15:45:56 +08:00
Xinchen Hui
de433d4c47
Fixed bug #66608 (Incorrect behavior with nested "finally" blocks)
2014-07-18 15:45:31 +08:00
Lior Kaplan
3e1b749f5e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Enable build without atoll (e.g old AIX flavours)
2014-07-17 23:04:23 +03:00
Lior Kaplan
2dff153b23
Enable build without atoll (e.g old AIX flavours)
2014-07-17 22:58:36 +03:00
Anatol Belski
b5324acd35
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
implemented usage of the non core ext deps in phpize mode
2014-07-17 21:48:46 +02:00
Anatol Belski
f0a1e410a3
implemented usage of the non core ext deps in phpize mode
2014-07-17 21:47:15 +02:00
Anatol Belski
1a2c3bd3ad
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
implemented force usage of generated .h and .js deps in phpize mode
2014-07-17 09:26:46 +02:00
