606N/A## Patch originally from Fedora - Revision 1.1 of:

235N/A## Modified to make httpd service off by default and only offered via -httpd

235N/A

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

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

235N/A@@ -58,6 +58,7 @@

235N/A # Check command line options

235N/A

235N/A &ParseOptions("-geometry",1,"-depth",1,"-pixelformat",1,"-name",1,"-kill",1,

235N/A+ "-httpd",0,

235N/A "-help",0,"-h",0,"--help",0);

235N/A

235N/A &Usage() if ($opt{'-help'} || $opt{'-h'} || $opt{'--help'});

235N/A@@ -78,6 +79,12 @@

235N/A if ($opt{'-pixelformat'}) {

235N/A $pixelformat = $opt{'-pixelformat'};

235N/A }

235N/A+if ($opt{'-httpd'}) {

235N/A+ $nohttpd = 0;

235N/A+ }

235N/A+else {

235N/A+ $nohttpd = 1;

235N/A+}

235N/A

235N/A &CheckGeometryAndDepth();

235N/A

235N/A@@ -137,7 +144,7 @@

235N/A

235N/A $cmd = "Xvnc :$displayNumber";

235N/A $cmd .= " -desktop " . &quotedString($desktopName);

235N/A-$cmd .= " -httpd $vncJavaFiles" if ($vncJavaFiles);

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

235N/A $cmd .= " -auth $xauthorityFile";

235N/A $cmd .= " -geometry $geometry" if ($geometry);

235N/A $cmd .= " -depth $depth" if ($depth);

235N/A@@ -413,7 +420,7 @@

235N/A

235N/A sub Usage

235N/A {

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

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

235N/A " [-geometry <width>x<height>]\n".

235N/A " [-pixelformat rgbNNN|bgrNNN]\n".

235N/A " <Xvnc-options>...\n\n".

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

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

235N/A@@ -77,6 +77,10 @@

235N/A must be 8 bits deep.

235N/A

235N/A .TP

240N/A+.B \-httpd

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

235N/A+

235N/A+.TP

235N/A .B \-kill :\fIdisplay#\fP

235N/A This kills a VNC desktop previously started with vncserver. It does this by

235N/A killing the Xvnc process, whose process ID is stored in the file