Two smaller bugfixes.

[fa-stable.git] / js / JsHttpRequest.js

diff --git a/js/JsHttpRequest.js b/js/JsHttpRequest.js
index 3ec48fd3328e35c2fc22bf4055d0e9adc9ea6a2a..654362dc2aeaf863115ebe4626f4cd1b6c268297 100644 (file)
--- a/js/JsHttpRequest.js
+++ b/js/JsHttpRequest.js
@@ -255,7 +255,7 @@ function JsHttpRequest() {
                     if (tn == 'FORM') {
                         // FORM itself is passed.
                         formAdded = true;
-                    } else if (tn == 'INPUT' || tn == 'TEXTAREA' || tn == 'SELECT') {
+                    } else if (tn == 'INPUT' || tn == 'TEXTAREA' || tn == 'SELECT' || tn == 'BUTTON') {
                         // This is a single form elemenent.
                     } else {
                         return this._error('inv_form_el', (v.name||''), v.tagName);
@@ -457,7 +457,7 @@ JsHttpRequest.LOADERS.xml = { loader: function(req) {
         if (this.queryElem.length) return ['xml_no_form_upl'];
         
         // XMLHttpRequest (and MS ActiveX'es) cannot work with different domains.
-        if (this.url.match(new RegExp('^([a-z]+://[^\\/]+)(.*)', 'i'))) {
+        if (this.url.match(new RegExp('^([a-z]+://[^\\/]+)(.*)((:[0-9]*)+)', 'i'))) {
                // We MUST also check if protocols matched: cannot send from HTTP 
                // to HTTPS and vice versa.
             if (RegExp.$1.toLowerCase() != document.location.protocol + '//' + document.location.hostname.toLowerCase()) {