Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.0 #8

Merged
merged 5 commits into from
Jan 8, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion README_CN.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
关于
-----

这是目前最好的php curl类库,很多开发者基于此库开发项目。类库是对curl_multi_*系列函数的封装,性能、扩展性、易用性、性能都是最高水平,很强大。
这是目前最好的php curl类库,很多开发者基于此库开发项目。类库是对curl_multi_*系列函数的封装,性能、扩展性、易用性都是最高水平,很强大。

需求
----
Expand Down
2 changes: 1 addition & 1 deletion src/Base.php
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ function cbCurlInfo($info, $isFirst, $isLast, $useOb = true) {
if (! empty ( $pre ) && ! $isFirst) {
$pre .= "\n";
}
$str = $pre . "\r" . rtrim ( $str );
$str = $pre . "\r" . rtrim ( $content );
}
if ($isFirst) {
$str = "\n" . $str;
Expand Down
2 changes: 1 addition & 1 deletion src/Core.php
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ static function getInstance() {
* @param mixed $fail
* curl fail callback,for callback first param array('error'=>array(0=>code,1=>msg),'info'=>array),second param $item[args];
* @throws Exception
* @return CurlMulti_Core
* @return self
*/
function add(array $item, $process = null, $fail = null) {
// check
Expand Down
2 changes: 1 addition & 1 deletion src/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

namespace Ares333\CurlMulti;

class Exception extends Exception {
class Exception extends \Exception {
}