[v3] - fix(windows): resolve doctor-installed perl and quote perl path (#1174 )

Use escapeshellarg instead
Merge branch 'refs/heads/v3' into pr/win-openssl-perl-path
2026-07-10 02:15:36 +08:00 · 2026-07-08 13:59:05 +08:00 · 2026-07-08 13:21:52 +08:00 · 2026-07-08 13:19:36 +08:00 · 2026-05-27 22:30:04 -07:00 · 2026-05-27 22:07:57 -07:00
1 changed files with 1 additions and 1 deletions
--- a/src/Package/Library/openssl.php
+++ b/src/Package/Library/openssl.php
@@ -42,7 +42,7 @@ class openssl
        $perl = ApplicationContext::get('perl');
        $cmd = cmd()->cd($lib->getSourceDir())
            ->exec(
-                "{$perl} Configure zlib VC-WIN64A " .
+                escapeshellarg($perl) . ' Configure zlib VC-WIN64A ' .
                'no-shared ' .
                '--prefix=' . quote($lib->getBuildRootPath()) . ' ' .
                '--with-zlib-lib=' . quote($lib->getLibDir()) . ' ' .
Author	SHA1	Message	Date
Jerry Ma	996cca12c0	[v3] - fix(windows): resolve doctor-installed perl and quote perl path (#1174 )	2026-07-08 13:59:05 +08:00
crazywhalecc	5451945972	Use escapeshellarg instead	2026-07-08 13:21:52 +08:00
crazywhalecc	fc1673e37f	Merge branch 'refs/heads/v3' into pr/win-openssl-perl-path # Conflicts: # src/Package/Library/openssl.php	2026-07-08 13:19:36 +08:00
Luther Monson	6c59456c02	fix(windows): consolidate to single canonical strawberry-perl path Per review: spc's pkg config, doctor, and MSVCToolchain all use PKG_ROOT_PATH\strawberry-perl. The arch-suffixed strawberry-perl-{arch}-win path was stale and shouldn't be juggled alongside it. Validate against the one canonical pkg-root path, falling back to WindowsUtil::findCommand.	2026-05-27 22:30:04 -07:00
Luther Monson	0e8a806640	fix(windows): resolve doctor-installed perl and quote perl path Two related fixes for OpenSSL builds on Windows: 1. spc doctor installs Strawberry Perl under `pkgroot/strawberry-perl/`, but the validate() check only looks at the arch-specific native path (`strawberry-perl-x86_64-win`). When a user runs `spc doctor` to install perl, the subsequent build fails because the doctor's install layout isn't on the lookup list. Add it as a fallback before falling through to WindowsUtil::findCommand. 2. Wrap the resolved perl path in quote() when building the Configure command. WindowsUtil::findCommand can return a path containing spaces (e.g. `C:\Program Files\...`), which then splits the cmd.exe invocation. Quoting matches how every other interpolated path in this command is handled.	2026-05-27 22:07:57 -07:00