mrpastewart/platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(fix) removed deprecated io reference, removed transfer-encoding from response headers

Browse source
This commit is contained in:
Daniel Varga-Hali 2018-03-20 17:38:22 +01:00
parent fd3c165e32
commit b67e1d8acf
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/src/proxy_layer.dart
View file

@ -1,5 +1,4 @@
import 'dart:async'; import 'dart:async';
import 'dart:convert';
import 'dart:io'; import 'dart:io';
import 'package:angel_framework/angel_framework.dart'; import 'package:angel_framework/angel_framework.dart';
import 'package:http/src/base_client.dart' as http; import 'package:http/src/base_client.dart' as http;
@ -7,7 +6,6 @@ import 'package:http/src/request.dart' as http;
import 'package:http/src/response.dart' as http; import 'package:http/src/response.dart' as http;
import 'package:http/src/streamed_response.dart' as http; import 'package:http/src/streamed_response.dart' as http;
final RegExp _param = new RegExp(r':([A-Za-z0-9_]+)(\((.+)\))?');
final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)'); final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
class Proxy { class Proxy {
@ -74,8 +72,8 @@ class Proxy {
var headers = <String, String>{ var headers = <String, String>{
'host': port == null ? host : '$host:$port', 'host': port == null ? host : '$host:$port',
'x-forwarded-for': req.io.connectionInfo.remoteAddress.address, 'x-forwarded-for': req.remoteAddress.address,
'x-forwarded-port': req.io.connectionInfo.remotePort.toString(), 'x-forwarded-port': req.uri.port.toString(),
'x-forwarded-host': 'x-forwarded-host':
req.headers.host ?? req.headers.value('host') ?? 'none', req.headers.host ?? req.headers.value('host') ?? 'none',
'x-forwarded-proto': protocol, 'x-forwarded-proto': protocol,
@ -101,7 +99,7 @@ class Proxy {
if (body != null) rq.bodyBytes = body; if (body != null) rq.bodyBytes = body;
return await httpClient.send(rq); return httpClient.send(rq);
} }
var future = accessRemote(); var future = accessRemote();
@ -127,9 +125,11 @@ class Proxy {
if (rs.statusCode == 404 && recoverFrom404 != false) return true; if (rs.statusCode == 404 && recoverFrom404 != false) return true;
// http/2 client implementations usually get confused by transfer-encoding
res res
..statusCode = rs.statusCode ..statusCode = rs.statusCode
..headers.addAll(rs.headers); ..headers.addAll(new Map<String, String>.from(rs.headers)
..remove(HttpHeaders.TRANSFER_ENCODING));
if (rs.contentLength == 0 && recoverFromDead != false) return true; if (rs.contentLength == 0 && recoverFromDead != false) return true;