clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 07:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,405 Commits 494 Branches 1,367 Tags 803 MiB
aed56fc9a7
Commit Graph

673 Commits

Author SHA1 Message Date
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
e3c88d16b4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  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)
 2012-12-21 19:27:51 -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
af10e698a2 Fixed bug #63352 (Can't enable hostname validation when using curl stream wrappers) 2012-12-21 19:12:43 -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
9d235eadc8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix test
 2012-12-21 11:49:00 -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
Pierrick Charron
aa9156d7e0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #55438 (Curlwapper is not sending http header randomly)
 2012-12-19 19:46:57 -05:00
Pierrick Charron
66b88c92bb Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #55438 (Curlwapper is not sending http header randomly)
 2012-12-19 19:44:08 -05:00
Pierrick Charron
c46e1cdcae Fixed bug #55438 (Curlwapper is not sending http header randomly) 
Since curl multi is used, it sometime happen that the resource is freed before
the curl multi really execute the query. The patch will store the headers
slist in the curlstream handle and free it only when the stream will be closed
 2012-12-19 19:40:29 -05:00
Xinchen Hui
6b0299aafc Merge branch 'PHP-5.4' into PHP-5.5 2012-11-21 12:30:54 +08:00
Xinchen Hui
e54970aaf1 Unused variable copystr 
copystr is declared again blow
 2012-11-21 12:30:03 +08:00
John Jawed (JJ)
f68f31f121 Notice if CURLOPT_SSL_VERIFYHOST is set to true 2012-10-25 16:00:02 -04:00
John Jawed (JJ)
3b85d09de7 Notice if CURLOPT_SSL_VERIFYHOST is set to true 2012-10-25 12:22:23 -07: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
4b152e5470 Merge branch 'PHP-5.4' 2012-10-10 10:32:38 +08:00
Pierrick Charron
02bdf4c1fc Merge branch 'PHP-5.4' 
* PHP-5.4:
  FD_ZERO file descriptors before calling curl_multi_fdset
 2012-09-28 15:22:37 -04: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
6c135dff97 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Avoid calling select if maxfd returned by curl_multi_fdset is -1
  Fixing NEWS file
 2012-09-22 10:19:16 -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
Pierrick Charron
70713a27b6 Add CURLOPT_READDATA which was removed by mistake 
I did a check and this is the only one which was removed by mistake.
No other constants are available in 5.4 branch and not in master
 2012-09-22 10:05:52 -04:00
Xinchen Hui
26ee1cb0b1 Merge branch 'PHP-5.4' 2012-09-18 10:50:24 +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
Felipe Pena
dd9478e6c8 - Fixed compiler warnings 2012-08-27 08:56:54 -03:00
Pierrick Charron
101fd2d3fd Fix bad version for CURLINFO_CERTINFO 
CURLINFO_CERTINFO is available since 7.19.1. The cURL extension
allow to use it since this same version but the internal function
create_certinfo used internally for CURLINFO_CERTINFO usage
is only usable for version greater than 7.19.1 which will cause
problem if the user is using the 7.19.1 cURL version
 2012-08-26 09:03:45 -04:00
Pierrick Charron
9ab45d3edb Add missing constants in cURL 2012-08-25 01:21:17 -04:00
Pierrick Charron
e5ff3f18f5 Update bad versions for cURL constants 
This was updated according to the cURL symbol tables located here :
http://curl.haxx.se/libcurl/c/symbols-in-versions.html
 2012-08-24 18:04:16 -04: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
2118ab9ab4 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #62839
 2012-08-16 14:51:28 -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
Nikita Popov
b5305d267b Fix curl_basic_022.phpt 
Some curl versions seem to have issues handling dates beyond
Thu, 31-Dec-2037 23:59:59 GMT (dates after this are just clamped to
MAX_INT).
 2012-08-16 19:08:46 +02:00
Pierrick Charron
edece6ec84 Fixed bug #62615 (test ext/curl/tests/curl_escape.phpt failed). 
curl_easy_escape was modified in 5.21.2 to not escape "unreserved" characters
so this test will fail on version older than 5.21.2
 2012-07-26 19:13:42 -04:00
Xinchen Hui
94a0f8722b Revert "fix test" 
This reverts commit cea3f0f363.

seems the behavior is different between certain versions
 2012-07-18 22:35:03 +08:00
Xinchen Hui
cea3f0f363 fix test 
All input characters that are not a-z, A-Z or 0-9 will be converted to their "URL escaped" version

see http://curl.haxx.se/libcurl/c/curl_escape.html
 2012-07-18 18:50:42 +08:00
