Skip to content

Commit f36859c

Browse files
committed
Correctly detect HTTPS
1 parent 3987213 commit f36859c

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

demo-web/public/cgi-worker.js

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

source/PhpCgiBase.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,12 +419,14 @@ export class PhpCgiBase
419419
putEnv(php, name, value);
420420
}
421421

422+
const protocol = selfUrl.protocol.substr(0, selfUrl.protocol.length - 1);
423+
422424
putEnv(php, 'SERVER_SOFTWARE', globalThis.navigator ? globalThis.navigator.userAgent : (globalThis.process ? 'Node ' + globalThis.process.version : 'Javascript - Unknown'));
423425
putEnv(php, 'REQUEST_METHOD', method);
424426
putEnv(php, 'REMOTE_ADDR', '127.0.0.1');
425427
putEnv(php, 'HTTP_HOST', selfUrl.host);
426-
putEnv(php, 'REQUEST_SCHEME', selfUrl.protocol);
427-
putEnv(php, 'HTTPS', selfUrl.protocol === 'https' ? 'on' : 'off');
428+
putEnv(php, 'REQUEST_SCHEME', protocol);
429+
putEnv(php, 'HTTPS', protocol === 'https' ? 'on' : 'off');
428430

429431
putEnv(php, 'DOCUMENT_ROOT', docroot);
430432
putEnv(php, 'REQUEST_URI', originalPath);

0 commit comments

Comments
 (0)