From 40237a1397f1876261699c72d16955378321aa6b Mon Sep 17 00:00:00 2001 From: john gravois Date: Mon, 21 Aug 2017 15:51:30 -0700 Subject: [PATCH 1/2] use gh-release for tagging --- .gitignore | 1 + CHANGELOG.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..b512c09d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +node_modules \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 2be4ff08..9088fbe5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [Unreleased][unreleased] + ## [1.1.1] - 2017-08-15 ### Added From fedcc89833db66a032a842ebbc8220f8aba463ab Mon Sep 17 00:00:00 2001 From: john gravois Date: Mon, 21 Aug 2017 16:02:43 -0700 Subject: [PATCH 2/2] :package: 1.1.2 --- CHANGELOG.md | 9 ++++++++- DotNet/proxy.ashx | 6 +++--- Java/proxy.jsp | 10 +++++----- license.txt => LICENSE | 0 PHP/proxy.php | 4 ++-- README.md | 17 ++++++++++++----- 6 files changed, 30 insertions(+), 16 deletions(-) rename license.txt => LICENSE (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9088fbe5..c29aaa40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased][unreleased] +## [1.1.2] - 2017-08-21 + +### Fixed + +- (DotNet) Appropriate request headers are now passed through [#433](https://github.com/Esri/resource-proxy/pull/433) + ## [1.1.1] - 2017-08-15 ### Added @@ -64,7 +70,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Initial public release -[Unreleased]: https://github.com/Esri/resource-proxy/compare/v1.1.1...HEAD +[Unreleased]: https://github.com/Esri/resource-proxy/compare/v1.1.2...HEAD +[1.1.2]: https://github.com/Esri/resource-proxy/compare/v1.1.1...v1.1.2 [1.1.1]: https://github.com/Esri/resource-proxy/compare/v1.1.0...v1.1.1 [1.1.0]: https://github.com/Esri/resource-proxy/compare/v1.0...v1.1.0 [1.0]: https://github.com/Esri/resource-proxy/compare/v0.9...v1.0 diff --git a/DotNet/proxy.ashx b/DotNet/proxy.ashx index 48abd4eb..607de6c6 100644 --- a/DotNet/proxy.ashx +++ b/DotNet/proxy.ashx @@ -3,7 +3,7 @@ /* * DotNet proxy client. * - * Version 1.1.1 + * Version 1.1.2 * See https://github.com/Esri/resource-proxy for more information. * */ @@ -21,7 +21,7 @@ using System.Net; public class proxy : IHttpHandler { - private static String version = "1.1.1"; + private static String version = "1.1.2"; class RateMeter { double _rate; //internal rate is stored in requests per second @@ -557,7 +557,7 @@ public class proxy : IHttpHandler { } private System.Net.HttpWebRequest createHTTPRequest(string uri, string method, string contentType, System.Net.NetworkCredential credentials = null) - { + { ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; System.Net.HttpWebRequest req = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(uri); req.ServicePoint.Expect100Continue = false; diff --git a/Java/proxy.jsp b/Java/proxy.jsp index 82c51ed2..45d1f931 100644 --- a/Java/proxy.jsp +++ b/Java/proxy.jsp @@ -35,12 +35,12 @@ java.text.SimpleDateFormat" %> * * JSP proxy client * -* Version 1.1.1 +* Version 1.1.2 * See https://github.com/Esri/resource-proxy for more information. * ----------------------------------------------------------- --> -<%! final String version = "1.1.1"; %> +<%! final String version = "1.1.2"; %> <%! public static final class DataValidUtil { @@ -166,11 +166,11 @@ java.text.SimpleDateFormat" %> // TODO: make this configurable if (headerFieldKey != null && headerFieldKey.toLowerCase().equals("content-type")){ if (value != null && value.toLowerCase().contains("application/vnd.ogc.wms_xml")){ - _log(Level.FINE, "Adjusting Content-Type for WMS OGC: " + value); + _log(Level.FINE, "Adjusting Content-Type for WMS OGC: " + value); value = "text/xml"; } } - + // remove Transfer-Encoding/chunked to the client // StackOverflow http://stackoverflow.com/questions/31452074/how-to-proxy-http-requests-in-spring-mvc if (headerFieldKey != null && headerFieldKey.toLowerCase().equals("transfer-encoding")) { @@ -178,7 +178,7 @@ java.text.SimpleDateFormat" %> continue; } } - + sb.append(value); sb.append(""); } diff --git a/license.txt b/LICENSE similarity index 100% rename from license.txt rename to LICENSE diff --git a/PHP/proxy.php b/PHP/proxy.php index 24233757..53f174cc 100644 --- a/PHP/proxy.php +++ b/PHP/proxy.php @@ -3,12 +3,12 @@ /** * PHP Proxy Client * - * Version 1.1.1 + * Version 1.1.2 * See https://github.com/Esri/resource-proxy for more information. * */ -$version = "1.1.1"; +$version = "1.1.2"; error_reporting(0); diff --git a/README.md b/README.md index bed84e16..44819774 100644 --- a/README.md +++ b/README.md @@ -107,14 +107,21 @@ Found a bug or want to request a new feature? Check out previously logged [Issue Esri welcomes [contributions](CONTRIBUTING.md) from anyone and everyone. Please see our [guidelines for contributing](https://github.com/esri/contributing). -## Licensing +## License -Copyright 2014 Esri +Copyright 2017 Esri Licensed under the Apache License, Version 2.0 (the "License"); -You may not use this file except in compliance with the License. +you may not use this file except in compliance with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 -Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for specific language governing permissions and limitations under the license. +> http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +A copy of the license is available in the repository's [LICENSE](./LICENSE) file.