archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
118300 commits 526 branches 1434 tags 877 MiB
Commit graph

540 commits

Author SHA1 Message Date
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Pierrick Charron
722b8fb80e Add new curl options 
Addes new curl options CURLOPT_TELNETOPTIONS, CURLOPT_GSSAPI_DELEGATION,
CURLOPT_ACCEPTTIMEOUT_MS, CURLOPT_SSL_OPTIONS, CURLOPT_TCP_KEEPALIVE,
CURLOPT_TCP_KEEPIDLE and CURLOPT_TCP_KEEPINTVL.
 2012-12-28 00:51:04 -05:00
Pierrick Charron
8b67981b67 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed #63859 Memory leak when reusing curl-handle
 2012-12-27 13:37:11 -05:00
Pierrick Charron
ac3d227e28 Fixed #63859 Memory leak when reusing curl-handle 
When CURLOPT_POSTFIELDS is called more than once on the same
curl handle, php/curl did not free the memory of the previous
post data. This commit will fix the problem unless the curl
handle was previously duplicated using the curl_copy_handle()
function in which case we can not know if the post data is
still in use or not by any curl handle
 2012-12-27 13:31:55 -05:00
Pierrick Charron
33f44af1a7 New curl_pause() function 
Add the curl_pause function (binding of curl_easy_pause).
Using this function, you can explicitly mark a running connection
to get paused, and you can unpause a connection that was
previously paused.
 2012-12-23 17:13:49 -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
Pierrick Charron
ee453541ed Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update NEWS file
  Fixed segfault due to libcurl connection caching
 2012-12-22 19:10:35 -05: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
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
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
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
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
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
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
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
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
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
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