cvs: /php4 php_content_types.h /php4/sapi/apache mod_php4.c

rasmus Sun Dec 5 09:37:39 1999 EDT Modified files: /php4 php_content_types.h /php4/sapi/apache mod_php4.c Log: More maintainer-mode cleanups Index: php4/php_content_types.h diff -u php4/php_content_types.h:1.1 php4/php_content_types.h:1.2 --- php4/php_content_types.h:1.1 Thu Sep 16 18:31:33 1999 +++ php4/php_content_types.h Sun Dec 5 09:37:37 1999 @@ -1,6 +1,6 @@ #ifndef _PHP_CONTENT_TYPES_H #define _PHP_CONTENT_TYPES_H -int php_startup_SAPI_content_types(); +int php_startup_SAPI_content_types(void); #endif /* _PHP_CONTENT_TYPES_H */ Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.5 php4/sapi/apache/mod_php4.c:1.6 --- php4/sapi/apache/mod_php4.c:1.5 Sat Dec 4 14:16:11 1999 +++ php4/sapi/apache/mod_php4.c Sun Dec 5 09:37:38 1999 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.5 1999/12/04 19:16:11 sas Exp $ */ +/* $Id: mod_php4.c,v 1.6 1999/12/05 14:37:38 rasmus Exp $ */ #include "zend.h" #include "php.h" @@ -58,7 +58,30 @@ #endif PHPAPI int apache_php_module_main(request_rec *r, int fd, int display_source_mode SLS_DC); +void php_save_umask(void); +void php_restore_umask(void); +int sapi_apache_read_post(char *buffer, uint count_bytes SLS_DC); +char *sapi_apache_read_cookies(SLS_D); +int sapi_apache_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers SLS_DC); +int sapi_apache_send_headers(sapi_headers_struct *sapi_headers SLS_DC); +int send_php(request_rec *r, int display_source_mode, char *filename); +int send_parsed_php(request_rec * r); +int send_parsed_php_source(request_rec * r); +int php_xbithack_handler(request_rec * r); +void php_init_handler(server_rec *s, pool *p); +#if MODULE_MAGIC_NUMBER > 19961007 +#define CONST_PREFIX const +#else +#define CONST_PREFIX +#endif +CONST_PREFIX char *php_apache_value_handler_ex(cmd_parms *cmd, HashTable *conf, char *arg1, char *arg2, int mode); +CONST_PREFIX char *php_apache_value_handler(cmd_parms *cmd, HashTable *conf, char *arg1, char *arg2); +CONST_PREFIX char *php_apache_admin_value_handler(cmd_parms *cmd, HashTable *conf, char *arg1, char *arg2); +CONST_PREFIX char *php_apache_flag_handler(cmd_parms *cmd, HashTable *conf, char *arg1, char *arg2); +CONST_PREFIX char *php_apache_flag_handler_ex(cmd_parms *cmd, HashTable *conf, char *arg1, char *arg2, int mode); +CONST_PREFIX char *php_apache_admin_flag_handler(cmd_parms *cmd, HashTable *conf, char *arg1, char *arg2); + /* ### these should be defined in mod_php4.h or somewhere else */ #define USE_PATH 1 #define IGNORE_URL 2 @@ -94,7 +117,7 @@ /* some systems are missing these from their header files */ -void php_save_umask() +void php_save_umask(void) { saved_umask = umask(077); umask(saved_umask); @@ -208,7 +231,7 @@ }; -void php_restore_umask() +void php_restore_umask(void) { umask(saved_umask); } @@ -399,12 +422,6 @@ } -#if MODULE_MAGIC_NUMBER > 19961007 -#define CONST_PREFIX const -#else -#define CONST_PREFIX -#endif - CONST_PREFIX char *php_apache_value_handler_ex(cmd_parms *cmd, HashTable *conf, char *arg1, char *arg2, int mode) { php_per_dir_entry per_dir_entry; @@ -498,7 +515,7 @@ void php_init_handler(server_rec *s, pool *p) { - register_cleanup(p, NULL, (void (*)(void *))apache_php_module_shutdown_wrapper, php_module_shutdown_for_exec); + register_cleanup(p, NULL, (void (*)(void *))apache_php_module_shutdown_wrapper, (void (*)(void *))php_module_shutdown_for_exec); if (!apache_php_initialized) { sapi_startup(&sapi_module); php_module_startup(&sapi_module);