0c1a1167911… — Fossil SCM

M src/cgi.c

+2 -2

		--- src/cgi.c
		+++ src/cgi.c
		@@ -277,12 +277,12 @@
277	277	** Return true if the response should be sent with Content-Encoding: gzip.
278	278	*/
279	279	static int is_gzippable(void){
280	280	if( strstr(PD("HTTP_ACCEPT_ENCODING", ""), "gzip")==0 ) return 0;
281	281	return strncmp(zContentType, "text/", 5)==0
282		- \|\| !sqlite3_strglob("application/*xml", zContentType)
283		- \|\| !sqlite3_strglob("application/*javascript", zContentType);
	282	+ \|\| sqlite3_strglob("application/*xml", zContentType)==0
	283	+ \|\| sqlite3_strglob("application/*javascript", zContentType)==0;
284	284	}
285	285
286	286	/*
287	287	** Do a normal HTTP reply
288	288	*/
289	289

	--- src/cgi.c
	+++ src/cgi.c
	@@ -277,12 +277,12 @@
277	** Return true if the response should be sent with Content-Encoding: gzip.
278	*/
279	static int is_gzippable(void){
280	if( strstr(PD("HTTP_ACCEPT_ENCODING", ""), "gzip")==0 ) return 0;
281	return strncmp(zContentType, "text/", 5)==0
282	\|\| !sqlite3_strglob("application/*xml", zContentType)
283	\|\| !sqlite3_strglob("application/*javascript", zContentType);
284	}
285
286	/*
287	** Do a normal HTTP reply
288	*/
289

	--- src/cgi.c
	+++ src/cgi.c
	@@ -277,12 +277,12 @@
277	** Return true if the response should be sent with Content-Encoding: gzip.
278	*/
279	static int is_gzippable(void){
280	if( strstr(PD("HTTP_ACCEPT_ENCODING", ""), "gzip")==0 ) return 0;
281	return strncmp(zContentType, "text/", 5)==0
282	\|\| sqlite3_strglob("application/*xml", zContentType)==0
283	\|\| sqlite3_strglob("application/*javascript", zContentType)==0;
284	}
285
286	/*
287	** Do a normal HTTP reply
288	*/
289

M src/diffcmd.c

+4 -4

		--- src/diffcmd.c
		+++ src/diffcmd.c
		@@ -923,17 +923,17 @@
923	923	blob_appendf(&script, "set fossilcmd {\| \"%/\" %s --html -y -i -v",
924	924	g.nameOfExe, zSubCmd);
925	925	for(i=firstArg; i<g.argc; i++){
926	926	const char *z = g.argv[i];
927	927	if( z[0]=='-' ){
928		- if( !sqlite3_strglob("*-html",z) ) continue;
929		- if( !sqlite3_strglob("*-y",z) ) continue;
930		- if( !sqlite3_strglob("*-i",z) ) continue;
	928	+ if( sqlite3_strglob("*-html",z)==0 ) continue;
	929	+ if( sqlite3_strglob("*-y",z)==0 ) continue;
	930	+ if( sqlite3_strglob("*-i",z)==0 ) continue;
931	931	/* The undocumented --script FILENAME option causes the Tk script to
932	932	** be written into the FILENAME instead of being run. This is used
933	933	** for testing and debugging. */
934		- if( !sqlite3_strglob("*-script",z) && i<g.argc-1 ){
	934	+ if( sqlite3_strglob("*-script",z)==0 && i<g.argc-1 ){
935	935	i++;
936	936	zTempFile = g.argv[i];
937	937	continue;
938	938	}
939	939	}
940	940

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -923,17 +923,17 @@
923	blob_appendf(&script, "set fossilcmd {\| \"%/\" %s --html -y -i -v",
924	g.nameOfExe, zSubCmd);
925	for(i=firstArg; i<g.argc; i++){
926	const char *z = g.argv[i];
927	if( z[0]=='-' ){
928	if( !sqlite3_strglob("*-html",z) ) continue;
929	if( !sqlite3_strglob("*-y",z) ) continue;
930	if( !sqlite3_strglob("*-i",z) ) continue;
931	/* The undocumented --script FILENAME option causes the Tk script to
932	** be written into the FILENAME instead of being run. This is used
933	** for testing and debugging. */
934	if( !sqlite3_strglob("*-script",z) && i<g.argc-1 ){
935	i++;
936	zTempFile = g.argv[i];
937	continue;
938	}
939	}
940

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -923,17 +923,17 @@
923	blob_appendf(&script, "set fossilcmd {\| \"%/\" %s --html -y -i -v",
924	g.nameOfExe, zSubCmd);
925	for(i=firstArg; i<g.argc; i++){
926	const char *z = g.argv[i];
927	if( z[0]=='-' ){
928	if( sqlite3_strglob("*-html",z)==0 ) continue;
929	if( sqlite3_strglob("*-y",z)==0 ) continue;
930	if( sqlite3_strglob("*-i",z)==0 ) continue;
931	/* The undocumented --script FILENAME option causes the Tk script to
932	** be written into the FILENAME instead of being run. This is used
933	** for testing and debugging. */
934	if( sqlite3_strglob("*-script",z)==0 && i<g.argc-1 ){
935	i++;
936	zTempFile = g.argv[i];
937	continue;
938	}
939	}
940

M src/glob.c

+1 -1

		--- src/glob.c
		+++ src/glob.c
		@@ -149,11 +149,11 @@
149	149	*/
150	150	int glob_match(Glob pGlob, const char zString){
151	151	int i;
152	152	if( pGlob==0 ) return 0;
153	153	for(i=0; i<pGlob->nPattern; i++){
154		- if( !sqlite3_strglob(pGlob->azPattern[i], zString) ) return i+1;
	154	+ if( sqlite3_strglob(pGlob->azPattern[i], zString)==0 ) return i+1;
155	155	}
156	156	return 0;
157	157	}
158	158
159	159	/*
160	160

	--- src/glob.c
	+++ src/glob.c
	@@ -149,11 +149,11 @@
149	*/
150	int glob_match(Glob pGlob, const char zString){
151	int i;
152	if( pGlob==0 ) return 0;
153	for(i=0; i<pGlob->nPattern; i++){
154	if( !sqlite3_strglob(pGlob->azPattern[i], zString) ) return i+1;
155	}
156	return 0;
157	}
158
159	/*
160

	--- src/glob.c
	+++ src/glob.c
	@@ -149,11 +149,11 @@
149	*/
150	int glob_match(Glob pGlob, const char zString){
151	int i;
152	if( pGlob==0 ) return 0;
153	for(i=0; i<pGlob->nPattern; i++){
154	if( sqlite3_strglob(pGlob->azPattern[i], zString)==0 ) return i+1;
155	}
156	return 0;
157	}
158
159	/*
160

Fossil SCM