http options inserted

2 files changed, 13 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index d2852ac..0e2a129 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-
+   http options in cargs
    when closing a client and no longer listening for new ones, don't crash
    fixed a bug with ClientConnectionGone
    endianness is checked at configure time
diff --git a/cargs.c b/cargs.c
index 25d57e4..7735c37 100644
--- a/cargs.c
+++ b/cargs.c
@@ -32,6 +32,10 @@ rfbUsage(void)
                                                              "new non-shared\n"
                     "                       connection comes in (refuse new connection "
                                                                 "instead)\n");
+    fprintf(stderr, "-httpdir dir-path      enable http server using dir-path home\n");
+    fprintf(stderr, "-httpport portnum      use portnum for http connection\n");
+    fprintf(stderr, "-enablehttpproxy       enable http proxy support\n");
+
     exit(1);
 }
 
@@ -89,6 +93,14 @@ rfbProcessArguments(rfbScreenInfoPtr rfbScreen,int* argc, char *argv[])
 	    /* we just remove the processed arguments from the list */
 	    if(i != i1)
 	        rfbPurgeArguments(argc,&i1,i-i1,argv);
+        } else if (strcmp(argv[i], "-httpdir") == 0) {  /* -httpdir directory-path */
+            if (i + 1 >= *argc) rfbUsage();
+            rfbScreen->httpDir = argv[++i];
+        } else if (strcmp(argv[i], "-httpport") == 0) {  /* -httpport portnum */
+            if (i + 1 >= *argc) rfbUsage();
+            rfbScreen->httpPort = atoi(argv[++i]);
+        } else if (strcmp(argv[i], "-enablehttpproxy") == 0) {
+            rfbScreen->httpEnableProxyConnect = TRUE;
         }
 	i1++;
 	i=i1;