Author: torsten
Date: Mon Mar 2 09:36:53 2009
New Revision: 749253
URL: http://svn.apache.org/viewvc?rev=749253&view=rev
Log:
Merged revisions 732889-732891,732893,732895,736207-736208,736213-736218 via
svnmerge from
https://svn.eu.apache.org/repos/asf/perl/modperl/trunk
........
r732889 | pgollucci | 2009-01-09 01:49:55 +0100 (Fri, 09 Jan 2009) | 3 lines
start the effort to import Apache-Reload and Apache-SizeLimit into mod_perl
core
........
r732890 | pgollucci | 2009-01-09 01:51:30 +0100 (Fri, 09 Jan 2009) | 3 lines
this is now contained in the toplevel Apache-SizeLimit
........
r732891 | pgollucci | 2009-01-09 01:53:25 +0100 (Fri, 09 Jan 2009) | 2 lines
tests are now in Apache-SizeLimit
........
r732893 | pgollucci | 2009-01-09 01:57:19 +0100 (Fri, 09 Jan 2009) | 4 lines
update the externals docs
remove cvs crap its been 5yrs or so now
........
r732895 | pgollucci | 2009-01-09 01:59:27 +0100 (Fri, 09 Jan 2009) | 3 lines
note that f. needs work before being used
........
r736207 | pgollucci | 2009-01-21 05:30:07 +0100 (Wed, 21 Jan 2009) | 2 lines
test committ
........
r736208 | pgollucci | 2009-01-21 05:30:22 +0100 (Wed, 21 Jan 2009) | 2 lines
remove test
........
r736213 | pgollucci | 2009-01-21 05:58:18 +0100 (Wed, 21 Jan 2009) | 2 lines
intentionally break the build for build bot
........
r736214 | pgollucci | 2009-01-21 05:58:32 +0100 (Wed, 21 Jan 2009) | 2 lines
fix the build
........
r736215 | pgollucci | 2009-01-21 05:59:07 +0100 (Wed, 21 Jan 2009) | 2 lines
forcibly fail a test for build bot
........
r736216 | pgollucci | 2009-01-21 06:00:08 +0100 (Wed, 21 Jan 2009) | 2 lines
fix the test
........
r736217 | pgollucci | 2009-01-21 06:09:23 +0100 (Wed, 21 Jan 2009) | 2 lines
take 2, that didn't work the first time
........
r736218 | pgollucci | 2009-01-21 06:09:40 +0100 (Wed, 21 Jan 2009) | 2 lines
undo it
........
Removed:
perl/modperl/branches/threading/lib/Apache2/SizeLimit.pm
Modified:
perl/modperl/branches/threading/ (props changed)
perl/modperl/branches/threading/README-SVN
perl/modperl/branches/threading/RELEASE
perl/modperl/branches/threading/t/conf/post_config_startup.pl
Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Mon Mar 2 09:36:53 2009
@@ -1,2 +1,4 @@
Apache-Test https://svn.apache.org/repos/asf/perl/Apache-Test/trunk
+Apache-Reload https://svn.apache.org/repos/asf/perl/Apache-Reload/trunk
+Apache-SizeLimit https://svn.apache.org/repos/asf/perl/Apache-SizeLimit/trunk
docs
https://svn.apache.org/repos/asf/perl/modperl/docs/trunk/src/docs/2.0
Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 2 09:36:53 2009
@@ -1 +1 @@
-/perl/modperl/trunk:594682-672484,672819-681118,693357,700369
+/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218
Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Mar 2 09:36:53 2009
@@ -1 +1 @@
-/perl/modperl/trunk:1-700369
+/perl/modperl/trunk:1-712967,712969-749251
Modified: perl/modperl/branches/threading/README-SVN
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/README-SVN?rev=749253&r1=749252&r2=749253&view=diff
==============================================================================
--- perl/modperl/branches/threading/README-SVN (original)
+++ perl/modperl/branches/threading/README-SVN Mon Mar 2 09:36:53 2009
@@ -22,9 +22,10 @@
% cd modperl
% svn propedit svn:externals .
[vi pops up]
- docs
https://svn.apache.org/repos/asf/perl/modperl/docs/trunk/src/docs/2.0
- Apache-Test https://svn.apache.org/repos/asf/perl/Apache-Test/trunk
-
+Apache-Test https://svn.apache.org/repos/asf/perl/Apache-Test/trunk
+Apache-Reload https://svn.apache.org/repos/asf/perl/Apache-Reload/trunk
+Apache-SizeLimit https://svn.apache.org/repos/asf/perl/Apache-SizeLimit/trunk
+docs
https://svn.apache.org/repos/asf/perl/modperl/docs/trunk/src/docs/2.0
DEVELOPER ACCESS
@@ -56,19 +57,3 @@
http://svnbook.red-bean.com/en/1.0/apa.html
-
-
-OTHER NOTES:
-
---------
-
-To rescue changed files under apr/httpd cvs checkouts (i.e. to get
-'cvs diff' working), one needs to switch to anoncvs:
-
- % cd httpd-2.0
- % find . | grep Root | xargs perl -pi -e \
-'s|\[email protected]:/home/cvs|:pserver:[email protected]:/home/cvspublic|'
-
---------
-
-
Modified: perl/modperl/branches/threading/RELEASE
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/RELEASE?rev=749253&r1=749252&r2=749253&view=diff
==============================================================================
--- perl/modperl/branches/threading/RELEASE (original)
+++ perl/modperl/branches/threading/RELEASE Mon Mar 2 09:36:53 2009
@@ -80,6 +80,7 @@
e. tag
% make tag
+ XXXX: This needs to be fixed, and updated, developer beware its outdated and
possibly wrong
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/modperl/tags/2_0_5
Modified: perl/modperl/branches/threading/t/conf/post_config_startup.pl
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/conf/post_config_startup.pl?rev=749253&r1=749252&r2=749253&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/conf/post_config_startup.pl (original)
+++ perl/modperl/branches/threading/t/conf/post_config_startup.pl Mon Mar 2
09:36:53 2009
@@ -30,8 +30,6 @@
test_apache_resource();
-test_apache_size_limit();
-
test_apache_status();
test_loglevel();
@@ -62,19 +60,6 @@
require Apache2::Resource;
}
-sub test_apache_size_limit {
- # would be nice to write a real test, but for now just see that we
- # can load it for non-threaded mpms on supported platforms
- require Apache2::MPM;
- return if Apache2::MPM->is_threaded;
- eval { require Apache2::SizeLimit };
- if ($@) {
- # unsupported platform
- die $@ unless $@ =~ /Apache2::SizeLimit not implemented on/
- or $@ =~ /you must install BSD::Resource/;
- }
-}
-
sub test_apache_status {
### Apache2::Status tests
require Apache2::Status;
