Fossil SCM

Add --https and --nossl options to the 'server' command.

mistachkin 2016-02-01 04:34 UTC trunk

Commit 2bf596c9d518549416313950277e8f627ad4431f

Parent 3c47e0c66a60c2c…

1 file changed +9 -1

M src/main.c

+9 -1

		--- src/main.c
		+++ src/main.c
		@@ -2429,11 +2429,13 @@
2429	2429	** --create Create a new REPOSITORY if it does not already exist
2430	2430	** --page PAGE Start "ui" on PAGE. ex: --page "timeline?y=ci"
2431	2431	** --files GLOBLIST Comma-separated list of glob patterns for static files
2432	2432	** --localauth enable automatic login for requests from localhost
2433	2433	** --localhost listen on 127.0.0.1 only (always true for "ui")
	2434	+** --https signal a request coming in via https
2434	2435	** --nojail Drop root privileges but do not enter the chroot jail
	2436	+** --nossl signal that no SSL connections are available
2435	2437	** --notfound URL Redirect
2436	2438	** -P\|--port TCPPORT listen to request on port TCPPORT
2437	2439	** --th-trace trace TH1 execution (for debugging purposes)
2438	2440	** --repolist If REPOSITORY is dir, URL "/" lists repos.
2439	2441	** --scgi Accept SCGI rather than HTTP
		@@ -2490,10 +2492,17 @@
2490	2492	zAltBase = find_option("baseurl", 0, 1);
2491	2493	fCreate = find_option("create",0,0)!=0;
2492	2494	if( find_option("scgi", 0, 0)!=0 ) flags \|= HTTP_SERVER_SCGI;
2493	2495	if( zAltBase ){
2494	2496	set_base_url(zAltBase);
	2497	+ }
	2498	+ g.sslNotAvailable = find_option("nossl", 0, 0)!=0;
	2499	+ if( find_option("https",0,0)!=0 ){
	2500	+ cgi_replace_parameter("HTTPS","on");
	2501	+ }else{
	2502	+ /* without --https, defaults to not available. */
	2503	+ g.sslNotAvailable = 1;
2495	2504	}
2496	2505	if( find_option("localhost", 0, 0)!=0 ){
2497	2506	flags \|= HTTP_SERVER_LOCALHOST;
2498	2507	}
2499	2508
		@@ -2551,11 +2560,10 @@
2551	2560	if( g.localOpen ) flags \|= HTTP_SERVER_HAD_CHECKOUT;
2552	2561	db_close(1);
2553	2562	if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){
2554	2563	fossil_fatal("unable to listen on TCP socket %d", iPort);
2555	2564	}
2556		- g.sslNotAvailable = 1;
2557	2565	g.httpIn = stdin;
2558	2566	g.httpOut = stdout;
2559	2567	if( g.fHttpTrace \|\| g.fSqlTrace ){
2560	2568	fprintf(stderr, "====== SERVER pid %d =======\n", getpid());
2561	2569	}
2562	2570

	--- src/main.c
	+++ src/main.c
	@@ -2429,11 +2429,13 @@
2429	** --create Create a new REPOSITORY if it does not already exist
2430	** --page PAGE Start "ui" on PAGE. ex: --page "timeline?y=ci"
2431	** --files GLOBLIST Comma-separated list of glob patterns for static files
2432	** --localauth enable automatic login for requests from localhost
2433	** --localhost listen on 127.0.0.1 only (always true for "ui")

2434	** --nojail Drop root privileges but do not enter the chroot jail

2435	** --notfound URL Redirect
2436	** -P\|--port TCPPORT listen to request on port TCPPORT
2437	** --th-trace trace TH1 execution (for debugging purposes)
2438	** --repolist If REPOSITORY is dir, URL "/" lists repos.
2439	** --scgi Accept SCGI rather than HTTP
	@@ -2490,10 +2492,17 @@
2490	zAltBase = find_option("baseurl", 0, 1);
2491	fCreate = find_option("create",0,0)!=0;
2492	if( find_option("scgi", 0, 0)!=0 ) flags \|= HTTP_SERVER_SCGI;
2493	if( zAltBase ){
2494	set_base_url(zAltBase);







2495	}
2496	if( find_option("localhost", 0, 0)!=0 ){
2497	flags \|= HTTP_SERVER_LOCALHOST;
2498	}
2499
	@@ -2551,11 +2560,10 @@
2551	if( g.localOpen ) flags \|= HTTP_SERVER_HAD_CHECKOUT;
2552	db_close(1);
2553	if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){
2554	fossil_fatal("unable to listen on TCP socket %d", iPort);
2555	}
2556	g.sslNotAvailable = 1;
2557	g.httpIn = stdin;
2558	g.httpOut = stdout;
2559	if( g.fHttpTrace \|\| g.fSqlTrace ){
2560	fprintf(stderr, "====== SERVER pid %d =======\n", getpid());
2561	}
2562

	--- src/main.c
	+++ src/main.c
	@@ -2429,11 +2429,13 @@
2429	** --create Create a new REPOSITORY if it does not already exist
2430	** --page PAGE Start "ui" on PAGE. ex: --page "timeline?y=ci"
2431	** --files GLOBLIST Comma-separated list of glob patterns for static files
2432	** --localauth enable automatic login for requests from localhost
2433	** --localhost listen on 127.0.0.1 only (always true for "ui")
2434	** --https signal a request coming in via https
2435	** --nojail Drop root privileges but do not enter the chroot jail
2436	** --nossl signal that no SSL connections are available
2437	** --notfound URL Redirect
2438	** -P\|--port TCPPORT listen to request on port TCPPORT
2439	** --th-trace trace TH1 execution (for debugging purposes)
2440	** --repolist If REPOSITORY is dir, URL "/" lists repos.
2441	** --scgi Accept SCGI rather than HTTP
	@@ -2490,10 +2492,17 @@
2492	zAltBase = find_option("baseurl", 0, 1);
2493	fCreate = find_option("create",0,0)!=0;
2494	if( find_option("scgi", 0, 0)!=0 ) flags \|= HTTP_SERVER_SCGI;
2495	if( zAltBase ){
2496	set_base_url(zAltBase);
2497	}
2498	g.sslNotAvailable = find_option("nossl", 0, 0)!=0;
2499	if( find_option("https",0,0)!=0 ){
2500	cgi_replace_parameter("HTTPS","on");
2501	}else{
2502	/* without --https, defaults to not available. */
2503	g.sslNotAvailable = 1;
2504	}
2505	if( find_option("localhost", 0, 0)!=0 ){
2506	flags \|= HTTP_SERVER_LOCALHOST;
2507	}
2508
	@@ -2551,11 +2560,10 @@
2560	if( g.localOpen ) flags \|= HTTP_SERVER_HAD_CHECKOUT;
2561	db_close(1);
2562	if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){
2563	fossil_fatal("unable to listen on TCP socket %d", iPort);
2564	}

2565	g.httpIn = stdin;
2566	g.httpOut = stdout;
2567	if( g.fHttpTrace \|\| g.fSqlTrace ){
2568	fprintf(stderr, "====== SERVER pid %d =======\n", getpid());
2569	}
2570

Fossil SCM

Keyboard Shortcuts