Fossil SCM

Merge from trunk.

brickviking 2024-10-23 09:37 bv-corrections01 merge
Commit f8f0d5977cb021ae7bba4aa52720f80134eccb3c9b048fd94c1b25ac296e1769
Parent 8e9fc86018293ba…
4 files changed +1 +3 -3 +1 -1 +1 -1
~ auto.def ~ extsrc/sqlite3.c ~ extsrc/sqlite3.h ~ src/http_ssl.c
M auto.def
+1
--- auto.def
+++ auto.def
@@ -104,10 +104,11 @@
104104
 msg-result "WARNING: tclsh $v found; need >= 8.6 for 'make test'."
105105
 define TCLSH false ;# force "make test" failure via /usr/bin/false
106106
 }
107107
 }
108108
109
+define CFLAGS [get-env CFLAGS "-g -O2"]
109110
 define EXTRA_CFLAGS "-Wall"
110111
 define EXTRA_LDFLAGS ""
111112
 define USE_SYSTEM_SQLITE 0
112113
 define USE_LINENOISE 0
113114
 define USE_MMAN_H 0
114115
--- auto.def
+++ auto.def
@@ -104,10 +104,11 @@
104 msg-result "WARNING: tclsh $v found; need >= 8.6 for 'make test'."
105 define TCLSH false ;# force "make test" failure via /usr/bin/false
106 }
107 }
108
 
109 define EXTRA_CFLAGS "-Wall"
110 define EXTRA_LDFLAGS ""
111 define USE_SYSTEM_SQLITE 0
112 define USE_LINENOISE 0
113 define USE_MMAN_H 0
114
--- auto.def
+++ auto.def
@@ -104,10 +104,11 @@
104 msg-result "WARNING: tclsh $v found; need >= 8.6 for 'make test'."
105 define TCLSH false ;# force "make test" failure via /usr/bin/false
106 }
107 }
108
109 define CFLAGS [get-env CFLAGS "-g -O2"]
110 define EXTRA_CFLAGS "-Wall"
111 define EXTRA_LDFLAGS ""
112 define USE_SYSTEM_SQLITE 0
113 define USE_LINENOISE 0
114 define USE_MMAN_H 0
115
M extsrc/sqlite3.c
+3 -3
--- extsrc/sqlite3.c
+++ extsrc/sqlite3.c
@@ -16,11 +16,11 @@
1616
 ** if you want a wrapper to interface SQLite with your choice of programming
1717
 ** language. The code for the "sqlite3" command-line shell is also in a
1818
 ** separate file. This file contains only code for the core SQLite library.
1919
 **
2020
 ** The content in this amalgamation comes from Fossil check-in
21
-** 9f642b3dbc8febfacad97076030f44e9b400.
21
+** 03a9703e27c44437c39363d0baf82db4ebc9.
2222
 */
2323
 #define SQLITE_CORE 1
2424
 #define SQLITE_AMALGAMATION 1
2525
 #ifndef SQLITE_PRIVATE
2626
 # define SQLITE_PRIVATE static
@@ -462,11 +462,11 @@
462462
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
463463
 ** [sqlite_version()] and [sqlite_source_id()].
464464
 */
465465
 #define SQLITE_VERSION "3.47.0"
466466
 #define SQLITE_VERSION_NUMBER 3047000
467
-#define SQLITE_SOURCE_ID "2024-10-21 10:47:24 9f642b3dbc8febfacad97076030f44e9b40067e27222f2bcb84813c5765d3d2a"
467
+#define SQLITE_SOURCE_ID "2024-10-21 16:30:22 03a9703e27c44437c39363d0baf82db4ebc94538a0f28411c85dda156f82636e"
468468
469469
 /*
470470
 ** CAPI3REF: Run-Time Library Version Numbers
471471
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
472472
 **
@@ -254886,11 +254886,11 @@
254886254886
 int nArg, /* Number of args */
254887254887
 sqlite3_value **apUnused /* Function arguments */
