Author: stas
Date: Mon May 9 19:32:55 2005
New Revision: 169396
URL: http://svn.apache.org/viewcvs?rev=169396&view=rev
Log:
fix modperl_brigade_dump to use apr_file_printf() instead of
fprintf(), which doesn't work everywhere
Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/src/modules/perl/modperl_filter.c
perl/modperl/trunk/src/modules/perl/modperl_filter.h
perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm
Modified: perl/modperl/trunk/Changes
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=169396&r1=169395&r2=169396&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Mon May 9 19:32:55 2005
@@ -12,6 +12,9 @@
=item 1.999_24-dev
+fix modperl_brigade_dump to use apr_file_printf() instead of
+fprintf(), which doesn't work everywhere [Stas]
+
Fix a warning triggered by `ln` on Cygwin, when running perl
Makefile.PL for a second time without previously running make
clean. [Nick *** <[EMAIL PROTECTED]>]
Modified: perl/modperl/trunk/src/modules/perl/modperl_filter.c
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/src/modules/perl/modperl_filter.c?rev=169396&r1=169395&r2=169396&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_filter.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_filter.c Mon May 9 19:32:55
2005
@@ -642,7 +642,7 @@
return 0;
}
- /*modperl_brigade_dump(filter->bb_in, stderr);*/
+ /* modperl_brigade_dump(filter->bb_in, NULL); */
MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT
"wanted: %db\n",
@@ -850,7 +850,7 @@
MP_FILTER_NAME(filter->f), *len,
MP_TRACE_STR_TRUNC(filter->pool, copy, *len));
APR_BRIGADE_INSERT_TAIL(filter->bb_out, bucket);
- /* modperl_brigade_dump(filter->bb_out, stderr); */
+ /* modperl_brigade_dump(filter->bb_out, NULL); */
return APR_SUCCESS;
}
@@ -1241,28 +1241,28 @@
(unsigned long)callback);
}
-void modperl_brigade_dump(apr_bucket_brigade *bb, FILE *fp)
+void modperl_brigade_dump(apr_bucket_brigade *bb, apr_file_t *file)
{
apr_bucket *bucket;
int i = 0;
#ifndef WIN32
- if (fp == NULL) {
- fp = stderr;
+ if (file == NULL) {
+ file = modperl_global_get_server_rec()->error_log;
}
- fprintf(fp, "dump of brigade 0x%lx\n",
- (unsigned long)bb);
+ apr_file_printf(file, "dump of brigade 0x%lx\n", (unsigned long)bb);
for (bucket = APR_BRIGADE_FIRST(bb);
bucket != APR_BRIGADE_SENTINEL(bb);
bucket = APR_BUCKET_NEXT(bucket))
{
- fprintf(fp, " %d: bucket=%s(0x%lx), length=%ld, data=0x%lx\n",
- i, bucket->type->name,
- (unsigned long)bucket,
- (long)bucket->length,
- (unsigned long)bucket->data);
- /* fprintf(fp, " : %s\n", (char *)bucket->data); */
+ apr_file_printf(file,
+ " %d: bucket=%s(0x%lx), length=%ld, data=0x%lx\n",
+ i, bucket->type->name,
+ (unsigned long)bucket,
+ (long)bucket->length,
+ (unsigned long)bucket->data);
+ /* apr_file_printf(file, " : %s\n", (char *)bucket->data); */
i++;
}
Modified: perl/modperl/trunk/src/modules/perl/modperl_filter.h
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/src/modules/perl/modperl_filter.h?rev=169396&r1=169395&r2=169396&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_filter.h (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_filter.h Mon May 9 19:32:55
2005
@@ -83,7 +83,7 @@
const char *buf,
apr_size_t *len);
-void modperl_brigade_dump(apr_bucket_brigade *bb, FILE *fp);
+void modperl_brigade_dump(apr_bucket_brigade *bb, apr_file_t *file);
/* input filters */
apr_status_t modperl_input_filter_handler(ap_filter_t *f,
Modified: perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm?rev=169396&r1=169395&r2=169396&view=diff
==============================================================================
--- perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm (original)
+++ perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm Mon May 9
19:32:55 2005
@@ -78,8 +78,8 @@
'name' => 'bb'
},
{
- 'type' => 'FILE *',
- 'name' => 'fp'
+ 'type' => 'apr_file_t *',
+ 'name' => 'file'
}
]
},
