CVS update: php31/ext/standard
| From: | rasmus | Date: | Tue, 11 Aug 1998 15:08:11 +0000 |
| Subject: | CVS update: php31/ext/standard | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-103@lists.php.net to get a copy of this message | ||
Date: Tuesday August 11, 1998 @ 11:08
Author: rasmus
Update of /repository/php31/ext/standard
In directory asf:/tmp/cvs-serv1478/ext/standard
Modified Files:
Makefile.am filestat.c md5.c
Log Message:
Some fixes to get --with-apache to compile
Index: php31/ext/standard/Makefile.am
diff -c php31/ext/standard/Makefile.am:2.3 php31/ext/standard/Makefile.am:2.4
*** php31/ext/standard/Makefile.am:2.3 Fri Jul 17 13:45:20 1998
--- php31/ext/standard/Makefile.am Tue Aug 11 11:08:10 1998
***************
*** 1,5 ****
## Process this file with automake to produce Makefile.in
! INCLUDES=@INCLUDES@ -I../../main
noinst_LIBRARIES=libphpext_standard.a
libphpext_standard_a_SOURCES=\
base64.c basic_functions.c browscap.c datetime.c dir.c \
--- 1,5 ----
## Process this file with automake to produce Makefile.in
! INCLUDES=@INCLUDES@ @APACHE_INCLUDE@ -I../../main -I../../sapi
noinst_LIBRARIES=libphpext_standard.a
libphpext_standard_a_SOURCES=\
base64.c basic_functions.c browscap.c datetime.c dir.c \
Index: php31/ext/standard/filestat.c
diff -c php31/ext/standard/filestat.c:2.1 php31/ext/standard/filestat.c:2.2
*** php31/ext/standard/filestat.c:2.1 Fri Jul 3 11:26:56 1998
--- php31/ext/standard/filestat.c Tue Aug 11 11:08:11 1998
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: filestat.c,v 2.1 1998/07/03 15:26:56 ssb Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: filestat.c,v 2.2 1998/08/11 15:08:11 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 308,315 ****
#if APACHE
if (!GLOBAL(CurrentStatFile)) {
! GLOBAL(CurrentStatLength) = strlen(GLOBAL(php3_rqst)->filename);
! GLOBAL(CurrentStatFile) = estrndup(GLOBAL(php3_rqst)->filename,GLOBAL(CurrentStatLength));
if (stat(GLOBAL(CurrentStatFile),&GLOBAL(sb))==-1) {
GLOBAL(CurrentStatFile)=NULL;
return;
--- 308,315 ----
#if APACHE
if (!GLOBAL(CurrentStatFile)) {
! GLOBAL(CurrentStatLength) = strlen(GLOBAL(sapi_rqst)->filename);
! GLOBAL(CurrentStatFile) = estrndup(GLOBAL(sapi_rqst)->filename,GLOBAL(CurrentStatLength));
if (stat(GLOBAL(CurrentStatFile),&GLOBAL(sb))==-1) {
GLOBAL(CurrentStatFile)=NULL;
return;
***************
*** 369,376 ****
TLS_VARS;
#if APACHE
if (!GLOBAL(CurrentStatFile)) {
! GLOBAL(CurrentStatLength) = strlen(GLOBAL(php3_rqst)->filename);
! GLOBAL(CurrentStatFile) = estrndup(GLOBAL(php3_rqst)->filename,GLOBAL(CurrentStatLength));
if (stat(GLOBAL(CurrentStatFile),&GLOBAL(sb))==-1) {
efree(GLOBAL(CurrentStatFile));
GLOBAL(CurrentStatFile)=NULL;
--- 369,376 ----
TLS_VARS;
#if APACHE
if (!GLOBAL(CurrentStatFile)) {
! GLOBAL(CurrentStatLength) = strlen(GLOBAL(sapi_rqst)->filename);
! GLOBAL(CurrentStatFile) = estrndup(GLOBAL(sapi_rqst)->filename,GLOBAL(CurrentStatLength));
if (stat(GLOBAL(CurrentStatFile),&GLOBAL(sb))==-1) {
efree(GLOBAL(CurrentStatFile));
GLOBAL(CurrentStatFile)=NULL;
Index: php31/ext/standard/md5.c
diff -c php31/ext/standard/md5.c:2.0 php31/ext/standard/md5.c:2.1
*** php31/ext/standard/md5.c:2.0 Fri Jul 3 09:14:29 1998
--- php31/ext/standard/md5.c Tue Aug 11 11:08:11 1998
***************
*** 40,45 ****
--- 40,46 ----
#include "internal_functions.h"
#if APACHE
+ #include "php3_apache.h"
#include <util_md5.h>
#else
#include "md5.h"
--
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