fix deadlock from rfbReleaseExtensionIterator(), fix no libz/libjpeg builds, disable tightvnc-filetransfer if no libpthread, add --without-pthread option, rm // comments, set NAME_MAX if not defined, x11vnc: throttle load if fb update requests not taking place.

4 files changed, 11 insertions, 7 deletions

diff --git a/libvncserver/tightvnc-filetransfer/filelistinfo.h b/libvncserver/tightvnc-filetransfer/filelistinfo.h
index 543edbe..a53964c 100644
--- a/libvncserver/tightvnc-filetransfer/filelistinfo.h
+++ b/libvncserver/tightvnc-filetransfer/filelistinfo.h
@@ -28,6 +28,10 @@
 
 #include <limits.h>
 
+#if !defined(NAME_MAX)
+#define NAME_MAX 255
+#endif
+
 
 #define SUCCESS 1
 #define FAILURE 0
diff --git a/libvncserver/tightvnc-filetransfer/filetransfermsg.c b/libvncserver/tightvnc-filetransfer/filetransfermsg.c
index e7f6476..a51181f 100644
--- a/libvncserver/tightvnc-filetransfer/filetransfermsg.c
+++ b/libvncserver/tightvnc-filetransfer/filetransfermsg.c
@@ -292,7 +292,7 @@ GetFileDownloadLengthErrResponseMsg()
 FileTransferMsg
 GetFileDownloadResponseMsgInBlocks(rfbClientPtr cl, rfbTightClientPtr rtcp)
 {
-	//const unsigned int sz_rfbBlockSize = SZ_RFBBLOCKSIZE;
+	/* const unsigned int sz_rfbBlockSize = SZ_RFBBLOCKSIZE; */
     int numOfBytesRead = 0;
 	char pBuf[SZ_RFBBLOCKSIZE];
 	char* path = rtcp->rcft.rcfd.fName;
diff --git a/libvncserver/tightvnc-filetransfer/handlefiletransferrequest.c b/libvncserver/tightvnc-filetransfer/handlefiletransferrequest.c
index d9165ef..9def149 100644
--- a/libvncserver/tightvnc-filetransfer/handlefiletransferrequest.c
+++ b/libvncserver/tightvnc-filetransfer/handlefiletransferrequest.c
@@ -984,5 +984,3 @@ HandleFileCreateDirRequest(rfbClientPtr cl, rfbTightClientPtr rtcp)
 
 	CreateDirectory(dirName);
 }
-
-
diff --git a/libvncserver/tightvnc-filetransfer/rfbtightserver.c b/libvncserver/tightvnc-filetransfer/rfbtightserver.c
index 9d89de1..933025f 100644
--- a/libvncserver/tightvnc-filetransfer/rfbtightserver.c
+++ b/libvncserver/tightvnc-filetransfer/rfbtightserver.c
@@ -62,7 +62,7 @@ rfbVncAuthSendChallenge(cl)
     rfbClientPtr cl;
 {
 	
-    // 4 byte header is alreay sent. Which is rfbSecTypeVncAuth (same as rfbVncAuth). Just send the challenge.
+    /* 4 byte header is alreay sent. Which is rfbSecTypeVncAuth (same as rfbVncAuth). Just send the challenge. */
     rfbRandomBytes(cl->authChallenge);
     if (rfbWriteExact(cl, (char *)cl->authChallenge, CHALLENGESIZE) < 0) {
         rfbLogPerror("rfbAuthNewClient: write");
@@ -165,7 +165,7 @@ rfbSendAuthCaps(cl)
 	return;
 
     if (cl->screen->authPasswdData && !cl->reverseConnection) {
-	// chk if this condition is valid or not.
+	/* chk if this condition is valid or not. */
 	    SetCapInfo(&caplist[count], rfbAuthVNC, rfbStandardVendor);
 	    rtcp->authCaps[count++] = rfbAuthVNC;
     }
@@ -294,8 +294,10 @@ rfbSendInteractionCaps(cl)
     SetCapInfo(&enc_list[i++],  rfbEncodingRRE,            rfbStandardVendor);
     SetCapInfo(&enc_list[i++],  rfbEncodingCoRRE,          rfbStandardVendor);
     SetCapInfo(&enc_list[i++],  rfbEncodingHextile,        rfbStandardVendor);
+#ifdef LIBVNCSERVER_HAVE_LIBZ
     SetCapInfo(&enc_list[i++],  rfbEncodingZlib,           rfbTridiaVncVendor);
     SetCapInfo(&enc_list[i++],  rfbEncodingTight,          rfbTightVncVendor);
+#endif
     SetCapInfo(&enc_list[i++],  rfbEncodingCompressLevel0, rfbTightVncVendor);
     SetCapInfo(&enc_list[i++],  rfbEncodingQualityLevel0,  rfbTightVncVendor);
     SetCapInfo(&enc_list[i++],  rfbEncodingXCursor,        rfbTightVncVendor);
@@ -404,7 +406,7 @@ const rfbClientToServerMsg* msg;
 
 	/*
 
-	// We shouldn't close the connection here for unhandled msg, it should be left to libvncserver.
+	We shouldn't close the connection here for unhandled msg, it should be left to libvncserver.
 	rfbLog(" ... closing connection\n");
 	rfbCloseClient(cl);
 
@@ -466,7 +468,7 @@ rfbHandleSecTypeTight(rfbClientPtr cl) {
     rfbTightClientPtr rtcp = (rfbTightClientPtr) malloc(sizeof(rfbTightClientRec));
 
     if(rtcp == NULL) {
-        // Error condition close socket
+        /* Error condition close socket */
         rfbLog("Memory error has occured while handling Tight security type... closing connection.\n");
 	 rfbCloseClient(cl);
 	 return;