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

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

919N/A

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

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

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

919N/A # Check command line options

830N/A

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

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

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

830N/A

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

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

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

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

919N/A }

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

919N/A+ $nohttpd = 0;

830N/A+ }

830N/A+else {

830N/A+ $nohttpd = 1;

830N/A+}

830N/A

830N/A &CheckGeometryAndDepth();

830N/A

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

830N/A

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

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

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

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

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

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

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

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

830N/A

830N/A sub Usage

830N/A {

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

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

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

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

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

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

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

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

830N/A must be 8 bits deep.

830N/A

830N/A .TP

830N/A+.B \-httpd

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

830N/A+

830N/A+.TP

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

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

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

830N/A