Re: [PHP-CVS] cvs: php4 / Makefile.in configure.in /main build-defs.h.in /pear PEAR.php.in /sapi Makefile.in /sapi/cgi config.m4
Derick Rethans wrote: On Sun, 8 Apr 2001, Stig Bakken wrote: * CGI version is always installed! Do we want this? I don't actually. It would be nice if the cgi build could be disabled. With PEAR maturing, it'll be pretty useful to have it installed by default; an option to disable it would definitely be good however. Anil -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4(PHP_4_0_5) /ext/standard output.c
avsmMon Apr 2 09:48:29 2001 EDT
Modified files: (Branch: PHP_4_0_5)
/php4/ext/standard output.c
Log:
MFH, rev 1.53
Index: php4/ext/standard/output.c
diff -u php4/ext/standard/output.c:1.48.2.2 php4/ext/standard/output.c:1.48.2.3
--- php4/ext/standard/output.c:1.48.2.2 Sat Mar 31 14:54:07 2001
+++ php4/ext/standard/output.c Mon Apr 2 09:48:29 2001
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: output.c,v 1.48.2.2 2001/03/31 22:54:07 zeev Exp $ */
+/* $Id: output.c,v 1.48.2.3 2001/04/02 16:48:29 avsm Exp $ */
#include "php.h"
#include "ext/standard/head.h"
@@ -214,6 +214,7 @@
zend_stack_destroy(OG(ob_buffers));
}
}
+ OG(nesting_level)--;
}
if (send_buffer) {
@@ -226,8 +227,6 @@
if (!just_flush) {
efree(to_be_destroyed_buffer);
-
- OG(nesting_level)--;
} else {
OG(active_ob_buffer).text_length = 0;
OG(active_ob_buffer).status |= PHP_OUTPUT_HANDLER_START;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 /ext/zlib zlib.c
avsmFri Mar 30 09:44:09 2001 EDT
Modified files:
/php4/ext/zlib zlib.c
Log:
Send the correct Vary headers, if we negotiate a gzip/deflate session
via Accept-Encoding. This obeys a SHOULD directive in RFC2616
PR: 10070
Index: php4/ext/zlib/zlib.c
diff -u php4/ext/zlib/zlib.c:1.76 php4/ext/zlib/zlib.c:1.77
--- php4/ext/zlib/zlib.c:1.76 Wed Mar 7 09:23:30 2001
+++ php4/ext/zlib/zlib.cFri Mar 30 09:44:08 2001
@@ -16,7 +16,7 @@
| Stefan Röhrich [EMAIL PROTECTED]|
+--+
*/
-/* $Id: zlib.c,v 1.76 2001/03/07 17:23:30 dbeu Exp $ */
+/* $Id: zlib.c,v 1.77 2001/03/30 17:44:08 avsm Exp $ */
#define IS_EXT_MODULE
#include "php.h"
@@ -1156,9 +1156,15 @@
if (sapi_add_header("Content-Encoding: gzip",
sizeof("Content-Encoding: gzip") - 1, 1)==FAILURE) {
return_original = 1;
}
+ if (sapi_add_header("Vary: Accept-Encoding",
+sizeof("Vary: Accept-Encoding") - 1, 1)==FAILURE) {
+ return_original = 1;
+ }
break;
case CODING_DEFLATE:
if (sapi_add_header("Content-Encoding:
deflate", sizeof("Content-Encoding: deflate") - 1, 1)==FAILURE) {
+ return_original = 1;
+ }
+ if (sapi_add_header("Vary: Accept-Encoding",
+sizeof("Vary: Accept-Encoding") - 1, 1)==FAILURE) {
return_original = 1;
}
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4(PHP_4_0_5) / ltconfig
avsmSat Mar 17 05:13:56 2001 EDT
Modified files: (Branch: PHP_4_0_5)
/php4 ltconfig
Log:
Update libtool to support OpenBSD 2.8+ wrt shared libraries and
library dependencies. Tested on i386/sparc.
Index: php4/ltconfig
diff -u php4/ltconfig:1.20 php4/ltconfig:1.20.4.1
--- php4/ltconfig:1.20 Fri Nov 3 18:42:10 2000
+++ php4/ltconfig Sat Mar 17 05:13:55 2001
@@ -1105,6 +1105,9 @@
with_gnu_ld=no
fi
;;
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -1402,10 +1405,21 @@
;;
openbsd*)
-archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
-hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+esac
;;
os2*)
@@ -2019,13 +2033,10 @@
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
-need_lib_prefix=no
-need_version=no
- fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
+ deplibs_check_method='pass_all'
;;
os2*)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
