1
0
mirror of https://github.com/php/php-src.git synced 2026-04-05 23:23:03 +02:00
Commit Graph

110 Commits

Author SHA1 Message Date
Anatol Belski
cc34dfce16 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  fix the test for curl 7.29.0+
2013-02-19 09:04:52 +01:00
Anatol Belski
558c5dbe65 fix the test for curl 7.29.0+ 2013-02-19 09:04:06 +01:00
Pierrick Charron
b10a3b9466 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed segfault due to libcurl connection caching
2012-12-22 19:04:45 -05:00
Pierrick Charron
a2b6d9c104 Fixed segfault due to libcurl connection caching
Libcurl is doing connection caching. When easy handle is cleaned up,
if the handle was previously used by the curl_multi_api, the connection
remains open un the curl multi handle is cleaned up. Some protocols are
sending content like the FTP one, and libcurl try to use the
WRITEFUNCTION or the HEADERFUNCTION. Since structures used in those
callback are freed, we need to use an other callback to which avoid
segfaults.

Libcurl commit d021f2e8a00 fix this issue and should be part of 7.28.2
2012-12-22 19:03:24 -05:00
Pierrick Charron
5499c7d201 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Update NEWS file
  Fixed bug #63352 (Can't enable hostname validation when using curl stream wrappers)
  CURL >= 7.28.0 no longer support value 1 for CURLOPT_SSL_VERIFYHOST)

Conflicts:
	ext/curl/interface.c
	ext/curl/tests/bug63363.phpt
2012-12-21 19:24:28 -05:00
Pierrick Charron
517f800277 CURL >= 7.28.0 no longer support value 1 for CURLOPT_SSL_VERIFYHOST)
Fixed bug #63795
2012-12-21 19:10:55 -05:00
Pierrick Charron
763bce0303 Fix test
This test is only valid if libcurl < 7.28.1 since
libcurl removed support for the 1 value in CURLOPT_SSL_VERIFYHOST.
2012-12-21 11:45:59 -05:00
John Jawed (JJ)
f68f31f121 Notice if CURLOPT_SSL_VERIFYHOST is set to true 2012-10-25 16:00:02 -04:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
e2d1eecf99 Merge branch 'PHP-5.3' into PHP-5.4 2012-09-18 10:48:16 +08:00
Xinchen Hui
e66a5ce56f Fixed Bug #63103 (ext\curl\tests\bug62839.phpt broken) 2012-09-18 10:46:58 +08:00
Pierrick Charron
8ac61a3e60 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #62839
2012-08-16 14:50:06 -04:00
Pierrick Charron
9cf0139460 Fixed bug #62839
curl_copy_handle segfault with CURLOPT_FILE. The refcount was incremented
before the assignement.
2012-08-16 14:48:44 -04:00
Xinchen Hui
0398cc22a9 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false)
  appease MSVC (doesnt like unary minus of unsigned ints)

Conflicts:
	ext/curl/interface.c
2012-07-09 08:38:03 +08:00
Xinchen Hui
c819cf9d6b Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false)
this bc break is caused by the fix for #61948
2012-07-09 08:32:40 +08:00
Anatoliy Belsky
16a592b13a Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #62149 Test Bug - ext/curl/tests/bug61948
  Fixed bug #62148 mail_skipif doesn't skip imap tests on Release Build
2012-05-25 10:52:38 +02:00
Matt Ficken
86d2fafded Fixed bug #62149 Test Bug - ext/curl/tests/bug61948 2012-05-25 10:44:59 +02:00
Xinchen Hui
0747b29bdf Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  correct NEWS
  Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)

Conflicts:
	ext/curl/interface.c
