stas 2003/11/07 00:58:50
Modified: src/modules/perl modperl_io_apache.c Log: move the macro IO_DUMP_FIRST_CHUNK outside #ifdef MP_IO_TIE_PERLIO since its needed in modperl_request_read, running under any perl setup Revision Changes Path 1.13 +10 -10 modperl-2.0/src/modules/perl/modperl_io_apache.c Index: modperl_io_apache.c =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_io_apache.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -u -r1.12 -r1.13 --- modperl_io_apache.c 6 Nov 2003 19:59:25 -0000 1.12 +++ modperl_io_apache.c 7 Nov 2003 08:58:50 -0000 1.13 @@ -1,5 +1,15 @@ #include "mod_perl.h" +/* not too long so it won't wrap when posted in email */ +#define IO_DUMP_LENGTH 35 +/* dumping hundreds of lines in the trace, makes it hard to read. Get + * a string chunk of IO_DUMP_LENGTH or less */ +#define IO_DUMP_FIRST_CHUNK(p, str, count) \ + count < IO_DUMP_LENGTH \ + ? (char *)str \ + : (char *)apr_psprintf(p, "%s...", \ + apr_pstrmemdup(p, str, IO_DUMP_LENGTH)) + #ifdef MP_IO_TIE_PERLIO /*************************** @@ -14,16 +24,6 @@ struct _PerlIO base; request_rec *r; } PerlIOApache; - -/* not too long so it won't wrap when posted in email */ -#define IO_DUMP_LENGTH 35 -/* dumping hundreds of lines in the trace, makes it hard to read. Get - * a string chunk of IO_DUMP_LENGTH or less */ -#define IO_DUMP_FIRST_CHUNK(p, str, count) \ - count < IO_DUMP_LENGTH \ - ? (char *)str \ - : (char *)apr_psprintf(p, "%s...", \ - apr_pstrmemdup(p, str, IO_DUMP_LENGTH)) /* _open just allocates the layer, _pushed does the real job of * filling the data in */