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

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

435N/A

943N/Adiff -urp -x '*~' -x '*.orig' unix/vncserver unix/vncserver

435N/A--- unix/vncserver 2009-08-20 02:46:42.000000000 -0700

435N/A+++ unix/vncserver 2009-08-31 03:21:53.656835000 -0700

919N/A@@ -123,6 +123,7 @@ if ($defFontPath) {

919N/A # Check command line options

919N/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,"-fp",1);

919N/A

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

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

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

919N/A $fpArgSpecified = 1;

919N/A }

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

919N/A+ $nohttpd = 0;

919N/A+}

919N/A+else {

919N/A+ $nohttpd = 1;

435N/A+}

435N/A

435N/A &CheckGeometryAndDepth();

435N/A

493N/A@@ -212,7 +219,7 @@ if ($opt{'-name'}) {

435N/A

435N/A $cmd = $exedir."Xvnc :$displayNumber";

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

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

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

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

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

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

435N/A@@ -535,7 +542,7 @@ sub removeSlashes

435N/A

435N/A sub Usage

435N/A {

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

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

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

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

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

diff -urp -x '*~' -x '*.orig' unix/vncserver.man unix/vncserver.man

--- unix/vncserver.man 2009-08-20 02:46:42.000000000 -0700

+++ unix/vncserver.man 2009-08-31 03:21:53.663499000 -0700

@@ -80,6 +80,10 @@ for the \-cc option may result in strang

must have an 8-bit depth.

.TP

+.B \-httpd

+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