[PHP4BETA] CVS update: php4
| From: | zeev | Date: | Wed, 05 May 1999 21:47:05 +0000 |
| Subject: | [PHP4BETA] CVS update: php4 | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-666@lists.php.net to get a copy of this message | ||
Date: Wednesday May 5, 1999 @ 17:47
Author: zeev
Update of /repository/php4
In directory php:/tmp/cvs-serv11923
Modified Files:
Makefile.in SAPI.c SAPI.h
Log Message:
vpath fix
Apache compatability fix
Index: php4/Makefile.in
diff -u php4/Makefile.in:1.26 php4/Makefile.in:1.27
--- php4/Makefile.in:1.26 Mon May 3 07:11:20 1999
+++ php4/Makefile.in Wed May 5 17:47:03 1999
@@ -24,7 +24,7 @@
# +----------------------------------------------------------------------+
#
-# $Id: Makefile.in,v 1.26 1999/05/03 11:11:20 ssb Exp $
+# $Id: Makefile.in,v 1.27 1999/05/05 21:47:03 zeev Exp $
#
prefix = @prefix@
@@ -89,7 +89,7 @@
# Apache modules
libphp3.a libmodphp3.a: all-recursive $(OBJS)
$(AR) $@.tmp $(OBJS)
- $(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a libzend/libzend.a @TSRM_LIB@
+ $(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a $(srcdir)/libzend/libzend.a @TSRM_LIB@
@rm -f $@.tmp
$(RANLIB) $(BINNAME)
Index: php4/SAPI.c
diff -u php4/SAPI.c:1.8 php4/SAPI.c:1.9
--- php4/SAPI.c:1.8 Wed May 5 17:29:25 1999
+++ php4/SAPI.c Wed May 5 17:47:04 1999
@@ -100,7 +100,7 @@
SAPI_API int sapi_send_headers()
{
int retval;
- sapi_header_struct default_header = { DEFAULT_CONTENT_TYPE, sizeof(DEFAULT_CONTENT_TYPE)-1 };
+ sapi_header_struct default_header = { SAPI_DEFAULT_CONTENT_TYPE,
sizeof(SAPI_DEFAULT_CONTENT_TYPE)-1 };
SLS_FETCH();
if (SG(headers_sent)) {
Index: php4/SAPI.h
diff -u php4/SAPI.h:1.8 php4/SAPI.h:1.9
--- php4/SAPI.h:1.8 Wed May 5 17:11:27 1999
+++ php4/SAPI.h Wed May 5 17:47:04 1999
@@ -105,6 +105,6 @@
#define SAPI_HEADER_DO_SEND 2
#define SAPI_HEADER_SEND_FAILED 3
-#define DEFAULT_CONTENT_TYPE "Content-Type: text/html"
+#define SAPI_DEFAULT_CONTENT_TYPE "Content-Type: text/html"
#endif /* _NEW_SAPI_H */
--
PHP 4 Beta