cvs: php4 /ext/session mod_files.c /sapi/pi3web pi3web_sapi.c
| From: | Zeev Suraski | Date: | Sun, 20 Aug 2000 22:18:20 +0000 |
| Subject: | cvs: php4 /ext/session mod_files.c /sapi/pi3web pi3web_sapi.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1274@lists.php.net to get a copy of this message | ||
zeev Sun Aug 20 15:18:20 2000 EDT
Modified files:
/php4/ext/session mod_files.c
/php4/sapi/pi3web pi3web_sapi.c
Log:
Fix build
Index: php4/ext/session/mod_files.c
diff -u php4/ext/session/mod_files.c:1.41 php4/ext/session/mod_files.c:1.42
--- php4/ext/session/mod_files.c:1.41 Sun Aug 20 07:02:57 2000
+++ php4/ext/session/mod_files.c Sun Aug 20 15:18:19 2000
@@ -92,10 +92,10 @@
(strlen(data->basedir) + 2 * data->dirdepth + keylen + 5 + sizeof(FILE_PREFIX)))
return NULL;
p = key;
- n = sprintf(buf, "%s%c", data->basedir, PHP_SEPARATOR);
+ n = sprintf(buf, "%s%c", data->basedir, PHP_DIR_SEPARATOR);
for (i = 0; i < data->dirdepth; i++) {
buf[n++] = *p++;
- buf[n++] = PHP_SEPARATOR;
+ buf[n++] = PHP_DIR_SEPARATOR;
}
buf[n] = '\0';
strcat(buf, FILE_PREFIX);
@@ -169,7 +169,7 @@
/* does the file start with our prefix? */
if (!strncmp(entry->d_name, FILE_PREFIX, sizeof(FILE_PREFIX) - 1) &&
/* create full path */
- snprintf(buf, MAXPATHLEN, "%s%c%s", dirname, PHP_SEPARATOR,
+ snprintf(buf, MAXPATHLEN, "%s%c%s", dirname, PHP_DIR_SEPARATOR,
entry->d_name) > 0 &&
/* stat the directory entry */
V_STAT(buf, &sbuf) == 0 &&
Index: php4/sapi/pi3web/pi3web_sapi.c
diff -u php4/sapi/pi3web/pi3web_sapi.c:1.7 php4/sapi/pi3web/pi3web_sapi.c:1.8
--- php4/sapi/pi3web/pi3web_sapi.c:1.7 Sun Aug 20 07:29:00 2000
+++ php4/sapi/pi3web/pi3web_sapi.c Sun Aug 20 15:18:19 2000
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pi3web_sapi.c,v 1.7 2000/08/20 14:29:00 sas Exp $ */
+/* $Id: pi3web_sapi.c,v 1.8 2000/08/20 22:18:19 zeev Exp $ */
#if WIN32|WINNT
# include <windows.h>
@@ -80,7 +80,7 @@
PUTS("<table border=5 width=600>\n");
PUTS("<tr><th colspan=2 bgcolor=\"" PHP_HEADER_COLOR
"\">Pi3Web Server Information</th></tr>\n");
php_info_print_table_header(2, "Information Field", "Value");
- php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.7
2000/08/20 14:29:00 sas Exp $");
+ php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.8
2000/08/20 22:18:19 zeev Exp $");
php_info_print_table_row(2, "Server Name Stamp", HTTPCore_getServerStamp());
snprintf(variable_buf, 511, "%d", HTTPCore_debugEnabled());
php_info_print_table_row(2, "Debug Enabled", variable_buf);
@@ -306,8 +306,8 @@
static void init_request_info(sapi_globals_struct *sapi_globals, LPCONTROL_BLOCK lpCB)
{
- char *path_end = strrchr(lpCB->lpszFileName, PHP_SEPARATOR);
- if ( path_end ) *path_end = PHP_SEPARATOR;
+ char *path_end = strrchr(lpCB->lpszFileName, PHP_DIR_SEPARATOR);
+ if ( path_end ) *path_end = PHP_DIR_SEPARATOR;
SG(server_context) = lpCB;
SG(request_info).request_method = lpCB->lpszMethod;