Skip to content

ext/phar: remove dead code #20199

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ext/phar: remove dead code #20199

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 1 addition & 14 deletions ext/phar/phar_object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;

Expand All @@ -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)) {
Expand Down Expand Up @@ -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] == '/') {
Expand All @@ -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);
Expand Down