95febf26c6
Fix wrong lenght size
2014-07-31 21:27:51 +03:00
c2f2d5c8fc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #51096 - Remove unnecessary ? for first/last day of
Conflicts:
ext/date/lib/parse_date.c
2014-07-31 14:33:55 +01:00
bff84d7c18
Merge branch 'pull-request/754' into PHP-5.4
2014-07-31 14:30:39 +01:00
358aedc454
Bug #51096 - Remove unnecessary ? for first/last day of
2014-07-31 14:21:38 +01:00
b96224625c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update NEWS
2014-07-30 18:39:59 +00:00
7b60430a8f
Update NEWS
2014-07-30 18:39:23 +00:00
0a29e4731e
Update NEWS
2014-07-30 18:33:19 +00:00
48cadf242d
BFN
2014-07-30 20:13:17 +02:00
6ed9991a6f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #67715 (php-milter does not build and crashes randomly).
2014-07-30 20:12:50 +02:00
12b2127b72
Fixed bug #67715 (php-milter does not build and crashes randomly).
2014-07-30 20:12:13 +02:00
579c9066a0
Merge commit '8b9719d' into PHP-5.5
...
* commit '8b9719d':
We need to turn off any strict mode here for this warning to show up
2014-07-30 12:23:24 -04:00
8b9719d8b9
We need to turn off any strict mode here for this warning to show up
2014-07-30 12:22:48 -04:00
52f4587e8a
Updated NEWS for #67693
2014-07-30 18:17:36 +08:00
e9967292c3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Updated NEWS for #67693
Fixed bug #67693 - incorrect push to the empty array
2014-07-30 18:17:13 +08:00
b3466f862f
Updated NEWS for #67693
2014-07-30 18:16:56 +08:00
da3add26cf
Fixed bug #67693 - incorrect push to the empty array
2014-07-30 18:15:14 +08:00
aa3ddda8e5
Fixed usage after free
2014-07-30 10:39:25 +04: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
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
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
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
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
4ae1d5d1bd
Add CVE no
2014-07-25 10:52:27 +08: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
899b369e15
BFN
2014-07-24 16:58:05 +02:00
ffc1d25b37
Merge branch 'PHP-5.4' into PHP-5.5
2014-07-24 16:56:05 +02:00
71d3a69425
Fix bug #55496 Interactive mode doesn't force a newline before the prompt
2014-07-24 16:53:51 +02:00
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
dc3a5d783f
fix nmake snap when ext name is different in target dll
2014-07-21 14:45:49 +02:00
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
0678dc8d91
Enable $ replacement in exif, ldap, pdo_pgsql and tidy
2014-07-21 01:45:36 +03:00
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
a051d7264d
NEWS
2014-07-19 18:46:17 +02:00
144a083954
improve previous, add message during configure
2014-07-19 18:42:40 +02:00
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
8ff00e6e85
Improve fix for #66608
2014-07-19 17:19:01 +08:00
9ce1a36af2
Fixed segfault with empty break
2014-07-19 15:30:50 +08:00
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
f604b61e39
New added opcodes don't need to be resloved
2014-07-19 12:53:34 +08:00
9b30b04b32
Update NEWS
2014-07-19 10:12:28 +09:00
Andrey Hristov