## Patch originally from Fedora vnc-4.1.2-21.fc8 RPM - vnc-nohttpd.patch

## Modified to make httpd service off by default and only offered via -httpd

--- vnc-4_1_1-unixsrc/unix/vncserver.nohttpd	2005-08-08 15:51:09.000000000 +0100

+++ vnc-4_1_1-unixsrc/unix/vncserver	2005-08-11 12:13:59.000000000 +0100

@@ -58,6 +58,7 @@

 # Check command line options

 &ParseOptions("-geometry",1,"-depth",1,"-pixelformat",1,"-name",1,"-kill",1,

+              "-httpd",0,

 	      "-help",0,"-h",0,"--help",0);

 &Usage() if ($opt{'-help'} || $opt{'-h'} || $opt{'--help'});

@@ -78,6 +79,12 @@

 if ($opt{'-pixelformat'}) {

     $pixelformat = $opt{'-pixelformat'};

 }

+if ($opt{'-httpd'}) {

+    $nohttpd = 0;

+  }

+else {

+    $nohttpd = 1;

+}

 &CheckGeometryAndDepth();

@@ -137,7 +144,7 @@

 $cmd = "Xvnc :$displayNumber";

 $cmd .= " -desktop " . &quotedString($desktopName);

-$cmd .= " -httpd $vncJavaFiles" if ($vncJavaFiles);

+$cmd .= " -httpd $vncJavaFiles" if ($vncJavaFiles && ! $nohttpd);

 $cmd .= " -auth $xauthorityFile";

 $cmd .= " -geometry $geometry" if ($geometry);

 $cmd .= " -depth $depth" if ($depth);

@@ -413,7 +420,7 @@

 sub Usage

 {

-    die("\nusage: $prog [:<number>] [-name <desktop-name>] [-depth <depth>]\n".

+    die("\nusage: $prog [:<number>] [-httpd] [-name <desktop-name>] [-depth <depth>]\n".

 	"                 [-geometry <width>x<height>]\n".

 	"                 [-pixelformat rgbNNN|bgrNNN]\n".

 	"                 <Xvnc-options>...\n\n".

--- vnc-4_1_1-unixsrc/unix/vncserver.man.nohttpd	2005-08-11 12:17:46.000000000 +0100

+++ vnc-4_1_1-unixsrc/unix/vncserver.man	2005-08-11 12:19:35.000000000 +0100

@@ -77,6 +77,10 @@

 must be 8 bits deep.

 .TP

+Instruct Xvnc to run a mini-httpd if the VNC Java applet is found.

+

+.TP

 .B \-kill :\fIdisplay#\fP

 This kills a VNC desktop previously started with vncserver.  It does this by

 killing the Xvnc process, whose process ID is stored in the file