clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,041 Commits 491 Branches 1,363 Tags 846 MiB
fcc6611de9
Commit Graph

7818 Commits

Author SHA1 Message Date
Nikita Popov
fcc6611de9 Add support for non-scalar Iterator keys in foreach 
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
 2013-03-12 17:27:31 +01:00
Anatol Belski
278c4097c6 fixed the test 2013-03-11 16:14:39 +01:00
Anatol Belski
8aaa09636a Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT']) 2013-03-11 16:04:37 +01:00
Xinchen Hui
1be745ce1b Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/standard/var_unserializer.c
 2013-03-09 23:10:48 +08:00
Xinchen Hui
f52b2e6a65 Fixed bug #64354 (Unserialize array of objects whose class can't be autoloaded fail) 
about the __sleep one, since php_serialize_* are all void function,
so,,only check exception at the very begining
 2013-03-09 23:00:58 +08:00
Carson McDonald
0c11cab919 Typo fix: recieved to received 2013-03-07 23:05:05 +01:00
Xinchen Hui
2413fa6fbb Fix test after the convert_to_long be improved, see #64290 2013-03-03 11:13:52 +08:00
Sara Golemon
ead2e1708d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  http-stream test requires network connectivity
 2013-02-21 03:22:09 -08:00
Sara Golemon
c16d6befd4 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  http-stream test requires network connectivity
 2013-02-21 03:21:49 -08:00
Sara Golemon
bc55a8eb9f http-stream test requires network connectivity 2013-02-21 03:21:23 -08:00
Stanislav Malyshev
0c6d903ce7 fix bug #49348 - issue notice on get_property_ptr_ptr when used for read 2013-02-18 20:56:02 -08:00
Stanislav Malyshev
748b37654d complete zts fix 2013-01-29 12:12:34 -08:00
Stanislav Malyshev
489073b501 Merge branch 'PHp-5.4' into PHP-5.5 
* PHp-5.4:
  Fix bug #62524, only follow redirects in file streams for 3xx HTTP statuses
 2013-01-29 00:28:50 -08:00
Stanislav Malyshev
5382e156f9 Fix bug #62524, only follow redirects in file streams for 3xx HTTP statuses 2013-01-29 00:27:35 -08:00
Xinchen Hui
85fae636d0 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/standard/var_unserializer.c
 2013-01-21 11:42:16 +08:00
Xinchen Hui
86c1a26169 Merge fix of #62836 to ?.re, and regenerate ?.c 2013-01-21 11:35:22 +08:00
Gustavo Lopes
cd2b03d5ae Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS for bug #64011. See 77ee200
  Fix bug #64011 (get_html_translation_table())
  Fix News
 2013-01-18 12:12:25 +01:00
Gustavo Lopes
77ee200097 Fix bug #64011 (get_html_translation_table()) 
get_html_translation_table() with encoding ISO-8859-1 and HTMLENTITIES
was broken. Only entities for characters U+0000 to U+0040 were being
included in the result.
 2013-01-18 12:10:27 +01:00
Anatoliy Belsky
18e160411e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed build
  NEWS for bug #63893

Conflicts:
	NEWS
 2013-01-15 22:39:49 +01:00
Anatoliy Belsky
9498cf6194 fixed build 2013-01-15 22:36:29 +01:00
Jille Timmermans
dba22c0864 Dereferencing process-handles no longer waits on those processes. 
Implements FR #46487
 2013-01-15 21:50:35 +01:00
Gustavo Lopes
1bd193ed36 Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_55' into PHP-5.5 
* remotes/cataphract/strtr_wu94_55:
  Fixed inconsequential bug in strtr()
  UPGRADING.INTERNALS: document zend_qsort_r
  Add zend_qsort_r & use it in strtr
  NEWS for bug #63893
  Remove _GNU_SOURCE, add local heap sort
  The compiler can figure this out
  Remove unused block
  strtr() with 2nd param array - optimization
  Refactoring, bugs & leaks
  Optimize strtr w/ 2nd arg array
 2013-01-15 21:45:22 +01:00
Gustavo Lopes
93e35137aa Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_54' into PHP-5.4 
* remotes/cataphract/strtr_wu94_54:
  Fixed inconsequential bug in strtr()
  Remove _GNU_SOURCE, add local heap sort
  The compiler can figure this out
  Remove unused block
  strtr() with 2nd param array - optimization
  Refactoring, bugs & leaks
  Optimize strtr w/ 2nd arg array
 2013-01-15 21:05:21 +01:00
Gustavo Lopes
88b82ae54d Merge branch 'strtr_wu94_54' into strtr_wu94_55 2013-01-15 17:26:24 +01:00
Gustavo Lopes
930ef9ddd6 Fixed inconsequential bug in strtr() 2013-01-15 17:25:59 +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
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
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
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
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
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
be07f815f2 Use zend_unmangle_property_name_ex to save strlen 2013-01-14 17:08:21 +08: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
Xinchen Hui
6deb8361f3 Merge branch 'PHP-5.4' into PHP-5.5 2013-01-09 10:57:47 +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
Pierre Joye
f4142a92b2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - fix the fix for bug #50524
 2013-01-07 13:04:29 +01:00
Pierre Joye
a71e91626a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - fix the fix for bug #50524
 2013-01-07 13:04:04 +01:00