Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
bugzilla
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
etersoft
bugzilla
Commits
606e568c
You need to sign in or sign up before continuing.
Commit
606e568c
authored
Dec 27, 2010
by
Max Kanat-Alexander
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug 599539: Update the mod_perl code for Apache2::SizeLimit 0.92
r=glob, a=mkanat
parent
9cfe048d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
16 deletions
+25
-16
Requirements.pm
Bugzilla/Install/Requirements.pm
+18
-0
mod_perl.pl
mod_perl.pl
+5
-14
release-notes.html.tmpl
template/en/default/pages/release-notes.html.tmpl
+2
-2
No files found.
Bugzilla/Install/Requirements.pm
View file @
606e568c
...
...
@@ -319,8 +319,26 @@ sub OPTIONAL_MODULES {
version
=>
'1.999022'
,
feature
=>
[
'mod_perl'
],
},
{
package
=>
'Apache-SizeLimit'
,
module
=>
'Apache2::SizeLimit'
,
# 0.93 fixes problems on Linux and Windows, and changes the
# syntax used by SizeLimit.
version
=>
'0.93'
,
feature
=>
[
'mod_perl'
],
},
);
if
(
ON_WINDOWS
)
{
# SizeLimit needs Win32::API to work on Windows.
push
(
@modules
,
{
package
=>
'Win32-API'
,
module
=>
'Win32::API'
,
version
=>
0
,
feature
=>
[
'mod_perl'
],
});
}
my
$extra_modules
=
_get_extension_requirements
(
'OPTIONAL_MODULES'
);
push
(
@modules
,
@$extra_modules
);
return
\
@modules
;
...
...
mod_perl.pl
View file @
606e568c
...
...
@@ -44,32 +44,23 @@ use Bugzilla::Util ();
# Pre-compile the CGI.pm methods that we're going to use.
Bugzilla::
CGI
->
compile
(
qw(:cgi :push)
);
my
(
$sizelimit
,
$maxrequests
)
=
(
''
,
''
);
if
(
Bugzilla::Constants::
ON_WINDOWS
)
{
$maxrequests
=
"MaxRequestsPerChild 25"
;
}
else
{
require
Apache2::
SizeLimit
;
# This means that every httpd child will die after processing
# a CGI if it is taking up more than 70MB of RAM all by itself.
$
Apache2::SizeLimit::
MAX_UNSHARED_SIZE
=
70000
;
$sizelimit
=
"PerlCleanupHandler Apache2::SizeLimit"
;
}
use
Apache2::
SizeLimit
;
# This means that every httpd child will die after processing
# a CGI if it is taking up more than 70MB of RAM all by itself.
Apache2::
SizeLimit
->
set_max_unshared_size
(
70_000
);
my
$cgi_path
=
Bugzilla::Constants::
bz_locations
()
->
{
'cgi_path'
};
# Set up the configuration for the web server
my
$server
=
Apache2::
ServerUtil
->
server
;
my
$conf
=
<<EOT;
$maxrequests
# Make sure each httpd child receives a different random seed (bug 476622)
PerlChildInitHandler "sub { srand(); }"
<Directory "$cgi_path">
AddHandler perl-script .cgi
# No need to PerlModule these because they're already defined in mod_perl.pl
PerlResponseHandler Bugzilla::ModPerl::ResponseHandler
PerlCleanupHandler Bugzilla::ModPerl::CleanupHandler
$sizelimit
PerlCleanupHandler Apache2::SizeLimit Bugzilla::ModPerl::CleanupHandler
PerlOptions +ParseHeaders
Options +ExecCGI
AllowOverride Limit FileInfo Indexes
...
...
template/en/default/pages/release-notes.html.tmpl
View file @
606e568c
...
...
@@ -98,8 +98,8 @@
<h3 id="v40_req_modules">Required Perl Modules</h3>
[% INCLUDE req_table reqs = REQUIRED_MODULES
new = ['List-MoreUtils']
updated = ['Email-MIME', 'CGI.pm'] %]
new = ['List-MoreUtils'
, 'Win32-API'
]
updated = ['Email-MIME', 'CGI.pm'
, 'Apache-SizeLimit'
] %]
<h3 id="v40_req_optional_mod">Optional Perl Modules</h3>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment