java/conf/httpd/webapp.conf | 110 ------------------------
web/modules/pxt/PXT/ApacheHandler.pm | 29 ------
web/modules/sniglets/Sniglets/ListView/Style.pm | 34 -------
3 files changed, 173 deletions(-)
New commits:
commit e727f50edbc2bf49a755c5dd321484f920d8253f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:20:42 2009 +0100
The package_download Style does not seem to be used anywhere, removing.
diff --git a/web/modules/sniglets/Sniglets/ListView/Style.pm
b/web/modules/sniglets/Sniglets/ListView/Style.pm
index 22effba..0de160c 100644
--- a/web/modules/sniglets/Sniglets/ListView/Style.pm
+++ b/web/modules/sniglets/Sniglets/ListView/Style.pm
@@ -344,38 +344,4 @@ EOQ
return $ret;
}
-package Sniglets::ListView::Style::package_download;
-
-use base qw/Sniglets::ListView::Style::standard/;
-
-sub empty_list_wrapper {
-
- return <<EOQ;
- <div align="right">
- <hr />
-
- <form method="post"
action="/cgi-bin/download.pl/rhn-packages.tar">
- <input type="submit" name="download_system_packages"
value="Download Selected Packages Now!" />
- <input type="hidden" name="token" value="{token}"
/>
- <input type="hidden" name="pxt:trap"
value="rhn:download_packages_cb" />
-{hidden_package_vars}
- </form>
- </div>
-EOQ
-}
-
-# <input type="hidden" name="pxt:trap"
value="rhn:download_packages_cb" />
-
-
-sub footer {
- my $self = shift;
-
- my $ret =<<EOQ;
-</table>
-{hidden_package_vars}
-EOQ
-
- return $ret;
-}
-
1;
commit 7717ffbe22463e7759ee580b31501d4276e4babf
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 16:59:21 2009 +0100
Removal of webapp.conf makes PXT::ApacheHandler::TransHandler unused, removing.
diff --git a/web/modules/pxt/PXT/ApacheHandler.pm b/web/modules/pxt/PXT/ApacheHandler.pm
index d61113f..d68c800 100644
--- a/web/modules/pxt/PXT/ApacheHandler.pm
+++ b/web/modules/pxt/PXT/ApacheHandler.pm
@@ -758,34 +758,5 @@ sub profiling_markpoint {
$last_profile_pt = $now;
}
-package PXT::ApacheHandler::TransHandler;
-use Apache2::Const qw/:common REDIRECT M_GET/;
-
-sub handler {
- my $r = shift;
-
- if ($r->uri =~ m(^/download/)) {
- my $path_info = $r->uri;
-
- # is this one of those bizarre user agents that mishandles
- # redirects and keeps growing the request string? typically seen
- # from LeechGet (which also sometimes apparently masquerades
- # itself). so, check to see if http: or https: occurs three times
- # in the request and truncate to 512 bytes.
-
- if ($path_info =~ /https?:.*https?:.*https?/) {
- Apache->log_error("Detected long download request line; altering
logging");
- $r->the_request(substr($path_info, 0, 256));
- }
-
- $path_info =~ s(^/download)();
- $r->filename($r->document_root . "/download");
- $r->pnotes(download_path_info => $path_info);
- return OK;
- }
-
- return DECLINED;
-}
-
1;
commit 461567b69f28d26e9c3038223fafaa664bf0f654
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 16:52:36 2009 +0100
The webapp.conf is not used anywhere.
diff --git a/java/conf/httpd/webapp.conf b/java/conf/httpd/webapp.conf
deleted file mode 100644
index 09716ba..0000000
--- a/java/conf/httpd/webapp.conf
+++ /dev/null
@@ -1,110 +0,0 @@
-Listen 81
-
-Alias /WEBRPC "/var/www/html/rpc"
-
-<IfDefine HAVE_PAF>
-LoadModule proxy_add_forward_module modules/mod_paf.so
-</IfDefine>
-
-<VirtualHost _default_:81>
- ProxyRequests On
- # ProxyVia On
- # ProxyPass /
http://www.devel.rhns.redhat.com/
-</VirtualHost>
-
-AddType text/pxt .pxt
-
-PerlTaintCheck Off
-PerlWarn On
-
-PerlModule Apache::StatINC
-PerlSetVar StatINC_Debug 9
-PerlInitHandler Apache::StatINC
-PerlFixupHandler Apache::SizeLimit
-
-PerlPassEnv ORACLE_HOME NLS_LANG
-
-# PerlModule Apache::DProf
-
-PerlRequire /etc/httpd/conf/startup.pl
-PerlFreshRestart Off
-
-ErrorDocument 403 /errors/permission.pxt
-ErrorDocument 404 /errors/404.pxt
-ErrorDocument 413 /errors/413.pxt
-ErrorDocument 500 /errors/500.pxt
-
-PerlSetVar pxt_make_vile on
-
-<Files *.pxt>
- SetHandler perl-script
- PerlHandler PXT::ApacheHandler
-</Files>
-
-PerlTransHandler PXT::ApacheHandler::TransHandler
-
-#<Directory /var/www/html/skipjack/RedHat/RPMS>
-# PerlModule Sniglets::Kickstart
-# PerlAccessHandler Sniglets::Kickstart::ftp_download_access_handler
-#</Directory>
-
-#<Files /var/www/html/skipjack/RedHat/base/comps>
-# PerlModule Sniglets::Kickstart
-# PerlAccessHandler Sniglets::Kickstart::ftp_download_access_handler
-#</Files>
-
-
-
-#LoadModule status_xml_module modules/mod_status_xml.so
-#ExtendedStatus On
-
-#<Location /server-status-xml>
-# StatusXMLStyleSheet /scoreboard.xsl
-# SetHandler server-status-xml
-#</Location>
-
-<IfDefine PERLDB>
- <Perl>
- use Apache::DB ();
- Apache::DB->init;
- </Perl>
-
- <Location />
- PerlFixupHandler Apache::DB
- </Location>
-</IfDefine>
-
-<IfDefine HAVE_JK>
- JkWorkersFile /etc/httpd/conf/workers.properties
- JkLogLevel info
- JkLogFile /var/log/httpd/mod_jk.log
- JkMount /rhn/* ajp13
- JkMount /rhn ajp13
- JkMount /*.do ajp13
- JkMount /*.jsp ajp13
- JkHTTPSIndicator HTTPS
-</IfDefine>
-
-PerlSetVar allow_pxt_personalities 1
-
-<Files *.pxi>
- Order allow,deny
- Deny from all
- Satisfy All
-</Files>
-
-RedirectMatch ^/renew/.*
http://rhn.redhat.com
-
-RedirectMatch ^/index\.html$ @INDEX_REDIRECT_MATCH@
-RedirectMatch ^/rhn/?$ @RHN_ROOT_REDIRECT_MATCH@
-
-# Send people who ask for /index.html to /index.pxt instead
-
-RewriteEngine on
-
-# This rule handles incoming kickstart file requests from
-# machines actually performing a kickstart. This rule
-# processes the incoming URL and converts it into something
-# slightly more Struts friendly.
-RewriteRule /kickstart/ks([-a-zA-Z0-9\._/]*)$ /rhn/kickstart/DownloadFile.do?ksurl=$1
[PT]
-RewriteRule /rpc/api /rhn/rpc/api [PT]