1
0
mirror of https://github.com/php/php-src.git synced 2026-04-25 17:08:14 +02:00
Commit Graph

199 Commits

Author SHA1 Message Date
Xinchen Hui c9e44dc2df Revert "Revert "Fixed warning "(null)(): supplied resource is not a valid cURL handle resource in Unknown on line 0"""
This reverts commit e78dd7ade2.
2015-02-02 10:32:26 +08:00
Xinchen Hui e78dd7ade2 Revert "Fixed warning "(null)(): supplied resource is not a valid cURL handle resource in Unknown on line 0""
This reverts commit 348be58f86.
2015-01-30 17:01:59 +08:00
Xinchen Hui 348be58f86 Fixed warning "(null)(): supplied resource is not a valid cURL handle resource in Unknown on line 0" 2015-01-30 16:50:13 +08:00
Xinchen Hui 007d5f2921 indent 2015-01-30 13:19:27 +08:00
Xinchen Hui 91ce41dc1e Add more test for bug #68937 2015-01-30 13:17:35 +08:00
Xinchen Hui 73288bbea4 Fixed bug #68937 (Segfault in curl_multi_exec) 2015-01-30 13:12:58 +08:00
Andrea Faulds e5eb9530ab Use "float" and "integer" in typehint and zpp errors 2014-12-21 13:23:02 +00:00
Andrea Faulds 1392102b0c Updated or skipped certain 32-bit tests 2014-12-17 01:06:48 +00:00
Stanislav Malyshev 8b2a8c46b0 Merge branch 'pull-request/728'
* pull-request/728:
  Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
  Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)

Conflicts:
	ext/curl/multi.c
2014-11-30 22:22:15 -08:00
Jille Timmermans 00c6033f99 Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set) 2014-11-24 09:37:55 +01:00
Stanislav Malyshev f782d6710d Merge branch 'PHP-5.6'
* PHP-5.6:
  test to function addcslashes
  test
  Test PHP Init Fail Without Params
  Add my information to this test
  Add a test for the exception cases of readline_read_history
  added some tests to datetime and dateinterval functions
  added various tests for XSLTProcessor and one test for iconv extension
  teste basico da funcao timezone_version_get
2014-11-23 17:26:35 -08:00
Stanislav Malyshev 2c67c0246e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Test PHP Init Fail Without Params
2014-11-23 17:21:29 -08:00
Stanislav Malyshev fa76fa8e32 Merge branch 'pull-request/863' into PHP-5.5
* pull-request/863:
  Test PHP Init Fail Without Params
2014-11-23 17:21:20 -08:00
Anatol Belski 4b8cc567cd Merge branch 'PHP-5.6'
* PHP-5.6:
  fix dir separator in test
2014-11-05 15:43:37 +01:00
Anatol Belski d4050f42fd Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix dir separator in test
2014-11-05 15:43:13 +01:00
Anatol Belski 53266476e6 fix dir separator in test 2014-11-05 15:42:45 +01:00
Stanislav Malyshev 81b67937e4 Fix bug #68089 - do not accept options with embedded \0
Conflicts:
	ext/curl/interface.c
2014-10-14 10:51:46 -07:00
Stanislav Malyshev 71b63fc701 Fix bug #68089 - do not accept options with embedded \0
Conflicts:
	ext/curl/interface.c
2014-10-14 10:45:35 -07:00
Stanislav Malyshev d1e030db02 Fix bug #68089 - do not accept options with embedded \0
Conflicts:
	ext/curl/interface.c
2014-10-14 10:43:59 -07:00
Anatol Belski d2161c8104 reveal some newer libcurl features in MINFO 2014-10-03 21:47:00 +02:00
Paulo Eduardo 17759439d7 Test PHP Init Fail Without Params 2014-09-30 08:56:46 -03:00
Anatol Belski 13280a9e36 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
2014-09-11 23:31:16 +02:00
Anatol Belski 69ea7f9509 reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0 2014-09-11 23:30:01 +02:00
Stanislav Malyshev 2152e2f127 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix test - output can be chunked

Conflicts:
	ext/curl/tests/curl_basic_006.phpt
