Skip to content

Commit b87e14c

Browse files
treefrogframeworktreefrogframework
committed
update version strings.
1 parent eb7518c commit b87e14c

7 files changed

Lines changed: 49 additions & 30 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# ChangeLog
22

3+
## 2.12.1
4+
- Added support for returning the RequestHeaderFieldsTooLarge status code.
5+
- Fixed a NUL-byte truncation bug.
6+
37
## 2.12.0
48
- Fix a bug of invalid parameter for shm_open() on macOS 26.
59
- Fix ERR_CONNECTION_RESET errors that occur after receiving an HTTP request that exceeds LimitRequestBody.

‎configure.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@echo off
22
@setlocal
33

4-
set VERSION=2.12.0
4+
set VERSION=2.12.1
55
set TFDIR=C:\TreeFrog\%VERSION%
66
set MONBOC_VERSION=2.3.3
77
set LZ4_VERSION=1.10.0

‎installer/create_installer.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
:: 10行目、27行目、28行目、38行目、39行目を編集
88

99

10-
set VERSION=2.12.0
10+
set VERSION=2.12.1
1111
set QTBASE=C:\Qt
1212
set TFDIR=C:\TreeFrog\%VERSION%
1313

‎installer/treefrog-setup/treefrog-setup/AssemblyInfo.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ using namespace System::Security::Permissions;
3131
// すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を
3232
// 既定値にすることができます:
3333

34-
[assembly:AssemblyVersionAttribute("2.12.0")];
34+
[assembly:AssemblyVersionAttribute("2.12.1")];
3535

3636
[assembly:ComVisible(false)];
3737

‎src/test/memcached/memcached.cpp‎

Lines changed: 38 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -63,31 +63,38 @@ void TestMemcached::setGet_data()
6363
QTest::addColumn<QByteArray>("value");
6464
QTest::addColumn<int>("secs");
6565
QTest::addColumn<uint>("flags");
66+
QTest::addColumn<int>("sleep_msecs");
6667

6768
QTest::newRow("1") << QByteArray::number(QDateTime::currentSecsSinceEpoch())
6869
<< QByteArray("Hello world.")
6970
<< (int)Tf::random(3, 10)
70-
<< (uint)Tf::random(1, UINT_MAX);
71+
<< (uint)Tf::random(1, UINT_MAX)
72+
<< (int)Tf::random(50, 2000);
7173
QTest::newRow("2") << QUuid::createUuid().toByteArray()
7274
<< QByteArray("こんにちは")
73-
<< (int)Tf::random(3, 10)
74-
<< (uint)Tf::random(1, UINT_MAX);
75+
<< (int)Tf::random(1, 2)
76+
<< (uint)Tf::random(1, UINT_MAX)
77+
<< (int)Tf::random(50, 200);
7578
QTest::newRow("3") << QUuid::createUuid().toByteArray()
7679
<< QByteArray(" Hello world. \r\nこんにちは、\n\"世界\"\t!!! ")
77-
<< (int)Tf::random(3, 10)
78-
<< (uint)Tf::random(1, UINT_MAX);
80+
<< (int)Tf::random(5, 7)
81+
<< (uint)Tf::random(1, UINT_MAX)
82+
<< (int)Tf::random(2000, 4000);
7983
QTest::newRow("4") << QUuid::createUuid().toByteArray()
8084
<< randomString(256)
81-
<< (int)Tf::random(3, 10)
82-
<< (uint)Tf::random(1, UINT_MAX);
85+
<< (int)Tf::random(5, 7)
86+
<< (uint)Tf::random(1, UINT_MAX)
87+
<< (int)Tf::random(50, 2000);
8388
QTest::newRow("5") << QUuid::createUuid().toByteArray()
8489
<< randomString(512)
85-
<< (int)Tf::random(3, 10)
86-
<< (uint)Tf::random(1, UINT_MAX);
90+
<< (int)Tf::random(3, 4)
91+
<< (uint)Tf::random(1, UINT_MAX)
92+
<< (int)Tf::random(50, 2000);
8793
QTest::newRow("6") << QUuid::createUuid().toByteArray()
8894
<< randomString(1024)
89-
<< (int)Tf::random(3, 10)
90-
<< (uint)Tf::random(1, UINT_MAX);
95+
<< (int)Tf::random(3, 4)
96+
<< (uint)Tf::random(1, UINT_MAX)
97+
<< (int)Tf::random(50, 2000);
9198
}
9299

93100

@@ -97,14 +104,15 @@ void TestMemcached::setGet()
97104
QFETCH(QByteArray, value);
98105
QFETCH(int, secs);
99106
QFETCH(uint, flags);
107+
QFETCH(int, sleep_msecs);
100108

