98cdd410df5… — Fossil SCM

M src/http_ssl.c

+2 -2

		--- src/http_ssl.c
		+++ src/http_ssl.c
		@@ -249,11 +249,11 @@
249	249	int j;
250	250	for( j = 0; j < mdLength; ++j ) {
251	251	BIO_printf(mem, " %02x", md[j]);
252	252	}
253	253	}
254		- BIO_write(mem, "", 1); // null-terminate mem buffer
	254	+ BIO_write(mem, "", 1); /* nul-terminate mem buffer */
255	255	BIO_get_mem_data(mem, &desc);
256	256
257	257	if( hasSavedCertificate ){
258	258	warning = "WARNING: Certificate doesn't match the "
259	259	"saved certificate for this host!";
		@@ -304,11 +304,11 @@
304	304	BIO *mem;
305	305	char zCert, zHost;
306	306
307	307	mem = BIO_new(BIO_s_mem());
308	308	PEM_write_bio_X509(mem, cert);
309		- BIO_write(mem, "", 1); // null-terminate mem buffer
	309	+ BIO_write(mem, "", 1); /* nul-terminate mem buffer */
310	310	BIO_get_mem_data(mem, &zCert);
311	311	zHost = mprintf("cert:%s", g.urlName);
312	312	db_set(zHost, zCert, 1);
313	313	free(zHost);
314	314	BIO_free(mem);
315	315

	--- src/http_ssl.c
	+++ src/http_ssl.c
	@@ -249,11 +249,11 @@
249	int j;
250	for( j = 0; j < mdLength; ++j ) {
251	BIO_printf(mem, " %02x", md[j]);
252	}
253	}
254	BIO_write(mem, "", 1); // null-terminate mem buffer
255	BIO_get_mem_data(mem, &desc);
256
257	if( hasSavedCertificate ){
258	warning = "WARNING: Certificate doesn't match the "
259	"saved certificate for this host!";
	@@ -304,11 +304,11 @@
304	BIO *mem;
305	char zCert, zHost;
306
307	mem = BIO_new(BIO_s_mem());
308	PEM_write_bio_X509(mem, cert);
309	BIO_write(mem, "", 1); // null-terminate mem buffer
310	BIO_get_mem_data(mem, &zCert);
311	zHost = mprintf("cert:%s", g.urlName);
312	db_set(zHost, zCert, 1);
313	free(zHost);
314	BIO_free(mem);
315

	--- src/http_ssl.c
	+++ src/http_ssl.c
	@@ -249,11 +249,11 @@
249	int j;
250	for( j = 0; j < mdLength; ++j ) {
251	BIO_printf(mem, " %02x", md[j]);
252	}
253	}
254	BIO_write(mem, "", 1); /* nul-terminate mem buffer */
255	BIO_get_mem_data(mem, &desc);
256
257	if( hasSavedCertificate ){
258	warning = "WARNING: Certificate doesn't match the "
259	"saved certificate for this host!";
	@@ -304,11 +304,11 @@
304	BIO *mem;
305	char zCert, zHost;
306
307	mem = BIO_new(BIO_s_mem());
308	PEM_write_bio_X509(mem, cert);
309	BIO_write(mem, "", 1); /* nul-terminate mem buffer */
310	BIO_get_mem_data(mem, &zCert);
311	zHost = mprintf("cert:%s", g.urlName);
312	db_set(zHost, zCert, 1);
313	free(zHost);
314	BIO_free(mem);
315

M src/json.c

+1 -1

		--- src/json.c
		+++ src/json.c
		@@ -67,11 +67,11 @@
67	67
68	68	FSL_JSON_E_DB = 4000,
69	69	FSL_JSON_E_STMT_PREP = FSL_JSON_E_DB + 1,
70	70	FSL_JSON_E_STMT_BIND = FSL_JSON_E_DB + 2,
71	71	FSL_JSON_E_STMT_EXEC = FSL_JSON_E_DB + 3,
72		-FSL_JSON_E_DB_LOCKED = FSL_JSON_E_DB + 4,
	72	+FSL_JSON_E_DB_LOCKED = FSL_JSON_E_DB + 4
73	73	};
74	74	#endif
75	75
76	76	/*
77	77	** Holds keys used for various JSON API properties.
78	78

	--- src/json.c
	+++ src/json.c
	@@ -67,11 +67,11 @@
67
68	FSL_JSON_E_DB = 4000,
69	FSL_JSON_E_STMT_PREP = FSL_JSON_E_DB + 1,
70	FSL_JSON_E_STMT_BIND = FSL_JSON_E_DB + 2,
71	FSL_JSON_E_STMT_EXEC = FSL_JSON_E_DB + 3,
72	FSL_JSON_E_DB_LOCKED = FSL_JSON_E_DB + 4,
73	};
74	#endif
75
76	/*
77	** Holds keys used for various JSON API properties.
78

	--- src/json.c
	+++ src/json.c
	@@ -67,11 +67,11 @@
67
68	FSL_JSON_E_DB = 4000,
69	FSL_JSON_E_STMT_PREP = FSL_JSON_E_DB + 1,
70	FSL_JSON_E_STMT_BIND = FSL_JSON_E_DB + 2,
71	FSL_JSON_E_STMT_EXEC = FSL_JSON_E_DB + 3,
72	FSL_JSON_E_DB_LOCKED = FSL_JSON_E_DB + 4
73	};
74	#endif
75
76	/*
77	** Holds keys used for various JSON API properties.
78

A src/json.c

+1 -1

		--- src/json.c
		+++ src/json.c
		@@ -67,11 +67,11 @@
67	67
68	68	FSL_JSON_E_DB = 4000,
69	69	FSL_JSON_E_STMT_PREP = FSL_JSON_E_DB + 1,
70	70	FSL_JSON_E_STMT_BIND = FSL_JSON_E_DB + 2,
71	71	FSL_JSON_E_STMT_EXEC = FSL_JSON_E_DB + 3,
72		-FSL_JSON_E_DB_LOCKED = FSL_JSON_E_DB + 4,
	72	+FSL_JSON_E_DB_LOCKED = FSL_JSON_E_DB + 4
73	73	};
74	74	#endif
75	75
76	76	/*
77	77	** Holds keys used for various JSON API properties.
78	78

	--- src/json.c
	+++ src/json.c
	@@ -67,11 +67,11 @@
67
68	FSL_JSON_E_DB = 4000,
69	FSL_JSON_E_STMT_PREP = FSL_JSON_E_DB + 1,
70	FSL_JSON_E_STMT_BIND = FSL_JSON_E_DB + 2,
71	FSL_JSON_E_STMT_EXEC = FSL_JSON_E_DB + 3,
72	FSL_JSON_E_DB_LOCKED = FSL_JSON_E_DB + 4,
73	};
74	#endif
75
76	/*
77	** Holds keys used for various JSON API properties.
78

	--- src/json.c
	+++ src/json.c
	@@ -67,11 +67,11 @@
67
68	FSL_JSON_E_DB = 4000,
69	FSL_JSON_E_STMT_PREP = FSL_JSON_E_DB + 1,
70	FSL_JSON_E_STMT_BIND = FSL_JSON_E_DB + 2,
71	FSL_JSON_E_STMT_EXEC = FSL_JSON_E_DB + 3,
72	FSL_JSON_E_DB_LOCKED = FSL_JSON_E_DB + 4
73	};
74	#endif
75
76	/*
77	** Holds keys used for various JSON API properties.
78

M src/style.c

+1

		--- src/style.c
		+++ src/style.c
		@@ -805,10 +805,11 @@
805	805	void page_test_env(void){
806	806	char c;
807	807	int i;
808	808	char zCap[30];
809	809	login_check_credentials();
	810	+ if( !g.perm.Admin && !g.perm.Setup ){ login_needed(); return; }
810	811	style_header("Environment Test");
811	812	#if !defined(_WIN32)
812	813	@ uid=%d(getuid()), gid=%d(getgid())<br />
813	814	#endif
814	815	@ g.zBaseURL = %h(g.zBaseURL)<br />
815	816

	--- src/style.c
	+++ src/style.c
	@@ -805,10 +805,11 @@
805	void page_test_env(void){
806	char c;
807	int i;
808	char zCap[30];
809	login_check_credentials();

810	style_header("Environment Test");
811	#if !defined(_WIN32)
812	@ uid=%d(getuid()), gid=%d(getgid())<br />
813	#endif
814	@ g.zBaseURL = %h(g.zBaseURL)<br />
815

	--- src/style.c
	+++ src/style.c
	@@ -805,10 +805,11 @@
805	void page_test_env(void){
806	char c;
807	int i;
808	char zCap[30];
809	login_check_credentials();
810	if( !g.perm.Admin && !g.perm.Setup ){ login_needed(); return; }
811	style_header("Environment Test");
812	#if !defined(_WIN32)
813	@ uid=%d(getuid()), gid=%d(getgid())<br />
814	#endif
815	@ g.zBaseURL = %h(g.zBaseURL)<br />
816

M www/reviews.wiki

+4 -3

		--- www/reviews.wiki
		+++ www/reviews.wiki
		@@ -8,10 +8,11 @@
8	8	by Juho Vepsäläinen.
9	9	* [http://blog.fupps.com/2010/12/04/exploring-the-fossil-dvcs \|
10	10	Exploring the Fossil DVCS] by Jan-Piet Mens.
11	11	* [http://blog.mired.org/2011/02/fossil-sweet-spot-in-vcs-space.html \|
12	12	Fossil - a sweet spot in the VCS space] by Mike Meyer.
	13	+ * [http://blog.s11n.net/?p=72\|Four reasons to take a closer look at the Fossil SCM] by Stephan Beal
13	14
14	15	<b>See Also:</b>
15	16
16	17	* [./quotes.wiki \| Short Quotes on Fossil, Git, And DVCSes]
17	18
		@@ -39,11 +40,11 @@
39	40	life easier on most of my projects, and being able to move commits to
40	41	another branch after the fact and shared-by-default branches are good
41	42	features. Also not having a misanthropic command line interface.
42	43	</blockquote>
43	44
44		-<b>Stephen Beal writes on 2009-01-11:</b>
	45	+<b>Stephan Beal writes on 2009-01-11:</b>
45	46
46	47	<blockquote>
47	48	Sometime in late 2007 I came across a link to fossil on
48	49	<a href="http://www.sqlite.org/">sqlite.org</a>. It
49	50	was a good thing I bookmarked it, because I was never able to find the
		@@ -136,12 +137,12 @@
136	137
137	138
138	139	In summary:
139	140
140	141	I remember my first reaction to fossil being, "this will be an
141		-excellent solution for small projects [like the dozens we've all got
	142	+excellent solution for small projects (like the dozens we've all got
142	143	sitting on our hard drives but which don't justify the hassle of
143		-version control]." A year of daily use in over 15 source trees has
	144	+version control)." A year of daily use in over 15 source trees has
144	145	confirmed that, and I continue to heartily recommend fossil to other
145	146	developers I know who also have their own collection of "unhosted" pet
146	147	projects.
147	148	</blockquote>
148	149

	--- www/reviews.wiki
	+++ www/reviews.wiki
	@@ -8,10 +8,11 @@
8	by Juho Vepsäläinen.
9	* [http://blog.fupps.com/2010/12/04/exploring-the-fossil-dvcs \|
10	Exploring the Fossil DVCS] by Jan-Piet Mens.
11	* [http://blog.mired.org/2011/02/fossil-sweet-spot-in-vcs-space.html \|
12	Fossil - a sweet spot in the VCS space] by Mike Meyer.

13
14	<b>See Also:</b>
15
16	* [./quotes.wiki \| Short Quotes on Fossil, Git, And DVCSes]
17
	@@ -39,11 +40,11 @@
39	life easier on most of my projects, and being able to move commits to
40	another branch after the fact and shared-by-default branches are good
41	features. Also not having a misanthropic command line interface.
42	</blockquote>
43
44	<b>Stephen Beal writes on 2009-01-11:</b>
45
46	<blockquote>
47	Sometime in late 2007 I came across a link to fossil on
48	<a href="http://www.sqlite.org/">sqlite.org</a>. It
49	was a good thing I bookmarked it, because I was never able to find the
	@@ -136,12 +137,12 @@
136
137
138	In summary:
139
140	I remember my first reaction to fossil being, "this will be an
141	excellent solution for small projects [like the dozens we've all got
142	sitting on our hard drives but which don't justify the hassle of
143	version control]." A year of daily use in over 15 source trees has
144	confirmed that, and I continue to heartily recommend fossil to other
145	developers I know who also have their own collection of "unhosted" pet
146	projects.
147	</blockquote>
148

	--- www/reviews.wiki
	+++ www/reviews.wiki
	@@ -8,10 +8,11 @@
8	by Juho Vepsäläinen.
9	* [http://blog.fupps.com/2010/12/04/exploring-the-fossil-dvcs \|
10	Exploring the Fossil DVCS] by Jan-Piet Mens.
11	* [http://blog.mired.org/2011/02/fossil-sweet-spot-in-vcs-space.html \|
12	Fossil - a sweet spot in the VCS space] by Mike Meyer.
13	* [http://blog.s11n.net/?p=72\|Four reasons to take a closer look at the Fossil SCM] by Stephan Beal
14
15	<b>See Also:</b>
16
17	* [./quotes.wiki \| Short Quotes on Fossil, Git, And DVCSes]
18
	@@ -39,11 +40,11 @@
40	life easier on most of my projects, and being able to move commits to
41	another branch after the fact and shared-by-default branches are good
42	features. Also not having a misanthropic command line interface.
43	</blockquote>
44
45	<b>Stephan Beal writes on 2009-01-11:</b>
46
47	<blockquote>
48	Sometime in late 2007 I came across a link to fossil on
49	<a href="http://www.sqlite.org/">sqlite.org</a>. It
50	was a good thing I bookmarked it, because I was never able to find the
	@@ -136,12 +137,12 @@
137
138
139	In summary:
140
141	I remember my first reaction to fossil being, "this will be an
142	excellent solution for small projects (like the dozens we've all got
143	sitting on our hard drives but which don't justify the hassle of
144	version control)." A year of daily use in over 15 source trees has
145	confirmed that, and I continue to heartily recommend fossil to other
146	developers I know who also have their own collection of "unhosted" pet
147	projects.
148	</blockquote>
149

Fossil SCM

Keyboard Shortcuts