Skip to content

Commit 0c84f99

Browse files
noaccidentnoaccident
committed
update 3.23.5
1 parent a56a37a commit 0c84f99

File tree

7 files changed

+242
-26
lines changed

7 files changed

+242
-26
lines changed

‎LICENSE‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -199,21 +199,3 @@
199199
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200200
See the License for the specific language governing permissions and
201201
limitations under the License.
202-
203-
OPEN SOURCE SOFTWARE NOTICE
204-
205-
This document contains open source software notice for this product. And this document is confidential information of copyright holder. Recipient shall protect it in due care and shall not disseminate it without permission.
206-
207-
Warranty Disclaimer
208-
209-
THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,BUT WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
210-
211-
Copyright Notice and License Texts
212-
213-
Written Offer
214-
215-
This product contains software whose rights holders license it on the terms of the GNU General Public License, version 2 (GPLv2) or other open source software license. We will provide you with the source code of the software licensed under related license if you send us a written request by mail or email to the following addresses:
216-
[email protected]
217-
detailing the name of the product and the firmware version for which you need the source code and indicating how we can contact you.
218-
219-
PLEASE NOTE THAT WE WILL ASK YOU TO PAY US FOR THE COSTS OF A DATA CARRIER AND THE POSTAL CHARGES TO SEND THE DATA CARRIER TO YOU. THIS OFFER IS VALID FOR THREE YEARS FROM THE MOMENT WE DISTRIBUTED THE PRODUCT AND VALID FOR AS LONG AS WE OFFER SPARE PARTS OR CUSTOMER SUPPORT FOR THAT PRODUCT MODEL.

‎Obs/Internal/Resource/Constants.php‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
namespace Obs\Internal\Resource;
1919