254888254888
 ){
254889254889
 assert( nArg==0 );
254890254890
 UNUSED_PARAM2(nArg, apUnused);
254891
- sqlite3_result_text(pCtx, "fts5: 2024-10-21 10:47:24 9f642b3dbc8febfacad97076030f44e9b40067e27222f2bcb84813c5765d3d2a", -1, SQLITE_TRANSIENT);
254891
+ sqlite3_result_text(pCtx, "fts5: 2024-10-21 16:30:22 03a9703e27c44437c39363d0baf82db4ebc94538a0f28411c85dda156f82636e", -1, SQLITE_TRANSIENT);
254892254892
 }
254893254893
254894254894
 /*
254895254895
 ** Implementation of fts5_locale(LOCALE, TEXT) function.
254896254896
 **
254897254897
--- extsrc/sqlite3.c
+++ extsrc/sqlite3.c
@@ -16,11 +16,11 @@
16 ** if you want a wrapper to interface SQLite with your choice of programming
17 ** language. The code for the "sqlite3" command-line shell is also in a
18 ** separate file. This file contains only code for the core SQLite library.
19 **
20 ** The content in this amalgamation comes from Fossil check-in
21 ** 9f642b3dbc8febfacad97076030f44e9b400.
22 */
23 #define SQLITE_CORE 1
24 #define SQLITE_AMALGAMATION 1
25 #ifndef SQLITE_PRIVATE
26 # define SQLITE_PRIVATE static
@@ -462,11 +462,11 @@
462 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
463 ** [sqlite_version()] and [sqlite_source_id()].
464 */
465 #define SQLITE_VERSION "3.47.0"
466 #define SQLITE_VERSION_NUMBER 3047000
467 #define SQLITE_SOURCE_ID "2024-10-21 10:47:24 9f642b3dbc8febfacad97076030f44e9b40067e27222f2bcb84813c5765d3d2a"
468
469 /*
470 ** CAPI3REF: Run-Time Library Version Numbers
471 ** KEYWORDS: sqlite3_version sqlite3_sourceid
472 **
@@ -254886,11 +254886,11 @@
254886 int nArg, /* Number of args */
254887 sqlite3_value **apUnused /* Function arguments */
254888 ){
254889 assert( nArg==0 );
254890 UNUSED_PARAM2(nArg, apUnused);
254891 sqlite3_result_text(pCtx, "fts5: 2024-10-21 10:47:24 9f642b3dbc8febfacad97076030f44e9b40067e27222f2bcb84813c5765d3d2a", -1, SQLITE_TRANSIENT);
254892 }
254893
254894 /*
254895 ** Implementation of fts5_locale(LOCALE, TEXT) function.
254896 **
254897
--- extsrc/sqlite3.c
+++ extsrc/sqlite3.c
@@ -16,11 +16,11 @@
16 ** if you want a wrapper to interface SQLite with your choice of programming
17 ** language. The code for the "sqlite3" command-line shell is also in a
18 ** separate file. This file contains only code for the core SQLite library.
19 **
20 ** The content in this amalgamation comes from Fossil check-in
21 ** 03a9703e27c44437c39363d0baf82db4ebc9.
22 */
23 #define SQLITE_CORE 1
24 #define SQLITE_AMALGAMATION 1
25 #ifndef SQLITE_PRIVATE
26 # define SQLITE_PRIVATE static
@@ -462,11 +462,11 @@
462 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
463 ** [sqlite_version()] and [sqlite_source_id()].
464 */
465 #define SQLITE_VERSION "3.47.0"
466 #define SQLITE_VERSION_NUMBER 3047000
467 #define SQLITE_SOURCE_ID "2024-10-21 16:30:22 03a9703e27c44437c39363d0baf82db4ebc94538a0f28411c85dda156f82636e"
468
469 /*
470 ** CAPI3REF: Run-Time Library Version Numbers
471 ** KEYWORDS: sqlite3_version sqlite3_sourceid
472 **
@@ -254886,11 +254886,11 @@
254886 int nArg, /* Number of args */
254887 sqlite3_value **apUnused /* Function arguments */
254888 ){
254889 assert( nArg==0 );
254890 UNUSED_PARAM2(nArg, apUnused);
254891 sqlite3_result_text(pCtx, "fts5: 2024-10-21 16:30:22 03a9703e27c44437c39363d0baf82db4ebc94538a0f28411c85dda156f82636e", -1, SQLITE_TRANSIENT);
254892 }
254893
254894 /*
254895 ** Implementation of fts5_locale(LOCALE, TEXT) function.
254896 **
254897
M extsrc/sqlite3.h
+1 -1
--- extsrc/sqlite3.h
+++ extsrc/sqlite3.h
@@ -146,11 +146,11 @@
146146
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
147147
 ** [sqlite_version()] and [sqlite_source_id()].
148148
 */
