diff options
| author | njhamann <njhamann@gmail.com> | 2013-08-24 13:02:17 -0400 |
|---|---|---|
| committer | Dave Methvin <dave.methvin@gmail.com> | 2013-11-13 22:55:12 -0500 |
| commit | c58a6435ef2a05d1e0c9f38a29c1d2d18eaa78aa (patch) | |
| tree | f3602174fde80115f75d077390a34f7003f2e745 | |
| parent | 97d53838e00f27d7dcf51f6a5627d8675f998284 (diff) | |
| download | jquery-c58a6435ef2a05d1e0c9f38a29c1d2d18eaa78aa.tar.gz jquery-c58a6435ef2a05d1e0c9f38a29c1d2d18eaa78aa.zip | |
Fix #14036. Remove user/pass from ajaxLocation. Close gh-1340.
(cherry picked from commit eb1a2afc9fb1d990d10358aab0e17bc0ce1d1db3)
| -rw-r--r-- | AUTHORS.txt | 1 | ||||
| -rw-r--r-- | src/ajax.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/AUTHORS.txt b/AUTHORS.txt index 74a1b912b..b2d21df46 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -172,3 +172,4 @@ Terry Jones <terry@jon.es> Jeremy Dunck <jdunck@gmail.com> Chris Price <price.c@gmail.com> Amey Sakhadeo <me@ameyms.com> +Noah Hamann <njhamann@gmail.com> diff --git a/src/ajax.js b/src/ajax.js index 174e8274d..1b01fd6a5 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) |