Author: glen Date: Sun Feb 24 12:04:32 2008 GMT Module: SOURCES Tag: HEAD ---- Log message: - svn diff --old=http://svn.apache.org/repos/asf/perl/modperl/tags/2_0_3 --new=http://svn.apache.org/repos/asf/perl/modperl/trunk
---- Files affected: SOURCES: apache-mod_perl-branch.diff (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/apache-mod_perl-branch.diff diff -u /dev/null SOURCES/apache-mod_perl-branch.diff:1.1 --- /dev/null Sun Feb 24 13:04:32 2008 +++ SOURCES/apache-mod_perl-branch.diff Sun Feb 24 13:04:27 2008 @@ -0,0 +1,9141 @@ +Index: RELEASE +=================================================================== +--- RELEASE (.../tags/2_0_3) (revision 630610) ++++ RELEASE (.../trunk) (revision 630610) +@@ -30,7 +30,7 @@ + make sure you give the correct permissions to them. + + 1. 'make dist' - to make sure nothing is missing from the manifest, +- etc. Now test this generated package mod_perl-2.0.3.tar.gz (not ++ etc. Now test this generated package mod_perl-2.0.4.tar.gz (not + the current build) with as many + configurations as possible on as many platforms as possible, + unpacking the package each time afresh. +@@ -55,7 +55,7 @@ + to the modperl/dev list (may be longer to give most people a chance + to catch up). no need to tag this package + +- Subject: [RELEASE CANDIDATE]: mod_perl-2.0.3 RC\d+ ++ Subject: [RELEASE CANDIDATE]: mod_perl-2.0.4 RC\d+ + + 2a. if problems are detected during stage 2, repeat stages 1 and 2. + +@@ -82,8 +82,8 @@ + + f. Update the svn:externals in the new tag + (you can't propedit remotely yet in svn) +- svn co https://svn.apache.org/repos/asf/perl/tags/2_0_3 +- svn propedit svn:xternals 2_0_3 ++ svn co https://svn.apache.org/repos/asf/perl/modperl/tags/2_0_3 ++ svn propedit svn:externals 2_0_3 + Update the Apache-Test line to the tag you previously created. + Update the docs line to the current tag. + svn ci +@@ -93,29 +93,29 @@ + + h. test the final package again at least once + +-4. Release the package and update links (e.g. mod_perl-2.0.3.tar.gz) ++4. Release the package and update links (e.g. mod_perl-2.0.4.tar.gz) + + a. upload to www.apache.org:/www/perl.apache.org/dist/ + +- % scp mod_perl-2.0.3.tar.gz perl.apache.org:/www/perl.apache.org/dist/ ++ % scp mod_perl-2.0.4.tar.gz perl.apache.org:/www/perl.apache.org/dist/ + + b. ssh to perl.apache.org, unpack the package, update symlinks to the + tar ball and unpacked distro: + + % ssh perl.apache.org + % cd /www/perl.apache.org/dist/ +- % ln -sf mod_perl-2.0.3.tar.gz mod_perl-2.0-current.tar.gz +- % tar -xzvf mod_perl-2.0.3.tar.gz ++ % ln -sf mod_perl-2.0.4.tar.gz mod_perl-2.0-current.tar.gz ++ % tar -xzvf mod_perl-2.0.4.tar.gz + % rm /www/perl.apache.org/dist/mod_perl-2.0-current +- % ln -sf mod_perl-2.0.3 mod_perl-2.0-current ++ % ln -sf mod_perl-2.0.4 mod_perl-2.0-current + + c. archive older releases (keep current + one prior release) + +- % mv /www/perl.apache.org/dist/mod_perl-2.0.0.tar.gz \ ++ % mv /www/perl.apache.org/dist/mod_perl-2.0.2.tar.gz \ + /www/perl.apache.org/dist/old +- % mv /www/perl.apache.org/dist/mod_perl-2.0.0.tar.gz.asc \ ++ % mv /www/perl.apache.org/dist/mod_perl-2.0.2.tar.gz.asc \ + /www/perl.apache.org/dist/old +- % rm -rf /www/perl.apache.org/dist/mod_perl-2.0.0 ++ % rm -rf /www/perl.apache.org/dist/mod_perl-2.0.2 + + d. update the version and release date + modperl-docs/src/download/index_top.html and commit. It'll be +@@ -138,27 +138,27 @@ + + a. sign your local copy of the tarball: + +- % gpg --detach-sign --armor mod_perl-2.0.3.tar.gz ++ % gpg --detach-sign --armor mod_perl-2.0.4.tar.gz + +- % pgps -b --armor mod_perl-2.0.3.tar.gz ++ % pgps -b --armor mod_perl-2.0.4.tar.gz + + b. upload the generated sig file to www.apache.org: + +- % scp mod_perl-2.0.3.tar.gz.asc perl.apache.org:/www/perl.apache.org/dist/ ++ % scp mod_perl-2.0.4.tar.gz.asc perl.apache.org:/www/perl.apache.org/dist/ + % ssh www.apache.org + % cd /www/perl.apache.org/dist/ +- % chmod 0664 mod_perl-2.0.3.tar.gz.asc +- % ln -sf mod_perl-2.0.3.tar.gz.asc mod_perl-2.0-current.tar.gz.asc ++ % chmod 0664 mod_perl-2.0.4.tar.gz.asc ++ % ln -sf mod_perl-2.0.4.tar.gz.asc mod_perl-2.0-current.tar.gz.asc + + c. ask one of the other developers to double check the signature file + and tarball: download both files and verify the signature: + +- http://perl.apache.org/dist/mod_perl-2.0.3.tar.gz.asc +- http://perl.apache.org/dist/mod_perl-2.0.3.tar.gz ++ http://perl.apache.org/dist/mod_perl-2.0.4.tar.gz.asc ++ http://perl.apache.org/dist/mod_perl-2.0.4.tar.gz + +- % gpg --verify mod_perl-2.0.3.tar.gz.asc ++ % gpg --verify mod_perl-2.0.4.tar.gz.asc + +- % pgpv mod_perl-2.0.3.tar.gz.asc ++ % pgpv mod_perl-2.0.4.tar.gz.asc + + d. make sure that the files you just created are group rw so + all the dist admins can make changes: +@@ -172,10 +172,10 @@ + a. unpack the package, update symlinks to the tarball and unpacked distro: + + % cd /www/www.apache.org/dist/perl/ +- % cp /www/perl.apache.org/dist/mod_perl-2.0.3.tar.gz* . +- % tar -xzvf mod_perl-2.0.3.tar.gz +- % mv mod_perl-2.0.0.tar.gz* /www/archive.apache.org/dist/perl/ +- % rm -rf mod_perl-2.0.0 ++ % cp /www/perl.apache.org/dist/mod_perl-2.0.4.tar.gz* . ++ % tar -xzvf mod_perl-2.0.4.tar.gz ++ % mv mod_perl-2.0.2.tar.gz* /www/archive.apache.org/dist/perl/ ++ % rm -rf mod_perl-2.0.2 + + b. make sure that the files you just created are group rw so + +@@ -188,11 +188,11 @@ + + a. post ... to the modperl, announce lists + Note, to post to announce@, you must be sending from an apache.org address. +- Subject: [ANNOUNCE] mod_perl 2.0.3 ++ Subject: [ANNOUNCE] mod_perl 2.0.4 + include + - link at perl.apache.org: +- http://apache.org/dist/perl/mod_perl-2.0.3.tar.gz +- http://apache.org/dist/perl/mod_perl-2.0.3.tar.gz.asc (pgp sig) ++ http://apache.org/dist/perl/mod_perl-2.0.4.tar.gz ++ http://apache.org/dist/perl/mod_perl-2.0.4.tar.gz.asc (pgp sig) + - MD5 sig (as it comes from CPAN upload announce). + - the latest Changes + +@@ -203,7 +203,7 @@ + b. edit ./Changes: + - start a new item with incremented version + '-dev' + +- =item 2.0.3-dev ++ =item 2.0.5-dev + + c. add a release entry in STATUS + +@@ -214,7 +214,7 @@ + + e. commit the changed files + +- % svn ci -m "start 2.0.3-dev cycle" Changes lib/mod_perl2.pm \ ++ % svn ci -m "start 2.0.4-dev cycle" Changes lib/mod_perl2.pm \ + STATUS RELEASE + + 10. Old Versions +Index: STATUS +=================================================================== +--- STATUS (.../tags/2_0_3) (revision 630610) ++++ STATUS (.../trunk) (revision 630610) +@@ -3,6 +3,7 @@ + + Release: + -------- ++ 2.000.03 : Released Nov 29, 2006 + 2.000.02 : Released Oct 20, 2005 + 2.000.01 : Released Jun 17, 2005 + 2.000.00 : Released May 20, 2005 +Index: src/modules/perl/modperl_handler.c +=================================================================== +--- src/modules/perl/modperl_handler.c (.../tags/2_0_3) (revision 630610) ++++ src/modules/perl/modperl_handler.c (.../trunk) (revision 630610) +@@ -18,7 +18,7 @@ + + modperl_handler_t *modperl_handler_new(apr_pool_t *p, const char *name) + { +- modperl_handler_t *handler = ++ modperl_handler_t *handler = + (modperl_handler_t *)apr_pcalloc(p, sizeof(*handler)); + + switch (*name) { +@@ -38,7 +38,7 @@ + + handler->cv = NULL; + handler->name = name; +- MP_TRACE_h(MP_FUNC, "[%s] new handler %s\n", ++ MP_TRACE_h(MP_FUNC, "[%s] new handler %s", + modperl_pid_tid(p), handler->name); + + return handler; +@@ -72,7 +72,7 @@ + * when perl_clone is called, each clone will clone that CV value, but + * we will still be able to find it, since we stored it in the + * hash. so we retrieve the CV value, whatever it is and we run it. +- * ++ * + * that explanation can be written and run in perl: + * + * use threads; +@@ -97,7 +97,7 @@ + { + /* re-use modperl_mgv_t entry which is otherwise is not used + * by anon handlers */ +- modperl_mgv_t *anon = ++ modperl_mgv_t *anon = + (modperl_mgv_t *)apr_pcalloc(p, sizeof(*anon)); + + anon->name = apr_psprintf(p, "anon%d", modperl_global_anon_cnt_next()); +@@ -157,7 +157,7 @@ + static + modperl_handler_t *modperl_handler_new_anon(pTHX_ apr_pool_t *p, CV *cv) + { +- modperl_handler_t *handler = ++ modperl_handler_t *handler = + (modperl_handler_t *)apr_pcalloc(p, sizeof(*handler)); + MpHandlerPARSED_On(handler); + MpHandlerANON_On(handler); +@@ -174,7 +174,7 @@ + handler->cv = cv; + handler->name = NULL; + +- MP_TRACE_h(MP_FUNC, "[%s] new cached cv anon handler\n", ++ MP_TRACE_h(MP_FUNC, "[%s] new cached cv anon handler", + modperl_pid_tid(p)); + #endif + +@@ -244,7 +244,7 @@ + modperl_handler_t *modperl_handler_dup(apr_pool_t *p, + modperl_handler_t *h) + { +- MP_TRACE_h(MP_FUNC, "dup handler %s\n", modperl_handler_name(h)); ++ MP_TRACE_h(MP_FUNC, "dup handler %s", modperl_handler_name(h)); + return modperl_handler_new(p, h->name); + } + +@@ -279,12 +279,12 @@ + for (i=0; i<base_a->nelts; i++) { + for (j=0; j<add_a->nelts; j++) { + if (modperl_handler_equal(base_h[i], add_h[j])) { +- MP_TRACE_d(MP_FUNC, "both base and new config contain %s\n", ++ MP_TRACE_d(MP_FUNC, "both base and new config contain %s", + add_h[j]->name); + } + else { + modperl_handler_array_push(mrg_a, add_h[j]); +- MP_TRACE_d(MP_FUNC, "base does not contain %s\n", ++ MP_TRACE_d(MP_FUNC, "base does not contain %s", + add_h[j]->name); + } + } +@@ -363,7 +363,7 @@ + * $r->push/set at request time will create entries in r->request_config + * push will first merge with configured handlers, unless an entry + * in r->request_config already exists. in this case, push or set has +- * already been called for the given handler, ++ * already been called for the given handler, + * r->request_config entries then override those in r->per_dir_config + */ + +@@ -427,15 +427,17 @@ + /* just a lookup */ + break; + case MP_HANDLER_ACTION_PUSH: +- if (ravp && !*ravp) { +- if (*avp) { +- /* merge with existing configured handlers */ +- *ravp = apr_array_copy(p, *avp); ++ if (ravp) { ++ if (!*ravp) { ++ if (*avp) { ++ /* merge with existing configured handlers */ ++ *ravp = apr_array_copy(p, *avp); ++ } ++ else { ++ /* no request handlers have been previously pushed or set */ ++ *ravp = modperl_handler_array_new(p); ++ } + } +- else { +- /* no request handlers have been previously pushed or set */ +- *ravp = modperl_handler_array_new(p); +- } + } + else if (!*avp) { + /* directly modify the configuration at startup time */ +@@ -514,6 +516,7 @@ + } + name = apr_pstrcat(p, HvNAME(GvSTASH(gv)), "::", GvNAME(gv), NULL); + return modperl_handler_new(p, apr_pstrdup(p, name)); ++ default: + break; + }; + +@@ -530,7 +533,7 @@ + return TRUE; + } + +- MP_TRACE_h(MP_FUNC, "unable to push_handler 0x%lx\n", ++ MP_TRACE_h(MP_FUNC, "unable to push_handler 0x%lx", + (unsigned long)sv); + + return FALSE; +@@ -569,7 +572,7 @@ + } + + if (!modperl_mgv_resolve(aTHX_ handler, p, handler->name, TRUE)) { +- MP_TRACE_h(MP_FUNC, "failed to resolve handler %s\n", ++ MP_TRACE_h(MP_FUNC, "failed to resolve handler %s", + handler->name); + } + +Index: src/modules/perl/modperl_common_types.h +=================================================================== +--- src/modules/perl/modperl_common_types.h (.../tags/2_0_3) (revision 630610) ++++ src/modules/perl/modperl_common_types.h (.../trunk) (revision 630610) +@@ -26,4 +26,3 @@ + } modperl_uri_t; + + #endif /* MODPERL_COMMON_TYPES_H */ +- +Index: src/modules/perl/modperl_handler.h +=================================================================== +--- src/modules/perl/modperl_handler.h (.../tags/2_0_3) (revision 630610) ++++ src/modules/perl/modperl_handler.h (.../trunk) (revision 630610) +@@ -27,7 +27,7 @@ + MP_INLINE modperl_mgv_t *modperl_handler_anon_next(pTHX_ apr_pool_t *p); + MP_INLINE void modperl_handler_anon_add(pTHX_ modperl_mgv_t *anon, CV *cv); + MP_INLINE CV *modperl_handler_anon_get(pTHX_ modperl_mgv_t *anon); +- ++ + #define modperl_handler_array_new(p) \ + apr_array_make(p, 1, sizeof(modperl_handler_t *)) + +@@ -45,7 +45,7 @@ + modperl_handler_t *modperl_handler_new_from_sv(pTHX_ apr_pool_t *p, SV *sv); + + MP_INLINE const char *modperl_handler_name(modperl_handler_t *handler); +- ++ + int modperl_handler_resolve(pTHX_ modperl_handler_t **handp, + apr_pool_t *p, server_rec *s); + +@@ -66,7 +66,7 @@ + modperl_handler_action_e action, + const char **desc); + +-MpAV **modperl_handler_get_handlers(request_rec *r, conn_rec *c,server_rec *s, ++MpAV **modperl_handler_get_handlers(request_rec *r, conn_rec *c,server_rec *s, + apr_pool_t *p, const char *name, + modperl_handler_action_e action); + +Index: src/modules/perl/modperl_apache_compat.c +=================================================================== +--- src/modules/perl/modperl_apache_compat.c (.../tags/2_0_3) (revision 630610) ++++ src/modules/perl/modperl_apache_compat.c (.../trunk) (revision 630610) +@@ -27,3 +27,45 @@ + * and don't forget to insert comments explaining exactly + * which httpd release allows us to remove the compat code + */ ++ ++/* pre-APACHE_2.2.4 */ ++#if ! AP_MODULE_MAGIC_AT_LEAST(20051115,4) ++ ++#define modperl_warn_fallback_http_function(ver, fallback) \ ++ { \ ++ dTHX; \ ++ Perl_warn(aTHX_ "%s() not available until httpd/%s " \ ++ "falling back to %s()", \ ++ __func__, ver, fallback); \ ++ } ++ ++/* added in APACHE_2.2.4 */ ++AP_DECLARE(const char *) ap_get_server_description(void) { ++ modperl_warn_fallback_http_function("2.2.4", "ap_get_server_version"); ++ return ap_get_server_version(); ++} ++ ++AP_DECLARE(const char *) ap_get_server_banner(void) { ++ modperl_warn_fallback_http_function("2.2.4", "ap_get_server_version"); ++ return ap_get_server_version(); ++} ++ ++#endif /* pre-APACHE_2.2.4 */ ++ ++/* since-APACHE-2.3.0 */ ++#if AP_MODULE_MAGIC_AT_LEAST(20060905,0) ++#define modperl_warn_deprecated_http_function(ver, fallback) \ ++ { \ ++ dTHX; \ ++ Perl_warn(aTHX_ "%s() is deprecated since httpd/%s " \ ++ "try using %s() instead", \ ++ __func__, ver, fallback); \ ++ } ++ ++AP_DECLARE(const char *) ap_get_server_version(void) { ++ modperl_warn_deprecated_http_function("2.3.0", ++ "ap_get_server_(description|banner)"); ++ return ap_get_server_banner(); ++} ++ ++#endif /* since-APACHE-2.3.0 */ +Index: src/modules/perl/modperl_module.c +=================================================================== +--- src/modules/perl/modperl_module.c (.../tags/2_0_3) (revision 630610) ++++ src/modules/perl/modperl_module.c (.../trunk) (revision 630610) +@@ -120,7 +120,7 @@ + + modperl_svptr_table_delete(aTHX_ cleanup->table, cleanup->ptr); + +- MP_TRACE_c(MP_FUNC, "deleting ptr 0x%lx from table 0x%lx\n", ++ MP_TRACE_c(MP_FUNC, "deleting ptr 0x%lx from table 0x%lx", + (unsigned long)cleanup->ptr, + (unsigned long)cleanup->table); + +@@ -211,7 +211,7 @@ + int count; + dSP; + +- MP_TRACE_c(MP_FUNC, "calling %s->%s\n", ++ MP_TRACE_c(MP_FUNC, "calling %s->%s", + SvCLASS(base_obj), modperl_mgv_last_name(method)); + + ENTER;SAVETMPS; +@@ -250,7 +250,7 @@ + modperl_interp_unselect(interp); */ + MP_PERL_CONTEXT_RESTORE; + #endif +- ++ + return (void *)mrg; + } + +@@ -296,7 +296,7 @@ + return NULL; + } + +- MP_TRACE_c(MP_FUNC, "%s cfg=0x%lx for %s.%s\n", ++ MP_TRACE_c(MP_FUNC, "%s cfg=0x%lx for %s.%s", + method, (unsigned long)cfg, + mname, parms->cmd->name); + +@@ -420,7 +420,7 @@ + } + + if (obj) { +- MP_TRACE_c(MP_FUNC, "found per-dir obj=0x%lx for %s.%s\n", ++ MP_TRACE_c(MP_FUNC, "found per-dir obj=0x%lx for %s.%s", + (unsigned long)obj, + info->modp->name, cmd->name); + } +@@ -440,7 +440,7 @@ + } + + if (srv_obj) { +- MP_TRACE_c(MP_FUNC, "found per-srv obj=0x%lx for %s.%s\n", ++ MP_TRACE_c(MP_FUNC, "found per-srv obj=0x%lx for %s.%s", + (unsigned long)srv_obj, + info->modp->name, cmd->name); + } +@@ -647,7 +647,7 @@ + #ifdef USE_ITHREADS + MP_dSCFG(s); + dTHXa(scfg->mip->parent->perl); +-#endif ++#endif + module_cmds = (AV*)SvRV(mod_cmds); + + fill = AvFILL(module_cmds); +@@ -772,7 +772,7 @@ + HV *stash = gv_stashpv(modp->name, FALSE); + GV *gv = gv_fetchmethod_autoload(stash, method, FALSE); + +- MP_TRACE_c(MP_FUNC, "looking for method %s in package `%s'...%sfound\n", ++ MP_TRACE_c(MP_FUNC, "looking for method %s in package `%s'...%sfound", + method, modp->name, + MP_isGV(gv) ? "" : "not "); + +@@ -809,7 +809,7 @@ + /* use this slot for our context */ + modp->dynamic_load_handle = minfo; + +- /* ++ /* + * XXX: we should lookup here if the Perl methods exist, + * and set these pointers only if they do. + */ +@@ -854,7 +854,7 @@ + apr_hash_set(scfg->modules, apr_pstrdup(p, name), APR_HASH_KEY_STRING, modp); + + #ifdef USE_ITHREADS +- /* ++ /* + * if the Perl module is loaded in the base server and a vhost + * has configuration directives from that module, but no mod_perl.c + * directives, scfg == NULL when modperl_module_cmd_take123 is run. +@@ -870,7 +870,7 @@ + return NULL; + } + +-SV *modperl_module_config_get_obj(pTHX_ SV *pmodule, server_rec *s, ++SV *modperl_module_config_get_obj(pTHX_ SV *pmodule, server_rec *s, + ap_conf_vector_t *v) + { + MP_dSCFG(s); +Index: src/modules/perl/modperl_filter.c +=================================================================== +--- src/modules/perl/modperl_filter.c (.../tags/2_0_3) (revision 630610) ++++ src/modules/perl/modperl_filter.c (.../trunk) (revision 630610) +@@ -85,7 +85,7 @@ + { + const char *name = f->frec->name; + +- /* frec->name is always lowercased */ ++ /* frec->name is always lowercased */ + if (!strcasecmp(name, MP_FILTER_CONNECTION_INPUT_NAME) || + !strcasecmp(name, MP_FILTER_CONNECTION_OUTPUT_NAME) || + !strcasecmp(name, MP_FILTER_REQUEST_INPUT_NAME) || +@@ -105,7 +105,7 @@ + APR_BRIGADE_INSERT_TAIL(filter->bb_out, b); + ((modperl_filter_ctx_t *)filter->f->ctx)->sent_eos = 1; + MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT +- "write out: EOS bucket\n", MP_FILTER_NAME(filter->f)); ++ "write out: EOS bucket", MP_FILTER_NAME(filter->f)); + return APR_SUCCESS; + } + +@@ -115,7 +115,7 @@ + apr_bucket *b = apr_bucket_flush_create(ba); + APR_BRIGADE_INSERT_TAIL(filter->bb_out, b); + MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT +- "write out: FLUSH bucket\n", MP_FILTER_NAME(filter->f)); ++ "write out: FLUSH bucket", MP_FILTER_NAME(filter->f)); + return APR_SUCCESS; + } + +@@ -128,7 +128,7 @@ + APR_BRIGADE_INSERT_TAIL(bb, b); + ((modperl_filter_ctx_t *)f->ctx)->sent_eos = 1; + MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT +- "write out: EOS bucket in separate bb\n", MP_FILTER_NAME(f)); ++ "write out: EOS bucket in separate bb", MP_FILTER_NAME(f)); + return ap_pass_brigade(f->next, bb); + } + +@@ -140,7 +140,7 @@ + apr_bucket *b = apr_bucket_flush_create(ba); + APR_BRIGADE_INSERT_TAIL(bb, b); + MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT +- "write out: FLUSH bucket in separate bb\n", MP_FILTER_NAME(f)); ++ "write out: FLUSH bucket in separate bb", MP_FILTER_NAME(f)); + return ap_pass_brigade(f, bb); + } + +@@ -165,7 +165,7 @@ + const char *body; + int status; + +- MP_TRACE_f(MP_FUNC, "\n\n\tparsing headers: %db [%s]\n", len, ++ MP_TRACE_f(MP_FUNC, "parsing headers: %db [%s]", len, + MP_TRACE_STR_TRUNC(wb->pool, buf, len)); + + status = modperl_cgi_header_parse(r, (char *)buf, &len, &body); +@@ -209,9 +209,9 @@ + APR_BRIGADE_INSERT_TAIL(bb, bucket); + } + +- MP_TRACE_f(MP_FUNC, "\n\n\twrite out: %db [%s]\n" +- "\t\tfrom %s\n\t\tto %s filter handler\n", +- len, ++ MP_TRACE_f(MP_FUNC, "\n\n\twrite out: %db [%s]" ++ "\t\tfrom %s\n\t\tto %s filter handler", ++ len, + MP_TRACE_STR_TRUNC(wb->pool, buf, len), + ((wb->r && wb->filters == &wb->r->output_filters) + ? "response handler" : "current filter handler"), +@@ -343,7 +343,7 @@ + + MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT + "new: %s %s filter (modperl_filter_t *0x%lx), " +- "f (ap_filter_t *0x%lx)\n", ++ "f (ap_filter_t *0x%lx)", + MP_FILTER_NAME(f), + MP_FILTER_TYPE(filter), + MP_FILTER_MODE(filter), +@@ -404,7 +404,7 @@ + FREETMPS;LEAVE; + + if (init_handler) { +- MP_TRACE_h(MP_FUNC, "found init handler %s\n", ++ MP_TRACE_h(MP_FUNC, "found init handler %s", + modperl_handler_name(init_handler)); <<Diff was trimmed, longer than 597 lines>> _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
