Fossil SCM

Initial code for implementing the idle-timeout feature for "fossil ui". Seems to work in preliminary tests on unix. Windows implementation is incomplete and untested.

drh 2020-04-09 16:14 trunk

Commit 39a899e4cf7da42e2f31802488160385ba134527525fa7d2c306691e03237c88

Parent facc16233b95141…

6 files changed +9 -1 +24 -2 +1 +4 +1 +1

~ src/cgi.c ~ src/main.c ~ src/main.mk ~ src/winhttp.c ~ win/Makefile.mingw ~ win/Makefile.msc

M src/cgi.c

+9 -1

		--- src/cgi.c
		+++ src/cgi.c
		@@ -1992,10 +1992,11 @@
1992	1992	*/
1993	1993	int cgi_http_server(
1994	1994	int mnPort, int mxPort, /* Range of TCP ports to try */
1995	1995	const char zBrowser, / Run this browser, if not NULL */
1996	1996	const char zIpAddr, / Bind to this IP address, if not null */
	1997	+ int iIdleTimeout, /* Stop after this many seconds of inactivity */
1997	1998	int flags /* HTTP_SERVER_* flags */
1998	1999	){
1999	2000	#if defined(_WIN32)
2000	2001	/* Use win32_http_server() instead */
2001	2002	fossil_exit(1);
		@@ -2008,11 +2009,12 @@
2008	2009	int child; /* PID of the child process */
2009	2010	int nchildren = 0; /* Number of child processes */
2010	2011	struct timeval delay; /* How long to wait inside select() */
2011	2012	struct sockaddr_in inaddr; /* The socket address */
2012	2013	int opt = 1; /* setsockopt flag */
2013		- int iPort = mnPort;
	2014	+ int iPort = mnPort; /* TCP port to use */
	2015	+ time_t stopTime; /* When to timeout */
2014	2016
2015	2017	while( iPort<=mxPort ){
2016	2018	memset(&inaddr, 0, sizeof(inaddr));
2017	2019	inaddr.sin_family = AF_INET;
2018	2020	if( zIpAddr ){
		@@ -2070,10 +2072,11 @@
2070	2072	#endif
2071	2073	if( system(zBrowser)<0 ){
2072	2074	fossil_warning("cannot start browser: %s\n", zBrowser);
2073	2075	}
2074	2076	}
	2077	+ if( iIdleTimeout>0 ) stopTime = time(0)+iIdleTimeout;
2075	2078	while( 1 ){
2076	2079	#if FOSSIL_MAX_CONNECTIONS>0
2077	2080	while( nchildren>=FOSSIL_MAX_CONNECTIONS ){
2078	2081	if( wait(0)>=0 ) nchildren--;
2079	2082	}
		@@ -2086,10 +2089,11 @@
2086	2089	select( listener+1, &readfds, 0, 0, &delay);
2087	2090	if( FD_ISSET(listener, &readfds) ){
2088	2091	lenaddr = sizeof(inaddr);
2089	2092	connection = accept(listener, (struct sockaddr*)&inaddr, &lenaddr);
2090	2093	if( connection>=0 ){
	2094	+ if( iIdleTimeout>0 ) stopTime = time(0)+iIdleTimeout;
2091	2095	child = fork();
2092	2096	if( child!=0 ){
2093	2097	if( child>0 ){
2094	2098	nchildren++;
2095	2099	nRequest++;
		@@ -2125,10 +2129,14 @@
2125	2129	fprintf(stderr, "/*** Child %d exited on signal %d (%s) ***/\n",
2126	2130	x, WTERMSIG(iStatus), strsignal(WTERMSIG(iStatus)));
2127	2131	}
2128	2132	nchildren--;
2129	2133	}
	2134	+ }
	2135	+ /* Stop serving if idle for too long */
	2136	+ if( iIdleTimeout>0 && stopTime<time(0) ){
	2137	+ fossil_exit(0);
2130	2138	}
2131	2139	}
2132	2140	/* NOT REACHED */
2133	2141	fossil_exit(1);
2134	2142	#endif
2135	2143

	--- src/cgi.c
	+++ src/cgi.c
	@@ -1992,10 +1992,11 @@
1992	*/
1993	int cgi_http_server(
1994	int mnPort, int mxPort, /* Range of TCP ports to try */
1995	const char zBrowser, / Run this browser, if not NULL */
1996	const char zIpAddr, / Bind to this IP address, if not null */

1997	int flags /* HTTP_SERVER_* flags */
1998	){
1999	#if defined(_WIN32)
2000	/* Use win32_http_server() instead */
2001	fossil_exit(1);
	@@ -2008,11 +2009,12 @@
2008	int child; /* PID of the child process */
2009	int nchildren = 0; /* Number of child processes */
2010	struct timeval delay; /* How long to wait inside select() */
2011	struct sockaddr_in inaddr; /* The socket address */
2012	int opt = 1; /* setsockopt flag */
2013	int iPort = mnPort;

2014
2015	while( iPort<=mxPort ){
2016	memset(&inaddr, 0, sizeof(inaddr));
2017	inaddr.sin_family = AF_INET;
2018	if( zIpAddr ){
	@@ -2070,10 +2072,11 @@
2070	#endif
2071	if( system(zBrowser)<0 ){
2072	fossil_warning("cannot start browser: %s\n", zBrowser);
2073	}
2074	}

2075	while( 1 ){
2076	#if FOSSIL_MAX_CONNECTIONS>0
2077	while( nchildren>=FOSSIL_MAX_CONNECTIONS ){
2078	if( wait(0)>=0 ) nchildren--;
2079	}
	@@ -2086,10 +2089,11 @@
2086	select( listener+1, &readfds, 0, 0, &delay);
2087	if( FD_ISSET(listener, &readfds) ){
2088	lenaddr = sizeof(inaddr);
2089	connection = accept(listener, (struct sockaddr*)&inaddr, &lenaddr);
2090	if( connection>=0 ){

2091	child = fork();
2092	if( child!=0 ){
2093	if( child>0 ){
2094	nchildren++;
2095	nRequest++;
	@@ -2125,10 +2129,14 @@
2125	fprintf(stderr, "/*** Child %d exited on signal %d (%s) ***/\n",
2126	x, WTERMSIG(iStatus), strsignal(WTERMSIG(iStatus)));
2127	}
2128	nchildren--;
2129	}




2130	}
2131	}
2132	/* NOT REACHED */
2133	fossil_exit(1);
2134	#endif
2135

	--- src/cgi.c
	+++ src/cgi.c
	@@ -1992,10 +1992,11 @@
1992	*/
1993	int cgi_http_server(
1994	int mnPort, int mxPort, /* Range of TCP ports to try */
1995	const char zBrowser, / Run this browser, if not NULL */
1996	const char zIpAddr, / Bind to this IP address, if not null */
1997	int iIdleTimeout, /* Stop after this many seconds of inactivity */
1998	int flags /* HTTP_SERVER_* flags */
1999	){
2000	#if defined(_WIN32)
2001	/* Use win32_http_server() instead */
2002	fossil_exit(1);
	@@ -2008,11 +2009,12 @@
2009	int child; /* PID of the child process */
2010	int nchildren = 0; /* Number of child processes */
2011	struct timeval delay; /* How long to wait inside select() */
2012	struct sockaddr_in inaddr; /* The socket address */
2013	int opt = 1; /* setsockopt flag */
2014	int iPort = mnPort; /* TCP port to use */
2015	time_t stopTime; /* When to timeout */
2016
2017	while( iPort<=mxPort ){
2018	memset(&inaddr, 0, sizeof(inaddr));
2019	inaddr.sin_family = AF_INET;
2020	if( zIpAddr ){
	@@ -2070,10 +2072,11 @@
2072	#endif
2073	if( system(zBrowser)<0 ){
2074	fossil_warning("cannot start browser: %s\n", zBrowser);
2075	}
2076	}
2077	if( iIdleTimeout>0 ) stopTime = time(0)+iIdleTimeout;
2078	while( 1 ){
2079	#if FOSSIL_MAX_CONNECTIONS>0
2080	while( nchildren>=FOSSIL_MAX_CONNECTIONS ){
2081	if( wait(0)>=0 ) nchildren--;
2082	}
	@@ -2086,10 +2089,11 @@
2089	select( listener+1, &readfds, 0, 0, &delay);
2090	if( FD_ISSET(listener, &readfds) ){
2091	lenaddr = sizeof(inaddr);
2092	connection = accept(listener, (struct sockaddr*)&inaddr, &lenaddr);
2093	if( connection>=0 ){
2094	if( iIdleTimeout>0 ) stopTime = time(0)+iIdleTimeout;
2095	child = fork();
2096	if( child!=0 ){
2097	if( child>0 ){
2098	nchildren++;
2099	nRequest++;
	@@ -2125,10 +2129,14 @@
2129	fprintf(stderr, "/*** Child %d exited on signal %d (%s) ***/\n",
2130	x, WTERMSIG(iStatus), strsignal(WTERMSIG(iStatus)));
2131	}
2132	nchildren--;
2133	}
2134	}
2135	/* Stop serving if idle for too long */
2136	if( iIdleTimeout>0 && stopTime<time(0) ){
2137	fossil_exit(0);
2138	}
2139	}
2140	/* NOT REACHED */
2141	fossil_exit(1);
2142	#endif
2143

M src/main.c

+24 -2

		--- src/main.c
		+++ src/main.c
		@@ -1256,10 +1256,20 @@
1256	1256	@ %h(blob_str(&versionInfo))
1257	1257	@ </pre>
1258	1258	style_footer();
1259	1259	}
1260	1260
	1261	+/*
	1262	+** WEBPAGE: noop
	1263	+**
	1264	+** Send back an empty HTTP reply. Deliver no content.
	1265	+*/
	1266	+void noop_page(void){
	1267	+ fossil_free(style_csp(1));
	1268	+ cgi_set_content_type("text/plain");
	1269	+}
	1270	+
1261	1271
1262	1272	/*
1263	1273	** Set the g.zBaseURL value to the full URL for the toplevel of
1264	1274	** the fossil tree. Set g.zTop to g.zBaseURL without the
1265	1275	** leading "http://" and the host and port.
		@@ -2361,10 +2371,11 @@
2361	2371	** --files GLOB comma-separate glob patterns for static file to serve
2362	2372	** --host NAME specify hostname of the server
2363	2373	** --https signal a request coming in via https
2364	2374	** --in FILE Take input from FILE instead of standard input
2365	2375	** --ipaddr ADDR Assume the request comes from the given IP address
	2376	+** --keep-alive Include "keepalive.js" in HTML pages
2366	2377	** --localauth enable automatic login for local connections
2367	2378	** --nocompress do not compress HTTP replies
2368	2379	** --nodelay omit backoffice processing if it would delay process exit
2369	2380	** --nojail drop root privilege but do not enter the chroot jail
2370	2381	** --nossl signal that no SSL connections are available
		@@ -2440,10 +2451,11 @@
2440	2451	zIpAddr = fossil_getenv("REMOTE_HOST"); /* From stunnel */
2441	2452	cgi_replace_parameter("HTTPS","on");
2442	2453	}
2443	2454	zHost = find_option("host", 0, 1);
2444	2455	if( zHost ) cgi_replace_parameter("HTTP_HOST",zHost);
	2456	+ if( find_option("keep-alive",0,0) ) style_load_js("keepalive.js");
2445	2457
2446	2458	#if defined(_WIN32) && USE_SEE
2447	2459	zPidKey = find_option("usepidkey", 0, 1);
2448	2460	if( zPidKey ){
2449	2461	DWORD processId = 0;
		@@ -2624,10 +2636,11 @@
2624	2636	** Options:
2625	2637	** --baseurl URL Use URL as the base (useful for reverse proxies)
2626	2638	** --create Create a new REPOSITORY if it does not already exist
2627	2639	** --extroot DIR Document root for the /ext extension mechanism
2628	2640	** --files GLOBLIST Comma-separated list of glob patterns for static files
	2641	+** --idle-timeout N Exit if no HTTP requests received for N seconds
2629	2642	** --localauth enable automatic login for requests from localhost
2630	2643	** --localhost listen on 127.0.0.1 only (always true for "ui")
2631	2644	** --https Indicates that the input is coming through a reverse
2632	2645	** proxy that has already translated HTTPS into HTTP.
2633	2646	** --max-latency N Do not let any single HTTP request run for more than N
		@@ -2663,10 +2676,12 @@
2663	2676	int allowRepoList; /* List repositories on URL "/" */
2664	2677	const char zAltBase; / Argument to the --baseurl option */
2665	2678	const char zFileGlob; / Static content must match this */
2666	2679	char zIpAddr = 0; / Bind to this IP address */
2667	2680	int fCreate = 0; /* The --create flag */
	2681	+ const char zIdleTimeout; / Value of the --idle-timeout flag */
	2682	+ int iIdle = 0; /* Idle timeout value */
2668	2683	const char zInitPage = 0; / Start on this page. --page option */
2669	2684	#if defined(_WIN32) && USE_SEE
2670	2685	const char *zPidKey;
2671	2686	#endif
2672	2687
		@@ -2696,11 +2711,17 @@
2696	2711	Th_InitTraceLog();
2697	2712	zPort = find_option("port", "P", 1);
2698	2713	isUiCmd = g.argv[1][0]=='u';
2699	2714	if( isUiCmd ){
2700	2715	zInitPage = find_option("page", 0, 1);
	2716	+ iIdle = 60;
	2717	+ }
	2718	+ zIdleTimeout = find_option("idle-timeout",0,1);
	2719	+ if( zIdleTimeout ){
	2720	+ iIdle = atoi(zIdleTimeout);
2701	2721	}
	2722	+
2702	2723	zNotFound = find_option("notfound", 0, 1);
2703	2724	allowRepoList = find_option("repolist",0,0)!=0;
2704	2725	if( find_option("nocompress",0,0)!=0 ) g.fNoHttpCompress = 1;
2705	2726	zAltBase = find_option("baseurl", 0, 1);
2706	2727	fCreate = find_option("create",0,0)!=0;
		@@ -2794,11 +2815,11 @@
2794	2815	}
2795	2816	}
2796	2817	if( g.repositoryOpen ) flags \|= HTTP_SERVER_HAD_REPOSITORY;
2797	2818	if( g.localOpen ) flags \|= HTTP_SERVER_HAD_CHECKOUT;
2798	2819	db_close(1);
2799		- if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){
	2820	+ if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, iIdle, flags) ){
2800	2821	fossil_fatal("unable to listen on TCP socket %d", iPort);
2801	2822	}
2802	2823	/* For the parent process, the cgi_http_server() command above never
2803	2824	** returns (except in the case of an error). Instead, for each incoming
2804	2825	** client connection, a child process is created, file descriptors 0
		@@ -2834,10 +2855,11 @@
2834	2855	if( flags & HTTP_SERVER_SCGI ){
2835	2856	cgi_handle_scgi_request();
2836	2857	}else{
2837	2858	cgi_handle_http_request(0);
2838	2859	}
	2860	+ if( iIdle>0 ) style_load_js("keepalive.js");
2839	2861	process_one_web_page(zNotFound, glob_create(zFileGlob), allowRepoList);
2840	2862	if( g.fAnyTrace ){
2841	2863	fprintf(stderr, "/*** Webpage finished in subprocess %d ***/\n",
2842	2864	getpid());
2843	2865	}
		@@ -2862,11 +2884,11 @@
2862	2884	if( allowRepoList ){
2863	2885	flags \|= HTTP_SERVER_REPOLIST;
2864	2886	}
2865	2887	if( win32_http_service(iPort, zAltBase, zNotFound, zFileGlob, flags) ){
2866	2888	win32_http_server(iPort, mxPort, zBrowserCmd, zStopperFile,
2867		- zAltBase, zNotFound, zFileGlob, zIpAddr, flags);
	2889	+ zAltBase, zNotFound, zFileGlob, zIpAddr, iIdle, flags);
2868	2890	}
2869	2891	#endif
2870	2892	}
2871	2893
2872	2894	/*
2873	2895

	--- src/main.c
	+++ src/main.c
	@@ -1256,10 +1256,20 @@
1256	@ %h(blob_str(&versionInfo))
1257	@ </pre>
1258	style_footer();
1259	}
1260










1261
1262	/*
1263	** Set the g.zBaseURL value to the full URL for the toplevel of
1264	** the fossil tree. Set g.zTop to g.zBaseURL without the
1265	** leading "http://" and the host and port.
	@@ -2361,10 +2371,11 @@
2361	** --files GLOB comma-separate glob patterns for static file to serve
2362	** --host NAME specify hostname of the server
2363	** --https signal a request coming in via https
2364	** --in FILE Take input from FILE instead of standard input
2365	** --ipaddr ADDR Assume the request comes from the given IP address

2366	** --localauth enable automatic login for local connections
2367	** --nocompress do not compress HTTP replies
2368	** --nodelay omit backoffice processing if it would delay process exit
2369	** --nojail drop root privilege but do not enter the chroot jail
2370	** --nossl signal that no SSL connections are available
	@@ -2440,10 +2451,11 @@
2440	zIpAddr = fossil_getenv("REMOTE_HOST"); /* From stunnel */
2441	cgi_replace_parameter("HTTPS","on");
2442	}
2443	zHost = find_option("host", 0, 1);
2444	if( zHost ) cgi_replace_parameter("HTTP_HOST",zHost);