2020
class Constants {
21-
const ALLOWED_RESOURCE_PARAMTER_NAMES = [
21+
const ALLOWED_RESOURCE_PARAMTER_NAMES = [
2222
'acl',
2323
'policy',
2424
'torrent',
@@ -55,7 +55,24 @@ class Constants {
5555
'replication',
5656
'append',
5757
'position',
58-
'x-oss-process'
58+
'x-oss-process',
59+
60+
'CDNNotifyConfiguration',
61+
'attname',
62+
'customdomain',
63+
'directcoldaccess',
64+
'encryption',
65+
'inventory',
66+
'length',
67+
'metadata',
68+
'modify',
69+
'name',
70+
'rename',
71+
'truncate',
72+
'x-image-save-bucket',
73+
'x-image-save-object',
74+
'x-obs-security-token',
75+
'x-obs-callback',
5976
];
6077
const ALLOWED_REQUEST_HTTP_HEADER_METADATA_NAMES = [
6178
'content-type',

‎Obs/Internal/Resource/OBSRequestResource.php‎

Lines changed: 103 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2847,6 +2847,11 @@ class OBSRequestResource {
28472847
'type' => 'string',
28482848
'location' => 'dns'
28492849
],
2850+
'Callback' => [
2851+
'type' => 'string',
2852+
'location' => 'header',
2853+
'sentAs' => 'x-obs-callback'
2854+
],
28502855
'Key' => [
28512856
'required' => true,
28522857
'type' => 'string',
@@ -3921,6 +3926,11 @@ class OBSRequestResource {
39213926
'type' => 'string',
39223927
'location' => 'query',
39233928
'sentAs' => 'uploadId'
3929+
],
3930+
'Callback' => [
3931+
'type' => 'string',
3932+
'location' => 'header',
3933+
'sentAs' => 'x-obs-callback'
39243934
]
39253935
],
39263936
'responseParameters' => [
@@ -4181,7 +4191,99 @@ class OBSRequestResource {
41814191
]
41824192
]
41834193
]
4184-
]
4194+
],
4195+
4196+
'setBucketCustomDomain' => [
4197+
'httpMethod' => 'PUT',
4198+
'requestParameters' => [
4199+
'Bucket' => [
4200+
'required' => true,
4201+
'type' => 'string',
4202+
'location' => 'dns'
4203+
],
4204+
'DomainName' => [
4205+
'required' => true,
4206+
'type' => 'string',
4207+
'location' => 'query',
4208+
'sentAs' => 'customdomain'
4209+
]
4210+
4211+
],
4212+
'responseParameters' => [
4213+
'RequestId' => [
4214+
'location' => 'header',
4215+
'sentAs' => 'x-obs-request-id'
4216+
]
4217+
]
4218+
],
4219+
4220+
'getBucketCustomDomain' => [
4221+
'httpMethod' => 'GET',
4222+
'specialParam' => 'customdomain',
4223+
'requestParameters' => [
4224+
'Bucket' => [
4225+
'required' => true,
4226+
'type' => 'string',
4227+
'location' => 'dns'
4228+
]
4229+
],
4230+
'responseParameters' => [
4231+
'type' => 'object',
4232+
'properties' => [
4233+
'RequestId' => [
4234+
'location' => 'header',
4235+
'sentAs' => 'x-obs-request-id'
4236+
],
4237+
'Domains' => [
4238+
'type' => 'array',
4239+
'location' => 'xml',
4240+
'sentAs' => 'Domains',
4241+
'data' => [
4242+
'xmlFlattened' => true
4243+
],
4244+
'items' => [
4245+
'type' => 'object',
4246+
'properties' => [
4247+
'DomainName' => [
4248+
'type' => 'string',
4249+
'location' => 'xml',
4250+
'sentAs' => 'DomainName'
4251+
],
4252+
'CreateTime' => [
4253+
'type' => 'string',
4254+
'location' => 'xml',
4255+
'sentAs' => 'CreateTime'
4256+
],
4257+
]
4258+
]
4259+
]
4260+
]
4261+
]
4262+
],
4263+
4264+
'deleteBucketCustomDomain' => [
4265+
'httpMethod' => 'DELETE',
4266+
'requestParameters' => [
4267+
'Bucket' => [
4268+
'required' => true,
4269+
'type' => 'string',
4270+
'location' => 'dns'
4271+
],
4272+
'DomainName' => [
4273+
'required' => true,
4274+
'type' => 'string',
4275+
'location' => 'query',
4276+
'sentAs' => 'customdomain'
4277+
]
4278+
],
4279+
'responseParameters' => [
4280+
'RequestId' => [
4281+
'location' => 'header',
4282+
'sentAs' => 'x-obs-request-id'
4283+
]
4284+
]
4285+
],
4286+
41854287
],
41864288