Xinchen Hui
0e97cdf86b Merge branch 'PHP-5.4' 
* PHP-5.4:
  update NEWS
  Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false)
  appease MSVC (doesnt like unary minus of unsigned ints)
  appease MSVC (doesnt like unary minus of unsigned ints)
 2012-07-09 08:46:38 +08: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
Your Name
60c4728594 VIM uses spaces as tabs and that doesn't comply with the coding 
standard. I think I'd fixed it so it's using real tabs now.
 2012-05-27 15:39:45 -07:00
Your Name
0667da8cb4 Removed syslog.h. That should never have been commited. 2012-05-27 01:50:29 -07:00
Your Name
d41fb16a52 Fixed the libcurl version checking for CURLOPT_MAIL_AUTH 2012-05-27 00:21:08 -07:00
Your Name
f75c1ed201 Added support for CURLOPT_MAIL_AUTH 2012-05-27 00:02:53 -07:00
Anatoliy Belsky
c8d8d2442e Merge branch 'PHP-5.4' 
* PHP-5.4:
  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:53:09 +02: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
71e7c854b1 Merge branch 'PHP-5.4' 
* PHP-5.4:
  correct NEWS
  Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
  Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
 2012-05-06 00:53:47 +08: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
Christopher Jones
d11f2beb82 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
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Pierrick Charron
066879fde3 Coding standards 2011-12-23 21:01:05 +00:00
Pierrick Charron
4b14c11dcd Unregister appropriate curl wrappers 2011-12-14 04:02:56 +00:00
Pierrick Charron
e37506bd58 Remove dead code 
# curl_version_info was introduced in 7.10 and the PHP requirement is 7.10.5
 2011-12-14 03:45:44 +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
64963d6e19 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
ebd3143cd3 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
25081046d7 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
Pierre Joye
9e567e295b - fix the fix, wrong endif pos 2011-12-06 16:09:06 +00:00
Pierre Joye
984344214f - fix build, CURLOPT_FNMATCH_DATA exists since 7.21.0 only 2011-12-06 15:57:43 +00:00
Pierre Joye
05781c747b - fix build, CURLOPT_FNMATCH_DATA exists since 7.21.0 only 2011-12-06 15:35:07 +00:00
Pierrick Charron
e038f2fe5d We should free the memory of any curl_slist returned by curl_easy_getinfo 2011-12-05 22:23:19 +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
d84e1b50c6 Fix segfault when using curl_copy_handle with CURLOPT_PROGRESSFUNCTION 2011-12-04 01:16:17 +00:00
Pierrick Charron
8253bdbb41 add CURLOPT_WILDCARDMATCH and CURLOPT_FNMATCH_FUNCTION 2011-12-04 00:19:12 +00:00
Pierrick Charron
1efb3e94a7 Add the curl handle to the progress callback function 2011-12-03 23:53:27 +00:00
Pierrick Charron
75b11d80fa The progress handle don't need to be allocated unless 
curl_setopt with CURLOPT_PROGRESSFUNCTION is called
 2011-12-03 23:43:44 +00:00
Pierrick Charron
799e4983eb useless variable 2011-12-03 23:21:43 +00:00
Pierrick Charron
e4afb60725 Update curl MINFO 2011-12-03 21:24:19 +00:00
Pierrick Charron
56ba384c9d Test curl_getinfo() function with CURLINFO_EFFECTIVE_URL parameter 2011-12-03 20:19:53 +00:00
Pierrick Charron
3e7310ece2 Clean curl_getinfo and add new constants from newer libcurl versions 2011-12-03 20:16:32 +00:00
Pierrick Charron
ef1af432c3 Fix test for libcurl < 7.12.1 2011-12-03 20:14:06 +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
82fab7b04d Cleans up test file 2011-12-02 04:16:46 +00:00
Pierrick Charron
e69f987948 Clean / Improve the curl extension 
# NEWS file will come soon
 2011-12-01 21:48:07 +00:00
Pierrick Charron
70136445cb Revert commit r319729 until I have a clean version for non-ZTS 2011-11-24 12:49:11 +00:00
Pierrick Charron
da2797108f Implemented FR #55540, added functions curl_share_init(), curl_share_setopt() and curl_share_close(). 2011-11-23 22:20:28 +00:00
Pierrick Charron
517e28309d Fix build for libcurl < 7.20.0 2011-11-23 19:36:52 +00:00
Pierrick Charron
bafdf84528 Fixed bug #54995 2011-11-23 05:45:27 +00:00
Felipe Pena
d0839fc837 - Fix build (using libcurl 7.21.0) 2011-11-22 21:10:24 +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
fe1bf12552 Fix test to remove dependancy over php.net 2011-11-22 18:50:57 +00:00
Pierrick Charron
fff23f12bd Add new cURL CURLOPT_* options 2011-11-22 17:33:48 +00:00