jenkins-bot has submitted this change and it was merged.
Change subject: Use an Accept and Content-Type header of text/vnd.wap.wml
instead of vnd.wap.wml.
......................................................................
Use an Accept and Content-Type header of text/vnd.wap.wml instead of
vnd.wap.wml.
* This is the correct Accept and Content-Type header value.
* The old script worked because of different server-side regex.
* The new script is necessary because of an updated server-side regex.
Change-Id: I3293d3aa906a440b3d5fbc06c712a4075b700b22
---
M maintenance/phantom/job.sh
M maintenance/phantom/zero_automated_tests.js
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Dr0ptp4kt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/phantom/job.sh b/maintenance/phantom/job.sh
index 4f36287..406d480 100755
--- a/maintenance/phantom/job.sh
+++ b/maintenance/phantom/job.sh
@@ -109,7 +109,7 @@
grep 'WMLRECORD' fullreport.txt > wmlentries.txt
-awk < wmlentries.txt '{ system("curl -H \"X-CS:"$3"\" -H \"Accept:
vnd.wap.wml\" -H \"User-Agent: Nokia3330/1.0 (03.05)\" "$2" ") }' > wmlout.txt
+awk < wmlentries.txt '{ system("curl -H \"X-CS:"$3"\" -H \"Accept:
text/vnd.wap.wml\" -H \"User-Agent: Nokia3330/1.0 (03.05)\" "$2" ") }' >
wmlout.txt
grep '<html' wmlout.txt > wmlbad.txt
grep '<wml ' wmlout.txt > wmlgood.txt
WMLTOTAL=`cat wmlentries.txt | wc -l`
diff --git a/maintenance/phantom/zero_automated_tests.js
b/maintenance/phantom/zero_automated_tests.js
index 37ddc26..e320369 100644
--- a/maintenance/phantom/zero_automated_tests.js
+++ b/maintenance/phantom/zero_automated_tests.js
@@ -546,7 +546,7 @@
subdomains[s],
{
'X-CS' : xcs,
- 'Accept' : 'vnd.wap.wml'
+ 'Accept' : 'text/vnd.wap.wml'
},
'Nokia3330/1.0 (03.05)',
'San_Francisco',
@@ -575,7 +575,7 @@
subdomains[s],
{
'X-CS' : xcs,
- 'Accept' : 'vnd.wap.wml'
+ 'Accept' : 'text/vnd.wap.wml'
},
'Nokia3330/1.0 (03.05)',
'San_Francisco',
@@ -797,7 +797,7 @@
ZRMA.DoStuffWithUrls(
urls,
function(status, url, page, fillBucketFunc,
addToBucketFunc) {
- if (status !== 'success' && url['headers']['Accept']
!== 'vnd.wap.wml') {
+ if (status !== 'success' && url['headers']['Accept']
!== 'text/vnd.wap.wml') {
return console.log("Unable to render '" +
url['url'] + "'" + ' on ' + (new Date()).toISOString());
} else {
var fs = require('fs');
--
To view, visit https://gerrit.wikimedia.org/r/89140
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3293d3aa906a440b3d5fbc06c712a4075b700b22
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Dr0ptp4kt <[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
