From: Dietmar Maurer <dietmar@proxmox.com>
Date: Mon, 15 Apr 2013 10:34:41 +0000 (+0200)
Subject: remove CGI.pm related code
X-Git-Url: https://git.proxmox.com/?p=pve-access-control.git;a=commitdiff_plain;h=b78ce7c2529a381669792a909d6b55b7790969d7

remove CGI.pm related code

New pveproxy does not need that.
---

diff --git a/Makefile b/Makefile
index 7484df4..5e6ddc3 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=3.0
 
 VERSION=3.0
 PACKAGE=libpve-access-control
-PKGREL=1
+PKGREL=2
 
 DESTDIR=
 PREFIX=/usr
diff --git a/PVE/RPCEnvironment.pm b/PVE/RPCEnvironment.pm
index eb7b3c7..765008e 100644
--- a/PVE/RPCEnvironment.pm
+++ b/PVE/RPCEnvironment.pm
@@ -15,7 +15,6 @@ use PVE::Cluster;
 use PVE::ProcFSTools;
 use PVE::AccessControl;
 use Cwd 'abs_path';
-use CGI;
 
 # we use this singleton class to pass RPC related environment values
 
@@ -528,51 +527,6 @@ sub get {
     return $pve_env;
 }
 
-sub parse_params {
-    my ($self, $enable_upload) = @_;
-
-    if ($self->{request_rec}) {
-	my $cgi;
-	if ($enable_upload) {
-	    $cgi = CGI->new($self->{request_rec});
-	} else {
-	    # disable upload using empty upload_hook
-	    $cgi = CGI->new($self->{request_rec}, sub {}, undef, 0);
-	}
-	$self->{cgi} = $cgi;
-	my $params = $cgi->Vars();
-	return PVE::Tools::decode_utf8_parameters($params);
-    } elsif ($self->{params}) {
-	return $self->{params};
-    } else {
-	die "no parameters registered";
-    }
-}
-
-sub get_upload_info {
-    my ($self, $param) = @_;
-
-    my $cgi = $self->{cgi};
-    die "CGI not initialized" if !$cgi;
-
-    my $pd = $cgi->param($param);
-    die "unable to get cgi parameter info\n" if !$pd;
-    my $info = $cgi->uploadInfo($pd);
-    die "unable to get cgi upload info\n" if !$info;
-
-    my $res = { %$info };
-
-    my $tmpfilename = $cgi->tmpFileName($pd);
-    die "unable to get cgi upload file name\n" if !$tmpfilename;
-    $res->{tmpfilename} = $tmpfilename;
-
-    #my $hndl = $cgi->upload($param);
-    #die "unable to get cgi upload handle\n" if !$hndl;
-    #$res->{handle} = $hndl->handle;
-
-    return $res;
-}
-
 # init_request - must be called before each RPC request
 sub init_request {
     my ($self, %params) = @_;
@@ -585,11 +539,6 @@ sub init_request {
     foreach my $p (keys %params) {
 	if ($p eq 'userconfig') {
 	    $userconfig = $params{$p};
-	} elsif ($p eq 'request_rec') {
-	    # pass Apache2::RequestRec
-	    $self->{request_rec} = $params{$p};
-	} elsif ($p eq 'params') {
-	    $self->{params} = $params{$p};
 	} else {
 	    die "unknown parameter '$p'";
 	}
diff --git a/changelog.Debian b/changelog.Debian
index 743cfc8..2a91114 100644
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+libpve-access-control (3.0-2) unstable; urgency=low
+
+  * remove CGI.pm related code (pveproxy does not need that)
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 15 Apr 2013 12:34:23 +0200
+
 libpve-access-control (3.0-1) unstable; urgency=low
 
   * bump version for wheezy release