Stanislav Malyshev
61fff1fd8b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64433 : does not follow redirects for non-3xx response codes
2013-03-30 21:24:21 -07:00
Sergey Akbarov
1d4fcdff9f
Fix bug #64433 : does not follow redirects for non-3xx response codes
2013-03-30 21:22:30 -07:00
Nikita Popov
dcf0b71c98
Fix tests after addition of ^ (xor) operator to ini
2013-03-28 18:35:46 +01:00
Xinchen Hui
f4daaf9250
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-28 19:13:58 +08:00
Veres Lajos
124a867b6a
Typo fix (greater then => greater than)
2013-03-28 19:12:08 +08:00
Pierre Joye
f01a7e54d3
add windows 8 and windows server 2012
2013-03-27 07:29:47 +01:00
Xinchen Hui
b29a9fa75d
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-21 11:14:36 +08:00
Xinchen Hui
0fd3572f4e
Fixed bug #64432 (more empty delimiter warning in strX methods)
2013-03-21 11:14:10 +08:00
David Soria Parra
0173c4bab0
Merge branch 'pull-request/257' into PHP-5.5
...
* pull-request/257:
array_column: Fix compile-time warnings
array_column: Removed array_pluck() alias
array_column: Set array_pluck as an alias for array_column
array_column: Implement ability to specify an index column
Cleaning up a memory leak.
array_column: Adding test for IS_OBJECT and converting object to string
array_column: Using add_next_index_zval() at nikic's recommendation.
array_column: Improved tests
array_column: Cleaning up, as recommended in pull request #56 comments
Fixing typo in test for array_column()
Simplify the code and use zend_hash_next_index_insert()
Adding test for columns not present in all rows for array_column().
Adding tests for the negative results of array_column()
Implement new array function array_column()
2013-03-20 13:02:33 +01:00
Ben Ramsey
f5bf1ba88f
array_column: Fix compile-time warnings
2013-03-19 20:44:19 -05:00
Anatol Belski
90c8f16c3b
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Backported patch for #64370
2013-03-15 19:08:32 +01:00
Anatol Belski
b903d2d6cd
Backported patch for #64370
2013-03-15 19:04:40 +01:00
Nikita Popov
28634bf603
Forgot to remove some now unused variables
2013-03-12 17:39:20 +01:00
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
Ben Ramsey
3439a098a0
array_column: Removed array_pluck() alias
2013-01-14 10:04:14 -06:00