cvs: php4 /main Makefile.in SAPI.c fdfdata.c fdfdata.h

steinm Wed Jul 5 01:57:37 2000 EDT Added files: /php4/main fdfdata.c fdfdata.h Modified files: /php4/main Makefile.in SAPI.c Log: - fixed handling of fdf data (application/vnd.fdf) Index: php4/main/Makefile.in diff -u php4/main/Makefile.in:1.2 php4/main/Makefile.in:1.3 --- php4/main/Makefile.in:1.2 Sun Jun 11 11:51:17 2000 +++ php4/main/Makefile.in Wed Jul 5 01:57:37 2000 @@ -4,7 +4,7 @@ main.c internal_functions.c snprintf.c php_sprintf.c \ configuration-parser.c configuration-scanner.c \ safe_mode.c fopen-wrappers.c php_realpath.c alloca.c \ - php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ + php_ini.c SAPI.c rfc1867.c fdfdata.c php_content_types.c strlcpy.c \ strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c php_virtual_cwd.c include $(top_srcdir)/build/ltlib.mk Index: php4/main/SAPI.c diff -u php4/main/SAPI.c:1.77 php4/main/SAPI.c:1.78 --- php4/main/SAPI.c:1.77 Sat Jul 1 11:06:11 2000 +++ php4/main/SAPI.c Wed Jul 5 01:57:37 2000 @@ -28,6 +28,9 @@ #endif #include "rfc1867.h" +#if HAVE_FDFLIB +#include "fdfdata.h" +#endif #ifdef PHP_WIN32 #define STRCASECMP stricmp @@ -35,12 +38,14 @@ #define STRCASECMP strcasecmp #endif +#include "php_content_types.h" SAPI_POST_READER_FUNC(sapi_read_standard_form_data); +SAPI_POST_READER_FUNC(php_default_post_reader); static sapi_post_entry supported_post_entries[] = { #if HAVE_FDFLIB - { "application/vnd.fdf", sizeof("application/vnd.fdf")-1, sapi_read_standard_form_data }, + { "application/vnd.fdf", sizeof("application/vnd.fdf")-1, php_default_post_reader, fdf_post_handler}, #endif { NULL, 0, NULL } }; Index: php4/main/fdfdata.c +++ php4/main/fdfdata.c /* +----------------------------------------------------------------------+ | PHP version 4.0 | +----------------------------------------------------------------------+ | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 2.02 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available at through the world-wide-web at | | http://www.php.net/license/2_02.txt. | | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Authors: Uwe Steinmann <steinm@php.net> | +----------------------------------------------------------------------+ */ /* $Id: fdfdata.c,v 1.1 2000/07/05 08:57:37 steinm Exp $ */ #include <stdio.h> #include "php.h" #include "ext/standard/php_standard.h" #include "zend_globals.h" #include "php_globals.h" #include "php_variables.h" #include "fdfdata.h" #if HAVE_FDFLIB SAPI_POST_HANDLER_FUNC(fdf_post_handler) { zval *array_ptr = (zval *) arg; } #endif /* * Local variables: * tab-width: 4 * c-basic-offset: 4 * End: */ Index: php4/main/fdfdata.h +++ php4/main/fdfdata.h #ifndef FDFDATA_H #define FDFDATA_H #include "SAPI.h" SAPI_POST_HANDLER_FUNC(fdf_post_handler); #endif /* FDFDATA_H */