From 73e65cbd097c96c3b33ddb1e37b34b8e4257bb09 Mon Sep 17 00:00:00 2001 From: Honza Bambas Date: Wed, 18 Feb 2009 14:31:30 +0100 Subject: [PATCH] Bug 468443 Remove PUT/DELETE support from httpd.js, revert XX in content tests, r=jonas --- content/base/test/test_CrossSiteXHR.html | 70 +++++++++---------- .../base/test/test_CrossSiteXHR_cache.html | 60 ++++++++-------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/content/base/test/test_CrossSiteXHR.html b/content/base/test/test_CrossSiteXHR.html index 714f406efd17..bd15ffc380c2 100644 --- a/content/base/test/test_CrossSiteXHR.html +++ b/content/base/test/test_CrossSiteXHR.html @@ -279,29 +279,29 @@ function runTest() { headers: { "x-my-header": "myValue" }, allowHeaders: "x-my-header, $_%", }, - { method: "XXDELETE", - allowMethods: "XXDELETE", + { method: "DELETE", + allowMethods: "DELETE", }, - { method: "XXDELETE", - allowMethods: "POST, PUT, XXDELETE", + { method: "DELETE", + allowMethods: "POST, PUT, DELETE", }, - { method: "XXDELETE", - allowMethods: "POST, XXDELETE, PUT", + { method: "DELETE", + allowMethods: "POST, DELETE, PUT", }, - { method: "XXDELETE", - allowMethods: "XXDELETE, POST, PUT", + { method: "DELETE", + allowMethods: "DELETE, POST, PUT", }, - { method: "XXDELETE", - allowMethods: "POST ,PUT ,XXDELETE", + { method: "DELETE", + allowMethods: "POST ,PUT ,DELETE", }, - { method: "XXDELETE", - allowMethods: "POST,PUT,XXDELETE", + { method: "DELETE", + allowMethods: "POST,PUT,DELETE", }, - { method: "XXDELETE", - allowMethods: "POST , PUT , XXDELETE", + { method: "DELETE", + allowMethods: "POST , PUT , DELETE", }, - { method: "XXDELETE", - allowMethods: " ,, PUT ,, , , XXDELETE , ,", + { method: "DELETE", + allowMethods: " ,, PUT ,, , , DELETE , ,", }, { method: "POST", body: "hi there", @@ -369,8 +369,8 @@ function runTest() { headers: { "x-my-header": "myValue" }, allowHeaders: "x-my-header y-my-header", }, - { method: "XXDELETE", - allowHeaders: "XXDELETE", + { method: "DELETE", + allowHeaders: "DELETE", }, { method: "POST", noAllowPreflight: 1, @@ -380,34 +380,34 @@ function runTest() { headers: { "Content-Type": "foo/bar" }, noAllowPreflight: 1, }, - { method: "XXDELETE", + { method: "DELETE", }, - { method: "XXDELETE", + { method: "DELETE", allowMethods: "", }, - { method: "XXDELETE", + { method: "DELETE", allowMethods: "PUT", }, - { method: "XXDELETE", - allowMethods: "XXDELETEZ", + { method: "DELETE", + allowMethods: "DELETEZ", }, - { method: "XXDELETE", - allowMethods: "XXDELETE PUT", + { method: "DELETE", + allowMethods: "DELETE PUT", }, - { method: "XXDELETE", - allowMethods: "XXDELETE, PUT Z", + { method: "DELETE", + allowMethods: "DELETE, PUT Z", }, - { method: "XXDELETE", - allowMethods: "XXDELETE, PU(T", + { method: "DELETE", + allowMethods: "DELETE, PU(T", }, - { method: "XXDELETE", - allowMethods: "PUT XXDELETE", + { method: "DELETE", + allowMethods: "PUT DELETE", }, - { method: "XXDELETE", - allowMethods: "PUT Z, XXDELETE", + { method: "DELETE", + allowMethods: "PUT Z, DELETE", }, - { method: "XXDELETE", - allowMethods: "PU(T, XXDELETE", + { method: "DELETE", + allowMethods: "PU(T, DELETE", }, { method: "MYMETHOD", allowMethods: "myMethod", diff --git a/content/base/test/test_CrossSiteXHR_cache.html b/content/base/test/test_CrossSiteXHR_cache.html index 4c0698ae9fa0..81cfbbb5a933 100644 --- a/content/base/test/test_CrossSiteXHR_cache.html +++ b/content/base/test/test_CrossSiteXHR_cache.html @@ -203,18 +203,18 @@ function runTest() { }, { newTest: "*******" }, { pass: 0, - method: "XXDELETE", + method: "DELETE", }, { pass: 1, - method: "XXDELETE", - allowMethods: "XXDELETE", + method: "DELETE", + allowMethods: "DELETE", cacheTime: 3600 }, { pass: 1, - method: "XXDELETE", + method: "DELETE", }, { pass: 1, - method: "XXDELETE", + method: "DELETE", }, { pass: 0, method: "PATCH", @@ -235,35 +235,35 @@ function runTest() { method: "PATCH", }, { pass: 0, - method: "XXDELETE", + method: "DELETE", }, { pass: 0, - method: "XXPUT", + method: "PUT", }, { newTest: "*******" }, { pass: 0, - method: "XXDELETE", + method: "DELETE", }, { pass: 1, - method: "XXDELETE", - allowMethods: "XXDELETE", + method: "DELETE", + allowMethods: "DELETE", cacheTime: 2 }, { pause: 2.1 }, { pass: 0, - method: "XXDELETE", + method: "DELETE", }, { newTest: "*******" }, { pass: 1, - method: "XXDELETE", - allowMethods: "XXDELETE, XXPUT", + method: "DELETE", + allowMethods: "DELETE, PUT", cacheTime: 3600 }, { pass: 1, - method: "XXDELETE", + method: "DELETE", }, { pass: 1, - method: "XXPUT", + method: "PUT", }, { pass: 0, method: "PATCH", @@ -345,7 +345,7 @@ function runTest() { headers: { "x-my-header": "x-value" }, }, { pass: 0, - method: "XXPUT", + method: "PUT", }, { pass: 0, method: "GET", @@ -372,50 +372,50 @@ function runTest() { }, { newTest: "*******" }, { pass: 1, - method: "XXDELETE", - allowMethods: "XXDELETE", + method: "DELETE", + allowMethods: "DELETE", cacheTime: 3600, }, { pass: 1, - method: "XXDELETE" + method: "DELETE" }, { pass: 0, - method: "XXPUT" + method: "PUT" }, { pass: 0, - method: "XXDELETE" + method: "DELETE" }, { newTest: "*******" }, { pass: 1, - method: "XXDELETE", - allowMethods: "XXDELETE", + method: "DELETE", + allowMethods: "DELETE", cacheTime: 3600, }, { pass: 1, - method: "XXDELETE" + method: "DELETE" }, { pass: 0, - method: "XXDELETE", + method: "DELETE", headers: { "my-header": "value" }, }, { pass: 0, - method: "XXDELETE" + method: "DELETE" }, { newTest: "*******" }, { pass: 1, - method: "XXDELETE", - allowMethods: "XXDELETE", + method: "DELETE", + allowMethods: "DELETE", cacheTime: 3600, }, { pass: 1, - method: "XXDELETE" + method: "DELETE" }, { pass: 0, method: "GET", noOrigin: 1, }, { pass: 0, - method: "XXDELETE" + method: "DELETE" }, ];