REST.pm: use inlime image data

New create_rrd_graph returns image data directly - no need to read from file.

PVE/REST.pm

@@ -115,9 +115,9 @@ sub format_response_data {
 	$raw = '';
 
 	if ($data && ref($data) && ref($data->{data}) && 
-	    $data->{data}->{filename}) {
+	    $data->{data}->{filename} && defined($data->{data}->{image})) {
 	    $filename = $data->{data}->{filename};
-	    $raw = PVE::Tools::file_get_contents($filename);
+	    $raw = $data->{data}->{image};
 	}
 	    
     } elsif ($format eq 'extjs') {

debian/changelog.Debian

+pve-manager (2.2-27) unstable; urgency=low
+
+  * fix RRD images caching problems: new create_rrd_graph returns rrd 
+  png data inline - no need to read data from file.
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 31 Oct 2012 07:15:57 +0100
+
 pve-manager (2.2-26) unstable; urgency=low
 
   *  pvestatd: fix server reload (run at least 10 cycles)

debian/control.in

@@ -3,7 +3,7 @@ Version: @VERSION@-@PACKAGERELEASE@
 Section: admin
 Priority: optional
 Architecture: all
-Depends: perl5, libtimedate-perl, apache2-mpm-prefork, libauthen-pam-perl, libintl-perl, rsync, libapache2-request-perl, libjson-perl, liblockfile-simple-perl, vncterm, qemu-server (>= 1.1-1), libwww-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, 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, mail-transport-agent, libxml-parser-perl, perl-suid, lzop, dtach
+Depends: perl5, libtimedate-perl, apache2-mpm-prefork, libauthen-pam-perl, libintl-perl, rsync, libapache2-request-perl, libjson-perl, liblockfile-simple-perl, vncterm, qemu-server (>= 1.1-1), libwww-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, mail-transport-agent, libxml-parser-perl, perl-suid, lzop, dtach
 Conflicts: netcat-openbsd, vzdump
 Replaces: vzdump
 Provides: vzdump

defines.mk

@@ -2,7 +2,7 @@ RELEASE=2.2
 
 VERSION=2.2
 PACKAGE=pve-manager
-PACKAGERELEASE=26
+PACKAGERELEASE=27
 
 BINDIR=${DESTDIR}/usr/bin
 PERLLIBDIR=${DESTDIR}/usr/share/perl5