Fossil SCM

Merge latest changes from trunk.

drh 2021-12-20 08:39 synclog merge
Commit 3348c66e3d39dde2ae5146012551bad005b3940565936a71abc27c537d6ff96b
Parent 3be414357f80566…
3 files changed -5 +3 -1 +2 -1
~ skins/eagle/header.txt ~ src/cgi.c ~ win/Makefile.mingw.mistachkin
M skins/eagle/header.txt
-5
--- skins/eagle/header.txt
+++ skins/eagle/header.txt
@@ -103,12 +103,7 @@
103103
 foreach {name url expr class} $mainmenu {
104104
 if {![capexpr $expr]} continue
105105
 if {[string match /* $url]} {set url $home$url}
106106
 html "<a href='$url' class='$class'>$name</a>\n"
107107
 }
108
-if {[info exists login]} {
109
- html "<a href='$home/logout' class='desktoponly'>Logout</a>\n"
110
-} else {
111
- html "<a href='$home/login' class='desktoponly'>Login</a>\n"
112
-}
113108
 </th1></div>
114109
 <div id="hbdrop"></div>
115110
--- skins/eagle/header.txt
+++ skins/eagle/header.txt
@@ -103,12 +103,7 @@
103 foreach {name url expr class} $mainmenu {
104 if {![capexpr $expr]} continue
105 if {[string match /* $url]} {set url $home$url}
106 html "<a href='$url' class='$class'>$name</a>\n"
107 }
108 if {[info exists login]} {
109 html "<a href='$home/logout' class='desktoponly'>Logout</a>\n"
110 } else {
111 html "<a href='$home/login' class='desktoponly'>Login</a>\n"
112 }
113 </th1></div>
114 <div id="hbdrop"></div>
115
--- skins/eagle/header.txt
+++ skins/eagle/header.txt
@@ -103,12 +103,7 @@
103 foreach {name url expr class} $mainmenu {
104 if {![capexpr $expr]} continue
105 if {[string match /* $url]} {set url $home$url}
106 html "<a href='$url' class='$class'>$name</a>\n"
107 }
 
 
 
 
 
108 </th1></div>
109 <div id="hbdrop"></div>
110
M src/cgi.c
+3 -1
--- src/cgi.c
+++ src/cgi.c
@@ -1196,11 +1196,13 @@
11961196
 g.zContentType = zType;
11971197
 }
11981198
 blob_zero(&g.cgiIn);
11991199
 if( len>0 && zType ){
12001200
 if( fossil_strcmp(zType, "application/x-fossil")==0 ){
1201
- blob_read_from_channel(&g.cgiIn, g.httpIn, len);
1201
+ if( blob_read_from_channel(&g.cgiIn, g.httpIn, len)!=len ){
1202
+ malformed_request("CGI content-length mismatch");
1203
+ }
12021204
 blob_uncompress(&g.cgiIn, &g.cgiIn);
12031205
 }
12041206
 #ifdef FOSSIL_ENABLE_JSON
12051207
 else if( noJson==0 && g.json.isJsonMode!=0
12061208
 && json_can_consume_content_type(zType)!=0 ){
12071209
--- src/cgi.c
+++ src/cgi.c
@@ -1196,11 +1196,13 @@
1196 g.zContentType = zType;
1197 }
1198 blob_zero(&g.cgiIn);
1199 if( len>0 && zType ){
1200 if( fossil_strcmp(zType, "application/x-fossil")==0 ){
1201 blob_read_from_channel(&g.cgiIn, g.httpIn, len);
 
 
1202 blob_uncompress(&g.cgiIn, &g.cgiIn);
1203 }
1204 #ifdef FOSSIL_ENABLE_JSON
1205 else if( noJson==0 && g.json.isJsonMode!=0
1206 && json_can_consume_content_type(zType)!=0 ){
1207
--- src/cgi.c
+++ src/cgi.c
@@ -1196,11 +1196,13 @@
1196 g.zContentType = zType;
1197 }
1198 blob_zero(&g.cgiIn);
1199 if( len>0 && zType ){
1200 if( fossil_strcmp(zType, "application/x-fossil")==0 ){
1201 if( blob_read_from_channel(&g.cgiIn, g.httpIn, len)!=len ){
1202 malformed_request("CGI content-length mismatch");
1203 }
1204 blob_uncompress(&g.cgiIn, &g.cgiIn);
1205 }
1206 #ifdef FOSSIL_ENABLE_JSON
1207 else if( noJson==0 && g.json.isJsonMode!=0
1208 && json_can_consume_content_type(zType)!=0 ){
1209
M win/Makefile.mingw.mistachkin
+2 -1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -623,11 +623,10 @@
623623
 $(SRCDIR)/accordion.js \
624624
 $(SRCDIR)/alerts/bflat2.wav \
625625
 $(SRCDIR)/alerts/bflat3.wav \
626626
 $(SRCDIR)/alerts/bloop.wav \
627627
 $(SRCDIR)/alerts/plunk.wav \
628
- $(SRCDIR)/chat.js \
629628
 $(SRCDIR)/ci_edit.js \
630629
 $(SRCDIR)/copybtn.js \
631630
 $(SRCDIR)/default.css \
632631
 $(SRCDIR)/diff.js \
633632
 $(SRCDIR)/diff.tcl \
@@ -638,10 +637,11 @@
638637
 $(SRCDIR)/fossil.diff.js \
639638
 $(SRCDIR)/fossil.dom.js \
640639
 $(SRCDIR)/fossil.fetch.js \
641640
 $(SRCDIR)/fossil.numbered-lines.js \
642641
 $(SRCDIR)/fossil.page.brlist.js \
642
+ $(SRCDIR)/fossil.page.chat.js \
643643
 $(SRCDIR)/fossil.page.fileedit.js \
644644
 $(SRCDIR)/fossil.page.forumpost.js \
645645
 $(SRCDIR)/fossil.page.pikchrshow.js \
646646
 $(SRCDIR)/fossil.page.whistory.js \
647647
 $(SRCDIR)/fossil.page.wikiedit.js \
@@ -674,10 +674,11 @@
674674
 $(SRCDIR)/sounds/c.wav \
675675
 $(SRCDIR)/sounds/d.wav \
676676
 $(SRCDIR)/sounds/e.wav \
677677
 $(SRCDIR)/sounds/f.wav \
678678
 $(SRCDIR)/style.admin_log.css \
679
+ $(SRCDIR)/style.chat.css \
679680
 $(SRCDIR)/style.fileedit.css \
680681
 $(SRCDIR)/style.wikiedit.css \
681682
 $(SRCDIR)/tree.js \
682683
 $(SRCDIR)/useredit.js \
683684
 $(SRCDIR)/wiki.wiki
684685
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -623,11 +623,10 @@
623 $(SRCDIR)/accordion.js \
624 $(SRCDIR)/alerts/bflat2.wav \
625 $(SRCDIR)/alerts/bflat3.wav \
626 $(SRCDIR)/alerts/bloop.wav \
627 $(SRCDIR)/alerts/plunk.wav \
628 $(SRCDIR)/chat.js \
629 $(SRCDIR)/ci_edit.js \
630 $(SRCDIR)/copybtn.js \
631 $(SRCDIR)/default.css \
632 $(SRCDIR)/diff.js \
633 $(SRCDIR)/diff.tcl \
@@ -638,10 +637,11 @@
638 $(SRCDIR)/fossil.diff.js \
639 $(SRCDIR)/fossil.dom.js \
640 $(SRCDIR)/fossil.fetch.js \
641 $(SRCDIR)/fossil.numbered-lines.js \
642 $(SRCDIR)/fossil.page.brlist.js \
 
643 $(SRCDIR)/fossil.page.fileedit.js \
644 $(SRCDIR)/fossil.page.forumpost.js \
645 $(SRCDIR)/fossil.page.pikchrshow.js \
646 $(SRCDIR)/fossil.page.whistory.js \
647 $(SRCDIR)/fossil.page.wikiedit.js \
@@ -674,10 +674,11 @@
674 $(SRCDIR)/sounds/c.wav \
675 $(SRCDIR)/sounds/d.wav \
676 $(SRCDIR)/sounds/e.wav \
677 $(SRCDIR)/sounds/f.wav \
678 $(SRCDIR)/style.admin_log.css \
 
679 $(SRCDIR)/style.fileedit.css \
680 $(SRCDIR)/style.wikiedit.css \
681 $(SRCDIR)/tree.js \
682 $(SRCDIR)/useredit.js \
683 $(SRCDIR)/wiki.wiki
684
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -623,11 +623,10 @@
623 $(SRCDIR)/accordion.js \
624 $(SRCDIR)/alerts/bflat2.wav \
625 $(SRCDIR)/alerts/bflat3.wav \
626 $(SRCDIR)/alerts/bloop.wav \
627 $(SRCDIR)/alerts/plunk.wav \
 
628 $(SRCDIR)/ci_edit.js \
629 $(SRCDIR)/copybtn.js \
630 $(SRCDIR)/default.css \
631 $(SRCDIR)/diff.js \
632 $(SRCDIR)/diff.tcl \
@@ -638,10 +637,11 @@
637 $(SRCDIR)/fossil.diff.js \
638 $(SRCDIR)/fossil.dom.js \
639 $(SRCDIR)/fossil.fetch.js \
640 $(SRCDIR)/fossil.numbered-lines.js \
641 $(SRCDIR)/fossil.page.brlist.js \
642 $(SRCDIR)/fossil.page.chat.js \
643 $(SRCDIR)/fossil.page.fileedit.js \
644 $(SRCDIR)/fossil.page.forumpost.js \
645 $(SRCDIR)/fossil.page.pikchrshow.js \
646 $(SRCDIR)/fossil.page.whistory.js \
647 $(SRCDIR)/fossil.page.wikiedit.js \
@@ -674,10 +674,11 @@
674 $(SRCDIR)/sounds/c.wav \
675 $(SRCDIR)/sounds/d.wav \
676 $(SRCDIR)/sounds/e.wav \
677 $(SRCDIR)/sounds/f.wav \
678 $(SRCDIR)/style.admin_log.css \
679 $(SRCDIR)/style.chat.css \
680 $(SRCDIR)/style.fileedit.css \
681 $(SRCDIR)/style.wikiedit.css \
682 $(SRCDIR)/tree.js \
683 $(SRCDIR)/useredit.js \
684 $(SRCDIR)/wiki.wiki
685

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button