From 05c7c27fe45eba7dc7e7ebfb775150df34d268d1 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 10 Apr 2013 06:06:49 +0200
Subject: [PATCH] use liburi-perl to get query params

---
 bin/pveproxy      | 11 +++++++----
 debian/control.in |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/bin/pveproxy b/bin/pveproxy
index 28ba5a65..51e4d5f3 100755
--- a/bin/pveproxy
+++ b/bin/pveproxy
@@ -15,7 +15,8 @@ use PVE::SafeSyslog;
 use PVE::APIDaemon;
 use HTTP::Response;
 use Encode;
-use CGI;
+use URI;
+use URI::QueryParam;
 use File::Find;
 use Data::Dumper;
 
@@ -140,7 +141,7 @@ sub get_index {
     my ($server, $r, $params) = @_;
 
     my $lang = 'en';
-    my $username = '';
+    my $username;
     my $token = 'null';
 
     if (my $cookie = $r->header('Cookie')) {
@@ -155,11 +156,13 @@ sub get_index {
 	}
     }
 
-    my %args = CGI->new($r->url->query)->Vars;
+    my $args = $r->url->query_form_hash();
 
-    my $workspace = defined($args{console}) ?
+    my $workspace = defined($args->{console}) ?
 	"PVE.ConsoleWorkspace" : "PVE.StdWorkspace";
 
+    $username = '' if !$username;
+
     my $jssrc = <<_EOJS;
 if (!PVE) PVE = {};
 PVE.UserName = '$username';
diff --git a/debian/control.in b/debian/control.in
index fad26773..65b7a664 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,7 +3,7 @@ Version: @VERSION@-@PACKAGERELEASE@
 Section: admin
 Priority: optional
 Architecture: amd64
-Depends: perl5, libtimedate-perl, libauthen-pam-perl, libintl-perl, rsync, libjson-perl, liblockfile-simple-perl, vncterm, qemu-server (>= 1.1-1), libwww-perl (>= 6.04-1), libnet-http-perl (>= 6.06-1), libhttp-daemon-perl, wget, libnet-dns-perl, vlan, ifenslave-2.6 (>= 1.1.0-10), liblinux-inotify2-perl, debconf (>= 0.5) | debconf-2.0, netcat-traditional, pve-cluster (>= 1.0-29), libpve-common-perl, libpve-storage-perl, libterm-readline-gnu-perl, libpve-access-control, libio-socket-ssl-perl, libfilesys-df-perl, libfile-readbackwards-perl, libfile-sync-perl, redhat-cluster-pve, resource-agents-pve, fence-agents-pve, cstream, postfix | mail-transport-agent, libxml-parser-perl, lzop, dtach, libanyevent-perl, libio-compress-perl
+Depends: perl5, libtimedate-perl, libauthen-pam-perl, libintl-perl, rsync, libjson-perl, liblockfile-simple-perl, vncterm, qemu-server (>= 1.1-1), libwww-perl (>= 6.04-1), libnet-http-perl (>= 6.06-1), libhttp-daemon-perl, wget, libnet-dns-perl, vlan, ifenslave-2.6 (>= 1.1.0-10), liblinux-inotify2-perl, debconf (>= 0.5) | debconf-2.0, netcat-traditional, pve-cluster (>= 1.0-29), libpve-common-perl, libpve-storage-perl, libterm-readline-gnu-perl, libpve-access-control, libio-socket-ssl-perl, libfilesys-df-perl, libfile-readbackwards-perl, libfile-sync-perl, redhat-cluster-pve, resource-agents-pve, fence-agents-pve, cstream, postfix | mail-transport-agent, libxml-parser-perl, lzop, dtach, libanyevent-perl, libio-compress-perl, liburi-perl
 Conflicts: netcat-openbsd, vzdump
 Replaces: vzdump
 Provides: vzdump