Skip to content

Commit ba36935

Browse files
committed
bugfixed
1 parent 95cee68 commit ba36935

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ array(
8282
### 下载文件
8383
````
8484
// 直接读取文件内容
85-
$data = $upyun->readFile(''/temp/upload_demo.png');
85+
$data = $upyun->readFile('/temp/upload_demo.png');
8686
8787
// 使用数据流模式下载,节省内存占用
8888
$fh = fopen('/tmp/demo.png', 'w');
@@ -121,7 +121,7 @@ echo $file['time']; // 创建时间
121121
### 获取文件信息
122122
````
123123
$result = $upyun->getFileInfo('/demo/demo.png');
124-
echo $result['x-upyun-file-type]; // 文件类型
124+
echo $result['x-upyun-file-type']; // 文件类型
125125
echo $result['x-upyun-file-size']; // 文件大小
126126
echo $result['x-upyun-file-date']; // 创建日期
127127
````

examples/get_list.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
echo "=========DONE\r\n\r\n";
1111
}
1212
catch(Exception $e) {
13-
$e->getCode();
14-
$e->getMessage();
13+
echo $e->getCode();
14+
echo $e->getMessage();
1515
}

examples/write_file.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@
4545
echo "=========DONE\r\n\r\n";
4646
}
4747
catch(Exception $e) {
48-
$e->getCode();
49-
$e->getMessage();
48+
echo $e->getCode();
49+
echo $e->getMessage();
5050
}

upyun.class.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,9 +309,15 @@ protected function _do_request($method, $path, $headers = NULL, $body= NULL, $fi
309309

310310
$header_string = '';
311311
$body = '';
312-
list($header_string, $body) = explode("\r\n\r\n", $response, 2);
313312

314-
//var_dump($header_string, $body);
313+
if ($method == 'GET' && is_resource($file_handle)) {
314+
$header_string = '';
315+
$body = $response;
316+
}
317+
else {
318+
list($header_string, $body) = explode("\r\n\r\n", $response, 2);
319+
}
320+
315321
//var_dump($http_code);
316322
if ($http_code == 200) {
317323
if ($method == 'GET' && is_null($file_handle)) {

0 commit comments

Comments
 (0)