CVS update: php3
| From: | shane | Date: | Mon, 07 Dec 1998 16:14:12 +0000 |
| Subject: | CVS update: php3 | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-2693@lists.php.net to get a copy of this message | ||
Date: Monday December 7, 1998 @ 11:14
Author: shane
Update of /repository/php3
In directory asf:/u/temp/cvs-serv12385
Modified Files:
fopen-wrappers.c
Log Message:
make fopen for parser use windows style path from doc_root.
Index: php3/fopen-wrappers.c
diff -c php3/fopen-wrappers.c:1.51 php3/fopen-wrappers.c:1.52
*** php3/fopen-wrappers.c:1.51 Wed Nov 11 18:19:00 1998
--- php3/fopen-wrappers.c Mon Dec 7 11:14:12 1998
***************
*** 27,33 ****
| Jim Winstead <jimw@php.net> |
+----------------------------------------------------------------------+
*/
! /* $Id: fopen-wrappers.c,v 1.51 1998/11/11 23:19:00 cschneid Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
--- 27,33 ----
| Jim Winstead <jimw@php.net> |
+----------------------------------------------------------------------+
*/
! /* $Id: fopen-wrappers.c,v 1.52 1998/12/07 16:14:12 shane Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
***************
*** 244,256 ****
}
} else
#endif
if (php3_ini.doc_root && '/' == *php3_ini.doc_root && path_info) {
!
l = strlen(php3_ini.doc_root);
fn = emalloc(l + strlen(path_info) + 2);
if (fn) {
memcpy(fn, php3_ini.doc_root, l);
! if ('/' != fn[l - 1]) /* l is never 0 */
fn[l++] = '/';
if ('/' == path_info[0])
l--;
--- 244,261 ----
}
} else
#endif
+ #if WIN32
+ if (php3_ini.doc_root && path_info && ('/' == *php3_ini.doc_root ||
+ '\\' == *php3_ini.doc_root || strstr(php3_ini.doc_root,":\\") ||
+ strstr(php3_ini.doc_root,":/"))) {
+ #else
if (php3_ini.doc_root && '/' == *php3_ini.doc_root && path_info) {
! #endif
l = strlen(php3_ini.doc_root);
fn = emalloc(l + strlen(path_info) + 2);
if (fn) {
memcpy(fn, php3_ini.doc_root, l);
! if ('/' != fn[l - 1] || '\\' != fn[l - 1]) /* l is never 0 */
fn[l++] = '/';
if ('/' == path_info[0])
l--;
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net