Skip to content

Commit 90e5604

Browse files
author
jan.nijtmans
committed
Merge 8.6
2 parents ac01540 + 13cedcc commit 90e5604

File tree

3 files changed

+35
-5
lines changed

3 files changed

+35
-5
lines changed

doc/http.n

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ The default is \fButf-8\fR, as specified by RFC 2718.
259259
The value of the User-Agent header in the HTTP request. In an unsafe
260260
interpreter, the default value depends upon the operating system, and
261261
the version numbers of \fBhttp\fR and \fBTcl\fR, and is (for example)
262-
.QW "\fBMozilla/5.0 (Windows; U; Windows NT 10.0) http/2.10.0 Tcl/9.0.0\fR" .
262+
.QW "\fBMozilla/5.0 (Windows; U; Windows NT 10.0) http/2.10.1 Tcl/9.0.0\fR" .
263263
A safe interpreter cannot determine its operating system, and so the default
264264
in a safe interpreter is to use a Windows 10 value with the current version
265265
numbers of \fBhttp\fR and \fBTcl\fR.

generic/tclTestObj.c

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,6 +1090,26 @@ static const Tcl_ObjType v1TestListType = {
10901090
};
10911091

10921092

1093+
static
1094+
void
1095+
HugeUpdateString(
1096+
TCL_UNUSED(Tcl_Obj *))
1097+
{
1098+
/* Always returns NULL, as an indication that
1099+
* room for its string representation cannot be allocated */
1100+
return;
1101+
}
1102+
1103+
static const Tcl_ObjType hugeType = {
1104+
"huge", /* name */
1105+
NULL, /* freeIntRepProc */
1106+
NULL, /* dupIntRepProc */
1107+
HugeUpdateString, /* updateStringProc */
1108+
NULL, /* setFromAnyProc */
1109+
TCL_OBJTYPE_V0
1110+
};
1111+
1112+
10931113
static int
10941114
TestobjCmd(
10951115
TCL_UNUSED(void *),
@@ -1104,14 +1124,14 @@ TestobjCmd(
11041124
static const char *const subcommands[] = {
11051125
"freeallvars", "bug3598580", "buge58d7e19e9",
11061126
"types", "objtype", "newobj", "set",
1107-
"assign", "convert", "duplicate",
1127+
"assign", "convert", "duplicate", "huge",
11081128
"invalidateStringRep", "refcount", "type",
11091129
NULL
11101130
};
11111131
enum testobjCmdIndex {
11121132
TESTOBJ_FREEALLVARS, TESTOBJ_BUG3598580, TESTOBJ_BUGE58D7E19E9,
11131133
TESTOBJ_TYPES, TESTOBJ_OBJTYPE, TESTOBJ_NEWOBJ, TESTOBJ_SET,
1114-
TESTOBJ_ASSIGN, TESTOBJ_CONVERT, TESTOBJ_DUPLICATE,
1134+
TESTOBJ_ASSIGN, TESTOBJ_CONVERT, TESTOBJ_DUPLICATE, TESTOBJ_HUGE,
11151135
TESTOBJ_INVALIDATESTRINGREP, TESTOBJ_REFCOUNT, TESTOBJ_TYPE,
11161136
} cmdIndex;
11171137

@@ -1208,7 +1228,17 @@ TestobjCmd(
12081228
}
12091229
SetVarToObj(varPtr, varIndex, objv[3]);
12101230
return TCL_OK;
1211-
1231+
case TESTOBJ_HUGE: {
1232+
if (objc != 2) {
1233+
goto wrongNumArgs;
1234+
}
1235+
Tcl_Obj *hugeObjPtr = Tcl_NewObj();
1236+
hugeObjPtr->typePtr = &hugeType;
1237+
hugeObjPtr->length = INT_MAX - 1;
1238+
hugeObjPtr->bytes = NULL;
1239+
Tcl_SetObjResult(interp, hugeObjPtr);
1240+
}
1241+
return TCL_OK;
12121242
default:
12131243
break;
12141244
}

library/manifest.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
apply {{dir} {
55
set isafe [interp issafe]
66
foreach {safe package version file} {
7-
0 http 2.10.0 {http http.tcl}
7+
0 http 2.10.1 {http http.tcl}
88
1 msgcat 1.7.1 {msgcat msgcat.tcl}
99
1 opt 0.4.9 {opt optparse.tcl}
1010
0 cookiejar 0.2.0 {cookiejar cookiejar.tcl}

0 commit comments

Comments
 (0)