Skip to content

Commit e9f6774

Browse files
author
YangSen-qn
committed
optimize use http3
1 parent 6f6f07c commit e9f6774

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

library/src/main/java/com/qiniu/android/http/metrics/UploadSingleRequestMetrics.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ public Request getRequest() {
6666
public void setRequest(Request request) {
6767
if (request != null) {
6868
this.request = new Request(request.urlString, request.httpMethod, request.allHeaders, null, request.timeout);
69-
this.request.host = request.host;
70-
this.request.ip = request.ip;
7169

7270
long headerLength = 0;
7371
long bodyLength = 0;

library/src/main/java/com/qiniu/android/http/request/RequestTransaction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import com.qiniu.android.common.ZoneInfo;
44
import com.qiniu.android.http.ResponseInfo;
55
import com.qiniu.android.http.UserAgent;
6+
import com.qiniu.android.http.metrics.UploadRegionRequestMetrics;
67
import com.qiniu.android.http.request.handler.RequestProgressHandler;
78
import com.qiniu.android.http.request.handler.RequestShouldRetryHandler;
8-
import com.qiniu.android.http.metrics.UploadRegionRequestMetrics;
99
import com.qiniu.android.http.serverRegion.UploadDomainRegion;
1010
import com.qiniu.android.storage.Configuration;
1111
import com.qiniu.android.storage.UpToken;
@@ -21,7 +21,6 @@
2121
import org.json.JSONException;
2222
import org.json.JSONObject;
2323

24-
import java.security.MessageDigest;
2524
import java.util.HashMap;
2625
import java.util.List;
2726
import java.util.Map;
@@ -92,6 +91,7 @@ private void initData(IUploadRegion targetRegion,
9291
IUploadRegion currentRegion) {
9392

9493
this.requestState = new UploadRequestState();
94+
this.requestState.setCouldUseHttp3(config.requestClient != null);
9595
this.requestInfo = new UploadRequestInfo();
9696
this.requestInfo.targetRegionId = targetRegion.getZoneInfo().getRegionId();
9797
this.requestInfo.currentRegionId = currentRegion.getZoneInfo().getRegionId();

library/src/main/java/com/qiniu/android/http/request/UploadRequestState.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,18 @@
22

33
public class UploadRequestState {
44

5+
private boolean couldUseHttp3;
56
private boolean isUseOldServer;
67
private boolean isUserCancel;
78

9+
public boolean couldUseHttp3(){
10+
return couldUseHttp3;
11+
}
12+
13+
void setCouldUseHttp3(boolean couldUseHttp3) {
14+
this.couldUseHttp3 = couldUseHttp3;
15+
}
16+
817
boolean isUserCancel(){
918
return isUserCancel;
1019
}

library/src/main/java/com/qiniu/android/http/serverRegion/UploadDomainRegion.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import com.qiniu.android.http.request.IUploadServer;
1010
import com.qiniu.android.http.request.UploadRequestState;
1111
import com.qiniu.android.storage.GlobalConfiguration;
12-
import com.qiniu.android.storage.serverConfig.ServerConfigMonitor;
13-
import com.qiniu.android.storage.serverConfig.ServerUserConfig;
1412
import com.qiniu.android.utils.LogUtil;
1513
import com.qiniu.android.utils.StringUtils;
1614
import com.qiniu.android.utils.Utils;
@@ -89,9 +87,6 @@ public void setupRegionData(ZoneInfo zoneInfo) {
8987
this.zoneInfo = zoneInfo;
9088

9189
isAllFrozen = false;
92-
http3Enabled = zoneInfo.http3Enabled;
93-
// 暂不开启
94-
http3Enabled = false;
9590

9691
ipv6Enabled = zoneInfo.ipv6;
9792

@@ -142,7 +137,7 @@ public IUploadServer getNextServer(UploadRequestState requestState, ResponseInfo
142137
}
143138

144139
// 1. 优先选择http3
145-
if (couldUseHttp3()) {
140+
if (couldUseHttp3() && requestState.couldUseHttp3()) {
146141
for (String host : hostList) {
147142
UploadServerDomain domain = domainInfo.get(host);
148143
if (domain == null) {

0 commit comments

Comments
 (0)