Remove non-capturing groups

injust · web-flow · commit ab4b1740b165 · 2018-12-04T13:32:15.000-05:00
diff --git a/src/chrome/content/rules/Oracle.xml b/src/chrome/content/rules/Oracle.xml
@@ -201,7 +201,7 @@
 		<!--
 			Exceptions:
 					-->
-		<exclusion pattern="^http://www\.oracle(?:img)?\.com/(?!(?:\w+/)?assets/|\w+/[^/]+\.(?:css|gif|jpg|js|png)$|(?:communities|corporate/careers|javaone|marketingcloud|rightnow)(?:$|[?/]))"/>
+		<exclusion pattern="^http://www\.oracle(img)?\.com/(?!(\w+/)?assets/|\w+/[^/]+\.(css|gif|jpg|js|png)$|(communities|corporate/careers|javaone|marketingcloud|rightnow)($|[?/]))"/>
 
 			<!--	+ve:
 					-->
@@ -233,19 +233,19 @@
 			<test url="http://www.oracleimg.com/us/assets/compass-hp-sprite.png" />
 			<test url="http://www.oracleimg.com/us/assets/sidebox-background-top.gif" />
 
-	<securecookie host="^(?:\w+|\.edelivery)\.oracle\.com$" name=".+" />
+	<securecookie host="^(\w+|\.edelivery)\.oracle\.com$" name=".+" />
 	<!--
 		Could we secure any of these safely?
 							-->
 	<!--securecookie host="^\.oracle\.com$" name="^(ORA_FND_SESSION_CRMAP\.US\.ORACLE\.COM|ORA_FUSION_PREFS|s_eVar21)$" /-->
 	<!--
 		Tracking cookies
 					-->
-	<securecookie host="^\." name="^(?:Order_Marketing(?:CampaignSuccess|Trigger)|gpw_e24|s_(?:cc|nr|sq))$" />
+	<securecookie host="^\." name="^(Order_Marketing(CampaignSuccess|Trigger)|gpw_e24|s_(cc|nr|sq))$" />
 
 
-	<rule from="^http://(?:www\.)?oracle(img)?\.com/us/(?=[^/]+\.(?:css|gif|jpg|js|png)$)"
-		to="https://www.oracle$1.com/us/assets/" />
+	<rule from="^http://(www\.)?oracle(img)?\.com/us/(?=[^/]+\.(css|gif|jpg|js|png)$)"
+		to="https://www.oracle$2.com/us/assets/" />
 
 			<test url="http://oracle.com/us/compass-hp-sprite.png" />
 			<test url="http://www.oracle.com/us/compass-hp-sprite.png" />
@@ -261,7 +261,5 @@
 	<rule from="^http://oracleimg\.com/"
 		to="https://www.oracleimg.com/" />
 
-	<rule from="^http:"
-		to="https:" />
-
+	<rule from="^http:" to="https:" />
 </ruleset>