101109
TMemcached memcached;
102110
uint flg;
103111
QByteArray res = memcached.get(key);
104112
QCOMPARE(res, QByteArray()); // empty
105113
bool ok = memcached.set(key, value, secs, flags);
106114
QCOMPARE(ok, true); // set ok
107-
Tf::msleep(Tf::random(50, 1900)); // sleep
115+
Tf::msleep(sleep_msecs); // sleep
108116
res = memcached.get(key, &flg); // get value
109117
QCOMPARE(res, value);
110118
QCOMPARE(flg, flags);
@@ -117,27 +125,33 @@ void TestMemcached::setGetNumber_data()
117125
QTest::addColumn<int64_t>("value");
118126
QTest::addColumn<int>("secs");
119127
QTest::addColumn<uint>("flags");
128+
QTest::addColumn<int>("sleep_msecs");
120129

121130
QTest::newRow("1") << QUuid::createUuid().toByteArray()
122131
<< (int64_t)123456789
123-
<< (int)Tf::random(3, 10)
124-
<< (uint)Tf::random(0, UINT_MAX);
132+
<< (int)Tf::random(3, 5)
133+
<< (uint)Tf::random(0, UINT_MAX)
134+
<< (int)Tf::random(50, 2000);
125135
QTest::newRow("2") << QUuid::createUuid().toByteArray()
126136
<< (int64_t)-987654321
127-
<< (int)Tf::random(3, 10)
128-
<< (uint)Tf::random(0, UINT_MAX);
137+
<< (int)Tf::random(1, 2)
138+
<< (uint)Tf::random(0, UINT_MAX)
139+
<< (int)Tf::random(100, 500);
129140
QTest::newRow("3") << QUuid::createUuid().toByteArray()
130141
<< (int64_t)0
131-
<< (int)Tf::random(3, 10)
132-
<< (uint)Tf::random(0, UINT_MAX);
142+
<< (int)Tf::random(5, 7)
143+
<< (uint)Tf::random(0, UINT_MAX)
144+
<< (int)Tf::random(3000, 4000);
133145
QTest::newRow("4") << QUuid::createUuid().toByteArray()
134146
<< (int64_t)Tf::random(1, INT64_MAX)
135-
<< (int)Tf::random(3, 10)
136-
<< (uint)Tf::random(0, UINT_MAX);
147+
<< (int)Tf::random(1, 2)
148+
<< (uint)Tf::random(0, UINT_MAX)
149+
<< (int)Tf::random(200, 500);
137150
QTest::newRow("5") << QUuid::createUuid().toByteArray()
138151
<< (int64_t)-Tf::random(1, INT_MAX)
139-
<< (int)Tf::random(3, 10)
140-
<< (uint)Tf::random(0, UINT_MAX);
152+
<< (int)Tf::random(3, 4)
153+
<< (uint)Tf::random(0, UINT_MAX)
154+
<< (int)Tf::random(1500, 2000);
141155
}
142156

143157

@@ -147,6 +161,7 @@ void TestMemcached::setGetNumber()
147161
QFETCH(int64_t, value);
148162
QFETCH(int, secs);
149163
QFETCH(uint, flags);
164+
QFETCH(int, sleep_msecs);
150165

151166
TMemcached memcached;
152167
bool ok;
@@ -157,7 +172,7 @@ void TestMemcached::setGetNumber()
157172
ok = memcached.set(key, value, secs, flags);
158173
//qDebug() << "set key:" << key << "value:" << value;
159174
QCOMPARE(ok, true); // set ok
160-
Tf::msleep(Tf::random(50, 1900)); // sleep
175+
Tf::msleep(sleep_msecs); // sleep
161176
res = memcached.getNumber(key, &ok, &flg); // get value
162177
//qDebug() << "got key:" << key << "value:" << res;
163178
QCOMPARE(res, value);

‎src/tglobal.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
2-
constexpr auto TF_VERSION_STR = "2.12.0";
3-
constexpr auto TF_VERSION_NUMBER = 0x020c00;
4-
constexpr auto TF_SRC_REVISION = 3148;
2+
constexpr auto TF_VERSION_STR = "2.12.1";
3+
constexpr auto TF_VERSION_NUMBER = 0x020c01;
4+
constexpr auto TF_SRC_REVISION = 3164;
55

66
#include <QMetaType>
77
#include <QIODevice>

‎tfbase.pri‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
TF_VER_MAJ=2
22
TF_VER_MIN=12
3-
TF_VER_PAT=0
3+
TF_VER_PAT=1
44
TF_VERSION=$${TF_VER_MAJ}.$${TF_VER_MIN}.$${TF_VER_PAT}

0 commit comments

Comments
 (0)