summaryrefslogtreecommitdiff
path: root/ext/curl/multi.c
diff options
context:
space:
mode:
authorJoe Watkins <krakjoe@php.net>2016-04-30 06:49:25 +0100
committerJoe Watkins <krakjoe@php.net>2016-04-30 06:49:25 +0100
commit436b26c70bfe44aff6367d85e1a50e497e58dc05 (patch)
treeb65650934c86f1be8f9ea6ec87bc85cf693f29f4 /ext/curl/multi.c
parent9ad40d8d36b3a481ab20f793e34d0d35148c07f5 (diff)
parent01df044fd54ee6728ef3b10dd073ca6c2750fd77 (diff)
downloadphp-git-436b26c70bfe44aff6367d85e1a50e497e58dc05.tar.gz
Merge branch 'master' of https://github.com/php/php-src
Diffstat (limited to 'ext/curl/multi.c')
-rw-r--r--ext/curl/multi.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/ext/curl/multi.c b/ext/curl/multi.c
index 641d20f903..ab6d56c438 100644
--- a/ext/curl/multi.c
+++ b/ext/curl/multi.c
@@ -417,6 +417,13 @@ static int _php_curl_multi_setopt(php_curlm *mh, zend_long option, zval *zvalue,
#if LIBCURL_VERSION_NUM >= 0x071003 /* 7.16.3 */
case CURLMOPT_MAXCONNECTS:
#endif
+#if LIBCURL_VERSION_NUM >= 0x071e00 /* 7.30.0 */
+ case CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE:
+ case CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE:
+ case CURLMOPT_MAX_HOST_CONNECTIONS:
+ case CURLMOPT_MAX_PIPELINE_LENGTH:
+ case CURLMOPT_MAX_TOTAL_CONNECTIONS:
+#endif
error = curl_multi_setopt(mh->multi, option, zval_get_long(zvalue));
break;