clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 03:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,556 Commits 493 Branches 1,366 Tags 848 MiB
b1bf524140
Commit Graph

69556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Stanislav Malyshev
374ebc8741 fix NEWS 2013-01-15 00:08:12 -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
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
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
6a065876b9 Bug #52958: Segfault in PDO_OCI on cleanup after running a long testsuite. 2013-01-14 21:35:48 +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
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
99d087e5d4 Fixed bug #63921: sqlite3::bindvalue and relative PHP functions aren't using sqlite3_*_int64 API 2013-01-14 17:35:07 +01:00
Stanislav Malyshev
1a96fe0b32 fix bug #63982: isset() inconsistently produces a fatal error on protected property 2013-01-13 17:08:52 -08:00
Stanislav Malyshev
c6203da6c2 different OSes have different messages, and that's not what the test is about anyway 2013-01-13 16:58:27 -08:00
Arnaud Le Blanc
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
Dmitry Stogov
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
Dmitry Stogov
e1410b5a70 Fixed uninitialized zval.type (Yoram) 2013-01-10 18:53:10 +04:00
ULF WENDEL
36e88d78e6 MySQL 5.6 EXPIRE PASSWORD flag tests 2013-01-10 14:51:14 +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
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
bcd278ad7f fix compilation error after merge 2013-01-09 18:39:59 +01:00
Andrey Hristov
6a6ec195ac Merge branch 'PHP-5.3' into PHP-5.4 2013-01-09 18:27:50 +01:00
Andrey Hristov
12e759c2ea Use during connect the flags set with set_client_option() 2013-01-09 18:27:06 +01:00
Dmitry Stogov
625000ab44 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed compilator bug that might cause jump depended on unitialized value
 2013-01-09 17:36:44 +04:00
Dmitry Stogov
d4650c5d69 Fixed compilator bug that might cause jump depended on unitialized value 2013-01-09 17:16:47 +04:00
Dmitry Stogov
f9e8678dd3 Fixed bug #63882 (zend_std_compare_objects crash on recursion) 2013-01-09 11:30:50 +04:00
Xinchen Hui
f3b1b85169 update NEWS 2013-01-09 10:55:50 +08:00
Xinchen Hui
15aaa9c660 Merge branch 'PHP-5.3' into PHP-5.4 2013-01-09 10:54:23 +08:00
Xinchen Hui
c05ee74e7f Fixed bug #63943 (Bad warning text from strpos() on empty needle) 2013-01-09 10:53:20 +08:00
Adam Harvey
6e684e6a6c Add NEWS for the previously cherry picked commit. 2013-01-08 11:40:51 +08:00
George Wang
9c52d09ebc sapi/litespeed/lsapi_main.c: Fix bug #63228 
Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]
 2013-01-08 11:40:13 +08:00
Derick Rethans
0de5fb4165 Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4 2013-01-06 15:09:55 +00:00
Derick Rethans
67c662a0a2 Update news with new bug fix. 2013-01-06 15:08:26 +00:00
Derick Rethans
ba35ae32b7 Merge branch 'PHP-5.3' into PHP-5.4 2013-01-06 15:07:13 +00:00
Lars Strojny
bdc1e2302c Adding test for bug #63462 2013-01-06 14:46:49 +01:00
Derick Rethans
ff9c1b12ff Fixed bug #55397: Comparsion of incomplete DateTime causes SIGSEGV. 2013-01-06 13:39:34 +00:00
Lars Strojny
d7da1aa694 Coding style, ANSI C compatibility 2013-01-06 14:08:23 +01:00
Xinchen Hui
a426e0b050 bump year 2013-01-06 10:22:15 +08:00
Xinchen Hui
a3a699e090 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2013-01-06 10:20:10 +08:00
Xinchen Hui
c2f8e90504 Merge branch 'PHP-5.3' into PHP-5.4 2013-01-06 10:20:00 +08:00
Xinchen Hui
bc11e6fdbb bump year 2013-01-06 10:19:09 +08:00
Lars Strojny
8e5460ad86 Adding test from 5.5 2013-01-06 03:15:08 +01:00
Lars Strojny
67557fcfce Bug #63699: performance improvements for varios ext/date functions 2013-01-06 03:06:09 +01:00
Xinchen Hui
2feea39a33 Update NEWS 2013-01-04 11:05:24 +08:00
Xinchen Hui
aff5d084a5 Merge branch 'PHP-5.3' into PHP-5.4 2013-01-04 11:03:52 +08:00
Xinchen Hui
c3e6de2227 Fixed bug #63899 (Use after scope error in zend_compile) 2013-01-04 11:02:21 +08:00
Stanislav Malyshev
5894aa0950 5.4.12-dev 2013-01-03 17:25:56 -08:00
Johannes Schlüter
aaecb99c6b Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	configure.in
	main/php_version.h
 2013-01-03 22:59:38 +01:00