2445
2446	#if defined(_WIN32) && USE_SEE
2447	zPidKey = find_option("usepidkey", 0, 1);
2448	if( zPidKey ){
2449	DWORD processId = 0;
	@@ -2624,10 +2636,11 @@
2624	** Options:
2625	** --baseurl URL Use URL as the base (useful for reverse proxies)
2626	** --create Create a new REPOSITORY if it does not already exist
2627	** --extroot DIR Document root for the /ext extension mechanism
2628	** --files GLOBLIST Comma-separated list of glob patterns for static files

2629	** --localauth enable automatic login for requests from localhost
2630	** --localhost listen on 127.0.0.1 only (always true for "ui")
2631	** --https Indicates that the input is coming through a reverse
2632	** proxy that has already translated HTTPS into HTTP.
2633	** --max-latency N Do not let any single HTTP request run for more than N
	@@ -2663,10 +2676,12 @@
2663	int allowRepoList; /* List repositories on URL "/" */
2664	const char zAltBase; / Argument to the --baseurl option */
2665	const char zFileGlob; / Static content must match this */
2666	char zIpAddr = 0; / Bind to this IP address */
2667	int fCreate = 0; /* The --create flag */


2668	const char zInitPage = 0; / Start on this page. --page option */
2669	#if defined(_WIN32) && USE_SEE
2670	const char *zPidKey;
2671	#endif
2672
	@@ -2696,11 +2711,17 @@
2696	Th_InitTraceLog();
2697	zPort = find_option("port", "P", 1);
2698	isUiCmd = g.argv[1][0]=='u';
2699	if( isUiCmd ){
2700	zInitPage = find_option("page", 0, 1);





2701	}

2702	zNotFound = find_option("notfound", 0, 1);
2703	allowRepoList = find_option("repolist",0,0)!=0;
2704	if( find_option("nocompress",0,0)!=0 ) g.fNoHttpCompress = 1;
2705	zAltBase = find_option("baseurl", 0, 1);
2706	fCreate = find_option("create",0,0)!=0;
	@@ -2794,11 +2815,11 @@
2794	}
2795	}
2796	if( g.repositoryOpen ) flags \|= HTTP_SERVER_HAD_REPOSITORY;
2797	if( g.localOpen ) flags \|= HTTP_SERVER_HAD_CHECKOUT;
2798	db_close(1);
2799	if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){
2800	fossil_fatal("unable to listen on TCP socket %d", iPort);
2801	}
2802	/* For the parent process, the cgi_http_server() command above never
2803	** returns (except in the case of an error). Instead, for each incoming
2804	** client connection, a child process is created, file descriptors 0
	@@ -2834,10 +2855,11 @@
2834	if( flags & HTTP_SERVER_SCGI ){
2835	cgi_handle_scgi_request();
2836	}else{
2837	cgi_handle_http_request(0);
2838	}

2839	process_one_web_page(zNotFound, glob_create(zFileGlob), allowRepoList);
2840	if( g.fAnyTrace ){
2841	fprintf(stderr, "/*** Webpage finished in subprocess %d ***/\n",
2842	getpid());
2843	}
	@@ -2862,11 +2884,11 @@