2012-05-06 00:52:51 +08:00
Xinchen Hui
035ce937e1 Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction) 2012-05-06 00:40:49 +08:00
Christopher Jones
dbefe8d8ea Allow alternative curl output shown in several qa.php.net/reports logs 2012-02-06 23:14:47 +00:00
Christopher Jones
a46497fd19 Allow alternative curl output shown in several qa.php.net/reports logs 2012-02-06 23:14:47 +00:00
Pierrick Charron
e8eab79ac8 Fix curl_copy_handle_basic_008.phpt when display_errors is On
(Thanks Chris Jones)
2011-12-08 18:57:01 +00:00
Pierrick Charron
4b860ccdad Fix curl_copy_handle_basic_008.phpt when display_errors is On
(Thanks Chris Jones)
2011-12-08 18:57:01 +00:00
Pierrick Charron
bc8fc80049 Fix test 2011-12-07 16:46:48 +00:00
Pierrick Charron
2e87cd3399 Fix test 2011-12-07 16:46:48 +00:00
Pierrick Charron
4093e5e797 Add new test for CURLOPT_POSTFIELDS 2011-12-07 16:32:50 +00:00
Pierrick Charron
572e36e2e4 Add new test for CURLOPT_POSTFIELDS 2011-12-07 16:32:50 +00:00
Pierrick Charron
109346779a Fixed bug #60439curl_copy_handle segfault when used with CURLOPT_PROGRESSFUNCTION 2011-12-04 01:34:54 +00:00
Pierrick Charron
191835fd3d Fixed bug #60439curl_copy_handle segfault when used with CURLOPT_PROGRESSFUNCTION 2011-12-04 01:34:54 +00:00
Pierrick Charron
3fe47ef089 Cleans up test file 2011-12-02 04:16:46 +00:00
Pierrick Charron
a2d189883f Cleans up test file 2011-12-02 04:16:46 +00:00
Pierrick Charron
def84f16ad Fix test to remove dependancy over php.net 2011-11-22 18:50:57 +00:00
Pierrick Charron
b0b58c3d08 Fix test to remove dependancy over php.net 2011-11-22 18:50:57 +00:00
Pierrick Charron
0f26db6956 Fix this test to work with all version (even old) of libcurl 2011-11-22 08:29:26 +00:00
Pierrick Charron
ecc6c335c5 Fix this test to work with all version (even old) of libcurl 2011-11-22 08:29:26 +00:00
Pierrick Charron
1260d8e1c3 Fix test to use PHP_CURL_HTTP_REMOTE_SERVER 2011-11-21 02:10:57 +00:00
Pierrick Charron
e3557389bf Fix test to use PHP_CURL_HTTP_REMOTE_SERVER 2011-11-21 02:10:57 +00:00
Rasmus Lerdorf
46f74e3523 Add a test and declare the local vars locally 2011-09-23 15:19:48 +00:00
Hannes Magnusson
413f94913d Fixed issues when streams were closed before curl read/write from them, or cleaning
Closing a original handle after copying it now no longer cleans up all resources (fixes missing CURLOPT_POSTFIELDS values among others)
2011-09-12 09:16:04 +00:00
Hannes Magnusson
e43c21e53a Fixed issues when streams were closed before curl read/write from them, or cleaning
Closing a original handle after copying it now no longer cleans up all resources (fixes missing CURLOPT_POSTFIELDS values among others)
2011-09-12 09:16:04 +00:00
Hannes Magnusson
0cac42b482 Being smart and cleanup/rename/modify tests seconds before committing isn't very smart. 2011-09-09 08:28:57 +00:00
Hannes Magnusson
a2c1d37d4f Being smart and cleanup/rename/modify tests seconds before committing isn't very smart. 2011-09-09 08:28:57 +00:00
Hannes Magnusson
23010d52ad Merge tests from trunk 2011-09-09 08:14:04 +00:00
Hannes Magnusson
7cbaf76ca1 Merge tests from trunk 2011-09-09 08:14:04 +00:00
Hannes Magnusson
33bee161f6 Fixed bug#54798 Segfault when CURLOPT_STDERR file pointer is closed before calling curl_exec 2011-09-08 14:37:18 +00:00
Hannes Magnusson
285ac82310 Fixed bug#54798 Segfault when CURLOPT_STDERR file pointer is closed before calling curl_exec 2011-09-08 14:37:18 +00:00
Ilia Alshanetsky
b6f512cae6 Fixed tests (skip when catch-all DNS such as openDNS is being used) 2011-09-07 15:31:48 +00:00
Hannes Magnusson
c038ac2251 Sync tests between branches and fix the getcontent test 2011-09-07 10:38:53 +00:00
Hannes Magnusson
3171c31bbc Sync tests between branches and fix the getcontent test 2011-09-07 10:38:53 +00:00