Anatol Belski
2873b5b6eb
added some tests based on bug #64395
2013-06-19 16:24:30 +02:00
Stanislav Malyshev
af5e2eaf8d
Merge branch 'pull-request/320'
...
* pull-request/320:
this is test 5 not 6
fix race condition
more shared names that create race conditions
change to a unique filename
more shared filenames
yet another shared filename
don't share a filename to stop race conditions
fix race condition for 2-4 and normalize names for others
fix race condition when running tests in parallel
clean up after test
Fix #64572 : Clean up after the test
Fix #64572 : Clean up after the test
2013-06-17 01:06:20 -07:00
Stanislav Malyshev
7d1fef15cf
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add more tests for bug #64166
Move unsigned char declaration to top of block
trailing ws
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
2013-06-16 16:38:49 -07:00
Stanislav Malyshev
7bb052ee3e
add more tests for bug #64166
2013-06-16 16:34:34 -07:00
Michael M Slusarz
b5b0a53b09
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
...
Second attempt: need to use lookaheadto determine whether to encode ws
2013-06-16 16:04:19 -07:00
Michael M Slusarz
600d6deef9
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
...
If trailing whitespace on a line is detected, mark the linebreak as a
soft linebreak.
2013-06-16 16:04:14 -07:00
Anatol Belski
3625b83aaa
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test
2013-06-17 00:10:32 +02:00
Anatol Belski
b6dd1ec60d
fix test
...
breach introduced in ac40c0b562
2013-06-17 00:09:05 +02:00
Anatol Belski
a0cb61b292
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
ensure the error_reporting level to get expected notice
2013-06-12 13:15:18 +02:00
Anatol Belski
ed2690477c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
ensure the error_reporting level to get expected notice
2013-06-12 13:14:53 +02:00
Anatol Belski
cd1b44c4b6
ensure the error_reporting level to get expected notice
2013-06-12 13:13:48 +02:00
Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
Stanislav Malyshev
84e35fb2e0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
typo fixes (argument)
typo fixes (accommodate, parameter)
2013-06-10 13:36:41 -07:00
Veres Lajos
04145dc2aa
typo fixes (argument)
2013-06-10 13:36:17 -07:00
Stanislav Malyshev
785f4c5fc6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix CVE-2013-2110 - use correct formula to calculate string size
2013-06-04 22:00:45 -07:00
Stanislav Malyshev
efdeec3c0e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix CVE-2013-2110 - use correct formula to calculate string size
2013-06-04 21:58:44 -07:00
Stanislav Malyshev
93e0d78ec6
fix CVE-2013-2110 - use correct formula to calculate string size
2013-06-04 21:56:33 -07: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
5c701d19ac
better fix for bug #64770
2013-05-04 12:16:38 +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
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
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
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
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
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
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
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
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
d8a5f41a60
Fixed bug parameter is casted to string of array_column
2013-04-01 19:11:45 +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
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
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
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
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