2862	if( allowRepoList ){
2863	flags \|= HTTP_SERVER_REPOLIST;
2864	}
2865	if( win32_http_service(iPort, zAltBase, zNotFound, zFileGlob, flags) ){
2866	win32_http_server(iPort, mxPort, zBrowserCmd, zStopperFile,
2867	zAltBase, zNotFound, zFileGlob, zIpAddr, flags);
2868	}
2869	#endif
2870	}
2871
2872	/*
2873

	--- src/main.c
	+++ src/main.c
	@@ -1256,10 +1256,20 @@
1256	@ %h(blob_str(&versionInfo))
1257	@ </pre>
1258	style_footer();
1259	}
1260
1261	/*
1262	** WEBPAGE: noop
1263	**
1264	** Send back an empty HTTP reply. Deliver no content.
1265	*/
1266	void noop_page(void){
1267	fossil_free(style_csp(1));
1268	cgi_set_content_type("text/plain");
1269	}
1270
1271
1272	/*
1273	** Set the g.zBaseURL value to the full URL for the toplevel of
1274	** the fossil tree. Set g.zTop to g.zBaseURL without the
1275	** leading "http://" and the host and port.
	@@ -2361,10 +2371,11 @@
2371	** --files GLOB comma-separate glob patterns for static file to serve
2372	** --host NAME specify hostname of the server
2373	** --https signal a request coming in via https
2374	** --in FILE Take input from FILE instead of standard input
2375	** --ipaddr ADDR Assume the request comes from the given IP address
2376	** --keep-alive Include "keepalive.js" in HTML pages
2377	** --localauth enable automatic login for local connections
2378	** --nocompress do not compress HTTP replies
2379	** --nodelay omit backoffice processing if it would delay process exit
2380	** --nojail drop root privilege but do not enter the chroot jail
2381	** --nossl signal that no SSL connections are available
	@@ -2440,10 +2451,11 @@
2451	zIpAddr = fossil_getenv("REMOTE_HOST"); /* From stunnel */
2452	cgi_replace_parameter("HTTPS","on");
2453	}
2454	zHost = find_option("host", 0, 1);
2455	if( zHost ) cgi_replace_parameter("HTTP_HOST",zHost);
2456	if( find_option("keep-alive",0,0) ) style_load_js("keepalive.js");
2457
2458	#if defined(_WIN32) && USE_SEE
2459	zPidKey = find_option("usepidkey", 0, 1);
2460	if( zPidKey ){
2461	DWORD processId = 0;
	@@ -2624,10 +2636,11 @@
2636	** Options:
2637	** --baseurl URL Use URL as the base (useful for reverse proxies)
2638	** --create Create a new REPOSITORY if it does not already exist
2639	** --extroot DIR Document root for the /ext extension mechanism
2640	** --files GLOBLIST Comma-separated list of glob patterns for static files
2641	** --idle-timeout N Exit if no HTTP requests received for N seconds
2642	** --localauth enable automatic login for requests from localhost
2643	** --localhost listen on 127.0.0.1 only (always true for "ui")
2644	** --https Indicates that the input is coming through a reverse
2645	** proxy that has already translated HTTPS into HTTP.
2646	** --max-latency N Do not let any single HTTP request run for more than N
	@@ -2663,10 +2676,12 @@
2676	int allowRepoList; /* List repositories on URL "/" */
2677	const char zAltBase; / Argument to the --baseurl option */
2678	const char zFileGlob; / Static content must match this */
2679	char zIpAddr = 0; / Bind to this IP address */
2680	int fCreate = 0; /* The --create flag */
2681	const char zIdleTimeout; / Value of the --idle-timeout flag */
2682	int iIdle = 0; /* Idle timeout value */
2683	const char zInitPage = 0; / Start on this page. --page option */
2684	#if defined(_WIN32) && USE_SEE
2685	const char *zPidKey;
2686	#endif
2687
	@@ -2696,11 +2711,17 @@
2711	Th_InitTraceLog();
2712	zPort = find_option("port", "P", 1);
2713	isUiCmd = g.argv[1][0]=='u';
2714	if( isUiCmd ){
2715	zInitPage = find_option("page", 0, 1);
2716	iIdle = 60;
2717	}
2718	zIdleTimeout = find_option("idle-timeout",0,1);
2719	if( zIdleTimeout ){
2720	iIdle = atoi(zIdleTimeout);
2721	}
2722
2723	zNotFound = find_option("notfound", 0, 1);
2724	allowRepoList = find_option("repolist",0,0)!=0;
2725	if( find_option("nocompress",0,0)!=0 ) g.fNoHttpCompress = 1;
2726	zAltBase = find_option("baseurl", 0, 1);
2727	fCreate = find_option("create",0,0)!=0;
	@@ -2794,11 +2815,11 @@
2815	}
2816	}
2817	if( g.repositoryOpen ) flags \|= HTTP_SERVER_HAD_REPOSITORY;
2818	if( g.localOpen ) flags \|= HTTP_SERVER_HAD_CHECKOUT;
2819	db_close(1);
2820	if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, iIdle, flags) ){
2821	fossil_fatal("unable to listen on TCP socket %d", iPort);
2822	}
2823	/* For the parent process, the cgi_http_server() command above never
2824	** returns (except in the case of an error). Instead, for each incoming
2825	** client connection, a child process is created, file descriptors 0
	@@ -2834,10 +2855,11 @@
2855	if( flags & HTTP_SERVER_SCGI ){
2856	cgi_handle_scgi_request();
2857	}else{
2858	cgi_handle_http_request(0);
2859	}
2860	if( iIdle>0 ) style_load_js("keepalive.js");
2861	process_one_web_page(zNotFound, glob_create(zFileGlob), allowRepoList);
2862	if( g.fAnyTrace ){
2863	fprintf(stderr, "/*** Webpage finished in subprocess %d ***/\n",
2864	getpid());
2865	}
	@@ -2862,11 +2884,11 @@
