diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2015-04-01 01:54:53 +0300 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2015-04-01 01:54:53 +0300 |
| commit | c22543b3f3ccdf7eb53af3c4d1459ae2dc9bc54e (patch) | |
| tree | 872a7aa43e99eba992a027de9c001a7b8f34f338 /ext/curl/interface.c | |
| parent | 2d3868984cc0c43dd66f5aa0d2e56a92821300a6 (diff) | |
| parent | a32c8ba719493fd2b4700c4f7db1ef130ceb7661 (diff) | |
| download | php-git-c22543b3f3ccdf7eb53af3c4d1459ae2dc9bc54e.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #68739 (Missing break / control flow in curl)
Fixed bug #68740 (NULL Pointer Dereference)
Fixed bug #68677 (Use After Free in OPcache)
Diffstat (limited to 'ext/curl/interface.c')
| -rw-r--r-- | ext/curl/interface.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 45b6bb0365..a7b68dfe17 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -2847,6 +2847,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue TSRMLS_DC) curl_easy_setopt(ch->cp, CURLOPT_SHARE, sh->share); } } + break; #if LIBCURL_VERSION_NUM >= 0x071500 /* Available since 7.21.0 */ case CURLOPT_FNMATCH_FUNCTION: |