Changeset 12674

Timestamp:

02/23/08 22:42:59 (3 months ago)

Author:

jburke

Message:

Fixes #5801. Send X-Requested-With: XMLHttpRequest header with dojo.xhr calls, to match behavior of other libraries.

Files:

• dojo/trunk/_base/xhr.js (modified) (2 diffs)

dojo/trunk/_base/xhr.js

@@ -592 +592 @@
                 var ioArgs = dfd.ioArgs;
                 var args = ioArgs.args;
-                ioArgs.xhr.open(type, ioArgs.url, args.sync !== true, args.user || undefined, args.password || undefined);
+                var xhr = ioArgs.xhr;
+                xhr.open(type, ioArgs.url, args.sync !== true, args.user || undefined, args.password || undefined);
                 if(args.headers){
                         for(var hdr in args.headers){
@@ -598 +599 @@
                                         args.contentType = args.headers[hdr];
                                 }else{
-                                        ioArgs.xhr.setRequestHeader(hdr, args.headers[hdr]);
+                                        xhr.setRequestHeader(hdr, args.headers[hdr]);
                                 }
                         }
                 }
                 // FIXME: is this appropriate for all content types?
-                ioArgs.xhr.setRequestHeader("Content-Type", args.contentType || _defaultContentType);
+                xhr.setRequestHeader("Content-Type", args.contentType || _defaultContentType);
+                if(!args.headers || !args.headers["X-Requested-With"]){
+                        xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+                }
                 // FIXME: set other headers here!
                 try{
-                        ioArgs.xhr.send(ioArgs.query);
+                        xhr.send(ioArgs.query);
                 }catch(e){
                         dfd.cancel();
                 }
                 _d._ioWatch(dfd, _validCheck, _ioCheck, _resHandle);
+                xhr = null;
                 return dfd; //Deferred
         }