2884	if( allowRepoList ){
2885	flags \|= HTTP_SERVER_REPOLIST;
2886	}
2887	if( win32_http_service(iPort, zAltBase, zNotFound, zFileGlob, flags) ){
2888	win32_http_server(iPort, mxPort, zBrowserCmd, zStopperFile,
2889	zAltBase, zNotFound, zFileGlob, zIpAddr, iIdle, flags);
2890	}
2891	#endif
2892	}
2893
2894	/*
2895

M src/main.mk

		--- src/main.mk
		+++ src/main.mk
		@@ -218,10 +218,11 @@
218	218	$(SRCDIR)/copybtn.js \
219	219	$(SRCDIR)/diff.tcl \
220	220	$(SRCDIR)/forum.js \
221	221	$(SRCDIR)/graph.js \
222	222	$(SRCDIR)/href.js \
	223	+ $(SRCDIR)/keepalive.js \
223	224	$(SRCDIR)/login.js \
224	225	$(SRCDIR)/markdown.md \
225	226	$(SRCDIR)/menu.js \
226	227	$(SRCDIR)/sbsdiff.js \
227	228	$(SRCDIR)/scroll.js \
228	229

	--- src/main.mk
	+++ src/main.mk
	@@ -218,10 +218,11 @@
218	$(SRCDIR)/copybtn.js \
219	$(SRCDIR)/diff.tcl \
220	$(SRCDIR)/forum.js \
221	$(SRCDIR)/graph.js \
222	$(SRCDIR)/href.js \

223	$(SRCDIR)/login.js \
224	$(SRCDIR)/markdown.md \
225	$(SRCDIR)/menu.js \
226	$(SRCDIR)/sbsdiff.js \
227	$(SRCDIR)/scroll.js \
228

	--- src/main.mk
	+++ src/main.mk
	@@ -218,10 +218,11 @@
218	$(SRCDIR)/copybtn.js \
219	$(SRCDIR)/diff.tcl \
220	$(SRCDIR)/forum.js \
221	$(SRCDIR)/graph.js \
222	$(SRCDIR)/href.js \
223	$(SRCDIR)/keepalive.js \
224	$(SRCDIR)/login.js \
225	$(SRCDIR)/markdown.md \
226	$(SRCDIR)/menu.js \
227	$(SRCDIR)/sbsdiff.js \
228	$(SRCDIR)/scroll.js \
229

M src/winhttp.c

		--- src/winhttp.c
		+++ src/winhttp.c
		@@ -519,10 +519,11 @@
519	519	const char zStopper, / Stop server when this file is exists (Or NULL) */
520	520	const char zBaseUrl, / The --baseurl option, or NULL */
521	521	const char zNotFound, / The --notfound option, or NULL */
522	522	const char zFileGlob, / The --fileglob option, or NULL */
523	523	const char zIpAddr, / Bind to this IP address, if not NULL */
	524	+ int idleTimeout, /* Idle timeout in seconds. 0 means none */
