Anatol Belski
|
a14a809aff
|
Merge branch 'PHP-5.5'
* PHP-5.5:
better fix for bug #64770
better fix for bug #64770
|
2013-05-04 12:20:36 +02:00 |
|
Anatol Belski
|
b2ef8672c7
|
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
better fix for bug #64770
better fix for bug #64770
|
2013-05-04 12:20:19 +02:00 |
|
Anatol Belski
|
ec4388158d
|
better fix for bug #64770
|
2013-05-04 12:19:52 +02:00 |
|
Anatol Belski
|
88c83469b5
|
Merge branch 'PHP-5.5'
* PHP-5.5:
updated NEWS
updated NEWS
Fixed bug #64770 stream_select() fails with pipes
|
2013-05-03 17:06:16 +02:00 |
|
Anatol Belski
|
6d41711fd9
|
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
updated NEWS
Fixed bug #64770 stream_select() fails with pipes
|
2013-05-03 17:04:53 +02:00 |
|
Anatol Belski
|
aa4762572e
|
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #64770 stream_select() fails with pipes
|
2013-05-03 17:03:16 +02:00 |
|
Anatol Belski
|
b1ea0b7a7a
|
Fixed bug #64770 stream_select() fails with pipes
returned by proc_open() on Windows x64
|
2013-05-03 17:01:33 +02:00 |
|
Matt Ficken
|
67a72ceb93
|
Merge branch 'PHP-5.5'
* PHP-5.5:
Fix Test Bug #64714
|
2013-04-25 11:37:36 -07:00 |
|
Matt Ficken
|
7d0dd957eb
|
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix Test Bug #64714
|
2013-04-25 11:37:25 -07:00 |
|
Matt Ficken
|
5adf1be45d
|
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix Test Bug #64714
|
2013-04-25 11:37:09 -07:00 |
|
Matt Ficken
|
bf5506f511
|
Fix Test Bug #64714
|
2013-04-25 11:34:57 -07:00 |
|
Stanislav Malyshev
|
84e5c8a0e2
|
update credits
|
2013-04-23 22:02:57 -07:00 |
|
Stanislav Malyshev
|
50800356af
|
Merge branch 'PHP-5.5'
* PHP-5.5:
Fix bug #64458 (dns_get_record result with string of length -1)
|
2013-04-23 21:46:27 -07:00 |
|
Stanislav Malyshev
|
5e24a6e74d
|
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix bug #64458 (dns_get_record result with string of length -1)
|
2013-04-23 21:45:49 -07:00 |
|
Stanislav Malyshev
|
2a15aed399
|
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #64458 (dns_get_record result with string of length -1)
|
2013-04-23 21:45:10 -07:00 |
|
Stanislav Malyshev
|
f87d2ab893
|
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix bug #64458 (dns_get_record result with string of length -1)
|
2013-04-23 21:43:55 -07:00 |
|
Stanislav Malyshev
|
18fdab5a09
|
Fix bug #64458 (dns_get_record result with string of length -1)
|
2013-04-23 21:43:35 -07:00 |
|
Pierrick Charron
|
74394733ed
|
Merge branch 'PHP-5.5'
* PHP-5.5:
Remove curl wrappers
|
2013-04-23 17:01:50 -04:00 |
|
Pierrick Charron
|
b79e65f268
|
Remove curl wrappers
|
2013-04-23 17:01:17 -04:00 |
|
Sara Golemon
|
231e2d762a
|
Merge branch 'PHP-5.5'
* PHP-5.5:
array_column() - Use entire subject array when NULL passed for second param.
|
2013-04-22 16:20:41 -07:00 |
|
Sara Golemon
|
734e165d4e
|
array_column() - Use entire subject array when NULL passed for second param.
This starts to look like array_values(), except that you can reindex the arrays
using the third parameter.
|
2013-04-22 16:19:21 -07:00 |
|
Sara Golemon
|
35df484b5b
|
Merge branch 'PHP-5.5'
* PHP-5.5:
Allow array_column() to take -1 as a valid value in third param
|
2013-04-22 15:55:38 -07:00 |
|
Sara Golemon
|
1a03bd5dee
|
Allow array_column() to take -1 as a valid value in third param
Also do some cleanup and simplification to make this code more
readable in the long term.
|
2013-04-22 15:54:21 -07:00 |
|
Sara Golemon
|
caff01e751
|
Merge branch 'PHP-5.5'
* PHP-5.5:
Harden array_column_basic.phpt against resource renumbering.
|
2013-04-22 13:37:36 -07:00 |
|
Sara Golemon
|
f63db963c4
|
Harden array_column_basic.phpt against resource renumbering.
We don't care what resource number it is, so long as there's a
stream resource returned.
|
2013-04-22 13:36:40 -07:00 |
|
Anatol Belski
|
8febe2ad08
|
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed stream_socket_pair() on Windows x64 and
|
2013-04-22 18:59:11 +02:00 |
|
Anatol Belski
|
f082d6311b
|
Fixed stream_socket_pair() on Windows x64 and
improved errorhandling in the socketpair() implementation.
|
2013-04-22 18:55:32 +02:00 |
|
Sara Golemon
|
70c700cf8c
|
Merge branch 'PHP-5.5'
* PHP-5.5:
Fix handling of double keys in array_column
|
2013-04-21 23:33:20 -07:00 |
|
Anatol Belski
|
8645309c4e
|
Merge branch 'PHP-5.5'
* PHP-5.5:
updated NEWS
updated NEWS
Fixed stream_socket_pair() on Windows x64 and
|
2013-04-22 19:01:07 +02:00 |
|
Anatol Belski
|
f578bb0388
|
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
updated NEWS
Fixed stream_socket_pair() on Windows x64 and
|
2013-04-22 19:00:13 +02:00 |
|
Sara Golemon
|
7b34324f84
|
Fix handling of double keys in array_column
Also fix resource test to not localize __FILE__ to cwd.
|
2013-04-21 22:35:04 -07:00 |
|
Johannes Schlüter
|
e9cc55a803
|
Merge branch 'PHP-5.5'
|
2013-04-04 15:38:35 +02:00 |
|
Johannes Schlüter
|
9587cf385e
|
Improve warning when trying to load zend ext as PHP module
|
2013-04-04 15:36:46 +02:00 |
|
Xinchen Hui
|
2794d455ea
|
Merge branch 'PHP-5.5'
|
2013-04-04 19:31:21 +08:00 |
|
Xinchen Hui
|
01ca2bf8c3
|
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
ext/curl/interface.c
|
2013-04-04 19:31:14 +08:00 |
|
Xinchen Hui
|
185e5e15ae
|
s ,CURL_WRAPPERS_ENABLE,CURL_WRAPPERS_ENABLED,
|
2013-04-04 19:28:17 +08:00 |
|
Xinchen Hui
|
e15a97f924
|
Merge branch 'PHP-5.5'
|
2013-04-03 18:51:44 +08:00 |
|
Xinchen Hui
|
bbb4a44f98
|
Merge branch 'PHP-5.4' into PHP-5.5
|
2013-04-03 18:51:19 +08:00 |
|
ptarjan
|
99ad08f9a5
|
Fix #64572: Clean up after the test
Lets not leave stuff lying around.
|
2013-04-03 18:50:27 +08:00 |
|
Xinchen Hui
|
bd6a90dac7
|
Merge branch 'PHP-5.5'
|
2013-04-03 10:17:49 +08:00 |
|
Xinchen Hui
|
6ace9c646b
|
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
ext/curl/interface.c
|
2013-04-03 10:15:41 +08:00 |
|
Xinchen Hui
|
78a9489f6a
|
Use new constant replace ugly trick
|
2013-04-03 10:12:49 +08:00 |
|
Xinchen Hui
|
aa1c764e3e
|
Merge branch 'PHP-5.5'
|
2013-04-01 19:16:44 +08:00 |
|
Xinchen Hui
|
d8a5f41a60
|
Fixed bug parameter is casted to string of array_column
|
2013-04-01 19:11:45 +08:00 |
|
Xinchen Hui
|
971676e859
|
Merge branch 'PHP-5.5'
|
2013-03-31 21:27:22 +08:00 |
|
Xinchen Hui
|
ad7c0b1928
|
Merge branch 'PHP-5.4' into PHP-5.5
|
2013-03-31 21:26:26 +08:00 |
|
Xinchen Hui
|
72426a446d
|
Skip test when --with-curlwrappers enabled.
|
2013-03-31 21:22:48 +08:00 |
|
Stanislav Malyshev
|
da43e7e0cd
|
Merge branch 'PHP-5.5'
* PHP-5.5:
Fix bug #64433: does not follow redirects for non-3xx response codes
|
2013-03-30 21:24:54 -07:00 |
|
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 |
|