diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 31b9261ba137..5582b449dbb8 100644
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -570,7 +570,7 @@ PHP_METHOD(Phar, webPhar)
 	const char *basename;
 	size_t fname_len, index_php_len = 0;
 	size_t entry_len;
-	int code, not_cgi;
+	int code;
 	phar_archive_data *phar = NULL;
 	phar_entry_info *info = NULL;
 	size_t sapi_mod_name_len = strlen(sapi_module.name);
@@ -681,7 +681,6 @@ PHP_METHOD(Phar, webPhar)
 			pt = estrndup(testit, (pt - testit) + (fname_len - (basename - fname)));
 			efree(testit);
 		}
-		not_cgi = 0;
 	} else {
 		path_info = SG(request_info).request_uri;
 
@@ -695,7 +694,6 @@ PHP_METHOD(Phar, webPhar)
 		entry = estrndup(pt + (fname_len - (basename - fname)), entry_len);
 
 		pt = estrndup(path_info, (pt - path_info) + (fname_len - (basename - fname)));
-		not_cgi = 1;
 	}
 
 	if (ZEND_FCI_INITIALIZED(rewrite_fci)) {
@@ -764,19 +762,12 @@ PHP_METHOD(Phar, webPhar)
 			(info = phar_get_entry_info(phar, entry, entry_len, NULL, false)) == NULL) {
 			phar_do_404(phar, fname, fname_len, f404);
 		} else {
-			char *tmp = NULL, sa = '\0';
 			sapi_header_line ctr = {0};
 			ctr.response_code = 301;
 			ctr.line_len = sizeof("HTTP/1.1 301 Moved Permanently")-1;
 			ctr.line = "HTTP/1.1 301 Moved Permanently";
 			sapi_header_op(SAPI_HEADER_REPLACE, &ctr);
 
-			if (not_cgi) {
-				tmp = strstr(path_info, basename) + fname_len;
-				sa = *tmp;
-				*tmp = '\0';
-			}
-
 			ctr.response_code = 0;
 
 			if (path_info[strlen(path_info)-1] == '/') {
@@ -785,10 +776,6 @@ PHP_METHOD(Phar, webPhar)
 				ctr.line_len = spprintf((char **) &(ctr.line), 4096, "Location: %s%s", path_info, entry);
 			}
 
-			if (not_cgi) {
-				*tmp = sa;
-			}
-
 			sapi_header_op(SAPI_HEADER_REPLACE, &ctr);
 			sapi_send_headers();
 			efree((void *) ctr.line);