Author: torsten
Date: Tue Apr 13 11:45:57 2010
New Revision: 933564
URL: http://svn.apache.org/viewvc?rev=933564&view=rev
Log:
Merged revisions 933373,933407-933409,933411,933563 via svnmerge from
https://svn.eu.apache.org/repos/asf/perl/modperl/trunk
........
r933373 | phred | 2010-04-12 21:20:15 +0200 (Mon, 12 Apr 2010) | 2 lines
Mark one todo off the list.
........
r933407 | gozer | 2010-04-12 22:57:30 +0200 (Mon, 12 Apr 2010) | 3 lines
Use the PROXYREQ_PROXY instead of the litteral value '1' for increased
readability
........
r933408 | gozer | 2010-04-12 22:59:02 +0200 (Mon, 12 Apr 2010) | 1 line
revert rev 933407
........
r933409 | gozer | 2010-04-12 23:00:43 +0200 (Mon, 12 Apr 2010) | 1 line
Use the PROXYREQ_PROXY instead of the litteral value 1 for increased
readability
........
r933411 | gozer | 2010-04-12 23:02:14 +0200 (Mon, 12 Apr 2010) | 3 lines
Export PROXYREQ_RESPONSE, a missing PROXYREQ_* constant
........
r933563 | torsten | 2010-04-13 13:36:14 +0200 (Tue, 13 Apr 2010) | 1 line
perl 5.12.0 warns about UNDEF in lc. Apache::Status uses "warnings FATAL =>
all"
........
Modified:
perl/modperl/branches/threading/ (props changed)
perl/modperl/branches/threading/Changes
perl/modperl/branches/threading/lib/Apache2/Status.pm
perl/modperl/branches/threading/src/modules/perl/modperl_apache_compat.h
perl/modperl/branches/threading/todo/2.0.5
perl/modperl/branches/threading/xs/Apache2/RequestRec/Apache2__RequestRec.h
perl/modperl/branches/threading/xs/tables/current/Apache2/ConstantsTable.pm
Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 13 11:45:57 2010
@@ -1 +1 @@
-/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879
+/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879,933373-933563
Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Apr 13 11:45:57 2010
@@ -1 +1 @@
-/perl/modperl/trunk:1-712967,712969-932896
+/perl/modperl/trunk:1-712967,712969-933563
Modified: perl/modperl/branches/threading/Changes
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/Changes?rev=933564&r1=933563&r2=933564&view=diff
==============================================================================
--- perl/modperl/branches/threading/Changes (original)
+++ perl/modperl/branches/threading/Changes Tue Apr 13 11:45:57 2010
@@ -31,6 +31,8 @@ Expose modperl_interp_t via ModPerl::Int
=item 2.0.5-dev
+Export PROXYREQ_RESPONSE, a missing PROXYREQ_* constant [Gozer]
+
Make sure standard file descriptors are preserved by the perl-script
handler [Torsten Foertsch]
Modified: perl/modperl/branches/threading/lib/Apache2/Status.pm
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/lib/Apache2/Status.pm?rev=933564&r1=933563&r2=933564&view=diff
==============================================================================
--- perl/modperl/branches/threading/lib/Apache2/Status.pm (original)
+++ perl/modperl/branches/threading/lib/Apache2/Status.pm Tue Apr 13 11:45:57
2010
@@ -96,8 +96,8 @@ sub install_hint {
sub status_config {
my ($r, $key) = @_;
- return (lc($r->dir_config($key)) eq "on") ||
- (lc($r->dir_config('StatusOptionsAll')) eq "on");
+ return (lc($r->dir_config($key) || '') eq "on") ||
+ (lc($r->dir_config('StatusOptionsAll') || '') eq "on");
}
sub menu_item {
Modified:
perl/modperl/branches/threading/src/modules/perl/modperl_apache_compat.h
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_apache_compat.h?rev=933564&r1=933563&r2=933564&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_apache_compat.h
(original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_apache_compat.h
Tue Apr 13 11:45:57 2010
@@ -72,6 +72,10 @@ AP_DECLARE(const char *) ap_get_server_v
OPT_SYM_OWNER | \
OPT_MULTI)
+#ifndef PROXYREQ_RESPONSE
+#define PROXYREQ_RESPONSE (3)
+#endif
+
#endif /* MODPERL_APACHE_COMPAT_H */
/*
Modified: perl/modperl/branches/threading/todo/2.0.5
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/todo/2.0.5?rev=933564&r1=933563&r2=933564&view=diff
==============================================================================
--- perl/modperl/branches/threading/todo/2.0.5 (original)
+++ perl/modperl/branches/threading/todo/2.0.5 Tue Apr 13 11:45:57 2010
@@ -1,6 +1,5 @@
SHOW STOPPERS
====================
-- Ship Apache::Test 1.31 official [phred, ]
- Windows Segfaults [needs windows developer owner, ]
- MANIFEST verifications [needs detail, ]
- rt.cpan.org PRs [pgollucci, phred, ]
Modified:
perl/modperl/branches/threading/xs/Apache2/RequestRec/Apache2__RequestRec.h
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/Apache2/RequestRec/Apache2__RequestRec.h?rev=933564&r1=933563&r2=933564&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/Apache2/RequestRec/Apache2__RequestRec.h
(original)
+++ perl/modperl/branches/threading/xs/Apache2/RequestRec/Apache2__RequestRec.h
Tue Apr 13 11:45:57 2010
@@ -59,7 +59,7 @@ int mpxs_Apache2__RequestRec_proxyreq(pT
r->parsed_uri.port :
ap_default_port(r))))
{
- retval = r->proxyreq = 1;
+ retval = r->proxyreq = PROXYREQ_PROXY;
r->uri = r->unparsed_uri;
/* else mod_proxy will segfault */
r->filename = apr_pstrcat(r->pool, "modperl-proxy:", r->uri, NULL);
Modified:
perl/modperl/branches/threading/xs/tables/current/Apache2/ConstantsTable.pm
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/tables/current/Apache2/ConstantsTable.pm?rev=933564&r1=933563&r2=933564&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/tables/current/Apache2/ConstantsTable.pm
(original)
+++ perl/modperl/branches/threading/xs/tables/current/Apache2/ConstantsTable.pm
Tue Apr 13 11:45:57 2010
@@ -233,6 +233,7 @@ $Apache2::ConstantsTable = {
'PROXYREQ_REVERSE',
'PROXYREQ_NONE',
'PROXYREQ_PROXY',
+ 'PROXYREQ_RESPONSE',
],
},
'APR::Const' => {
