cvs: php4 /main SAPI.c SAPI.h /sapi/apache mod_php4.c

From: Date: Sun, 20 Aug 2000 14:20:21 +0000
Subject: cvs: php4 /main SAPI.c SAPI.h /sapi/apache mod_php4.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-1260@lists.php.net to get a copy of this message
sas Sun Aug 20 07:20:21 2000 EDT Modified files: /php4/sapi/apache mod_php4.c /php4/main SAPI.c SAPI.h Log: Use size_t as parameter type in the getenv member of struct sapi_module Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.63 php4/sapi/apache/mod_php4.c:1.64 --- php4/sapi/apache/mod_php4.c:1.63 Fri Aug 4 09:48:42 2000 +++ php4/sapi/apache/mod_php4.c Sun Aug 20 07:20:21 2000 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.63 2000/08/04 16:48:42 rasmus Exp $ */ +/* $Id: mod_php4.c,v 1.64 2000/08/20 14:20:21 sas Exp $ */ #define NO_REGEX_EXTRA_H #ifdef WIN32 @@ -315,7 +315,7 @@ } -static char *php_apache_getenv(char *name, int name_len SLS_DC) +static char *php_apache_getenv(char *name, size_t name_len SLS_DC) { return (char *) table_get(((request_rec *) SG(server_context))->subprocess_env, name); } Index: php4/main/SAPI.c diff -u php4/main/SAPI.c:1.82 php4/main/SAPI.c:1.83 --- php4/main/SAPI.c:1.82 Sat Aug 19 09:38:19 2000 +++ php4/main/SAPI.c Sun Aug 20 07:20:21 2000 @@ -570,7 +570,7 @@ } -SAPI_API char *sapi_getenv(char *name, int name_len) +SAPI_API char *sapi_getenv(char *name, size_t name_len) { if (sapi_module.getenv) { SLS_FETCH(); Index: php4/main/SAPI.h diff -u php4/main/SAPI.h:1.49 php4/main/SAPI.h:1.50 --- php4/main/SAPI.h:1.49 Sun Jul 2 16:46:50 2000 +++ php4/main/SAPI.h Sun Aug 20 07:20:21 2000 @@ -140,7 +140,7 @@ SAPI_API int sapi_flush(void); SAPI_API struct stat *sapi_get_stat(void); -SAPI_API char *sapi_getenv(char *name, int name_len); +SAPI_API char *sapi_getenv(char *name, size_t name_len); SAPI_API char *sapi_get_default_content_type(SLS_D); SAPI_API void sapi_get_default_content_type_header(sapi_header_struct *default_header SLS_DC); @@ -159,7 +159,7 @@ int (*ub_write)(const char *str, unsigned int str_length); void (*flush)(void *server_context); struct stat *(*get_stat)(SLS_D); - char *(*getenv)(char *name, int name_len SLS_DC); + char *(*getenv)(char *name, size_t name_len SLS_DC); void (*sapi_error)(int type, const char *error_msg, ...);

« previous php.cvs (#1260) next »