Author: jacopoc
Date: Sat Feb 28 11:19:14 2015
New Revision: 1662920
URL: http://svn.apache.org/r1662920
Log:
Applied fix from trunk for revision: 1662919
===
With this change the "secure" attribute of <@ofbizURL/> will be honoured (as it
was until 13.07) even when the request-map doesn't have a "security" element,
i.e.:
<@ofbizUrl secure="true">SomeRequest</@ofbizUrl>
will actually use the https protocol. Thanks to Deepak Dixit for reporting
discussing the issue and fix with me.
Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/OfbizUrlBuilder.java
Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 28 11:19:14 2015
@@ -8,4 +8,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812
+/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919
Modified:
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/OfbizUrlBuilder.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/OfbizUrlBuilder.java?rev=1662920&r1=1662919&r2=1662920&view=diff
==============================================================================
---
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/OfbizUrlBuilder.java
(original)
+++
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/OfbizUrlBuilder.java
Sat Feb 28 11:19:14 2015
@@ -133,7 +133,7 @@ public final class OfbizUrlBuilder {
* @param buffer
* @param url
* @param useSSL Default value to use - will be replaced by request-map
setting
- * if one is found.
+ * if one is found with security=true set.
* @return <code>true</code> if the URL uses https
* @throws WebAppConfigurationException
* @throws IOException
@@ -150,7 +150,7 @@ public final class OfbizUrlBuilder {
if (config != null) {
requestMap = config.getRequestMapMap().get(requestMapUri);
}
- if (requestMap != null) {
+ if (!makeSecure && requestMap != null) { // if the request has
security="true" then use it
makeSecure = requestMap.securityHttps;
}
makeSecure = webSiteProps.getEnableHttps() & makeSecure;
