diff options
| author | Xinchen Hui <laruence@php.net> | 2014-01-03 11:09:07 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-01-03 11:09:07 +0800 |
| commit | 0f53e37494e5cb280cb37c4ab15fe82e0c92a69e (patch) | |
| tree | 0a2d58a2239481f947326143f3e9ec289b5b5a43 /ext/curl | |
| parent | c9f909cd4297cee26c0033efaa31e45d6ec8d9f2 (diff) | |
| parent | c081ce628f0d76d44784d7bb8e06428b06142ac0 (diff) | |
| download | php-git-0f53e37494e5cb280cb37c4ab15fe82e0c92a69e.tar.gz | |
Merge branch 'PHP-5.6'
Diffstat (limited to 'ext/curl')
| -rw-r--r-- | ext/curl/curl_file.c | 2 | ||||
| -rw-r--r-- | ext/curl/interface.c | 2 | ||||
| -rw-r--r-- | ext/curl/multi.c | 2 | ||||
| -rw-r--r-- | ext/curl/php_curl.h | 2 | ||||
| -rw-r--r-- | ext/curl/share.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/ext/curl/curl_file.c b/ext/curl/curl_file.c index 91dfd275b5..9f371df538 100644 --- a/ext/curl/curl_file.c +++ b/ext/curl/curl_file.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 591315973c..921929aa52 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | diff --git a/ext/curl/multi.c b/ext/curl/multi.c index af78651ba1..e5c026a513 100644 --- a/ext/curl/multi.c +++ b/ext/curl/multi.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index c45ed80fc2..e02a890b0b 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | diff --git a/ext/curl/share.c b/ext/curl/share.c index d1aed87940..d46361e0ae 100644 --- a/ext/curl/share.c +++ b/ext/curl/share.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | |