4fa5c1d22d
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-15 15:33:26 +08:00
3bc7490370
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-01-15 15:32:42 +08:00
4fcf4e0845
Fixed bug #57702 (Multi-row BLOB fetches)
2013-01-15 15:31:49 +08:00
ba32970710
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update fputcsv() to escape all characters equally.
2013-01-15 15:26:25 +08:00
a4191b0aad
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Update fputcsv() to escape all characters equally.
2013-01-15 15:24:21 +08:00
9b5cb0e805
Update fputcsv() to escape all characters equally.
...
At present, backslashes have special case handling within fputcsv(): when one
is encountered within a field that's being escaped, escaping stops until the
next instance of the enclosure character is hit. This can result in malformed
CSV.
Fixes bug #43225 (fputcsv incorrectly handles cells ending in \ followed by ").
2013-01-15 15:17:45 +08:00
be1700d467
Fix compile failure introduced by the fix for bug #46408 .
2013-01-15 10:08:26 +08:00
3ea2b73a30
Merge branch 'PHP-5.5' of git://github.com/php/php-src into PHP-5.5
2013-01-14 21:41:24 +01:00
6313fc7e10
Added NEWS item for DateTimeImmutable
2013-01-14 20:36:48 +00:00
c4de702d4e
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-14 21:36:28 +01:00
6a065876b9
Bug #52958 : Segfault in PDO_OCI on cleanup after running a long testsuite.
2013-01-14 21:35:48 +01:00
c20911a850
Make DatePeriod support DateTimeImmutable as well.
...
If the start element is a DateTimeImmutable object, then all returned objects
are also DateTimeImmutable objects. If the start element is a DateTime object,
then all returned objects are DateTime objects.
2013-01-14 20:34:58 +00:00
a0618139c9
Fixed crash bug when the non-OO interface was used.
2013-01-14 20:34:58 +00:00
017b1f7fca
Rename DateTimePoint to DateTimeImmutable.
2013-01-14 20:34:58 +00:00
a0bea9a1de
Added another test to test the unmodified inherited methods.
2013-01-14 20:34:58 +00:00
3919d0adf7
Added a few missing TSRMLS_DC/TSRMLS_CC.
2013-01-14 20:34:58 +00:00
45a429200c
Added a test case for DateTimePoint.
2013-01-14 20:34:57 +00:00
1cc61f0927
Implemented immutable DateTime objects as the DateTimePoint class.
2013-01-14 20:34:57 +00:00
92965b033a
Bug #46408 : Fix double formatting for PostgreSQL bound parameters
2013-01-14 21:23:52 +01:00
785e66adb5
PR #260 : Update css for 404 pages to feel more up to date and have a consistent layout across browsers
2013-01-14 20:43:14 +01:00
97157b376f
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-14 18:53:40 +01:00
bf9ad4e661
Support BITMAPV5HEADER in getimagesize(): https://en.wikipedia.org/wiki/BMP_file_format#DIB_header_.28bitmap_information_header.29
2013-01-14 18:52:38 +01:00
3ec2281298
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-14 18:00:00 +01:00
1e9a3ed234
Fix bug #63916 : PDO::PARAM_INT casts to 32bit int internally even on 64bit builds in pdo_sqlite
2013-01-14 17:59:11 +01:00
b16463a9fb
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-14 17:36:07 +01:00
99d087e5d4
Fixed bug #63921 : sqlite3::bindvalue and relative PHP functions aren't using sqlite3_*_int64 API
2013-01-14 17:35:07 +01:00
be07f815f2
Use zend_unmangle_property_name_ex to save strlen
2013-01-14 17:08:21 +08:00
62059c16ee
Fixed bug #63980 (object members get trimmed by zero bytes)
2013-01-14 16:23:22 +08:00
fe27146b1b
Tinker with UPGRADING's wording for the format string changes for clarity.
2013-01-14 13:54:43 +08:00
30fd25bb49
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #63982 : isset() inconsistently produces a fatal error on protected property
different OSes have different messages, and that's not what the test is about anyway
2013-01-13 17:27:05 -08:00
1a96fe0b32
fix bug #63982 : isset() inconsistently produces a fatal error on protected property
2013-01-13 17:08:52 -08:00
c6203da6c2
different OSes have different messages, and that's not what the test is about anyway
2013-01-13 16:58:27 -08:00
718afb9acf
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-13 15:47:12 +01:00
a06313fe5a
fixed alternate form for 'x' and 'X' formats
...
same fix exists in original code:
https://svn.apache.org/viewvc?view=revision&revision=1152309
2013-01-13 15:45:15 +01:00
52dd0d1c73
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed uninitialized zval.type (Yoram)
2013-01-10 18:54:37 +04:00
046ae2f77c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed uninitialized zval.type (Yoram)
2013-01-10 18:54:19 +04:00
e1410b5a70
Fixed uninitialized zval.type (Yoram)
2013-01-10 18:53:10 +04:00
f787e21ef5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
MySQL 5.6 EXPIRE PASSWORD flag tests
2013-01-10 14:53:46 +01:00
36e88d78e6
MySQL 5.6 EXPIRE PASSWORD flag tests
2013-01-10 14:51:14 +01:00
b3a934bdb3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7f
2013-01-10 11:18:25 +01:00
f659ec108f
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7f
2013-01-10 11:17:53 +01:00
dc9f0e70b7
Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle)
...
See commit c05ee74e7f
2013-01-10 11:14:38 +01:00
846e506a3d
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-09 19:15:29 +01:00
d430b5a4eb
Add mysqli support - constants and checking in mysqli_options() for the
...
new constant for password expriration
2013-01-09 19:14:48 +01:00
790096b68b
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/mysqlnd/mysqlnd_enum_n_def.h
2013-01-09 19:03:56 +01:00
258c76eb41
backport handling of expired passwords in mysqlnd to 5.4
2013-01-09 18:58:29 +01:00
1f7f8429af
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/mysqlnd/mysqlnd.c
2013-01-09 18:40:57 +01:00
bcd278ad7f
fix compilation error after merge
2013-01-09 18:39:59 +01:00
cb6071ef54
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/mysqlnd/mysqlnd.c
2013-01-09 18:30:56 +01:00
6a6ec195ac
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-09 18:27:50 +01:00
Xinchen Hui