149149
 #define SQLITE_VERSION "3.47.0"
150150
 #define SQLITE_VERSION_NUMBER 3047000
151
-#define SQLITE_SOURCE_ID "2024-10-21 10:47:24 9f642b3dbc8febfacad97076030f44e9b40067e27222f2bcb84813c5765d3d2a"
151
+#define SQLITE_SOURCE_ID "2024-10-21 16:30:22 03a9703e27c44437c39363d0baf82db4ebc94538a0f28411c85dda156f82636e"
152152
153153
 /*
154154
 ** CAPI3REF: Run-Time Library Version Numbers
155155
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
156156
 **
157157
--- extsrc/sqlite3.h
+++ extsrc/sqlite3.h
@@ -146,11 +146,11 @@
146 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
147 ** [sqlite_version()] and [sqlite_source_id()].
148 */
149 #define SQLITE_VERSION "3.47.0"
150 #define SQLITE_VERSION_NUMBER 3047000
151 #define SQLITE_SOURCE_ID "2024-10-21 10:47:24 9f642b3dbc8febfacad97076030f44e9b40067e27222f2bcb84813c5765d3d2a"
152
153 /*
154 ** CAPI3REF: Run-Time Library Version Numbers
155 ** KEYWORDS: sqlite3_version sqlite3_sourceid
156 **
157
--- extsrc/sqlite3.h
+++ extsrc/sqlite3.h
@@ -146,11 +146,11 @@
146 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
147 ** [sqlite_version()] and [sqlite_source_id()].
148 */
149 #define SQLITE_VERSION "3.47.0"
150 #define SQLITE_VERSION_NUMBER 3047000
151 #define SQLITE_SOURCE_ID "2024-10-21 16:30:22 03a9703e27c44437c39363d0baf82db4ebc94538a0f28411c85dda156f82636e"
152
153 /*
154 ** CAPI3REF: Run-Time Library Version Numbers
155 ** KEYWORDS: sqlite3_version sqlite3_sourceid
156 **
157
M src/http_ssl.c
+1 -1
--- src/http_ssl.c
+++ src/http_ssl.c
@@ -405,11 +405,11 @@
405405
 bbuf = blob_buffer(&reply);
406406
 len = blob_size(&reply);
407407
 while(end < len) {
408408
 if( bbuf[end]=='\n' ) {
409409
 if( (end+1<len && bbuf[end+1]=='\n')
410
- || (end+2<len && bbuf[end+1]=='\r' && bbuf[end+1]=='\n')
410
+ || (end+2<len && bbuf[end+1]=='\r' && bbuf[end+2]=='\n')
411411
 ){
412412
 done = 1;
413413
 break;
414414
 }
415415
 }
416416
--- src/http_ssl.c
+++ src/http_ssl.c
@@ -405,11 +405,11 @@
405 bbuf = blob_buffer(&reply);
406 len = blob_size(&reply);
407 while(end < len) {
408 if( bbuf[end]=='\n' ) {
409 if( (end+1<len && bbuf[end+1]=='\n')
410 || (end+2<len && bbuf[end+1]=='\r' && bbuf[end+1]=='\n')
411 ){
412 done = 1;
413 break;
414 }
415 }
416
--- src/http_ssl.c
+++ src/http_ssl.c
@@ -405,11 +405,11 @@
405 bbuf = blob_buffer(&reply);
406 len = blob_size(&reply);
407 while(end < len) {
408 if( bbuf[end]=='\n' ) {
409 if( (end+1<len && bbuf[end+1]=='\n')
410 || (end+2<len && bbuf[end+1]=='\r' && bbuf[end+2]=='\n')
411 ){
412 done = 1;
413 break;
414 }
415 }
416

Keyboard Shortcuts

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