diff options
| author | Tim Graham <timograham@gmail.com> | 2014-06-18 14:35:38 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-06-18 14:38:19 -0400 |
| commit | ce06ef5569705ab4a7c0a495deb7fe5efb63c153 (patch) | |
| tree | 9169ce87743bb739aec07fbbe5832ca7f5c47689 | |
| parent | 7342784b99a45cf661fd23f3ffd52eb02ce5cf3a (diff) | |
[1.5.x] Fixed #22859 -- Improved crossDomain technique in CSRF example.
Thanks flisky for the report.
Backport of 0be4d64487 from master
| -rw-r--r-- | docs/ref/contrib/csrf.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docs/ref/contrib/csrf.txt b/docs/ref/contrib/csrf.txt index a5f4492be8..4c942aa422 100644 --- a/docs/ref/contrib/csrf.txt +++ b/docs/ref/contrib/csrf.txt @@ -190,9 +190,8 @@ jQuery 1.5 and newer in order to replace the ``sameOrigin`` logic above: return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method)); } $.ajaxSetup({ - crossDomain: false, // obviates need for sameOrigin test beforeSend: function(xhr, settings) { - if (!csrfSafeMethod(settings.type)) { + if (!csrfSafeMethod(settings.type) && !this.crossDomain) { xhr.setRequestHeader("X-CSRFToken", csrftoken); } } |
