aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS.txt2
-rw-r--r--src/ajax.js2
2 files changed, 3 insertions, 1 deletions
diff --git a/AUTHORS.txt b/AUTHORS.txt
index 01bb1f804..04e0542dd 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -176,3 +176,5 @@ Jeremy Dunck <jdunck@gmail.com>
Chris Price <price.c@gmail.com>
Guy Bedford <guybedford@gmail.com>
Amey Sakhadeo <me@ameyms.com>
+Noah Hamann <njhamann@gmail.com>
+
diff --git a/src/ajax.js b/src/ajax.js
index 15a5e9d3b..d39de2a9b 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -21,7 +21,7 @@ var
rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
rnoContent = /^(?:GET|HEAD)$/,
rprotocol = /^\/\//,
- rurl = /^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,
+ rurl = /^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,
/* Prefilters
* 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)