jenkins-bot has submitted this change and it was merged.
Change subject: Added "enableHttps" flag support to zero configuration
......................................................................
Added "enableHttps" flag support to zero configuration
* The flag is currently ignored in production
Change-Id: I4fe3f20f2dd87ae94b315912329bd029d75eff21
---
M includes/CarrierConfig.php
M includes/ZeroConfigContentHandler.php
2 files changed, 4 insertions(+), 0 deletions(-)
Approvals:
Dr0ptp4kt: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/CarrierConfig.php b/includes/CarrierConfig.php
index b3ddf22..fd12e97 100644
--- a/includes/CarrierConfig.php
+++ b/includes/CarrierConfig.php
@@ -247,6 +247,9 @@
// default = ( count( 'showLangs' ) > 1 )
$this->check( 'showZeroPage', true, $validateBool );
+ // If carrier supports zero-rating HTTPS traffic
+ $this->check( 'enableHttps', false, $validateBool );
+
// List of IP CIDR blocks for this provider
if ( $this->thorough ) {
$this->check( 'ips', '',
diff --git a/includes/ZeroConfigContentHandler.php
b/includes/ZeroConfigContentHandler.php
index ac07917..3535927 100644
--- a/includes/ZeroConfigContentHandler.php
+++ b/includes/ZeroConfigContentHandler.php
@@ -73,6 +73,7 @@
"bannerWarning": false, // Optional, default = true
"showImages": false, // Optional, default = true
"showZeroPage": false, // Optional, default is count('showLangs') > 1 ?
true : false
+ "enableHttps": true, // Optional, default is false
"ips": [
// Neither of these two private CIDR ranges are legal
"192.168.0.0/16",
--
To view, visit https://gerrit.wikimedia.org/r/68824
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4fe3f20f2dd87ae94b315912329bd029d75eff21
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Yurik <[email protected]>
Gerrit-Reviewer: Dr0ptp4kt <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
