cc65959b0fd… — Fossil SCM

M src/login.c

-1

		--- src/login.c
		+++ src/login.c
		@@ -860,11 +860,10 @@
860	860	int uid = 0;
861	861	int nDecode = 0;
862	862	char *zDecode = 0;
863	863	const char *zUsername = 0;
864	864	const char *zPasswd = 0;
865		-
866	865
867	866	if( zAuth==0 ) return 0; /* Fail: No Authentication: header */
868	867	while( fossil_isspace(zAuth[0]) ) zAuth++; /* Skip leading whitespace */
869	868	if( strncmp(zAuth, "Basic ", 6)!=0 ) return 0; /* Fail: Not Basic Authentication */
870	869
871	870

	--- src/login.c
	+++ src/login.c
	@@ -860,11 +860,10 @@
860	int uid = 0;
861	int nDecode = 0;
862	char *zDecode = 0;
863	const char *zUsername = 0;
864	const char *zPasswd = 0;
865
866
867	if( zAuth==0 ) return 0; /* Fail: No Authentication: header */
868	while( fossil_isspace(zAuth[0]) ) zAuth++; /* Skip leading whitespace */
869	if( strncmp(zAuth, "Basic ", 6)!=0 ) return 0; /* Fail: Not Basic Authentication */
870
871

	--- src/login.c
	+++ src/login.c
	@@ -860,11 +860,10 @@
860	int uid = 0;
861	int nDecode = 0;
862	char *zDecode = 0;
863	const char *zUsername = 0;
864	const char *zPasswd = 0;

865
866	if( zAuth==0 ) return 0; /* Fail: No Authentication: header */
867	while( fossil_isspace(zAuth[0]) ) zAuth++; /* Skip leading whitespace */
868	if( strncmp(zAuth, "Basic ", 6)!=0 ) return 0; /* Fail: Not Basic Authentication */
869
870

M src/shell.c

+2 -3

		--- src/shell.c
		+++ src/shell.c
		@@ -2924,11 +2924,10 @@
2924	2924	if( i>nCol ){
2925	2925	/* At this point, we know that azRowid[j] is not the name of any
2926	2926	** ordinary column in the table. Verify that azRowid[j] is a valid
2927	2927	** name for the rowid before adding it to azCol[0]. WITHOUT ROWID
2928	2928	** tables will fail this last check */
2929		- int rc;
2930	2929	rc = sqlite3_table_column_metadata(p->db,0,zTab,azRowid[j],0,0,0,0,0);
2931	2930	if( rc==SQLITE_OK ) azCol[0] = azRowid[j];
2932	2931	break;
2933	2932	}
2934	2933	}
		@@ -2957,18 +2956,18 @@
