diff options
Diffstat (limited to 'devtools/client')
| -rw-r--r-- | devtools/client/scratchpad/scratchpad.xul | 2 | ||||
| -rw-r--r-- | devtools/client/shared/curl.js | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/devtools/client/scratchpad/scratchpad.xul b/devtools/client/scratchpad/scratchpad.xul index 0603fa95e..3712f163d 100644 --- a/devtools/client/scratchpad/scratchpad.xul +++ b/devtools/client/scratchpad/scratchpad.xul @@ -121,7 +121,7 @@ <key id="sp-key-reloadAndRun" key="&reloadAndRun.key;" command="sp-cmd-reloadAndRun" - modifiers="accel,shift"/> + modifiers="accel,alt"/> <key id="sp-key-evalFunction" key="&evalFunction.key;" command="sp-cmd-evalFunction" diff --git a/devtools/client/shared/curl.js b/devtools/client/shared/curl.js index 978cbad9c..44465193f 100644 --- a/devtools/client/shared/curl.js +++ b/devtools/client/shared/curl.js @@ -107,7 +107,13 @@ const Curl = { // Add http version. if (data.httpVersion && data.httpVersion != DEFAULT_HTTP_VERSION) { - command.push("--" + data.httpVersion.split("/")[1]); + let version = data.httpVersion.split("/")[1]; + // curl accepts --http1.0, --http1.1 and --http2 for HTTP/1.0, HTTP/1.1 + // and HTTP/2 protocols respectively. But the corresponding values in + // data.httpVersion are HTTP/1.0, HTTP/1.1 and HTTP/2.0 + // So in case of HTTP/2.0 (which should ideally be HTTP/2) we are using + // only major version, and full version in other cases + command.push("--http" + (version == "2.0" ? version.split(".")[0] : version)); } // Add request headers. |