[PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c

2003-06-06 Thread Hartmut Holzgraefe
hholzgraThu Jun 5 10:42:12 2003 EDT Modified files: /php4/ext/mime_magicmime_magic.c Log: ... as suggested by Wez Index: php4/ext/mime_magic/mime_magic.c diff -u php4/ext/mime_magic/mime_magic.c:1.28 php4/ext/mime_magic/mime_magic.c:1.29 ---

Re: [PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c

2003-06-05 Thread Wez Furlong
php_stream_from_zval will verify the resource and return from the function if it is not a resource. If you just want to check and not have it return, use the php_stream_from_zval_no_verify() macro instead (same parameters). --Wez. On Wed, 4 Jun 2003, Hartmut Holzgraefe wrote: > + switch (Z_

[PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c

2003-06-05 Thread Hartmut Holzgraefe
hholzgraWed Jun 4 10:21:40 2003 EDT Modified files: /php4/ext/mime_magicmime_magic.c Log: mime_content_type() now also accepts open streams as argument streas have to bee seekable, the stream position is reset to its original value using ftell

Re: [PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c/ext/standardaggregation.cbasic_functions.c image.c /main SAPI.c output.c

2003-02-09 Thread Moriyoshi Koizumi
Jani Taskinen <[EMAIL PROTECTED]> wrote: > >If zlib extension was built as shared any kinds of outputs such as > >generated images would be compressed when zlib.output_compression=1 and > >bug #16109 revisited. > > If it's compiled as shared, the compression will not be available at all >

Re: [PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c/ext/standardaggregation.cbasic_functions.c image.c /main SAPI.c output.c

2003-02-09 Thread Jani Taskinen
On Mon, 10 Feb 2003, Moriyoshi Koizumi wrote: >Jani Taskinen <[EMAIL PROTECTED]> wrote: > >> On Mon, 10 Feb 2003, Moriyoshi Koizumi wrote: >> >> >Jani Taskinen <[EMAIL PROTECTED]> wrote: >> > >> >> On Mon, 10 Feb 2003, Moriyoshi Koizumi wrote: >> >> >>} >> >> >> >> >> >> -#if HAVE_ZLIB

Re: [PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c/ext/standardaggregation.c basic_functions.c image.c /main SAPI.c output.c

2003-02-09 Thread Moriyoshi Koizumi
Jani Taskinen <[EMAIL PROTECTED]> wrote: > On Mon, 10 Feb 2003, Moriyoshi Koizumi wrote: > > >Jani Taskinen <[EMAIL PROTECTED]> wrote: > > > >> On Mon, 10 Feb 2003, Moriyoshi Koizumi wrote: > >> >> } > >> >> > >> >> -#if HAVE_ZLIB > >> >> +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) > >>

Re: [PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c /ext/standardaggregation.c basic_functions.c image.c /main SAPI.c output.c

2003-02-09 Thread Jani Taskinen
On Mon, 10 Feb 2003, Moriyoshi Koizumi wrote: >Jani Taskinen <[EMAIL PROTECTED]> wrote: > >> On Mon, 10 Feb 2003, Moriyoshi Koizumi wrote: >> >> } >> >> >> >> -#if HAVE_ZLIB >> >> +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) >> >> /* Add output compression headers at this late stage in order

Re: [PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c /ext/standardaggregation.c basic_functions.c image.c /main SAPI.c output.c

2003-02-09 Thread Moriyoshi Koizumi
Jani Taskinen <[EMAIL PROTECTED]> wrote: > On Mon, 10 Feb 2003, Moriyoshi Koizumi wrote: > >>} > >> > >> -#if HAVE_ZLIB > >> +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) > >>/* Add output compression headers at this late stage in order to make > >> it possible to switch it off insid

Re: [PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c /ext/standardaggregation.c basic_functions.c image.c /main SAPI.c output.c

2003-02-09 Thread Jani Taskinen
On Mon, 10 Feb 2003, Moriyoshi Koizumi wrote: >> } >> >> -#if HAVE_ZLIB >> +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) >> /* Add output compression headers at this late stage in order to make >> it possible to switch it off inside the script. */ >> if (ZLIBG(output_compress

Re: [PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c /ext/standard aggregation.c basic_functions.c image.c /main SAPI.c output.c

2003-02-09 Thread Moriyoshi Koizumi
"Jani Taskinen" <[EMAIL PROTECTED]> wrote: > Index: php4/main/SAPI.c > diff -u php4/main/SAPI.c:1.163 php4/main/SAPI.c:1.164 > --- php4/main/SAPI.c:1.163Tue Jan 21 06:03:57 2003 > +++ php4/main/SAPI.c Sun Feb 9 14:09:51 2003 > @@ -18,7 +18,7 @@ > +

[PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c /ext/standard aggregation.c basic_functions.c image.c /main SAPI.c output.c

2003-02-09 Thread Jani Taskinen
sniper Sun Feb 9 14:09:52 2003 EDT Modified files: /php4/ext/mime_magicmime_magic.c /php4/ext/standard aggregation.c basic_functions.c image.c /php4/main SAPI.c output.c Log: Fixed compile failures when ZLIB / PCRE are compiled as shared ext

[PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c

2003-01-26 Thread Sander Roobol
sander Sun Jan 26 04:13:31 2003 EDT Modified files: /php4/ext/mime_magicmime_magic.c Log: Fix build Index: php4/ext/mime_magic/mime_magic.c diff -u php4/ext/mime_magic/mime_magic.c:1.25 php4/ext/mime_magic/mime_magic.c:1.26 --- php4/ext/mime_magic/mi

[PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c

2003-01-25 Thread Hartmut Holzgraefe
hholzgraSat Jan 25 11:25:38 2003 EDT Modified files: /php4/ext/mime_magicmime_magic.c Log: - mime file parser messages only with mime_magic.debug=On (default: off) - fix docref URL in startup error messages - show status in php info, either "ena

[PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c

2003-01-09 Thread Moriyoshi Koizumi
moriyoshi Thu Jan 9 23:37:26 2003 EDT Modified files: /php4/ext/mime_magicmime_magic.c Log: Reduced compiler warnings Index: php4/ext/mime_magic/mime_magic.c diff -u php4/ext/mime_magic/mime_magic.c:1.22 php4/ext/mime_magic/mime_magic.c:1.23 --

[PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c

2002-12-24 Thread Stefan Esser
sesser Tue Dec 24 18:28:05 2002 EDT Modified files: /php4/ext/mime_magicmime_magic.c Log: do correct casting Index: php4/ext/mime_magic/mime_magic.c diff -u php4/ext/mime_magic/mime_magic.c:1.20 php4/ext/mime_magic/mime_magic.c:1.21 --- php4/ext/m

[PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c

2002-12-23 Thread Stefan Esser
sesser Mon Dec 23 03:50:06 2002 EDT Modified files: /php4/ext/mime_magicmime_magic.c Log: fix compile error on IRIX Index: php4/ext/mime_magic/mime_magic.c diff -u php4/ext/mime_magic/mime_magic.c:1.19 php4/ext/mime_magic/mime_magic.c:1.20 --- php

[PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c

2002-11-18 Thread Moriyoshi Koizumi
moriyoshi Mon Nov 18 16:20:45 2002 EDT Modified files: /php4/ext/mime_magicmime_magic.c Log: We have to use binary mode here. Index: php4/ext/mime_magic/mime_magic.c diff -u php4/ext/mime_magic/mime_magic.c:1.17 php4/ext/mime_magic/mime_magic.c:

[PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c

2002-11-18 Thread Moriyoshi Koizumi
moriyoshi Mon Nov 18 16:15:42 2002 EDT Modified files: /php4/ext/mime_magicmime_magic.c Log: Fixed possible leaks Index: php4/ext/mime_magic/mime_magic.c diff -u php4/ext/mime_magic/mime_magic.c:1.16 php4/ext/mime_magic/mime_magic.c:1.17 --- php

[PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c

2002-11-15 Thread Moriyoshi Koizumi
moriyoshi Fri Nov 15 11:25:31 2002 EDT Modified files: /php4/ext/mime_magicmime_magic.c Log: Always use binary mode for magic files Index: php4/ext/mime_magic/mime_magic.c diff -u php4/ext/mime_magic/mime_magic.c:1.15 php4/ext/mime_magic/mime_ma

Re: [PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c

2002-11-15 Thread Moriyoshi Koizumi
> > MSVCRT's fgets() can handle both "\r\n" and "\n" under text mode, and the > > magic file is always a text file. Why not use text mode for it? > > According to MSDN > 'fgets reads characters from the current stream position to and including the > first newline character, to the end of the stre

Re: [PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c

2002-11-15 Thread Jani Taskinen
MFH? On Fri, 15 Nov 2002, Moriyoshi Koizumi wrote: >moriyoshi Fri Nov 15 10:13:31 2002 EDT > > Modified files: >/php4/ext/mime_magic mime_magic.c > Log: > Fixed segfault in case the specified magic file cannot be read. > > >Index: php4/ext/mi

Re: [PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c

2002-11-15 Thread Ilia A.
On November 15, 2002 10:50 am, Moriyoshi Koizumi wrote: > MSVCRT's fgets() can handle both "\r\n" and "\n" under text mode, and the > magic file is always a text file. Why not use text mode for it? According to MSDN 'fgets reads characters from the current stream position to and including the fir

Re: [PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c

2002-11-15 Thread Moriyoshi Koizumi
MSVCRT's fgets() can handle both "\r\n" and "\n" under text mode, and the magic file is always a text file. Why not use text mode for it? Anyway using "r" should be discouraged, because cli and cgi SAPI forcefully set the default CR handling mode to binary with setmode() function while apache S

Re: [PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c

2002-11-15 Thread Ilia A.
Are you absolutely certain that it is safe to open the magic file as text and not binary on Windows? Ilia On November 15, 2002 10:13 am, Moriyoshi Koizumi wrote: > moriyoshi Fri Nov 15 10:13:31 2002 EDT > > Modified files: > /php4/ext/mime_magic mime_magic.c > Log: > F

[PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c

2002-11-15 Thread Moriyoshi Koizumi
moriyoshi Fri Nov 15 10:13:31 2002 EDT Modified files: /php4/ext/mime_magicmime_magic.c Log: Fixed segfault in case the specified magic file cannot be read. Index: php4/ext/mime_magic/mime_magic.c diff -u php4/ext/mime_magic/mime_magic.c:1.14 ph

[PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c

2002-11-14 Thread Moriyoshi Koizumi
moriyoshi Thu Nov 14 20:45:23 2002 EDT Modified files: /php4/ext/mime_magicmime_magic.c Log: Use C comments Index: php4/ext/mime_magic/mime_magic.c diff -u php4/ext/mime_magic/mime_magic.c:1.13 php4/ext/mime_magic/mime_magic.c:1.14 --- php4/ext/

[PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c

2002-10-04 Thread Wez Furlong
wez Fri Oct 4 15:01:34 2002 EDT Modified files: /php4/ext/mime_magicmime_magic.c Log: Make that error message more meaningful for systems like my SuSE 7.0 with an apparently broken magic file. Index: php4/ext/mime_magic/mime_magic.c diff -u ph

[PHP-CVS] cvs: php4 /ext/mime_magic mime_magic.c

2002-09-23 Thread Sascha Schumann
sas Tue Sep 24 02:39:43 2002 EDT Modified files: /php4/ext/mime_magicmime_magic.c Log: Fix typo Index: php4/ext/mime_magic/mime_magic.c diff -u php4/ext/mime_magic/mime_magic.c:1.11 php4/ext/mime_magic/mime_magic.c:1.12 --- php4/ext/mime_magic/mi