2957	2956	** This is a different callback routine used for dumping the database.
2958	2957	** Each row received by this callback consists of a table name,
2959	2958	** the table type ("index" or "table") and SQL to create the table.
2960	2959	** This routine should print text sufficient to recreate the table.
2961	2960	*/
2962		-static int dump_callback(void pArg, int nArg, char azArg, char *azCol){
	2961	+static int dump_callback(void pArg, int nArg, char azArg, char *azNotUsed){
2963	2962	int rc;
2964	2963	const char *zTable;
2965	2964	const char *zType;
2966	2965	const char *zSql;
2967	2966	ShellState p = (ShellState )pArg;
2968	2967
2969		- UNUSED_PARAMETER(azCol);
	2968	+ UNUSED_PARAMETER(azNotUsed);
2970	2969	if( nArg!=3 ) return 1;
2971	2970	zTable = azArg[0];
2972	2971	zType = azArg[1];
2973	2972	zSql = azArg[2];
2974	2973
2975	2974

	--- src/shell.c
	+++ src/shell.c
	@@ -2924,11 +2924,10 @@
2924	if( i>nCol ){
2925	/* At this point, we know that azRowid[j] is not the name of any
2926	** ordinary column in the table. Verify that azRowid[j] is a valid
2927	** name for the rowid before adding it to azCol[0]. WITHOUT ROWID
2928	** tables will fail this last check */
2929	int rc;
2930	rc = sqlite3_table_column_metadata(p->db,0,zTab,azRowid[j],0,0,0,0,0);
2931	if( rc==SQLITE_OK ) azCol[0] = azRowid[j];
2932	break;
2933	}
2934	}
	@@ -2957,18 +2956,18 @@
2957	** This is a different callback routine used for dumping the database.
2958	** Each row received by this callback consists of a table name,
2959	** the table type ("index" or "table") and SQL to create the table.
2960	** This routine should print text sufficient to recreate the table.
2961	*/
2962	static int dump_callback(void pArg, int nArg, char azArg, char *azCol){
2963	int rc;
2964	const char *zTable;
2965	const char *zType;
2966	const char *zSql;
2967	ShellState p = (ShellState )pArg;
2968
2969	UNUSED_PARAMETER(azCol);
2970	if( nArg!=3 ) return 1;
2971	zTable = azArg[0];
2972	zType = azArg[1];
2973	zSql = azArg[2];
2974
2975

	--- src/shell.c
	+++ src/shell.c
	@@ -2924,11 +2924,10 @@
2924	if( i>nCol ){
2925	/* At this point, we know that azRowid[j] is not the name of any
2926	** ordinary column in the table. Verify that azRowid[j] is a valid
2927	** name for the rowid before adding it to azCol[0]. WITHOUT ROWID
2928	** tables will fail this last check */

2929	rc = sqlite3_table_column_metadata(p->db,0,zTab,azRowid[j],0,0,0,0,0);
2930	if( rc==SQLITE_OK ) azCol[0] = azRowid[j];
2931	break;
2932	}
2933	}
	@@ -2957,18 +2956,18 @@
2956	** This is a different callback routine used for dumping the database.
2957	** Each row received by this callback consists of a table name,
2958	** the table type ("index" or "table") and SQL to create the table.
2959	** This routine should print text sufficient to recreate the table.
2960	*/
2961	static int dump_callback(void pArg, int nArg, char azArg, char *azNotUsed){
2962	int rc;
2963	const char *zTable;
2964	const char *zType;
2965	const char *zSql;
2966	ShellState p = (ShellState )pArg;
2967
2968	UNUSED_PARAMETER(azNotUsed);
2969	if( nArg!=3 ) return 1;
2970	zTable = azArg[0];
2971	zType = azArg[1];
2972	zSql = azArg[2];
2973
2974

M www/changes.wiki

+2 -2

		--- www/changes.wiki
		+++ www/changes.wiki
		@@ -4,11 +4,11 @@
4	4	<h2>Changes for Version 2.2 (2017-??-??)</h2>
5	5
6	6	* Show the content of README files on directory listings.
7	7	([/file/skins\|example])
8	8	* Support for Basic Authentication if enabled (default off).
9		- * Show the hash algorithms used on the
	9	+ * Show the hash algorithms used on the
10	10	[/help?cmd=/rcvfromlist\|/rcvfromlist] page.
11	11	* The [/help?cmd=/tarball\|/tarball] and [/help?cmd=/zip\|/zip] pages
12	12	now use the the r= query parameter
13	13	to select which check-in to deliver. The uuid= query parameter
14	14	is still accepted for backwards compatibility.
		@@ -42,11 +42,11 @@
42	42	<a name='v1_37'></a>
43	43	<h2>Changes for Version 1.37 (2017-01-16)</h2>
44	44
45	45	* Add checkbox widgets to various web pages. See [/technote/8d18bf27e9\|
46	46	this technote] for more information. To get the checkboxes to look as
47		- intended, you must update the CSS in your repository and all clones.
	47	+ intended, you must update the CSS in your repository and all clones.
48	48	* Add the [/help/all\|fossil all ui] command
49	49	* Add the [/help?cmd=/file\|/file] webpage
50	50	* Enhance the [/help?cmd=/brlist\|/brlist] webpage to make use of branch colors.
51	51	* Add support for the ms=EXACT\|LIKE\|GLOB\|REGEXP query parameter on the
52	52	[/help?cmd=/timeline\|/timeline] webpage, with associated form widgets.
53	53

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -4,11 +4,11 @@
4	<h2>Changes for Version 2.2 (2017-??-??)</h2>
5
6	* Show the content of README files on directory listings.
7	([/file/skins\|example])
8	* Support for Basic Authentication if enabled (default off).
9	* Show the hash algorithms used on the
10	[/help?cmd=/rcvfromlist\|/rcvfromlist] page.
11	* The [/help?cmd=/tarball\|/tarball] and [/help?cmd=/zip\|/zip] pages
12	now use the the r= query parameter
13	to select which check-in to deliver. The uuid= query parameter
14	is still accepted for backwards compatibility.
	@@ -42,11 +42,11 @@
42	<a name='v1_37'></a>
43	<h2>Changes for Version 1.37 (2017-01-16)</h2>
44
45	* Add checkbox widgets to various web pages. See [/technote/8d18bf27e9\|
46	this technote] for more information. To get the checkboxes to look as
47	intended, you must update the CSS in your repository and all clones.
48	* Add the [/help/all\|fossil all ui] command
49	* Add the [/help?cmd=/file\|/file] webpage
50	* Enhance the [/help?cmd=/brlist\|/brlist] webpage to make use of branch colors.
51	* Add support for the ms=EXACT\|LIKE\|GLOB\|REGEXP query parameter on the
52	[/help?cmd=/timeline\|/timeline] webpage, with associated form widgets.
53

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -4,11 +4,11 @@
4	<h2>Changes for Version 2.2 (2017-??-??)</h2>
5
6	* Show the content of README files on directory listings.
7	([/file/skins\|example])
8	* Support for Basic Authentication if enabled (default off).
9	* Show the hash algorithms used on the
10	[/help?cmd=/rcvfromlist\|/rcvfromlist] page.
11	* The [/help?cmd=/tarball\|/tarball] and [/help?cmd=/zip\|/zip] pages
12	now use the the r= query parameter
13	to select which check-in to deliver. The uuid= query parameter
14	is still accepted for backwards compatibility.
	@@ -42,11 +42,11 @@
42	<a name='v1_37'></a>
43	<h2>Changes for Version 1.37 (2017-01-16)</h2>
44
45	* Add checkbox widgets to various web pages. See [/technote/8d18bf27e9\|
46	this technote] for more information. To get the checkboxes to look as
47	intended, you must update the CSS in your repository and all clones.
48	* Add the [/help/all\|fossil all ui] command
49	* Add the [/help?cmd=/file\|/file] webpage
50	* Enhance the [/help?cmd=/brlist\|/brlist] webpage to make use of branch colors.
51	* Add support for the ms=EXACT\|LIKE\|GLOB\|REGEXP query parameter on the
52	[/help?cmd=/timeline\|/timeline] webpage, with associated form widgets.
53

Fossil SCM

Keyboard Shortcuts