CVS update: php3

Date: Friday December 4, 1998 @ 11:45 Author: ssb Update of /repository/php3 In directory asf:/u/temp/cvs-serv23285 Modified Files: acconfig.h config.h.in internal_functions.c main.c Log Message: first attempt at hooking mod_php3 into mod_dav Index: php3/acconfig.h diff -c php3/acconfig.h:1.69 php3/acconfig.h:1.70 *** php3/acconfig.h:1.69 Tue Nov 17 18:21:14 1998 --- php3/acconfig.h Fri Dec 4 11:45:03 1998 *************** *** 208,213 **** --- 208,216 ---- /* Define if you want to enable the PHP TCP/IP debugger (experimental) */ #define PHP_DEBUGGER 0 + /* Define if you want to enable PHP RPC (experimental) */ + #define PHP_RPC 0 + /* Define if you want to enable bc style precision math support */ #define WITH_BCMATH 0 *************** *** 245,247 **** --- 248,255 ---- /* Define if you have the pdflib library */ #define HAVE_PDFLIB 0 + /* Define if you have the fdftk library */ + #define HAVE_FDFLIB 0 + + /* Define to compile with mod_dav support */ + #define HAVE_MOD_DAV 0 Index: php3/config.h.in diff -c php3/config.h.in:1.122 php3/config.h.in:1.123 *** php3/config.h.in:1.122 Wed Dec 2 11:16:11 1998 --- php3/config.h.in Fri Dec 4 11:45:03 1998 *************** *** 285,292 **** /* Define if you have the pdflib library */ #define HAVE_PDFLIB 0 ! /* Define if you have the fdftk lib library */ #define HAVE_FDFLIB 0 /* Define if you have the crypt function. */ #undef HAVE_CRYPT --- 285,295 ---- /* Define if you have the pdflib library */ #define HAVE_PDFLIB 0 ! /* Define if you have the fdftk library */ #define HAVE_FDFLIB 0 + + /* Define to compile with mod_dav support */ + #define HAVE_MOD_DAV 0 /* Define if you have the crypt function. */ #undef HAVE_CRYPT Index: php3/internal_functions.c diff -c php3/internal_functions.c:1.332 php3/internal_functions.c:1.333 *** php3/internal_functions.c:1.332 Wed Dec 2 11:16:12 1998 --- php3/internal_functions.c Fri Dec 4 11:45:03 1998 *************** *** 29,35 **** */ ! /* $Id: internal_functions.c,v 1.332 1998/12/02 16:16:12 steinm Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: internal_functions.c,v 1.333 1998/12/04 16:45:03 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 94,99 **** --- 94,100 ---- #include "functions/php3_pdf.h" #include "functions/php3_fdf.h" #include "functions/php3_sysvsem.h" + #include "functions/php3_dav.h" extern php3_ini_structure php3_ini; *************** *** 154,159 **** --- 155,161 ---- {"PDF", pdf_module_ptr}, {"FDF", fdf_module_ptr}, {"System V semaphores", sysvsem_module_ptr}, + {"DAV", phpdav_module_ptr}, {NULL, NULL} }; Index: php3/main.c diff -c php3/main.c:1.479 php3/main.c:1.480 *** php3/main.c:1.479 Sat Nov 21 15:29:45 1998 --- php3/main.c Fri Dec 4 11:45:07 1998 *************** *** 29,35 **** +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 1.479 1998/11/21 20:29:45 andi Exp $ */ /* #define CRASH_DETECTION */ --- 29,35 ---- +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 1.480 1998/12/04 16:45:07 ssb Exp $ */ /* #define CRASH_DETECTION */ *************** *** 1804,1810 **** #if APACHE ! PHPAPI int apache_php3_module_main(request_rec * r, int fd, int display_source_mode, int preprocessed) { FILE *in = NULL; TLS_VARS; --- 1804,1813 ---- #if APACHE ! PHPAPI int apache_php3_module_main(request_rec * r, int fd, ! int display_source_mode, ! int preprocessed, ! FILE *handler_file) { FILE *in = NULL; TLS_VARS; *************** *** 1815,1821 **** return FAILURE; } php3_TreatHeaders(); ! in = fdopen(fd, "r"); if (in) { GLOBAL(phpin) = in; phprestart(GLOBAL(phpin)); --- 1818,1828 ---- return FAILURE; } php3_TreatHeaders(); ! if (handler_file) { ! in = handler_file; ! } else { ! in = fdopen(fd, "r"); ! } if (in) { GLOBAL(phpin) = in; phprestart(GLOBAL(phpin)); -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net