cvs: php4 / NEWS fopen-wrappers.c /ext/session/ mod_files.c /sapi/cgi/ cgi_main.c

andi		Sat May 27 09:38:49 2000 EDT

  Modified files:
    /php4	NEWS fopen-wrappers.c 
    /php4/ext/session	mod_files.c 
    /php4/sapi/cgi	cgi_main.c 
  Log:
  - Fix problem in sessions module under Win32. Need to use ; as an options
  - delimiter in save_path instead of :.
  
  
Index: php4/NEWS
diff -u php4/NEWS:1.261 php4/NEWS:1.262
--- php4/NEWS:1.261	Fri May 26 19:15:06 2000
+++ php4/NEWS	Sat May 27 09:38:49 2000
@@ -2,6 +2,9 @@
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ?? ??? 2000, Version 4.0.1
+- Fixed sessions on Win32. When setting the directory depth parameter in
+  save_path you need to now delimit it with a ';' instead of ':', e.g
+  "5;/tmp" instead of "5:/tmp" (Andi)
 - Changed the Apache handler's return status to 'Declined' when a requested
   PHP file could not be found.  Returning 'Not Found' caused problems
   in the ErrorDocument handler stage in that $REDIRECT_REDIRECT_ERROR_NOTES
Index: php4/fopen-wrappers.c
diff -u php4/fopen-wrappers.c:1.59 php4/fopen-wrappers.c:1.60
--- php4/fopen-wrappers.c:1.59	Thu May 18 08:34:21 2000
+++ php4/fopen-wrappers.c	Sat May 27 09:38:49 2000
@@ -16,7 +16,7 @@
    |          Jim Winstead <[email protected]>                                 |
    +----------------------------------------------------------------------+
  */
-/* $Id: fopen-wrappers.c,v 1.59 2000/05/18 15:34:21 zeev Exp $ */
+/* $Id: fopen-wrappers.c,v 1.60 2000/05/27 16:38:49 andi Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -1015,7 +1015,7 @@
 
 			if (filepath[1] == '.') {	/* parent directory - .. */
 				/* erase the last directory name from the path */
-#if PHP_WIN32
+#ifdef PHP_WIN32
 				while (*cwd_end != '/' || *cwd_end != '\\') {
 #else
 				while (*cwd_end != '/') {
@@ -1024,7 +1024,7 @@
 				}
 				filepath++;		/* make filepath appear as a current directory path */
 			}
-#if PHP_WIN32
+#ifdef PHP_WIN32
 			if (cwd_end > cwd && (*cwd_end == '/' || *cwd_end == '\\')) { /* remove trailing slashes */
 #else
 			if (cwd_end > cwd && *cwd_end == '/') {		/* remove trailing slashes */
Index: php4/ext/session/mod_files.c
diff -u php4/ext/session/mod_files.c:1.34 php4/ext/session/mod_files.c:1.35
--- php4/ext/session/mod_files.c:1.34	Tue May 23 08:13:15 2000
+++ php4/ext/session/mod_files.c	Sat May 27 09:38:49 2000
@@ -199,7 +199,7 @@
 	PS_SET_MOD_DATA(data);
 
 	data->fd = -1;
-	if ((p = strchr(save_path, ':'))) {
+	if ((p = strchr(save_path, ';'))) {
 		data->dirdepth = strtol(save_path, NULL, 10);
 		save_path = p + 1;
 	}
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.46 php4/sapi/cgi/cgi_main.c:1.47
--- php4/sapi/cgi/cgi_main.c:1.46	Thu May 25 07:43:30 2000
+++ php4/sapi/cgi/cgi_main.c	Sat May 27 09:38:49 2000
@@ -86,7 +86,7 @@
 
 static int sapi_cgibin_ub_write(const char *str, uint str_length)
 {
-	int ret;
+	size_t ret;
 
 	ret = fwrite(str, 1, str_length, stdout);
 	if (ret != str_length) {