cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaz...@apache.org
Subject cordova-plugins git commit: CB-9566 - move ATS exception in Info.plist into local-webserver plugin instead of the wkwebview-engine-localhost plugin
Date Fri, 11 Sep 2015 19:10:46 GMT
Repository: cordova-plugins
Updated Branches:
  refs/heads/master d93723d07 -> 2d3370ddc


CB-9566 - move ATS exception in Info.plist into local-webserver plugin instead of the wkwebview-engine-localhost
plugin


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugins/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugins/commit/2d3370dd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugins/tree/2d3370dd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugins/diff/2d3370dd

Branch: refs/heads/master
Commit: 2d3370ddc5c06c9d21afbf00c1b91890b7fade59
Parents: d93723d
Author: Shazron Abdullah <shazron@apache.org>
Authored: Fri Sep 11 12:14:41 2015 -0700
Committer: Shazron Abdullah <shazron@apache.org>
Committed: Fri Sep 11 12:14:41 2015 -0700

----------------------------------------------------------------------
 local-webserver/plugin.xml            | 16 +++++++++++++++-
 wkwebview-engine-localhost/plugin.xml | 14 --------------
 2 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/2d3370dd/local-webserver/plugin.xml
----------------------------------------------------------------------
diff --git a/local-webserver/plugin.xml b/local-webserver/plugin.xml
index d403207..aaca9a7 100644
--- a/local-webserver/plugin.xml
+++ b/local-webserver/plugin.xml
@@ -42,7 +42,21 @@
 		    </feature>
             <preference name="CordovaLocalWebServerStartOnSimulator" value="true" />
         </config-file>
-
+        
+		<!-- temporary, until access tags translate into ATS directives in CB-9569 -->
+		<config-file target="*-Info.plist" parent="NSAppTransportSecurity">
+		    <dict>
+		        <key>NSExceptionDomains</key>
+		        <dict>
+		            <key>localhost</key>
+		            <dict>
+		                <key>NSExceptionAllowsInsecureHTTPLoads</key>
+		                <true/>
+		            </dict>  
+		        </dict>  
+		    </dict>
+		</config-file>
+			
 	    <header-file src="src/ios/CDVLocalWebServer.h" />
 	    <source-file src="src/ios/CDVLocalWebServer.m" />
 

http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/2d3370dd/wkwebview-engine-localhost/plugin.xml
----------------------------------------------------------------------
diff --git a/wkwebview-engine-localhost/plugin.xml b/wkwebview-engine-localhost/plugin.xml
index 0f242b3..726b361 100644
--- a/wkwebview-engine-localhost/plugin.xml
+++ b/wkwebview-engine-localhost/plugin.xml
@@ -21,20 +21,6 @@
 
     <!-- ios -->
     <platform name="ios">
-		<!-- temporary, until access tags translate into ATS directives in CB-9569 -->
-		<config-file target="*-Info.plist" parent="NSAppTransportSecurity">
-		    <dict>
-		        <key>NSExceptionDomains</key>
-		        <dict>
-		            <key>localhost</key>
-		            <dict>
-		                <key>NSExceptionAllowsInsecureHTTPLoads</key>
-		                <true/>
-		            </dict>  
-		        </dict>  
-		    </dict>
-		</config-file>
-			
     </platform>
 
 </plugin>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message