2014-05-12 10:56:03 -07:00
Stanislav Malyshev e3ca87265d Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix test - output can be chunked
2014-05-12 10:54:34 -07:00
Stanislav Malyshev 6ef8e0f088 fix test - output can be chunked 2014-05-12 10:54:16 -07:00
Stanislav Malyshev 9c27063a65 fix test 2014-05-12 01:27:18 -07:00
Stanislav Malyshev 89798f57d4 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  improve CURL tests to allow testing without separate server
2014-05-11 23:03:21 -07:00
Stanislav Malyshev c507c9f01b improve CURL tests to allow testing without separate server 2014-05-11 22:43:08 -07:00
Michael Wallner 42fbb952d7 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix test locality inconsitency
2014-04-30 13:02:43 +02:00
Michael Wallner b79301d11f fix test locality inconsitency 2014-04-30 13:01:59 +02:00
Michael Wallner 407612083f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix bug #64247 (CURLOPT_INFILE doesn't allow reset)
2014-04-30 09:28:21 +02:00
Michael Wallner 54fee59598 fix bug #64247 (CURLOPT_INFILE doesn't allow reset) 2014-04-30 09:27:58 +02:00
Tjerk Meesters cbb2dc0788 Merge branch '5.5' into 5.6
* 5.5:
  Fixed expected output of a few cURL test cases
  Allow NULL as value for CURLOPT_CUSTOMREQUEST option.
2014-02-28 19:01:17 +08:00
Tjerk Meesters 9443fb999d Fixed expected output of a few cURL test cases 2014-02-28 18:59:06 +08:00
datibbaw 488e64dbe4 Allow NULL as value for CURLOPT_CUSTOMREQUEST option.
Added test case.

Refactored the code to isolate the string handling. Fixed return values to use SUCCESS and FAILURE.

Removed unused error variable.

Indentation fix.
Removed the ugly goto.
2014-02-28 18:27:22 +08:00
Anatol Belski 5180425ca9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  adapt test to curl 7.35.0 upgrade
2014-02-05 15:17:30 +01:00
Anatol Belski fd87b38c47 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  adapt test to curl 7.35.0 upgrade
2014-02-05 15:16:57 +01:00
Anatol Belski 71ebc0a7f3 adapt test to curl 7.35.0 upgrade
which is a security one and should be performed as in
http://curl.haxx.se/docs/adv_20140129.html
2014-02-05 15:15:34 +01:00
Adam Harvey fba290c061 Allow CURLOPT_FOLLOWLOCATION to be used with open_basedir.
Newer versions of libcurl prevent file:// location response headers by default,
which means that the open_basedir check is unnecessary — the fact
CURLOPT_REDIR_PROTOCOLS can't set CURLPROTO_FILE with open_basedir enabled
means that there's no possibility of breaching the open_basedir restriction,
and this allows HTTP redirects to be followed automatically.

Implements FR #65646 (re-enable CURLOPT_FOLLOWLOCATION with open_basedir or
safe_mode).
2013-09-10 11:42:42 -07:00
Adam Harvey 69f12ad582 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Track created curl_slist structs by option so they can be updated in situ.

Conflicts:
	ext/curl/interface.c
2013-08-19 12:16:36 -07:00
Adam Harvey aa7d3d8e6d Track created curl_slist structs by option so they can be updated in situ.
At present, when curl_setopt() is called with an option that requires the
creation of a curl_slist, we simply push the new curl_slist onto a list to be
freed when the curl handle is freed. This avoids a memory leak, but means that
repeated calls to curl_setopt() on the same handle with the same option wastes
previously allocated memory on curl_slist structs that will no longer be read.

This commit changes the zend_llist that was previously used to track the lists
to a HashTable keyed by the option number, which means that we can simply
update the hash table each time curl_setopt() is called.

Fixes bug #65458 (curl memory leak).
2013-08-19 12:01:04 -07:00
Anatol Belski 2d9cbf720d Added curl config test for windows 2013-04-17 14:25:45 +02:00
Anatol Belski 43664e656d Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix the test for curl 7.29.0+
2013-02-19 09:05:27 +01:00
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
Stanislav Malyshev a9d013bb02 Implement fix for bug #46439 - add CURLFile class for safer uploads 2013-01-28 22:22:59 -08:00
Pierrick Charron 8456cef1db Fix ext/curl tests to work on every libcurl versions
Thanks Laruence :)
2012-12-26 00:43:37 -05:00
Pierrick Charron 4b4f3db731 Support for curl_strerror and curl_multi_strerror
Add the support for both curl_strerror and curl_multi_strerror.
Those function will return a string describing the error code
passed in the argument errornum
2012-12-23 15:45:39 -05:00
Pierrick Charron 64595a5d1a Add curl_multi_setopt and clean curl_share_setopt
curl_multi_setopt is now available and supports CURLMOPT_PIPELINING
and CURLMOPT_MAXCONNECTS
2012-12-23 14:59:41 -05:00