]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d27b3e 2b5bffe)
Merge branch 'PHP-5.5' into PHP-5.6
authorRasmus Lerdorf <rasmus@php.net>
Fri, 17 Oct 2014 04:28:20 +0000 (21:28 -0700)
committerRasmus Lerdorf <rasmus@php.net>
Fri, 17 Oct 2014 04:28:20 +0000 (21:28 -0700)
* PHP-5.5:
  TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247

1  2 
ext/curl/interface.c patch | diff1 | diff2 | blob | history

diff --cc ext/curl/interface.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.