524	525	int flags /* One or more HTTP_SERVER_ flags */
525	526	){
526	527	HANDLE hStoppedEvent;
527	528	WSADATA wd;
528	529	DualSocket ds;
		@@ -553,10 +554,13 @@
553	554	blob_appendf(&options, " --localauth");
554	555	}
555	556	if( g.thTrace ){
556	557	blob_appendf(&options, " --th-trace");
557	558	}
	559	+ if( idleTimeout>0 ){
	560	+ blob_appendf(&options, " --keep-alive");
	561	+ }
558	562	if( flags & HTTP_SERVER_REPOLIST ){
559	563	blob_appendf(&options, " --repolist");
560	564	}
561	565	zSkin = skin_in_use();
562	566	if( zSkin ){
563	567

	--- src/winhttp.c
	+++ src/winhttp.c
	@@ -519,10 +519,11 @@
519	const char zStopper, / Stop server when this file is exists (Or NULL) */
520	const char zBaseUrl, / The --baseurl option, or NULL */
521	const char zNotFound, / The --notfound option, or NULL */
522	const char zFileGlob, / The --fileglob option, or NULL */
523	const char zIpAddr, / Bind to this IP address, if not NULL */

524	int flags /* One or more HTTP_SERVER_ flags */
525	){
526	HANDLE hStoppedEvent;
527	WSADATA wd;
528	DualSocket ds;
	@@ -553,10 +554,13 @@
553	blob_appendf(&options, " --localauth");
554	}
555	if( g.thTrace ){
556	blob_appendf(&options, " --th-trace");
557	}



