[PECL-CVS] [pecl-networking-ssh2] master: Fixes #90 (#93)

Author: Rasmus Lerdorf (rlerdorf)
Committer: GitHub (web-flow)
Pusher: rlerdorf
Date: 2026-04-04T06:14:30-04:00

Commit: https://github.com/php/pecl-networking-ssh2/commit/301ca837c576886117b41911332e737ac4f4e144
Raw diff: https://github.com/php/pecl-networking-ssh2/commit/301ca837c576886117b41911332e737ac4f4e144.diff

Fixes #90 (#93)

* Fixes #90

* The minimum PHP version is 8.0

Changed paths:
  M  package.xml
  M  ssh2_fopen_wrappers.c


Diff:

diff --git a/package.xml b/package.xml
index f463b36..4714e84 100644
--- a/package.xml
+++ b/package.xml
@@ -79,7 +79,7 @@
     <dependencies>
         <required>
             <php>
-                <min>7.0.0</min>
+                <min>8.0.0</min>
             </php>
             <pearinstaller>
                 <min>1.4.0</min>
diff --git a/ssh2_fopen_wrappers.c b/ssh2_fopen_wrappers.c
index 03e28de..dd109a0 100644
--- a/ssh2_fopen_wrappers.c
+++ b/ssh2_fopen_wrappers.c
@@ -277,27 +277,17 @@ php_url *php_ssh2_fopen_wrapper_parse_path(const char *path, char *type, php_str
 	}
 
 	/*
-		Find resource->path in the path string, then copy the entire string from the original path.
-		This includes ?query#fragment in the path string
+		Find resource->path in the original path string, then copy from that
+		position to the end. This preserves ?query and #fragment (e.g. filenames
+		containing '#') which php_url_parse() strips from resource->path.
 	*/
-// TODO copy seems uneeded
-#if PHP_VERSION_ID < 70300
 	{
-	char * s;
-
-	s = resource->path;
-	resource->path = estrdup(strstr(path, resource->path));
-	efree(s);
+	const char *path_in_original = strstr(path, ZSTR_VAL(resource->path));
+	if (path_in_original) {
+		zend_string_release(resource->path);
+		resource->path = zend_string_init(path_in_original, strlen(path_in_original), 0);
 	}
-#else
-	{
-	zend_string *tmp;
-
-	tmp = resource->path;
-	resource->path = zend_string_init(ZSTR_VAL(resource->path), ZSTR_LEN(resource->path), 0);
-	zend_string_release(tmp);
 	}
-#endif
 
 	/* Look for a resource ID to reuse a session */
 	if (is_numeric_string(SSH2_URL_STR(resource->host), SSH2_URL_LEN(resource->host), &resource_id, NULL, 0) == IS_LONG) {