Skip to content

Commit 2f85190

Browse files
committed
sapi: Eliminate php_content_types
All its contents have been folded elsewhere. XXX: Perhaps php_std_post_handler belongs in php_variables.h?
1 parent 611c0a9 commit 2f85190

9 files changed

Lines changed: 2 additions & 43 deletions

File tree

‎configure.ac‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1650,7 +1650,6 @@ PHP_ADD_SOURCES([main], m4_normalize([
16501650
main.c
16511651
network.c
16521652
output.c
1653-
php_content_types.c
16541653
php_ini_builder.c
16551654
php_ini.c
16561655
php_glob.c

‎ext/mbstring/mbstring.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646

4747
#include "php_globals.h"
4848
#include "rfc1867.h"
49-
#include "php_content_types.h"
5049
#include "SAPI.h"
5150
#include "php_unicode.h"
5251
#include "TSRM.h"

‎main/SAPI.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333

3434
#include "rfc1867.h"
3535

36-
#include "php_content_types.h"
37-
3836
#ifdef ZTS
3937
SAPI_API int sapi_globals_id;
4038
SAPI_API size_t sapi_globals_offset;

‎main/SAPI.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,7 @@ END_EXTERN_C()
307307
#define DEFAULT_POST_CONTENT_TYPE "application/x-www-form-urlencoded"
308308

309309
BEGIN_EXTERN_C()
310+
SAPI_API SAPI_POST_HANDLER_FUNC(php_std_post_handler);
310311
SAPI_API SAPI_POST_READER_FUNC(sapi_read_standard_form_data);
311312
SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data);
312313
SAPI_API SAPI_INPUT_FILTER_FUNC(php_default_input_filter);

‎main/main.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
#include "zend_system_id.h"
8080
#include "zend_smart_string.h"
8181

82-
#include "php_content_types.h"
8382
#include "php_ticks.h"
8483
#include "php_streams.h"
8584
#include "php_open_temporary_file.h"

‎main/php_content_types.c‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎main/php_content_types.h‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎main/php_variables.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "zend_smart_str.h"
2121
#include "php_variables.h"
2222
#include "php_globals.h"
23-
#include "php_content_types.h"
2423
#include "SAPI.h"
2524
#include "zend_globals.h"
2625
#include "zend_exceptions.h"

‎win32/build/config.w32‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ ADD_FLAG("CFLAGS_BD_ZEND", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
288288

289289
ADD_SOURCES("main", "main.c snprintf.c spprintf.c getopt.c fopen_wrappers.c \
290290
php_ini_builder.c php_glob.c \
291-
php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
291+
php_scandir.c php_ini.c SAPI.c rfc1867.c strlcpy.c \
292292
strlcat.c reentrancy.c php_variables.c php_ticks.c network.c \
293293
php_open_temporary_file.c output.c internal_functions.c \
294294
php_syslog.c php_odbc_utils.c safe_bcmp.c");

0 commit comments

Comments
 (0)