(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);
/* 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 &&
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;