Skip to content

Commit c4f434b

Browse files
committed
sapi: Remove sapi_activate_headers_only
Introduced in 99c7ddc; previously called in some SAPIs, but the callsites have all been removed for years.
1 parent 56afe82 commit c4f434b

2 files changed

Lines changed: 0 additions & 40 deletions

File tree

‎main/SAPI.c‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -355,45 +355,6 @@ SAPI_API size_t sapi_apply_default_charset(char **mimetype, size_t len)
355355
return 0;
356356
}
357357

358-
SAPI_API void sapi_activate_headers_only(void)
359-
{
360-
if (SG(request_info).headers_read == 1)
361-
return;
362-
SG(request_info).headers_read = 1;
363-
zend_llist_init(&SG(sapi_headers).headers, sizeof(sapi_header_struct),
364-
(void (*)(void *)) sapi_free_header, 0);
365-
SG(sapi_headers).send_default_content_type = 1;
366-
367-
/* SG(sapi_headers).http_response_code = 200; */
368-
SG(sapi_headers).http_status_line = NULL;
369-
SG(sapi_headers).mimetype = NULL;
370-
SG(read_post_bytes) = 0;
371-
SG(request_info).request_body = NULL;
372-
SG(request_info).current_user = NULL;
373-
SG(request_info).no_headers = 0;
374-
SG(request_info).post_entry = NULL;
375-
SG(global_request_time) = 0;
376-
377-
/*
378-
* It's possible to override this general case in the activate() callback,
379-
* if necessary.
380-
*/
381-
if (SG(request_info).request_method && !strcmp(SG(request_info).request_method, "HEAD")) {
382-
SG(request_info).headers_only = 1;
383-
} else {
384-
SG(request_info).headers_only = 0;
385-
}
386-
if (SG(server_context)) {
387-
SG(request_info).cookie_data = sapi_module.read_cookies();
388-
if (sapi_module.activate) {
389-
sapi_module.activate();
390-
}
391-
}
392-
if (sapi_module.input_filter_init ) {
393-
sapi_module.input_filter_init();
394-
}
395-
}
396-
397358
/*
398359
* Called from php_request_startup() for every request.
399360
*/

‎main/SAPI.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ SAPI_API char *sapi_getenv(const char *name, size_t name_len);
222222
SAPI_API char *sapi_get_default_content_type(void);
223223
SAPI_API void sapi_get_default_content_type_header(sapi_header_struct *default_header);
224224
SAPI_API size_t sapi_apply_default_charset(char **mimetype, size_t len);
225-
SAPI_API void sapi_activate_headers_only(void);
226225

227226
SAPI_API double sapi_get_request_time(void);
228227
END_EXTERN_C()

0 commit comments

Comments
 (0)