41874289
'aliases' => [

‎Obs/Internal/Resource/V2RequestResource.php‎

Lines changed: 102 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2683,6 +2683,11 @@ class V2RequestResource {
26832683
'type' => 'string',
26842684
'location' => 'uri'
26852685
],
2686+
'Callback' => [
2687+
'type' => 'string',
2688+
'location' => 'header',
2689+
'sentAs' => 'x-amz-callback'
2690+
],
26862691
'ContentMD5' => [
26872692
'type' => 'string',
26882693
'location' => 'header',
@@ -3733,6 +3738,11 @@ class V2RequestResource {
37333738
'type' => 'string',
37343739
'location' => 'query',
37353740
'sentAs' => 'uploadId'
3741+
],
3742+
'Callback' => [
3743+
'type' => 'string',
3744+
'location' => 'header',
3745+
'sentAs' => 'x-amz-callback'
37363746
]
37373747
],
37383748
'responseParameters' => [
@@ -3999,7 +4009,98 @@ class V2RequestResource {
39994009
]
40004010
]
40014011
]
4002-
]
4012+
],
4013+
4014+
'setBucketCustomDomain' => [
4015+
'httpMethod' => 'PUT',
4016+
'requestParameters' => [
4017+
'Bucket' => [
4018+
'required' => true,
4019+
'type' => 'string',
4020+
'location' => 'dns'
4021+
],
4022+
'DomainName' => [
4023+
'required' => true,
4024+
'type' => 'string',
4025+
'location' => 'query',
4026+
'sentAs' => 'customdomain'
4027+
]
4028+
4029+
],
4030+
'responseParameters' => [
4031+
'RequestId' => [
4032+
'location' => 'header',
4033+
'sentAs' => 'x-obs-request-id'
4034+
]
4035+
]
4036+
],
4037+
4038+
'getBucketCustomDomain' => [
4039+
'httpMethod' => 'GET',
4040+
'specialParam' => 'customdomain',
4041+
'requestParameters' => [
4042+
'Bucket' => [
4043+
'required' => true,
4044+
'type' => 'string',
4045+
'location' => 'dns'
4046+
]
4047+
],
4048+
'responseParameters' => [
4049+
'type' => 'object',
4050+
'properties' => [
4051+
'RequestId' => [
4052+
'location' => 'header',
4053+
'sentAs' => 'x-obs-request-id'
4054+
],
4055+
'Domains' => [
4056+
'type' => 'array',
4057+
'location' => 'xml',
4058+
'sentAs' => 'Domains',
4059+
'data' => [
4060+
'xmlFlattened' => true
4061+
],
4062+
'items' => [
4063+
'type' => 'object',
4064+
'properties' => [
4065+
'DomainName' => [
4066+
'type' => 'string',
4067+
'location' => 'xml',
4068+
'sentAs' => 'DomainName'
4069+
],
4070+
'CreateTime' => [
4071+
'type' => 'string',
4072+
'location' => 'xml',
4073+
'sentAs' => 'CreateTime'
4074+
],
4075+
]
4076+
]
4077+
]
4078+
]
4079+
]
4080+
],
4081+
4082+
'deleteBucketCustomDomain' => [
4083+
'httpMethod' => 'DELETE',
4084+
'requestParameters' => [
4085+
'Bucket' => [
4086+
'required' => true,
4087+
'type' => 'string',
4088+
'location' => 'dns'
4089+
],
4090+
'DomainName' => [
4091+
'required' => true,
4092+
'type' => 'string',
4093+
'location' => 'query',
4094+
'sentAs' => 'customdomain'
4095+
]
4096+
],
4097+
'responseParameters' => [
4098+
'RequestId' => [
4099+
'location' => 'header',
4100+
'sentAs' => 'x-obs-request-id'
4101+
]
4102+
]
4103+
],
40034104
],
40044105

40054106
'aliases' => [

‎Obs/ObsClient.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ private static function choose_handler($obsclient)
398398
} elseif (function_exists('curl_multi_exec')) {
399399
$f = new SdkCurlFactory(50);
400400
$obsclient->factorys[] = $f;
401-
$handler = new CurlMultiHandler(['handle_factory' => $f1]);
401+
$handler = new CurlMultiHandler(['handle_factory' => $f]);
402402
}
403403

404404
if (ini_get('allow_url_fopen')) {

‎README.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
Version 3.22.6
22

3+
新特性：
4+
1. 新增自定义域名相关接口；
5+
2. 新增上传回调参数；
6+
7+
资料&demo:
8+
9+
修复问题：
10+
1. 优化部分代码；
11+
12+
----
13+
14+
Version 3.22.6
15+
316
新特性：
417

518
资料&demo:

‎composer.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
"name" : "obs/esdk-obs-php",
33
"description" : "OBS PHP SDK",
44
"license":"Apache-2.0",
5-
"version":"3.22.6",
5+
"version":"3.23.5",
66
"require" : {
77
"php" : ">=5.6.0",
88
"guzzlehttp/guzzle" : "^6.3.0 || ^7.0",
99
"guzzlehttp/psr7" : "^1.4.2 || ^2.0",
10-
"monolog/monolog" : "^1.23.0 || ^2.0"
10+
"monolog/monolog" : "^1.23.0 || ^2.0",
11+
"psr/http-message": "^1.0"
1112
},
1213

1314
"keywords" :["obs", "php"],
@@ -16,4 +17,4 @@
1617
"Obs\\": "Obs/"
1718
}
1819
}
19-
}
20+
}

0 commit comments

Comments
 (0)