diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | ext/standard/info.c | 2 | ||||
| -rw-r--r-- | main/php_content_types.c | 14 |
3 files changed, 16 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 2cd1acbc29..dc63bfa22c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -73,7 +73,7 @@ LIBOBJS=@LIBOBJS@ SOURCE = main.c internal_functions.c snprintf.c php3_sprintf.c \ configuration-parser.c configuration-scanner.c request_info.c \ safe_mode.c fopen-wrappers.c php3_realpath.c alloca.c output.c \ - php_ini.c SAPI.c cgi_main.c rfc1867.c dlist.c + php_ini.c SAPI.c cgi_main.c rfc1867.c dlist.c rfc1867.c OBJS = $(SOURCE:.c=.o) $(LIBOBJS) PHPLIBS = -Llibzend -lzend -Lext -lphpext LIBS = $(PHPLIBS) $(EXTRA_LIBS) @LIBS@ diff --git a/ext/standard/info.c b/ext/standard/info.c index 5388c02d99..e2f4a8d20f 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -213,7 +213,7 @@ PHPAPI void php_print_info(int flag) } PUTS("\"]</b></td><td bgcolor=\"" PHP_CONTENTS_COLOR "\">"); if ((*tmp)->type == IS_ARRAY) { - PUTS("<br><pre>"); + PUTS("<pre>"); zend_print_zval_r(*tmp, 0); PUTS("</pre>"); } else { diff --git a/main/php_content_types.c b/main/php_content_types.c new file mode 100644 index 0000000000..8ee79dc0e5 --- /dev/null +++ b/main/php_content_types.c @@ -0,0 +1,14 @@ +#include "php.h" +#include "SAPI.h" +#include "rfc1867.h" + +static sapi_post_content_type_reader php_post_content_types[] = { + { MULTIPART_CONTENT_TYPE, sizeof(MULTIPART_CONTENT_TYPE)-1, rfc1867_post_reader }, + { NULL, 0, NULL } +} + +int php_startup_SAPI_content_types() +{ + sapi_register_post_readers(php_post_content_types); + return SUCCESS; +} |