Skip to content

Commit 67852ba

Browse files
committed
fix uc domain problem
fix http header case sensitive problem
1 parent 28e51bd commit 67852ba

File tree

5 files changed

+16
-9
lines changed

5 files changed

+16
-9
lines changed

CHANGELOG.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# Changelog
22

3-
## 7.2.2 (2017-11-06
3+
## 7.2.3 (2018-01-20)
4+
### 增加
5+
* 新加坡机房
6+
### 修正
7+
* 获取域名的入口域名
8+
* http回复头部兼容大小写
9+
10+
## 7.2.2 (2017-11-06)
411
### 增加
512
* Qiniu算法的鉴权方法
613

src/Qiniu/Config.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
final class Config
55
{
6-
const SDK_VER = '7.2.2';
6+
const SDK_VER = '7.2.3';
77

88
const BLOCK_SIZE = 4194304; //4*1024*1024 分块上传块大小,该参数为接口规格,不能修改
99

1010
const RSF_HOST = 'rsf.qiniu.com';
1111
const API_HOST = 'api.qiniu.com';
1212
const RS_HOST = 'rs.qiniu.com'; //RS Host
13-
const UC_HOST = 'https://uc.qbox.me'; //UC Host
13+
const UC_HOST = 'https://api.qiniu.com'; //UC Host
1414

1515
// Zone 空间对应的机房
1616
public $zone;

src/Qiniu/Http/Response.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public function needRetry()
170170

171171
private static function isJson($headers)
172172
{
173-
return array_key_exists('content-type', $headers) &&
173+
return array_key_exists('Content-Type', $headers) &&
174174
strpos($headers['Content-Type'], 'application/json') === 0;
175175
}
176176
}

src/Qiniu/Zone.php

+5-4
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ public function __construct(
4242
public static function zone0()
4343
{
4444
$Zone_z0 = new Zone(
45-
array("up.qiniup.com", 'up-nb.qiniup.com', 'up-xs.qiniup.com'),
46-
array('upload.qiniup.com', 'upload-nb.qiniup.com', 'upload-xs.qiniup.com'),
45+
array("up.qiniup.com", 'up-jjh.qiniup.com', 'up-xs.qiniup.com'),
46+
array('upload.qiniup.com', 'upload-jjh.qiniup.com', 'upload-xs.qiniup.com'),
4747
'rs.qiniu.com',
4848
'rsf.qiniu.com',
4949
'api.qiniu.com',
@@ -71,8 +71,8 @@ public static function zone1()
7171
public static function zone2()
7272
{
7373
$Zone_z2 = new Zone(
74-
array('up-z2.qiniup.com', 'up-gz.qiniup.com', 'up-fs.qiniup.com'),
75-
array('upload-z2.qiniup.com', 'upload-gz.qiniup.com', 'upload-fs.qiniup.com'),
74+
array('up-z2.qiniup.com', 'up-dg.qiniup.com', 'up-fs.qiniup.com'),
75+
array('upload-z2.qiniup.com', 'upload-dg.qiniup.com', 'upload-fs.qiniup.com'),
7676
"rs-z2.qiniu.com",
7777
"rsf-z2.qiniu.com",
7878
"api-z2.qiniu.com",
@@ -123,6 +123,7 @@ public static function queryZone($ak, $bucket)
123123
return array(null, new Error($url, $ret));
124124
}
125125
$r = ($ret->body === null) ? array() : $ret->json();
126+
//print_r($ret);
126127
//parse zone;
127128

128129
$iovipHost = $r['io']['src']['main'][0];

tests/Qiniu/Tests/ZoneTest.php

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ protected function setUp()
3636
public function testUpHosts()
3737
{
3838
$zone = Zone::queryZone($this->ak, $this->bucketName);
39-
print_r($zone);
4039
$this->assertContains('upload.qiniup.com', $zone->cdnUpHosts);
4140

4241
$zone = Zone::queryZone($this->ak, $this->bucketNameBC);

0 commit comments

Comments
 (0)