| Index: runtime/bin/vmservice/server.dart
|
| diff --git a/runtime/bin/vmservice/server.dart b/runtime/bin/vmservice/server.dart
|
| index f6dc7b85406c545f64878125109eceea4828641b..8d6a932ffc515acb8995632adad54ba59434f970 100644
|
| --- a/runtime/bin/vmservice/server.dart
|
| +++ b/runtime/bin/vmservice/server.dart
|
| @@ -96,10 +96,13 @@ class HttpRequestClient extends Client {
|
| }
|
| HttpResponse response = request.response;
|
| response.headers.contentType = jsonContentType;
|
| - final uri = Uri.parse(request.headers['Origin'].single ?? '');
|
| - final noPortOrigin = new Uri(host: uri.host, scheme: uri.scheme).origin;
|
| - if (_allowedOrigins.contains(noPortOrigin)) {
|
| - response.headers.add('Access-Control-Allow-Origin', uri.origin);
|
| + final origins = request.headers['Origin'];
|
| + if ((origins != null) && (origins.isNotEmpty)) {
|
| + final uri = Uri.parse(origins.first);
|
| + final noPortOrigin = new Uri(host: uri.host, scheme: uri.scheme).origin;
|
| + if (_allowedOrigins.contains(noPortOrigin)) {
|
| + response.headers.add('Access-Control-Allow-Origin', uri.origin);
|
| + }
|
| }
|
| if (result is String) {
|
| response.write(result);
|
|
|