558	if( flags & HTTP_SERVER_REPOLIST ){
559	blob_appendf(&options, " --repolist");
560	}
561	zSkin = skin_in_use();
562	if( zSkin ){
563

	--- src/winhttp.c
	+++ src/winhttp.c
	@@ -519,10 +519,11 @@
519	const char zStopper, / Stop server when this file is exists (Or NULL) */
520	const char zBaseUrl, / The --baseurl option, or NULL */
521	const char zNotFound, / The --notfound option, or NULL */
522	const char zFileGlob, / The --fileglob option, or NULL */
523	const char zIpAddr, / Bind to this IP address, if not NULL */
524	int idleTimeout, /* Idle timeout in seconds. 0 means none */
525	int flags /* One or more HTTP_SERVER_ flags */
526	){
527	HANDLE hStoppedEvent;
528	WSADATA wd;
529	DualSocket ds;
	@@ -553,10 +554,13 @@
554	blob_appendf(&options, " --localauth");
555	}
556	if( g.thTrace ){
557	blob_appendf(&options, " --th-trace");
558	}
559	if( idleTimeout>0 ){
560	blob_appendf(&options, " --keep-alive");
561	}
562	if( flags & HTTP_SERVER_REPOLIST ){
563	blob_appendf(&options, " --repolist");
564	}
565	zSkin = skin_in_use();
566	if( zSkin ){
567

M win/Makefile.mingw

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -640,10 +640,11 @@
640	640	$(SRCDIR)/copybtn.js \
641	641	$(SRCDIR)/diff.tcl \
642	642	$(SRCDIR)/forum.js \
643	643	$(SRCDIR)/graph.js \
644	644	$(SRCDIR)/href.js \
	645	+ $(SRCDIR)/keepalive.js \
645	646	$(SRCDIR)/login.js \
646	647	$(SRCDIR)/markdown.md \
647	648	$(SRCDIR)/menu.js \
648	649	$(SRCDIR)/sbsdiff.js \
649	650	$(SRCDIR)/scroll.js \
650	651

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -640,10 +640,11 @@
640	$(SRCDIR)/copybtn.js \
641	$(SRCDIR)/diff.tcl \
642	$(SRCDIR)/forum.js \
643	$(SRCDIR)/graph.js \
644	$(SRCDIR)/href.js \

645	$(SRCDIR)/login.js \
646	$(SRCDIR)/markdown.md \
647	$(SRCDIR)/menu.js \
648	$(SRCDIR)/sbsdiff.js \
649	$(SRCDIR)/scroll.js \
650

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -640,10 +640,11 @@
640	$(SRCDIR)/copybtn.js \
641	$(SRCDIR)/diff.tcl \
642	$(SRCDIR)/forum.js \
643	$(SRCDIR)/graph.js \
644	$(SRCDIR)/href.js \
645	$(SRCDIR)/keepalive.js \
646	$(SRCDIR)/login.js \
647	$(SRCDIR)/markdown.md \
648	$(SRCDIR)/menu.js \
649	$(SRCDIR)/sbsdiff.js \
650	$(SRCDIR)/scroll.js \
651

M win/Makefile.msc

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -547,10 +547,11 @@
547	547	$(SRCDIR)\copybtn.js \
548	548	$(SRCDIR)\diff.tcl \
549	549	$(SRCDIR)\forum.js \
550	550	$(SRCDIR)\graph.js \
551	551	$(SRCDIR)\href.js \
	552	+ $(SRCDIR)\keepalive.js \
552	553	$(SRCDIR)\login.js \
553	554	$(SRCDIR)\markdown.md \
554	555	$(SRCDIR)\menu.js \
555	556	$(SRCDIR)\sbsdiff.js \
556	557	$(SRCDIR)\scroll.js \
557	558

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -547,10 +547,11 @@
547	$(SRCDIR)\copybtn.js \
548	$(SRCDIR)\diff.tcl \
549	$(SRCDIR)\forum.js \
550	$(SRCDIR)\graph.js \
551	$(SRCDIR)\href.js \

552	$(SRCDIR)\login.js \
553	$(SRCDIR)\markdown.md \
554	$(SRCDIR)\menu.js \
555	$(SRCDIR)\sbsdiff.js \
556	$(SRCDIR)\scroll.js \
557

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -547,10 +547,11 @@
547	$(SRCDIR)\copybtn.js \
548	$(SRCDIR)\diff.tcl \
549	$(SRCDIR)\forum.js \
550	$(SRCDIR)\graph.js \
551	$(SRCDIR)\href.js \
552	$(SRCDIR)\keepalive.js \
553	$(SRCDIR)\login.js \
554	$(SRCDIR)\markdown.md \
555	$(SRCDIR)\menu.js \
556	$(SRCDIR)\sbsdiff.js \
557	$(SRCDIR)\scroll.js \
558

Fossil SCM

Keyboard Shortcuts