Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Typofixes #140

Merged
merged 1 commit into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion overrides/path/php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PATH="${PATH//`dirname "$0"`:/}"
real_php=`command -v php`
PATH="`dirname "$0"`:$PATH"

# Strip out our PHP_INI_SCAN_DIR - if this file has been run succesfully, then it's not necessary,
# Strip out our PHP_INI_SCAN_DIR - if this file has been run successfully, then it's not necessary,
# and it can cause problems (since it overrides any default scan directories configured)
export INJECTED_PHP_INI_DIR=$HTTP_TOOLKIT_OVERRIDE_PATH/php
export PHP_INI_SCAN_DIR="${PHP_INI_SCAN_DIR//:$INJECTED_PHP_INI_DIR/}"
Expand Down
4 changes: 2 additions & 2 deletions src/api/api-model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export class ApiModel {
};
}

// Seperate purely to support the GQL API resolver structure
// Separate purely to support the GQL API resolver structure
getDnsServers(proxyPort: number) {
return withFallback(async () => {
const dnsServer = await getDnsServer(proxyPort);
Expand Down Expand Up @@ -140,7 +140,7 @@ export class ApiModel {
};
}

// Seperate purely to support the GQL API resolver structure
// Separate purely to support the GQL API resolver structure
async isInterceptorActive(id: string, proxyPort: number) {
const interceptor = this.interceptors[id];

Expand Down
2 changes: 1 addition & 1 deletion src/client/http-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export class HttpClient {

// Node supports sending raw headers via [key, value, key, value] array, but if we do
// so with 'headers' above then we can't removeHeader first (to disable the defaults).
// Instead we remove headers and then manunally trigger the 'raw' write behaviour.
// Instead we remove headers and then manually trigger the 'raw' write behaviour.

request.removeHeader('connection');
request.removeHeader('transfer-encoding');
Expand Down
2 changes: 1 addition & 1 deletion src/interceptors/docker/docker-commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export async function transformContainerCreationConfig(
baseImageConfig?.ContainerConfig;

// Combine the image config with the container creation options. Most
// fields are overriden by container config, a couple are merged:
// fields are overridden by container config, a couple are merged:
const currentConfig: Docker.ContainerCreateOptions = {
...imageContainerConfig,
...containerConfig,
Expand Down
2 changes: 1 addition & 1 deletion src/interceptors/docker/docker-tunnel-proxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const pullTunnelImage = (docker: Docker) =>
.then(stream => waitForDockerStream(docker, stream));

// Parallel mutation of a single Docker container's state is asking for trouble, so we use
// a simple lock over all operations (across all proxes, not per-proxy, just for simplicity/safety).
// a simple lock over all operations (across all proxies, not per-proxy, just for simplicity/safety).
const containerMutex = new Mutex();

// Starts pulling the docker tunnel image, just to ensure it's available if we need it.
Expand Down
2 changes: 1 addition & 1 deletion src/interceptors/terminal/terminal-env-overrides.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export function getTerminalEnvVars(
| 'posix-runtime-inherit'
| 'powershell-runtime-inherit',

// All 3 of the below must be overriden together, or not at all, to avoid
// All 3 of the below must be overridden together, or not at all, to avoid
// mixing platforms & default (platform-specific) paths
targetEnvConfig?: {
httpToolkitHost: string,
Expand Down
6 changes: 3 additions & 3 deletions src/interceptors/terminal/terminal-scripts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export const getBashShellScript = (callbackUrl: string, env: { [name: string]: s
fi

if command -v curl >/dev/null 2>&1; then
# Let the HTTP Toolkit app know this ran succesfully
# Let the HTTP Toolkit app know this ran successfully
(curl --noproxy '*' -X POST "${callbackUrl}" >/dev/null 2>&1 &) &> /dev/null
fi

Expand Down Expand Up @@ -117,7 +117,7 @@ export const getFishShellScript = (callbackUrl: string, env: { [name: string]: s
end

if command -v curl >/dev/null 2>&1
# Let the HTTP Toolkit app know this ran succesfully
# Let the HTTP Toolkit app know this ran successfully
curl --noproxy '*' -X POST "${callbackUrl}" >/dev/null 2>&1 &
end

Expand Down Expand Up @@ -157,7 +157,7 @@ ${
# Then we disable cert checks completely - all traffic will go to us, we'll handle HTTPS upstream
$PSDefaultParameterValues["invoke-webrequest:SkipCertificateCheck"] = $True

# Let the HTTP Toolkit app know this ran succesfully
# Let the HTTP Toolkit app know this ran successfully
Start-Job -ScriptBlock { Invoke-WebRequest "${callbackUrl}" -NoProxy -Method 'POST' } | out-null

Write-Host "HTTP Toolkit interception enabled\`nTo stop intercepting type " -NoNewline
Expand Down
Loading