1
0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00
Commit Graph

535 Commits

Author SHA1 Message Date
Xinchen Hui e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui 610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Pierrick Charron a2a8220127 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  FD_ZERO file descriptors before calling curl_multi_fdset
2012-09-28 15:21:33 -04:00
Pierrick Charron 936553d666 FD_ZERO file descriptors before calling curl_multi_fdset
As per curl documentation http://curl.haxx.se/libcurl/c/curl_multi_fdset.html
we need to FD_ZERO file descriptors before calling the curl_multi_fdset function
2012-09-28 15:21:03 -04:00
Pierrick Charron c8687ee63b Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Avoid calling select if maxfd returned by curl_multi_fdset is -1
2012-09-22 10:18:44 -04:00
Pierrick Charron 2e8ab65270 Avoid calling select if maxfd returned by curl_multi_fdset is -1
As per libcurl documentation :

When libcurl returns -1 in max_fd, it is because libcurl currently
does something that isn't possible for your application to monitor
with a socket and unfortunately you can then not know exactly when
the current action is completed using select().
2012-09-22 10:15:40 -04: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 4c83ecc754 Fixed bug #62912 (CURLINFO_PRIMARY_IP is not exposed)
CURLINFO_PRIMARY_* and CURLINFO_LOCAL_* where available in curl_getinfo
but the constant itself was not exposed to php userland
2012-08-24 10:16:40 -04: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 19632ae7dc Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction) 2012-05-06 00:50:37 +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
Felipe Pena e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena 4e19825281 - Year++ 2012-01-01 13:15:04 +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 a1f1e0bcf9 Fix memory leak when using libcurl < 7.17.0 2011-11-22 05:19:37 +00:00
Pierrick Charron 20324d06da Fix memory leak when using libcurl < 7.17.0 2011-11-22 05:19:37 +00:00
Pierrick Charron 4dce729ca0 Fix memory leak 2011-11-21 02:44:28 +00:00
Pierrick Charron 0d73c76bec Fix memory leak 2011-11-21 02:29:24 +00:00
Pierrick Charron d69a1b09af Fix memory leak 2011-11-21 02:29:24 +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
Rasmus Lerdorf f5ec360df7 Fix for bug #55767 2011-09-23 13:16:37 +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