Skip to content
This repository has been archived by the owner on Apr 26, 2023. It is now read-only.

Commit

Permalink
Merge pull request #441 from Esri/bump
Browse files Browse the repository at this point in the history
use gh-release (and tag 1.1.2)
  • Loading branch information
bsvensson authored Aug 21, 2017
2 parents 3112776 + fedcc89 commit e40dbb8
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 16 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
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.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
Expand Down Expand Up @@ -62,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
6 changes: 3 additions & 3 deletions DotNet/proxy.ashx
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
*/
Expand All @@ -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
Expand Down Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions Java/proxy.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -166,19 +166,19 @@ 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")) {
if (value != null && value.toLowerCase().equals("chunked")) {
continue;
}
}
sb.append(value);
sb.append("");
}
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions PHP/proxy.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
17 changes: 12 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

0 comments on commit e40dbb8

Please sign in to comment.