cvs: /php4 php_content_types.c /php4 Makefile.in /php4/ext/standard info.c
| From: | Zeev Suraski | Date: | Thu, 16 Sep 1999 22:15:43 +0000 |
| Subject: | cvs: /php4 php_content_types.c /php4 Makefile.in /php4/ext/standard info.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-4539@lists.php.net to get a copy of this message | ||
zeev Thu Sep 16 18:15:43 1999 EDT
Added files:
/php4 php_content_types.c
Modified files:
/php4 Makefile.in
/php4/ext/standard info.c
Log:
Generalize SAPI a bit
Index: php4/Makefile.in
diff -u php4/Makefile.in:1.58 php4/Makefile.in:1.59
--- php4/Makefile.in:1.58 Wed Sep 15 07:08:00 1999
+++ php4/Makefile.in Thu Sep 16 18:15:42 1999
@@ -24,7 +24,7 @@
# +----------------------------------------------------------------------+
#
-# $Id: Makefile.in,v 1.58 1999/09/15 11:08:00 ssb Exp $
+# $Id: Makefile.in,v 1.59 1999/09/16 22:15:42 zeev Exp $
#
prefix = @prefix@
@@ -73,7 +73,7 @@
SOURCE = main.c internal_functions.c snprintf.c php3_sprintf.c \
configuration-parser.c configuration-scanner.c request_info.c \
safe_mode.c fopen-wrappers.c php3_realpath.c alloca.c output.c \
- php_ini.c SAPI.c cgi_main.c rfc1867.c dlist.c
+ php_ini.c SAPI.c cgi_main.c rfc1867.c dlist.c rfc1867.c
OBJS = $(SOURCE:.c=.o) $(LIBOBJS)
PHPLIBS = -Llibzend -lzend -Lext -lphpext
LIBS = $(PHPLIBS) $(EXTRA_LIBS) @LIBS@
Index: php4/ext/standard/info.c
diff -u php4/ext/standard/info.c:1.33 php4/ext/standard/info.c:1.34
--- php4/ext/standard/info.c:1.33 Sun Sep 12 21:11:41 1999
+++ php4/ext/standard/info.c Thu Sep 16 18:15:43 1999
@@ -213,7 +213,7 @@
}
PUTS("\"]</b></td><td bgcolor=\"" PHP_CONTENTS_COLOR
"\">");
if ((*tmp)->type == IS_ARRAY) {
- PUTS("<br><pre>");
+ PUTS("<pre>");
zend_print_zval_r(*tmp, 0);
PUTS("</pre>");
} else {