clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 23:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,895 Commits 494 Branches 1,367 Tags 802 MiB
41433a52d6
Commit Graph

72895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Xinchen Hui
a744390c50 Merge branch 'PHP-5.5' 2013-01-15 10:41:07 +08:00
Adam Harvey
be1700d467 Fix compile failure introduced by the fix for bug #46408. 2013-01-15 10:08:26 +08:00
Lars Strojny
212f9f05f0 Merge branch 'PHP-5.5' 2013-01-14 21:43:07 +01: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
Derick Rethans
3f20a2dec3 Merge branch 'PHP-5.5' 2013-01-14 20:39:06 +00:00
Derick Rethans
6313fc7e10 Added NEWS item for DateTimeImmutable 2013-01-14 20:36:48 +00: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
cca1a6e344 Merge branch 'PHP-5.5' 2013-01-14 20:35:13 +00: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
fd72588979 Merge branch 'PHP-5.5' 2013-01-14 21:25:01 +01:00
Lars Strojny
92965b033a Bug #46408: Fix double formatting for PostgreSQL bound parameters 2013-01-14 21:23:52 +01:00
Lars Strojny
ef6ae113f1 Merge branch 'PHP-5.5' 2013-01-14 20:43:55 +01:00
Lars Strojny
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
Lars Strojny
02d04c244f Merge branch 'PHP-5.5' 2013-01-14 18:54:08 +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
df8a9e1ecb Merge branch 'PHP-5.5' 2013-01-14 18:16:48 +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
0c153aeb3b Merge branch 'PHP-5.5' 2013-01-14 17:44:03 +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
Gustavo Lopes
70b25e9c61 UPGRADING.INTERNALS: document zend_qsort_r 2013-01-14 17:27:20 +01:00
Gustavo Lopes
22390d3393 Add zend_qsort_r & use it in strtr 2013-01-14 17:24:16 +01:00
Gustavo Lopes
1ce5a22589 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
 2013-01-14 17:19:23 +01:00
Gustavo Lopes
200242595d NEWS for bug #63893 2013-01-14 17:17:58 +01:00
Gustavo Lopes
d7bac4f5ba Remove _GNU_SOURCE, add local heap sort 2013-01-14 17:06:52 +01:00
Gustavo Lopes
e5029ac40b The compiler can figure this out 2013-01-14 12:22:42 +01:00
Gustavo Lopes
93d1171c47 Remove unused block 2013-01-14 12:22:42 +01:00
Gustavo Lopes
cddbb98ada strtr() with 2nd param array - optimization 
About a 1.25x speedup in my test script by writing the result string
only when a match is found and at the end instead of on each iteration.
 2013-01-14 12:22:42 +01:00
Gustavo Lopes
2111ee3df5 Refactoring, bugs & leaks 2013-01-14 12:22:41 +01:00
Gustavo Lopes
ccf15cf2dc Optimize strtr w/ 2nd arg array 
Fixes bug #63893: poor efficiency of strtr() using array with keys of
very different length.

The implementation is basically all new, which carries some risk with
it.

The algorithm is described in "A Fast Algorithm For Multi-Pattern
Searching" (1994) by Sun Wu and Udi Manber.
 2013-01-14 12:22:41 +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
Xinchen Hui
f6260b36dd Merge branch 'PHP-5.5' 2013-01-14 16:24:26 +08:00
Xinchen Hui
62059c16ee Fixed bug #63980 (object members get trimmed by zero bytes) 2013-01-14 16:23:22 +08:00
Adam Harvey
5c7ae74f10 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Tinker with UPGRADING's wording for the format string changes for clarity.
 2013-01-14 13:56:22 +08:00
Adam Harvey
fe27146b1b Tinker with UPGRADING's wording for the format string changes for clarity. 2013-01-14 13:54:43 +08:00
Stanislav Malyshev
308d817fb6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  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:29:06 -08:00
Stanislav Malyshev
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
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