cvs: /php4 SAPI.c php4dll.dsp /php4/ext/session mod_files.c /php4/ext/standard basic_functions.c dir.c /php4/win32 readdir.h

andi Sun Sep 5 15:04:41 1999 EDT Modified files: /php4 SAPI.c php4dll.dsp /php4/ext/session mod_files.c /php4/ext/standard basic_functions.c dir.c /php4/win32 readdir.h Log: - Make dir functions compile in Win32 - Fix too early memory manager initialization (For you Thies) Index: php4/SAPI.c diff -u php4/SAPI.c:1.28 php4/SAPI.c:1.29 --- php4/SAPI.c:1.28 Fri Sep 3 13:46:39 1999 +++ php4/SAPI.c Sun Sep 5 15:04:39 1999 @@ -20,6 +20,7 @@ #include <ctype.h> +#include "php.h" #include "SAPI.h" #ifdef ZTS #include "TSRM.h" Index: php4/php4dll.dsp diff -u php4/php4dll.dsp:1.13 php4/php4dll.dsp:1.14 --- php4/php4dll.dsp:1.13 Tue Aug 24 19:12:50 1999 +++ php4/php4dll.dsp Sun Sep 5 15:04:39 1999 @@ -327,6 +327,10 @@ # End Source File # Begin Source File +SOURCE=.\ext\standard\lcg.c +# End Source File +# Begin Source File + SOURCE=.\ext\standard\link.c # End Source File # Begin Source File @@ -347,6 +351,10 @@ # End Source File # Begin Source File +SOURCE=.\ext\session\mod_files.c +# End Source File +# Begin Source File + SOURCE=.\ext\bcmath\number.c # End Source File # Begin Source File @@ -380,6 +388,10 @@ # Begin Source File SOURCE=.\ext\standard\reg.c +# End Source File +# Begin Source File + +SOURCE=.\ext\session\session.c # End Source File # Begin Source File Index: php4/ext/session/mod_files.c diff -u php4/ext/session/mod_files.c:1.14 php4/ext/session/mod_files.c:1.15 --- php4/ext/session/mod_files.c:1.14 Sat Sep 4 04:33:31 1999 +++ php4/ext/session/mod_files.c Sun Sep 5 15:04:39 1999 @@ -30,6 +30,12 @@ #include <dirent.h> #endif +#if WIN32||WINNT +#define NEEDRDH 1 +#include "win32/readdir.h" +#include <time.h> +#endif + #include <fcntl.h> #include "php_session.h" Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.77 php4/ext/standard/basic_functions.c:1.78 --- php4/ext/standard/basic_functions.c:1.77 Sat Sep 4 17:10:39 1999 +++ php4/ext/standard/basic_functions.c Sun Sep 5 15:04:40 1999 @@ -1629,9 +1629,9 @@ if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &new_setting)==FAILURE) { RETURN_FALSE; } - convert_to_long(new_setting); + convert_to_boolean(new_setting); - PG(magic_quotes_runtime)=new_setting->value.lval; + PG(magic_quotes_runtime) = (zend_bool) new_setting->value.lval; RETURN_TRUE; } @@ -2346,6 +2346,8 @@ Returns true if client disconnected */ PHP_FUNCTION(connection_aborted) { + PLS_FETCH(); + RETURN_LONG(PG(connection_status)&PHP_CONNECTION_ABORTED); } /* }}} */ @@ -2354,6 +2356,7 @@ Returns true if script timed out */ PHP_FUNCTION(connection_timeout) { + PLS_FETCH(); RETURN_LONG(PG(connection_status)&PHP_CONNECTION_TIMEOUT); } @@ -2363,6 +2366,7 @@ Returns the connection status bitfield */ PHP_FUNCTION(connection_status) { + PLS_FETCH(); RETURN_LONG(PG(connection_status)); } @@ -2374,6 +2378,7 @@ { pval *arg; int old_setting; + PLS_FETCH(); old_setting = PG(ignore_user_abort); switch (ARG_COUNT(ht)) { @@ -2383,8 +2388,8 @@ if (getParameters(ht,1,&arg) == FAILURE) { RETURN_FALSE; } - convert_to_long(arg); - PG(ignore_user_abort)=arg->value.lval; + convert_to_boolean(arg); + PG(ignore_user_abort) = (zend_bool) arg->value.lval; break; default: WRONG_PARAM_COUNT; Index: php4/ext/standard/dir.c diff -u php4/ext/standard/dir.c:1.11 php4/ext/standard/dir.c:1.12 --- php4/ext/standard/dir.c:1.11 Thu Aug 19 12:52:53 1999 +++ php4/ext/standard/dir.c Sun Sep 5 15:04:40 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dir.c,v 1.11 1999/08/19 16:52:53 andi Exp $ */ +/* $Id: dir.c,v 1.12 1999/09/05 19:04:40 andi Exp $ */ #include "php.h" #include "fopen-wrappers.h" @@ -33,10 +33,8 @@ #include <errno.h> -#if MSVC5 -#if !(APACHE) +#if WIN32||WINNT #define NEEDRDH 1 -#endif #include "win32/readdir.h" #endif Index: php4/win32/readdir.h diff -u php4/win32/readdir.h:1.1 php4/win32/readdir.h:1.2 --- php4/win32/readdir.h:1.1 Wed Apr 7 17:05:12 1999 +++ php4/win32/readdir.h Sun Sep 5 15:04:40 1999 @@ -30,8 +30,9 @@ } DIR; /* Function prototypes */ -extern DIR *opendir(const char *); -extern struct dirent *readdir(DIR *); -extern int closedir(DIR *); +DIR *opendir(const char *); +struct dirent *readdir(DIR *); +int closedir(DIR *); +void rewinddir(DIR *); + #endif -extern void rewinddir(DIR *);