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

1276N/Adiff --git a/unix/vncserver b/unix/vncserver

1276N/Aindex 689641f..f3468ed 100755

1276N/A--- a/unix/vncserver

1276N/A+++ b/unix/vncserver

1276N/A@@ -122,6 +122,7 @@ if ($fontPath eq "") {

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,

1124N/A "-help",0,"-h",0,"--help",0,"-fp",1,"-list",0,"-fg",0,"-autokill",0);

235N/A

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

1276N/A@@ -148,6 +149,12 @@ if ($opt{'-fp'}) {

822N/A $fontPath = $opt{'-fp'};

822N/A $fpArgSpecified = 1;

235N/A }

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

235N/A+ $nohttpd = 0;

822N/A+}

235N/A+else {

235N/A+ $nohttpd = 1;

235N/A+}

235N/A

235N/A &CheckGeometryAndDepth();

235N/A

1276N/A@@ -253,7 +260,7 @@ if ($opt{'-name'}) {

235N/A

822N/A $cmd = $exedir."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);

1276N/A@@ -568,7 +575,7 @@ sub removeSlashes

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".

822N/A " [-fp <font-path>]\n".

1276N/Adiff --git a/unix/vncserver.man b/unix/vncserver.man

1276N/Aindex 7654380..fef13f3 100644

1276N/A--- a/unix/vncserver.man

1276N/A+++ b/unix/vncserver.man

1276N/A@@ -82,6 +82,10 @@ for the \-cc option may result in strange behaviour, and PseudoColor desktops

822N/A must have an 8-bit depth.

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