Merge pull request #97 from rwifeng/demo

replace __file__
qiniu · Nov 5, 2014 · 2dd48db · 2dd48db
2 parents 4adfb0d + c379afe
commit 2dd48db
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 32 deletions.
diff --git a/demo/download_token.php b/demo/download_token.php
diff --git a/demo/get_policy.php b/demo/get_policy.php
@@ -0,0 +1,16 @@
+<?php
+require_once('../qiniu/rs.php');
+require_once('../qiniu/auth_digest.php');
+
+$gpy = new Qiniu_RS_GetPolicy();
+
+$url = 'http://sslayer.qiniudn.com/dive-into-golang.pptx';
+echo $gpy->MakeRequest($url, null);
+
+echo "\n";
+$url = 'http://sslayer.qiniudn.com/dive-into-golang.pptx?odconv/pdf';
+echo $gpy->MakeRequest($url, null);
+
+echo "\n";
+$url = 'http://sslayer.qiniug.com/2.m3u8';
+echo $gpy->MakeRequest($url, null);
diff --git a/demo/up.php b/demo/up.php
@@ -5,7 +5,7 @@
 
 $bucket = 'rwxf';
 $key = 'up.php';
-$file = __FILE__;  //path to local file
+$file = <path_to_local_file>;
 
 
 $client = new Qiniu_MacHttpClient(null);

diff --git a/qiniu/io.php b/qiniu/io.php
@@ -70,10 +70,7 @@ function Qiniu_PutFile($upToken, $key, $localFile, $putExtra) // => ($putRet, $e
 	}
 
 	$fields = array('token' => $upToken, 'file' => createFile($localFile, $putExtra->MimeType));
-	if ($key === null) {
-		$fname = '?';
-	} else {
-		$fname = $key;
+	if ($key !== null) {
 		$fields['key'] = $key;
 	}
 	if ($putExtra->CheckCrc) {