mirror of
https://github.com/kkroening/ffmpeg-python.git
synced 2026-06-05 02:18:17 +08:00
Merge 7e7e2f424d9a6deaed4b28d8854d9705fe1135c4 into df129c7ba30aaa9ffffb81a48f53aa7253b0b4e6
This commit is contained in:
commit
9f5e7292e4
5
doc/html/_static/jquery-3.2.1.js
vendored
5
doc/html/_static/jquery-3.2.1.js
vendored
@ -8712,6 +8712,11 @@ function ajaxConvert( s, response, jqXHR, isSuccess ) {
|
|||||||
// Convert response if prev dataType is non-auto and differs from current
|
// Convert response if prev dataType is non-auto and differs from current
|
||||||
} else if ( prev !== "*" && prev !== current ) {
|
} else if ( prev !== "*" && prev !== current ) {
|
||||||
|
|
||||||
|
// Mitigate possible XSS vulnerability (gh-2432)
|
||||||
|
if ( s.crossDomain && current === "script" ) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
// Seek a direct converter
|
// Seek a direct converter
|
||||||
conv = converters[ prev + " " + current ] || converters[ "* " + current ];
|
conv = converters[ prev + " " + current ] || converters[ "* " + current ];
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user