Andrey Hristov
a7fc90703f
Merge branch 'PHP-5.5'
2013-01-15 11:07:08 +01:00
Andrey Hristov
22ba2b95ce
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-01-15 11:06:59 +01:00
Adam Harvey
83864b470b
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
...
This reverts commit 0510701474
.
2013-01-15 17:37:21 +08:00
Adam Harvey
b1bf524140
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Revert "Update fputcsv() to escape all characters equally."
2013-01-15 17:35:34 +08:00
Adam Harvey
c077074c13
Revert "Update fputcsv() to escape all characters equally."
...
On second thoughts, while the behaviour _is_ broken, this isn't the right fix.
This reverts commit 9b5cb0e805
.
2013-01-15 17:33:54 +08:00
Andrey Hristov
c4fe37bd8c
Merge branch 'PHP-5.5'
...
Conflicts:
NEWS
2013-01-15 10:12:54 +01:00
Andrey Hristov
dc495bbe95
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
2013-01-15 10:05:54 +01:00
Andrey Hristov
1ff4352263
Add support for connect attributes, as of MySQL 5.6
2013-01-15 10:04:59 +01:00
Lars Strojny
eb40f73ca0
Bug #62489 : dba_insert not working as expected
2013-01-15 09:30:44 +01:00
Adam Harvey
8bf937f9bf
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa.
2013-01-15 15:50:57 +08:00
Adam Harvey
0510701474
Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa.
2013-01-15 15:49:52 +08:00
Xinchen Hui
4fa5c1d22d
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-15 15:33:26 +08:00
Xinchen Hui
3bc7490370
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-01-15 15:32:42 +08:00
Xinchen Hui
4fcf4e0845
Fixed bug #57702 (Multi-row BLOB fetches)
2013-01-15 15:31:49 +08:00
Adam Harvey
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
Adam Harvey
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
Adam Harvey
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
Lars Strojny
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
Lars Strojny
c4de702d4e
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-14 21:36:28 +01:00
Lars Strojny
6a065876b9
Bug #52958 : Segfault in PDO_OCI on cleanup after running a long testsuite.
2013-01-14 21:35:48 +01:00
Derick Rethans
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
Derick Rethans
a0618139c9
Fixed crash bug when the non-OO interface was used.
2013-01-14 20:34:58 +00:00
Derick Rethans
017b1f7fca
Rename DateTimePoint to DateTimeImmutable.
2013-01-14 20:34:58 +00:00
Derick Rethans
a0bea9a1de
Added another test to test the unmodified inherited methods.
2013-01-14 20:34:58 +00:00
Derick Rethans
3919d0adf7
Added a few missing TSRMLS_DC/TSRMLS_CC.
2013-01-14 20:34:58 +00:00
Derick Rethans
45a429200c
Added a test case for DateTimePoint.
2013-01-14 20:34:57 +00:00
Derick Rethans
1cc61f0927
Implemented immutable DateTime objects as the DateTimePoint class.
2013-01-14 20:34:57 +00:00
Lars Strojny
92965b033a
Bug #46408 : Fix double formatting for PostgreSQL bound parameters
2013-01-14 21:23:52 +01:00
Lars Strojny
97157b376f
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-14 18:53:40 +01:00
Lars Strojny
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
Lars Strojny
3ec2281298
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-14 18:00:00 +01:00
Lars Strojny
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
Lars Strojny
b16463a9fb
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-14 17:36:07 +01:00
Lars Strojny
99d087e5d4
Fixed bug #63921 : sqlite3::bindvalue and relative PHP functions aren't using sqlite3_*_int64 API
2013-01-14 17:35:07 +01:00
Xinchen Hui
7a31692253
Merge branch 'PHP-5.5'
2013-01-14 17:09:05 +08:00
Xinchen Hui
be07f815f2
Use zend_unmangle_property_name_ex to save strlen
2013-01-14 17:08:21 +08:00
ULF WENDEL
9202225f29
Merge branch 'PHP-5.5'
...
* PHP-5.5:
MySQL 5.6 EXPIRE PASSWORD flag tests
2013-01-10 14:54:01 +01:00
ULF WENDEL
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
ULF WENDEL
36e88d78e6
MySQL 5.6 EXPIRE PASSWORD flag tests
2013-01-10 14:51:14 +01:00
Remi Collet
79dc69b75f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7f
2013-01-10 11:18:59 +01:00
Remi Collet
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
Remi Collet
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
Remi Collet
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
Andrey Hristov
1b25386175
Merge branch 'PHP-5.5'
2013-01-09 19:15:57 +01:00
Andrey Hristov
846e506a3d
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-09 19:15:29 +01:00
Andrey Hristov
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
Andrey Hristov
258c76eb41
backport handling of expired passwords in mysqlnd to 5.4
2013-01-09 18:58:29 +01:00
Andrey Hristov
cd45e54006
Merge branch 'PHP-5.5'
2013-01-09 18:41:06 +01:00
Andrey Hristov
1f7f8429af
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/mysqlnd/mysqlnd.c
2013-01-09 18:40:57 +01:00
Andrey Hristov
bcd278ad7f
fix compilation error after merge
2013-01-09 18:39:59 +01:00