From e6b21d422e631a7c0cc81abf956af179b3b4c5e8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 2 Oct 2020 13:45:24 +0200 Subject: [PATCH] runtests: provide curl's version string as %VERSION for tests ... so that we can check HTTP requests for User-Agent: curl/%VERSION Update 600+ test cases accordingly. Closes #6037 --- tests/FILEFORMAT.md | 1 + tests/data/test1 | 4 +--- tests/data/test10 | 4 +--- tests/data/test1001 | 6 ++---- tests/data/test1002 | 10 ++++------ tests/data/test1004 | 4 +--- tests/data/test1008 | 7 +++---- tests/data/test1011 | 6 ++---- tests/data/test1012 | 6 ++---- tests/data/test1015 | 5 +---- tests/data/test1021 | 8 ++++---- tests/data/test1024 | 6 +++--- tests/data/test1025 | 6 +++--- tests/data/test1028 | 4 +--- tests/data/test1029 | 4 +--- tests/data/test1030 | 6 ++---- tests/data/test1031 | 5 ++--- tests/data/test1032 | 4 +--- tests/data/test1033 | 4 +--- tests/data/test1035 | 3 --- tests/data/test1040 | 4 +--- tests/data/test1041 | 4 +--- tests/data/test1042 | 4 +--- tests/data/test1043 | 4 +--- tests/data/test1045 | 4 +--- tests/data/test1046 | 4 +--- tests/data/test1051 | 5 ++--- tests/data/test1052 | 5 ++--- tests/data/test1053 | 6 +++--- tests/data/test1054 | 5 ++--- tests/data/test1055 | 4 +--- tests/data/test1056 | 5 ++--- tests/data/test1058 | 4 +--- tests/data/test1059 | 4 +--- tests/data/test1060 | 6 +++--- tests/data/test1061 | 6 +++--- tests/data/test1064 | 5 ++--- tests/data/test1065 | 5 ++--- tests/data/test1066 | 5 ++--- tests/data/test1067 | 5 ++--- tests/data/test1068 | 4 +--- tests/data/test1070 | 4 +--- tests/data/test1071 | 5 ++--- tests/data/test1072 | 4 +--- tests/data/test1073 | 4 +--- tests/data/test1074 | 5 ++--- tests/data/test1075 | 5 ++--- tests/data/test1076 | 6 ++---- tests/data/test1077 | 5 ++--- tests/data/test1078 | 6 +++--- tests/data/test1079 | 5 ++--- tests/data/test1080 | 5 ++--- tests/data/test1081 | 5 ++--- tests/data/test1082 | 4 +--- tests/data/test1083 | 4 +--- tests/data/test1087 | 6 +++--- tests/data/test1088 | 6 +++--- tests/data/test1089 | 5 ++--- tests/data/test1090 | 5 ++--- tests/data/test1092 | 4 +--- tests/data/test1095 | 6 ++---- tests/data/test1097 | 7 ++----- tests/data/test1098 | 5 ++--- tests/data/test11 | 5 ++--- tests/data/test1100 | 10 +++------- tests/data/test1101 | 4 +--- tests/data/test1104 | 5 ++--- tests/data/test1105 | 4 +--- tests/data/test1106 | 4 +--- tests/data/test1109 | 4 +--- tests/data/test1110 | 4 +--- tests/data/test1111 | 4 +--- tests/data/test1115 | 4 +--- tests/data/test1116 | 4 +--- tests/data/test1117 | 5 ++--- tests/data/test1118 | 4 +--- tests/data/test1121 | 4 +--- tests/data/test1122 | 4 +--- tests/data/test1123 | 4 +--- tests/data/test1124 | 4 +--- tests/data/test1125 | 4 +--- tests/data/test1126 | 4 +--- tests/data/test1127 | 4 +--- tests/data/test1128 | 5 ++--- tests/data/test1129 | 5 ++--- tests/data/test1130 | 5 ++--- tests/data/test1131 | 5 ++--- tests/data/test1133 | 4 ++-- tests/data/test1134 | 5 ++--- tests/data/test1138 | 6 ++---- tests/data/test1141 | 5 ++--- tests/data/test1142 | 4 +--- tests/data/test1143 | 4 +--- tests/data/test1144 | 4 +--- tests/data/test1148 | 4 +--- tests/data/test1150 | 5 ++--- tests/data/test1151 | 4 +--- tests/data/test1154 | 4 +--- tests/data/test1155 | 4 +--- tests/data/test1157 | 4 +--- tests/data/test1158 | 4 ++-- tests/data/test1159 | 4 +--- tests/data/test1160 | 4 +--- tests/data/test1161 | 4 +--- tests/data/test1164 | 4 +--- tests/data/test1166 | 5 ++--- tests/data/test1168 | 5 ++--- tests/data/test1170 | 4 +--- tests/data/test1171 | 4 +--- tests/data/test1172 | 4 +--- tests/data/test1174 | 4 +--- tests/data/test1176 | 4 +--- tests/data/test1178 | 4 +--- tests/data/test1197 | 5 ++--- tests/data/test12 | 4 +--- tests/data/test1204 | 5 ++--- tests/data/test1205 | 4 +--- tests/data/test1210 | 4 +--- tests/data/test1212 | 4 +--- tests/data/test1213 | 4 +--- tests/data/test1214 | 4 +--- tests/data/test1215 | 7 ++----- tests/data/test1216 | 5 ++--- tests/data/test1218 | 6 +++--- tests/data/test1223 | 4 +--- tests/data/test1228 | 5 ++--- tests/data/test1229 | 5 ++--- tests/data/test1230 | 5 ++--- tests/data/test1231 | 5 ++--- tests/data/test1232 | 5 ++--- tests/data/test1235 | 11 ++++------- tests/data/test1237 | 4 +--- tests/data/test1239 | 4 +--- tests/data/test1240 | 5 ++--- tests/data/test1241 | 5 ++--- tests/data/test1244 | 4 +--- tests/data/test1245 | 4 +--- tests/data/test1246 | 5 ++--- tests/data/test1248 | 4 +--- tests/data/test1249 | 4 +--- tests/data/test1250 | 4 +--- tests/data/test1251 | 4 +--- tests/data/test1252 | 4 +--- tests/data/test1253 | 4 +--- tests/data/test1254 | 4 +--- tests/data/test1255 | 4 +--- tests/data/test1256 | 4 +--- tests/data/test1257 | 4 +--- tests/data/test1258 | 5 ++--- tests/data/test1259 | 4 +--- tests/data/test1261 | 4 +--- tests/data/test1265 | 4 +--- tests/data/test1266 | 4 +--- tests/data/test1267 | 4 +--- tests/data/test1270 | 4 +--- tests/data/test1271 | 4 +--- tests/data/test1280 | 7 ++++--- tests/data/test1283 | 4 +--- tests/data/test1284 | 5 ++--- tests/data/test1285 | 5 ++--- tests/data/test1286 | 7 ++++--- tests/data/test1287 | 5 ++--- tests/data/test1288 | 5 ++--- tests/data/test1290 | 4 +--- tests/data/test1292 | 4 +--- tests/data/test1293 | 4 +--- tests/data/test1294 | 4 +--- tests/data/test1295 | 4 +--- tests/data/test1296 | 4 +--- tests/data/test1297 | 5 ++--- tests/data/test1298 | 4 +--- tests/data/test1299 | 4 +--- tests/data/test13 | 4 +--- tests/data/test1310 | 7 ++----- tests/data/test1311 | 4 +--- tests/data/test1312 | 4 +--- tests/data/test1313 | 4 +--- tests/data/test1314 | 5 ++--- tests/data/test1315 | 4 ++-- tests/data/test1317 | 4 +--- tests/data/test1318 | 5 ++--- tests/data/test1319 | 5 +---- tests/data/test1320 | 5 +---- tests/data/test1321 | 5 +---- tests/data/test1322 | 4 +--- tests/data/test1324 | 4 +--- tests/data/test1325 | 5 ++--- tests/data/test1328 | 5 ++--- tests/data/test1331 | 5 ++--- tests/data/test1332 | 6 ++---- tests/data/test1333 | 4 +--- tests/data/test1334 | 4 +--- tests/data/test1335 | 4 +--- tests/data/test1336 | 4 +--- tests/data/test1337 | 4 +--- tests/data/test1338 | 4 +--- tests/data/test1339 | 4 +--- tests/data/test1340 | 4 +--- tests/data/test1341 | 4 +--- tests/data/test1342 | 4 +--- tests/data/test1343 | 4 +--- tests/data/test1344 | 4 +--- tests/data/test1345 | 4 +--- tests/data/test1346 | 4 +--- tests/data/test1347 | 4 +--- tests/data/test1364 | 4 +--- tests/data/test1365 | 4 +--- tests/data/test1366 | 4 +--- tests/data/test1367 | 4 +--- tests/data/test1368 | 4 +--- tests/data/test1369 | 4 +--- tests/data/test1370 | 4 +--- tests/data/test1371 | 4 +--- tests/data/test1372 | 4 +--- tests/data/test1373 | 4 +--- tests/data/test1374 | 4 +--- tests/data/test1375 | 4 +--- tests/data/test1376 | 4 +--- tests/data/test1377 | 4 +--- tests/data/test14 | 5 +---- tests/data/test1400 | 5 +---- tests/data/test1401 | 5 +---- tests/data/test1402 | 5 +---- tests/data/test1403 | 5 +---- tests/data/test1404 | 4 ++-- tests/data/test1408 | 5 ++--- tests/data/test1411 | 4 +--- tests/data/test1412 | 10 ++++------ tests/data/test1413 | 5 ++--- tests/data/test1415 | 4 +--- tests/data/test1416 | 4 +--- tests/data/test1417 | 4 +--- tests/data/test1418 | 7 ++++--- tests/data/test1419 | 5 ++--- tests/data/test1421 | 5 ++--- tests/data/test1422 | 4 +--- tests/data/test1423 | 4 +--- tests/data/test1424 | 4 +--- tests/data/test1425 | Bin 1726 -> 1721 bytes tests/data/test1426 | Bin 1663 -> 1658 bytes tests/data/test1428 | 7 ++----- tests/data/test1429 | 4 +--- tests/data/test1430 | 4 +--- tests/data/test1431 | 4 +--- tests/data/test1432 | 4 +--- tests/data/test1433 | 4 +--- tests/data/test1434 | 4 +--- tests/data/test1435 | 4 +--- tests/data/test1436 | 6 +++--- tests/data/test1437 | 6 ++---- tests/data/test1438 | 4 +--- tests/data/test1439 | 4 +--- tests/data/test1443 | 4 +--- tests/data/test1448 | 5 ++--- tests/data/test1455 | 4 +--- tests/data/test1456 | 5 +---- tests/data/test1457 | 4 +--- tests/data/test1458 | 4 +--- tests/data/test1460 | 3 --- tests/data/test1465 | Bin 3106 -> 2914 bytes tests/data/test15 | 4 +--- tests/data/test150 | 7 ++----- tests/data/test1502 | 3 --- tests/data/test1503 | 3 --- tests/data/test1504 | 3 --- tests/data/test1505 | 3 --- tests/data/test151 | 5 +---- tests/data/test152 | 5 +---- tests/data/test1524 | 6 ++---- tests/data/test153 | 10 +++++----- tests/data/test154 | 6 ++---- tests/data/test155 | 7 +++---- tests/data/test1551 | 3 --- tests/data/test1556 | 3 --- tests/data/test156 | 5 +---- tests/data/test1561 | 7 ++----- tests/data/test1562 | 6 +++--- tests/data/test1563 | 4 +--- tests/data/test1566 | 4 +--- tests/data/test1567 | 3 --- tests/data/test157 | 4 +--- tests/data/test158 | 3 +-- tests/data/test159 | 5 +---- tests/data/test1591 | 3 --- tests/data/test1593 | 3 --- tests/data/test1594 | 3 --- tests/data/test1595 | 3 --- tests/data/test1596 | 3 --- tests/data/test16 | 4 +--- tests/data/test160 | 5 ++--- tests/data/test162 | 5 +---- tests/data/test163 | 4 ++-- tests/data/test1630 | 4 +--- tests/data/test1633 | 7 ++++--- tests/data/test164 | 4 +--- tests/data/test165 | 5 ++--- tests/data/test166 | 4 ++-- tests/data/test167 | 7 ++----- tests/data/test168 | 9 +++------ tests/data/test169 | 9 +++------ tests/data/test170 | 5 +---- tests/data/test1700 | 3 ++- tests/data/test1701 | 2 +- tests/data/test1702 | 2 +- tests/data/test171 | 4 +--- tests/data/test172 | 4 +--- tests/data/test173 | 4 ++-- tests/data/test174 | 5 +---- tests/data/test175 | 7 ++----- tests/data/test176 | 7 ++----- tests/data/test177 | 5 +---- tests/data/test178 | 4 +--- tests/data/test179 | 4 +--- tests/data/test18 | 9 +++------ tests/data/test180 | 4 +--- tests/data/test1800 | 4 +--- tests/data/test1801 | 4 +--- tests/data/test181 | 4 +--- tests/data/test183 | 7 ++----- tests/data/test184 | 6 ++---- tests/data/test185 | 6 ++---- tests/data/test186 | 4 ++-- tests/data/test187 | 5 ++--- tests/data/test188 | 7 ++----- tests/data/test189 | 7 ++----- tests/data/test1904 | 7 ++----- tests/data/test1905 | 3 --- tests/data/test1906 | 3 --- tests/data/test1907 | 3 --- tests/data/test1908 | 3 --- tests/data/test1909 | 5 ++--- tests/data/test1910 | 3 --- tests/data/test192 | 4 +--- tests/data/test193 | 5 ++--- tests/data/test194 | 4 +--- tests/data/test197 | 5 ++--- tests/data/test198 | 5 ++--- tests/data/test199 | 5 ++--- tests/data/test2 | 4 +--- tests/data/test2001 | 4 +--- tests/data/test2002 | 4 +--- tests/data/test2003 | 5 ++--- tests/data/test2005 | 4 +--- tests/data/test2006 | 4 +--- tests/data/test2007 | 4 +--- tests/data/test2008 | 4 +--- tests/data/test2009 | 4 +--- tests/data/test2010 | 4 +--- tests/data/test2011 | 4 +--- tests/data/test2012 | 4 +--- tests/data/test2023 | 3 --- tests/data/test2024 | 3 --- tests/data/test2025 | 3 --- tests/data/test2026 | 3 --- tests/data/test2027 | 3 --- tests/data/test2028 | 3 --- tests/data/test2029 | 3 --- tests/data/test2030 | 3 --- tests/data/test2031 | 3 --- tests/data/test2032 | 3 --- tests/data/test2034 | 4 +--- tests/data/test2036 | 3 --- tests/data/test2037 | 3 +-- tests/data/test2040 | 5 ++--- tests/data/test2041 | 4 +--- tests/data/test2046 | 5 ++--- tests/data/test2047 | 5 ++--- tests/data/test2049 | 7 ++++--- tests/data/test2050 | 5 ++--- tests/data/test2051 | 6 +++--- tests/data/test2052 | 5 ++--- tests/data/test2053 | 5 ++--- tests/data/test2054 | 7 ++++--- tests/data/test2055 | 5 ++--- tests/data/test2056 | 4 +--- tests/data/test2057 | 5 ++--- tests/data/test2058 | 6 ++---- tests/data/test2059 | 6 ++---- tests/data/test206 | 7 +++---- tests/data/test2060 | 6 ++---- tests/data/test2061 | 6 ++---- tests/data/test2062 | 6 ++---- tests/data/test2063 | 6 ++---- tests/data/test2064 | 6 ++---- tests/data/test2065 | 6 ++---- tests/data/test2066 | 6 ++---- tests/data/test2067 | 5 ++--- tests/data/test2068 | 5 ++--- tests/data/test2069 | 5 ++--- tests/data/test207 | 4 +--- tests/data/test2070 | 4 +--- tests/data/test2073 | 4 +++- tests/data/test2074 | 4 +--- tests/data/test2076 | 5 ++--- tests/data/test2078 | 4 +--- tests/data/test208 | 4 +--- tests/data/test209 | 7 +++---- tests/data/test2100 | Bin 1647 -> 1642 bytes tests/data/test213 | 7 +++---- tests/data/test214 | 4 +--- tests/data/test217 | 4 +--- tests/data/test218 | 4 +--- tests/data/test22 | 5 +---- tests/data/test220 | 4 +--- tests/data/test221 | 4 +--- tests/data/test222 | 4 +--- tests/data/test223 | 4 +--- tests/data/test224 | 4 +--- tests/data/test230 | 4 +--- tests/data/test232 | 4 +--- tests/data/test233 | 5 ++--- tests/data/test234 | 5 ++--- tests/data/test239 | 7 ++----- tests/data/test24 | 5 +---- tests/data/test240 | 4 +--- tests/data/test241 | 4 +--- tests/data/test242 | 4 +--- tests/data/test243 | 9 +++------ tests/data/test245 | 7 ++----- tests/data/test246 | 7 ++----- tests/data/test249 | 4 +--- tests/data/test25 | 15 ++++++--------- tests/data/test256 | 4 +--- tests/data/test257 | 9 +++------ tests/data/test258 | 6 +++--- tests/data/test259 | 6 +++--- tests/data/test26 | 5 +---- tests/data/test260 | 4 +--- tests/data/test262 | Bin 1137 -> 1132 bytes tests/data/test263 | 4 +--- tests/data/test264 | 4 +--- tests/data/test265 | 7 +++---- tests/data/test266 | 4 +--- tests/data/test267 | 7 ++----- tests/data/test268 | 4 +--- tests/data/test269 | 4 +--- tests/data/test27 | 6 +++--- tests/data/test273 | 6 ++---- tests/data/test274 | 5 +---- tests/data/test275 | 7 +++---- tests/data/test276 | 5 ++--- tests/data/test277 | 5 +---- tests/data/test278 | 4 +--- tests/data/test279 | 4 +--- tests/data/test28 | 5 ++--- tests/data/test281 | 4 +--- tests/data/test282 | 4 +--- tests/data/test29 | 4 +--- tests/data/test292 | 4 +--- tests/data/test293 | 4 +--- tests/data/test299 | 4 +--- tests/data/test3 | 4 +--- tests/data/test30 | 4 +--- tests/data/test300 | 4 +--- tests/data/test3000 | 4 +--- tests/data/test3001 | 4 +--- tests/data/test3008 | 4 +--- tests/data/test3009 | 4 +--- tests/data/test301 | 4 +--- tests/data/test3011 | 4 +--- tests/data/test3012 | 4 +--- tests/data/test3013 | 5 ++--- tests/data/test3014 | 4 +--- tests/data/test3015 | 5 ++--- tests/data/test302 | 3 --- tests/data/test303 | 4 +--- tests/data/test304 | 4 ++-- tests/data/test305 | 3 --- tests/data/test306 | 4 +--- tests/data/test307 | 4 +--- tests/data/test309 | 5 ++--- tests/data/test31 | 4 +--- tests/data/test310 | 4 +--- tests/data/test314 | 4 +--- tests/data/test315 | 4 +--- tests/data/test316 | 4 +--- tests/data/test317 | 5 ++--- tests/data/test318 | 5 ++--- tests/data/test319 | 4 +--- tests/data/test32 | 5 +---- tests/data/test325 | 4 +--- tests/data/test326 | 4 +--- tests/data/test327 | 5 ++--- tests/data/test328 | 2 +- tests/data/test329 | 5 ++--- tests/data/test33 | 5 +---- tests/data/test330 | 5 ++--- tests/data/test331 | 5 ++--- tests/data/test334 | 4 +--- tests/data/test335 | 9 +++------ tests/data/test338 | 5 ++--- tests/data/test339 | 4 +--- tests/data/test34 | 4 +--- tests/data/test341 | 3 --- tests/data/test342 | 4 +--- tests/data/test343 | 4 +--- tests/data/test344 | 4 +--- tests/data/test345 | 4 +--- tests/data/test346 | 4 +--- tests/data/test347 | 4 +--- tests/data/test35 | Bin 810 -> 805 bytes tests/data/test355 | 4 +--- tests/data/test356 | 4 +--- tests/data/test357 | 5 ++--- tests/data/test36 | 4 +--- tests/data/test37 | 4 +--- tests/data/test38 | 4 +--- tests/data/test39 | 4 ++-- tests/data/test393 | 4 +--- tests/data/test394 | 4 +--- tests/data/test395 | 4 +--- tests/data/test396 | 4 +--- tests/data/test397 | 4 +--- tests/data/test4 | 5 ++--- tests/data/test40 | 6 ++---- tests/data/test42 | 6 ++---- tests/data/test43 | 5 ++--- tests/data/test430 | 6 +++--- tests/data/test431 | 6 +++--- tests/data/test432 | 6 +++--- tests/data/test433 | 4 +--- tests/data/test434 | 4 +--- tests/data/test44 | 4 ++-- tests/data/test45 | 5 ++--- tests/data/test46 | 4 +--- tests/data/test47 | 4 +--- tests/data/test48 | 5 ++--- tests/data/test49 | 6 ++---- tests/data/test490 | 5 ++--- tests/data/test491 | 4 +--- tests/data/test492 | 7 ++++--- tests/data/test5 | 4 +--- tests/data/test50 | 6 ++---- tests/data/test51 | 6 ++---- tests/data/test512 | 3 --- tests/data/test514 | 3 --- tests/data/test515 | 3 --- tests/data/test516 | 3 --- tests/data/test52 | 6 ++---- tests/data/test522 | 3 --- tests/data/test523 | 3 --- tests/data/test53 | 4 +--- tests/data/test54 | 4 +--- tests/data/test540 | 3 --- tests/data/test544 | 3 --- tests/data/test547 | 6 ------ tests/data/test548 | 6 ------ tests/data/test549 | 3 --- tests/data/test55 | 6 ++---- tests/data/test550 | 3 --- tests/data/test551 | 3 --- tests/data/test552 | Bin 142947 -> 142909 bytes tests/data/test553 | 3 --- tests/data/test555 | 6 ------ tests/data/test556 | 3 --- tests/data/test560 | 3 --- tests/data/test561 | 3 --- tests/data/test57 | 4 +--- tests/data/test573 | 3 --- tests/data/test58 | 4 +--- tests/data/test580 | 3 --- tests/data/test581 | 3 --- tests/data/test585 | 3 --- tests/data/test589 | 3 --- tests/data/test59 | 4 +--- tests/data/test590 | 7 +------ tests/data/test6 | 4 +--- tests/data/test60 | 4 +--- tests/data/test61 | 4 +--- tests/data/test62 | 5 ++--- tests/data/test63 | 4 +--- tests/data/test64 | 6 ++---- tests/data/test65 | 6 ++---- tests/data/test658 | 3 --- tests/data/test659 | 3 --- tests/data/test66 | 4 +--- tests/data/test662 | 5 ++--- tests/data/test663 | 5 ++--- tests/data/test669 | 5 +---- tests/data/test67 | 7 ++----- tests/data/test674 | 3 --- tests/data/test68 | 7 ++----- tests/data/test69 | 9 +++------ tests/data/test7 | 4 +--- tests/data/test70 | 7 ++----- tests/data/test700 | 4 +--- tests/data/test701 | 4 +--- tests/data/test708 | 4 +--- tests/data/test709 | 4 +--- tests/data/test710 | 4 +--- tests/data/test717 | 4 +--- tests/data/test72 | 7 ++----- tests/data/test73 | 4 +--- tests/data/test74 | 5 ++--- tests/data/test75 | 3 --- tests/data/test76 | 3 --- tests/data/test77 | 4 +--- tests/data/test78 | 4 +--- tests/data/test79 | 4 +--- tests/data/test8 | 4 +--- tests/data/test80 | 7 ++----- tests/data/test81 | 7 ++----- tests/data/test82 | 5 +---- tests/data/test83 | 7 ++----- tests/data/test84 | 5 +---- tests/data/test85 | 5 +---- tests/data/test86 | 9 +++------ tests/data/test88 | 6 ++---- tests/data/test89 | 11 ++++------- tests/data/test9 | 4 ++-- tests/data/test90 | 13 ++++++------- tests/data/test91 | 9 +++------ tests/data/test92 | 4 +--- tests/data/test93 | 4 +--- tests/data/test94 | 5 +---- tests/data/test95 | 7 ++----- tests/data/test97 | 4 +--- tests/data/test970 | 4 +--- tests/data/test98 | 4 +--- tests/data/test99 | 4 +--- tests/runtests.pl | 5 ++++- 621 files changed, 852 insertions(+), 2003 deletions(-) diff --git a/tests/FILEFORMAT.md b/tests/FILEFORMAT.md index 7748b67061..c2cc1016ea 100644 --- a/tests/FILEFORMAT.md +++ b/tests/FILEFORMAT.md @@ -106,6 +106,7 @@ Available substitute variables include: - `%TFTP6PORT` - IPv6 port number of the TFTP server - `%TFTPPORT` - Port number of the TFTP server - `%USER` - Login ID of the user running the test +- `%VERSION` - the full version number of the tested curl # `` diff --git a/tests/data/test1 b/tests/data/test1 index 7c0e1602a0..461375b628 100644 --- a/tests/data/test1 +++ b/tests/data/test1 @@ -42,12 +42,10 @@ http://%HOSTIP:%HTTPPORT/1 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test10 b/tests/data/test10 index 806aa697ff..c5053b5db6 100644 --- a/tests/data/test10 +++ b/tests/data/test10 @@ -43,12 +43,10 @@ the # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /we/want/10 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 78 Expect: 100-continue diff --git a/tests/data/test1001 b/tests/data/test1001 index 53d7da3810..6edaade79d 100644 --- a/tests/data/test1001 +++ b/tests/data/test1001 @@ -81,14 +81,11 @@ test # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://%HOSTIP:%HTTPPORT/1001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Content-Range: bytes 2-4/5 -User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Content-Length: 0 @@ -97,6 +94,7 @@ GET http://%HOSTIP:%HTTPPORT/1001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1001", response="6af4d89c952f4dd4cc215a6878dc499d" Content-Range: bytes 2-4/5 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Content-Length: 3 diff --git a/tests/data/test1002 b/tests/data/test1002 index 5b6ef94315..7ec7501f79 100644 --- a/tests/data/test1002 +++ b/tests/data/test1002 @@ -80,14 +80,11 @@ test # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://%HOSTIP:%HTTPPORT/1002.upload1 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Content-Range: bytes 2-4/5 -User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Content-Length: 0 @@ -96,6 +93,7 @@ GET http://%HOSTIP:%HTTPPORT/1002.upload1 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1002.upload1", response="198aa9b6acb4b0c71d02a197a5e41f54" Content-Range: bytes 2-4/5 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Content-Length: 3 @@ -105,7 +103,7 @@ st GET http://%HOSTIP:%HTTPPORT/1002.upload2 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Content-Range: bytes 2-4/5 -User-Agent: curl/7.16.1 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Content-Length: 0 @@ -114,7 +112,7 @@ GET http://%HOSTIP:%HTTPPORT/1002.upload2 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1002.upload2", response="d711f0d2042786d930de635ba0d1a1d0" Content-Range: bytes 2-4/5 -User-Agent: curl/7.16.1 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Content-Length: 3 diff --git a/tests/data/test1004 b/tests/data/test1004 index 955163b365..05e92a598e 100644 --- a/tests/data/test1004 +++ b/tests/data/test1004 @@ -43,12 +43,10 @@ http://%HOSTIP:%HTTPPORT/1004 --proxy "" # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1004 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1008 b/tests/data/test1008 index a1ef0dd7a9..a076fa0d49 100644 --- a/tests/data/test1008 +++ b/tests/data/test1008 @@ -110,23 +110,22 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent: curl/.* - CONNECT test.remote.example.com.1008:%HTTPPORT HTTP/1.1 Host: test.remote.example.com.1008:%HTTPPORT Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive CONNECT test.remote.example.com.1008:%HTTPPORT HTTP/1.1 Host: test.remote.example.com.1008:%HTTPPORT Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q= +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive GET /path/10080002 HTTP/1.1 -User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4 Host: test.remote.example.com.1008:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* [DISCONNECT] diff --git a/tests/data/test1011 b/tests/data/test1011 index 566867dd61..6d3297a761 100644 --- a/tests/data/test1011 +++ b/tests/data/test1011 @@ -56,19 +56,17 @@ http://%HOSTIP:%HTTPPORT/blah/1011 -L -d "moo" # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /blah/1011 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 3 Content-Type: application/x-www-form-urlencoded mooGET /blah/moo.html&testcase=/10110002 HTTP/1.1 -User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1012 b/tests/data/test1012 index 4edc1731e4..943db91c0f 100644 --- a/tests/data/test1012 +++ b/tests/data/test1012 @@ -56,19 +56,17 @@ http://%HOSTIP:%HTTPPORT/blah/1012 -L -d "moo" --post301 # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /blah/1012 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 3 Content-Type: application/x-www-form-urlencoded mooPOST /blah/moo.html&testcase=/10120002 HTTP/1.1 -User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 3 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test1015 b/tests/data/test1015 index a2b2cefa1e..c568b86783 100644 --- a/tests/data/test1015 +++ b/tests/data/test1015 @@ -38,13 +38,10 @@ content to _?!#$'|<> # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /1015 HTTP/1.1 -User-Agent: curl/7.17.2-CVS (i686-pc-linux-gnu) libcurl/7.17.2-CVS OpenSSL/0.9.8g zlib/1.2.3.3 c-ares/1.5.2-CVS libidn/1.1 libssh2/0.19.0-C Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 133 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test1021 b/tests/data/test1021 index 84d1e62a73..10a0314ad7 100644 --- a/tests/data/test1021 +++ b/tests/data/test1021 @@ -115,27 +115,27 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent: curl/.* - CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1 Host: test.remote.example.com.1021:%HTTPPORT +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1 Host: test.remote.example.com.1021:%HTTPPORT Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1 Host: test.remote.example.com.1021:%HTTPPORT Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q= +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive GET /path/10210002 HTTP/1.1 -User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4 Host: test.remote.example.com.1021:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1024 b/tests/data/test1024 index 086ef267a1..4971eedbdb 100644 --- a/tests/data/test1024 +++ b/tests/data/test1024 @@ -81,20 +81,20 @@ http://%HOSTIP:%HTTPPORT/want/1024 -L -c log/jar1024 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/1024 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /data/10240002.txt HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /want/10240003.txt HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Cookie: firstcookie=want diff --git a/tests/data/test1025 b/tests/data/test1025 index 494f8f8d50..66f7532b46 100644 --- a/tests/data/test1025 +++ b/tests/data/test1025 @@ -81,22 +81,22 @@ http://%HOSTIP:%HTTPPORT/want/1025 -L -c log/jar1025 -b forcedcookie=yes # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/1025 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Cookie: forcedcookie=yes GET /data/10250002.txt HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Cookie: forcedcookie=yes GET /want/10250003.txt HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Cookie: firstcookie=want; forcedcookie=yes diff --git a/tests/data/test1028 b/tests/data/test1028 index b154372afd..c10d581260 100644 --- a/tests/data/test1028 +++ b/tests/data/test1028 @@ -52,12 +52,10 @@ http://%HOSTIP:%HTTPPORT/10280001 -L # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /10280001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* USER anonymous diff --git a/tests/data/test1029 b/tests/data/test1029 index c77209cad8..9a351a4f38 100644 --- a/tests/data/test1029 +++ b/tests/data/test1029 @@ -36,12 +36,10 @@ http://%HOSTIP:%HTTPPORT/we/want/our/1029 -w '%{redirect_url}\n' # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/our/1029 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1030 b/tests/data/test1030 index 5a8ed4cd62..735c08b7ab 100644 --- a/tests/data/test1030 +++ b/tests/data/test1030 @@ -79,12 +79,10 @@ four is the number of lines # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /1030 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 85 Expect: 100-continue @@ -96,7 +94,7 @@ four is the number of lines PUT /1030 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/1030", response="01cb59db1ddaac246b072d5f5f0716d9" -User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* Content-Length: 85 Expect: 100-continue diff --git a/tests/data/test1031 b/tests/data/test1031 index 9cfbab5c5a..b12785a0c6 100644 --- a/tests/data/test1031 +++ b/tests/data/test1031 @@ -59,16 +59,15 @@ http://%HOSTIP:%HTTPPORT/want/this/1031 -L # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/this/1031 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /want/this/1031?coolsite=yes/10310002.txt HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1032 b/tests/data/test1032 index b0b6834cc8..0c38ae1327 100644 --- a/tests/data/test1032 +++ b/tests/data/test1032 @@ -42,13 +42,11 @@ HTTP HEAD with --range # # Verify data after the test has been "shot" - -^User-Agent:.* - HEAD /1032 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Range: bytes=1-3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1033 b/tests/data/test1033 index 9ad5d2526c..908dd32c02 100644 --- a/tests/data/test1033 +++ b/tests/data/test1033 @@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/1033 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1033 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1035 b/tests/data/test1035 index 62f9d7ae89..b67eab281b 100644 --- a/tests/data/test1035 +++ b/tests/data/test1035 @@ -42,9 +42,6 @@ http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/10 # # Verify data after the test has been "shot" - -^User-Agent:.* - 3 diff --git a/tests/data/test1040 b/tests/data/test1040 index e21ed81992..d480bb4484 100644 --- a/tests/data/test1040 +++ b/tests/data/test1040 @@ -65,13 +65,11 @@ http://%HOSTIP:%HTTPPORT/1040 -C - # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1040 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Range: bytes=100- +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1041 b/tests/data/test1041 index c77d616a82..4797cf937d 100644 --- a/tests/data/test1041 +++ b/tests/data/test1041 @@ -50,15 +50,13 @@ http://%HOSTIP:%HTTPPORT/1041 -Tlog/test1041.txt -C - # Verify data after the test has been "shot" - -^User-Agent:.* - # curl doesn't do a HEAD request on the remote file so it has no idea whether # it can skip part of the file or not. Instead, it sends the entire file. PUT /1041 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Content-Range: bytes 0-99/100 +User-Agent: curl/%VERSION Accept: */* Content-Length: 100 Expect: 100-continue diff --git a/tests/data/test1042 b/tests/data/test1042 index dfebaa152f..d374d2ab5e 100644 --- a/tests/data/test1042 +++ b/tests/data/test1042 @@ -80,13 +80,11 @@ http://%HOSTIP:%HTTPPORT/1042 -C 200 33 - -^User-Agent:.* - GET /1042 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Range: bytes=200- +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1043 b/tests/data/test1043 index 4ab4987626..e200b61ea3 100644 --- a/tests/data/test1043 +++ b/tests/data/test1043 @@ -70,13 +70,11 @@ http://%HOSTIP:%HTTPPORT/1043 -C - # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1043 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Range: bytes=40- +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1045 b/tests/data/test1045 index fa8ad4b448..9de169babd 100644 --- a/tests/data/test1045 +++ b/tests/data/test1045 @@ -39,12 +39,10 @@ http://%HOSTIP:%HTTPPORT/1045 --interface %CLIENTIP # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1045 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1046 b/tests/data/test1046 index e86e1329cb..0f04b8a334 100644 --- a/tests/data/test1046 +++ b/tests/data/test1046 @@ -47,12 +47,10 @@ perl -e "print 'Test requires default test client host address' if ( '%CLIENT6IP # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1046 HTTP/1.1 Host: %HOST6IP:%HTTP6PORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1051 b/tests/data/test1051 index 080e1d1d5a..7a8eae1bd5 100644 --- a/tests/data/test1051 +++ b/tests/data/test1051 @@ -73,9 +73,6 @@ the # Verify data after the test has been "shot" - -^User-Agent:.* - # The primary reason libcurl sends the data part twice in this test is that # the test HTTP server is blocking until it has read the entire request, @@ -85,6 +82,7 @@ the PUT /want/1051 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 78 Expect: 100-continue @@ -100,6 +98,7 @@ the feature PUT /want/data/10510002.txt?coolsite=yes HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 78 Expect: 100-continue diff --git a/tests/data/test1052 b/tests/data/test1052 index 10c16b4a79..e0c2f32a63 100644 --- a/tests/data/test1052 +++ b/tests/data/test1052 @@ -69,9 +69,6 @@ the # Verify data after the test has been "shot" - -^User-Agent:.* - # The primary reason libcurl sends the data part twice in this test is that # the test HTTP server is blocking until it has read the entire request, @@ -80,6 +77,7 @@ the PUT /want/1052 HTTP/1.0 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 78 @@ -94,6 +92,7 @@ the feature PUT /want/data/10520002.txt?coolsite=yes HTTP/1.0 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 78 diff --git a/tests/data/test1053 b/tests/data/test1053 index 239a1100fd..5f3ec2932c 100644 --- a/tests/data/test1053 +++ b/tests/data/test1053 @@ -71,12 +71,12 @@ bar # Verify data after the test has been "shot" -^(User-Agent:|Content-Type: multipart/form-data;|------------).* +^(Content-Type: multipart/form-data;|------------).* POST /we/want/1053 HTTP/1.1 -User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 410 Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763 @@ -99,8 +99,8 @@ bar ------------------------------9ef8d6205763-- POST /we/want/data/10530002.txt?coolsite=yes HTTP/1.1 -User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 410 Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763 diff --git a/tests/data/test1054 b/tests/data/test1054 index 54d023267c..ac6671f6ef 100644 --- a/tests/data/test1054 +++ b/tests/data/test1054 @@ -58,18 +58,17 @@ http://%HOSTIP:%HTTPPORT/blah/1054 -L -d @log/test1054.txt --post301 # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /blah/1054 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 10 Content-Type: application/x-www-form-urlencoded field=dataPOST /blah/moo/testcase/10540002 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 10 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test1055 b/tests/data/test1055 index f25db8f426..4788ae77d9 100644 --- a/tests/data/test1055 +++ b/tests/data/test1055 @@ -54,12 +54,10 @@ the # # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /1055 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 78 Expect: 100-continue diff --git a/tests/data/test1056 b/tests/data/test1056 index 756d0f27f1..7ccdb21997 100644 --- a/tests/data/test1056 +++ b/tests/data/test1056 @@ -60,16 +60,15 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/1056 -L # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/are/all/twits/1056 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /moo/10560002 HTTP/1.1 Host: %HOST6IP:%HTTP6PORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1058 b/tests/data/test1058 index 4eb34da738..d177b5fd78 100644 --- a/tests/data/test1058 +++ b/tests/data/test1058 @@ -39,13 +39,11 @@ http://%HOSTIP:%HTTPPORT/want/1058 -r -101 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/1058 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Range: bytes=-101 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1059 b/tests/data/test1059 index 615e625c96..32e5aec3ac 100644 --- a/tests/data/test1059 +++ b/tests/data/test1059 @@ -46,12 +46,10 @@ ftp://test-number:1059/wanted/page -p -x %HOSTIP:%HTTPPORT 56 - -^User-Agent:.* - CONNECT test-number:1059 HTTP/1.1 Host: test-number:1059 +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive diff --git a/tests/data/test1060 b/tests/data/test1060 index c4b264c108..86fe835a91 100644 --- a/tests/data/test1060 +++ b/tests/data/test1060 @@ -881,21 +881,21 @@ http://test.remote.haxx.se.1060:8990/path/10600002 --proxy http://%HOSTIP:%HTTPP # Verify data after the test has been "shot" - -^User-Agent: curl/.* - CONNECT test.remote.haxx.se.1060:8990 HTTP/1.1 Host: test.remote.haxx.se.1060:8990 +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive CONNECT test.remote.haxx.se.1060:8990 HTTP/1.1 Host: test.remote.haxx.se.1060:8990 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.1060:8990", response="e1fbed39c26f4efe284adc0e576ff638" +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive GET /path/10600002 HTTP/1.1 Host: test.remote.haxx.se.1060:8990 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1061 b/tests/data/test1061 index 6ddddfee2e..bfb0c6d2f1 100644 --- a/tests/data/test1061 +++ b/tests/data/test1061 @@ -886,21 +886,21 @@ http://test.remote.haxx.se.1061:8990/path/10610002 --proxy http://%HOSTIP:%HTTPP # Verify data after the test has been "shot" - -^User-Agent: curl/.* - CONNECT test.remote.haxx.se.1061:8990 HTTP/1.1 Host: test.remote.haxx.se.1061:8990 +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive CONNECT test.remote.haxx.se.1061:8990 HTTP/1.1 Host: test.remote.haxx.se.1061:8990 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.1061:8990", response="4e23449fa93224834299e7282a70472c" +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive GET /path/10610002 HTTP/1.1 Host: test.remote.haxx.se.1061:8990 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1064 b/tests/data/test1064 index dd05ddf3af..3d2f4d2cbf 100644 --- a/tests/data/test1064 +++ b/tests/data/test1064 @@ -44,18 +44,17 @@ test # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /1064.upload1 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 5 test PUT /10640002.upload2 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 5 diff --git a/tests/data/test1065 b/tests/data/test1065 index 5688ff9645..1d27ffb4b7 100644 --- a/tests/data/test1065 +++ b/tests/data/test1065 @@ -45,18 +45,17 @@ test # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /1065.upload1 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 5 test GET /10650002.url2 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1066 b/tests/data/test1066 index bacedefbb3..8175af1727 100644 --- a/tests/data/test1066 +++ b/tests/data/test1066 @@ -41,16 +41,15 @@ http://%HOSTIP:%HTTPPORT/want/1066 http://%HOSTIP:%HTTPPORT/want/10660001 --dump # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/1066 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /want/10660001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1067 b/tests/data/test1067 index 9fc7a6fa46..4706a0a586 100644 --- a/tests/data/test1067 +++ b/tests/data/test1067 @@ -59,17 +59,16 @@ http://%HOSTIP:%HTTPPORT/want/1067 -L --referer "firstone.html;auto" # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/1067 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Referer: firstone.html GET /want/data/10670002.txt?coolsite=yes HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Referer: http://%HOSTIP:%HTTPPORT/want/1067 diff --git a/tests/data/test1068 b/tests/data/test1068 index f9bfec90f1..15a702d119 100644 --- a/tests/data/test1068 +++ b/tests/data/test1068 @@ -38,12 +38,10 @@ more than one byte # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /bzz/1068 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Transfer-Encoding: chunked Expect: 100-continue diff --git a/tests/data/test1070 b/tests/data/test1070 index 81b473de45..6056e5d936 100644 --- a/tests/data/test1070 +++ b/tests/data/test1070 @@ -48,12 +48,10 @@ OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /1070 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Expect: 100-continue Content-Length: 2313 diff --git a/tests/data/test1071 b/tests/data/test1071 index 4352e61115..d89b74bd0a 100644 --- a/tests/data/test1071 +++ b/tests/data/test1071 @@ -85,12 +85,10 @@ four is the number of lines # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /1071 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 85 Expect: 100-continue @@ -102,6 +100,7 @@ four is the number of lines PUT /1071 HTTP/1.0 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/1071", response="df4cef6b52a30e65d472dd848d2055a1" +User-Agent: curl/%VERSION Accept: */* Content-Length: 85 diff --git a/tests/data/test1072 b/tests/data/test1072 index 14b6d804cd..128f0944c6 100644 --- a/tests/data/test1072 +++ b/tests/data/test1072 @@ -55,12 +55,10 @@ which is impossible in HTTP/1.0 25 - -^User-Agent:.* - PUT /1072 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Transfer-Encoding: chunked Expect: 100-continue diff --git a/tests/data/test1073 b/tests/data/test1073 index 481f9098fc..80f5ec0dca 100644 --- a/tests/data/test1073 +++ b/tests/data/test1073 @@ -49,12 +49,10 @@ which is impossible in HTTP/1.0 25 - -^User-Agent:.* - PUT /1073 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Transfer-Encoding: chunked Expect: 100-continue diff --git a/tests/data/test1074 b/tests/data/test1074 index 3464b4183d..840d46195e 100644 --- a/tests/data/test1074 +++ b/tests/data/test1074 @@ -59,16 +59,15 @@ Connection: close surprise2 - -^User-Agent:.* - GET /want/1074 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /wantmore/10740001 HTTP/1.0 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1075 b/tests/data/test1075 index 4b30c593a3..f0f255ab6c 100644 --- a/tests/data/test1075 +++ b/tests/data/test1075 @@ -64,12 +64,10 @@ four is the number of lines # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /1075 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 85 Expect: 100-continue @@ -81,6 +79,7 @@ four is the number of lines PUT /1075 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M= +User-Agent: curl/%VERSION Accept: */* Content-Length: 85 Expect: 100-continue diff --git a/tests/data/test1076 b/tests/data/test1076 index ad079eb940..8322be23ae 100644 --- a/tests/data/test1076 +++ b/tests/data/test1076 @@ -56,19 +56,17 @@ http://%HOSTIP:%HTTPPORT/blah/1076 -L -d "moo" --post302 # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /blah/1076 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 3 Content-Type: application/x-www-form-urlencoded mooPOST /blah/moo.html&testcase=/10760002 HTTP/1.1 -User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 3 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test1077 b/tests/data/test1077 index e917e8a56c..8b1d288dea 100644 --- a/tests/data/test1077 +++ b/tests/data/test1077 @@ -57,17 +57,16 @@ FTP over HTTP proxy with downgrade to HTTP 1.0 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/1077 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/10770002 HTTP/1.0 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1078 b/tests/data/test1078 index d705dbca4d..65c77ed7c8 100644 --- a/tests/data/test1078 +++ b/tests/data/test1078 @@ -53,22 +53,22 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - CONNECT %HOSTIP.1078:%HTTPPORT HTTP/1.0 Host: %HOSTIP.1078:%HTTPPORT +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive GET /we/want/that/page/1078 HTTP/1.1 Host: %HOSTIP.1078:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /we/want/that/page/1078 HTTP/1.0 Host: %HOSTIP.1078:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1079 b/tests/data/test1079 index ac7b899fbe..460439d534 100644 --- a/tests/data/test1079 +++ b/tests/data/test1079 @@ -58,17 +58,16 @@ http://%HOSTIP:%HTTPPORT/1079 -u testuser:testpass --digest 52 - -^User-Agent:.* - GET /1079 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /1079 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1079", response="e340c7cdca0950462070f46ee139e9f7" +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1080 b/tests/data/test1080 index e0f7d62ae4..9fa48576d4 100644 --- a/tests/data/test1080 +++ b/tests/data/test1080 @@ -36,16 +36,15 @@ http://%HOSTIP:%HTTPPORT/we/want/our/1080 http://%HOSTIP:%HTTPPORT/we/want/our/1 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/our/1080 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /we/want/our/1080 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1081 b/tests/data/test1081 index d9f895fd26..2a5a765e66 100644 --- a/tests/data/test1081 +++ b/tests/data/test1081 @@ -44,16 +44,15 @@ http://%HOSTIP:%HTTPPORT/we/want/our/1081 http://%HOSTIP:%HTTPPORT/we/want/our/1 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/our/1081 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /we/want/our/10810002 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1082 b/tests/data/test1082 index 8e4078b2d7..0df70afaed 100644 --- a/tests/data/test1082 +++ b/tests/data/test1082 @@ -42,12 +42,10 @@ perl -e "print 'Test requires default test client host address' if ( '%CLIENTIP' # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1082 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1083 b/tests/data/test1083 index 1b1db05399..89beea0fc3 100644 --- a/tests/data/test1083 +++ b/tests/data/test1083 @@ -46,12 +46,10 @@ perl -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test client # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1083 HTTP/1.1 Host: %HOST6IP:%HTTP6PORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1087 b/tests/data/test1087 index 883d986424..f674294035 100644 --- a/tests/data/test1087 +++ b/tests/data/test1087 @@ -88,23 +88,23 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://first.host.it.is/we/want/that/page/10871000 HTTP/1.1 Host: first.host.it.is +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://first.host.it.is/we/want/that/page/10871000 HTTP/1.1 Host: first.host.it.is Authorization: Basic aWFtOm15c2VsZg== +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://goto.second.host.now/10871002 HTTP/1.1 Host: goto.second.host.now +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1088 b/tests/data/test1088 index f2b6fc2632..649cb88eca 100644 --- a/tests/data/test1088 +++ b/tests/data/test1088 @@ -89,24 +89,24 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://first.host.it.is/we/want/that/page/10881000 HTTP/1.1 Host: first.host.it.is +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://first.host.it.is/we/want/that/page/10881000 HTTP/1.1 Host: first.host.it.is Authorization: Basic aWFtOm15c2VsZg== +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://goto.second.host.now/10881002 HTTP/1.1 Host: goto.second.host.now Authorization: Basic aWFtOm15c2VsZg== +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1089 b/tests/data/test1089 index d2a18a21d2..d4b8791368 100644 --- a/tests/data/test1089 +++ b/tests/data/test1089 @@ -50,16 +50,15 @@ http://%HOSTIP:%HTTPPORT/1089 -w "%{num_connects}\n%{num_redirects}\n%{size_down # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1089 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /10890001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1090 b/tests/data/test1090 index 3304f911d3..9ae803fb70 100644 --- a/tests/data/test1090 +++ b/tests/data/test1090 @@ -57,16 +57,15 @@ http://%HOSTIP:%HTTPPORT/1090 -w "%{num_connects}\n%{num_redirects}\n%{size_down # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1090 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /10900001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1092 b/tests/data/test1092 index 725a274ba2..d3ea902444 100644 --- a/tests/data/test1092 +++ b/tests/data/test1092 @@ -43,12 +43,10 @@ FTP with type=i over HTTP proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/1092;type=i HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1095 b/tests/data/test1095 index 6bfe54f333..3e562b0379 100644 --- a/tests/data/test1095 +++ b/tests/data/test1095 @@ -65,18 +65,16 @@ http://%HOSTIP:%HTTPPORT/1095 -u testuser:testpass --digest # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1095 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /1095 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="test \"this\" realm!!", nonce="1053604145", uri="/1095", response="a1c7931ece9e8617bae2715045e4f49f" -User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1097 b/tests/data/test1097 index 82f23846d9..218d57bbec 100644 --- a/tests/data/test1097 +++ b/tests/data/test1097 @@ -59,19 +59,16 @@ http://test.a.galaxy.far.far.away.1097:%HTTPPORT/1097 --proxy http://%HOSTIP:%HT # Verify data after the test has been "shot" - -^User-Agent: curl/.* - CONNECT test.a.galaxy.far.far.away.1097:%HTTPPORT HTTP/1.1 Host: test.a.galaxy.far.far.away.1097:%HTTPPORT Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.19.5-CVS (i686-pc-linux-gnu) libcurl/7.19.5-CVS OpenSSL/0.9.8g zlib/1.2.3.3 c-ares/1.6.1-CVS libidn/1.12 libssh2/1.0.1_CVS +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive POST /1097 HTTP/1.1 -User-Agent: curl/7.19.5-CVS (i686-pc-linux-gnu) libcurl/7.19.5-CVS OpenSSL/0.9.8g zlib/1.2.3.3 c-ares/1.6.1-CVS libidn/1.12 libssh2/1.0.1_CVS Host: test.a.galaxy.far.far.away.1097:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 11 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test1098 b/tests/data/test1098 index 0d397340c8..a8d25cbe29 100644 --- a/tests/data/test1098 +++ b/tests/data/test1098 @@ -43,17 +43,16 @@ ftp://ftp-site/moo/1098 ftp://ftp-site/moo/1098 --proxy http://%HOSTIP:%HTTPPORT # # Verify data after the test has been "shot" - -^User-Agent:.* - GET ftp://ftp-site/moo/1098 HTTP/1.1 Host: ftp-site:21 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET ftp://ftp-site/moo/1098 HTTP/1.1 Host: ftp-site:21 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test11 b/tests/data/test11 index 9d93f80e0d..3eed8a17f7 100644 --- a/tests/data/test11 +++ b/tests/data/test11 @@ -59,16 +59,15 @@ http://%HOSTIP:%HTTPPORT/want/11 -L # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/11 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /want/data/110002.txt?coolsite=yes HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1100 b/tests/data/test1100 index 101b1e7acc..5bb807200d 100644 --- a/tests/data/test1100 +++ b/tests/data/test1100 @@ -89,14 +89,10 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - - POST /1100 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* Content-Length: 0 Content-Type: application/x-www-form-urlencoded @@ -104,14 +100,14 @@ Content-Type: application/x-www-form-urlencoded POST /1100 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q= -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* Content-Length: 18 Content-Type: application/x-www-form-urlencoded stuff to send awayGET /1100 HTTP/1.1 Host: %HOSTIP:%HTTPPORT -User-Agent: curl/7.19.5-CVS (i686-pc-linux-gnu) libcurl/7.19.5-CVS GnuTLS/2.6.6 zlib/1.2.3.3 c-ares/1.6.1-CVS libidn/1.14 libssh2/1.1 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1101 b/tests/data/test1101 index 75c66195ec..eaf16bd681 100644 --- a/tests/data/test1101 +++ b/tests/data/test1101 @@ -40,13 +40,11 @@ http://user:secret@%HOSTIP:%HTTPPORT/gimme/1101 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /gimme/1101 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Basic dXNlcjpzZWNyZXQ= +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1104 b/tests/data/test1104 index e66da58add..2c5b9fcf79 100644 --- a/tests/data/test1104 +++ b/tests/data/test1104 @@ -68,17 +68,16 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://%HOSTIP:%HTTPPORT/want/1104 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://%HOSTIP:%HTTPPORT/want/data/11040002 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Cookie: test2=true diff --git a/tests/data/test1105 b/tests/data/test1105 index 7820445837..8142ad2669 100644 --- a/tests/data/test1105 +++ b/tests/data/test1105 @@ -41,12 +41,10 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0 # Verify data after the test has been "shot" - -^User-Agent:.* - POST /we/want/1105?parm1=this*that/other/thing&parm2=foobar/1105 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 33 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test1106 b/tests/data/test1106 index 37a77e36e1..e23c33c045 100644 --- a/tests/data/test1106 +++ b/tests/data/test1106 @@ -44,12 +44,10 @@ ftp://%HOSTIP:23456/1106 # Verify data after the test has been "shot" - -^User-Agent:.* - GET ftp://%HOSTIP:23456/1106 HTTP/1.1 Host: %HOSTIP:23456 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1109 b/tests/data/test1109 index b68b5a22f4..e504ce9da1 100644 --- a/tests/data/test1109 +++ b/tests/data/test1109 @@ -33,12 +33,10 @@ http://%HOSTIP:%HTTPPORT/1109#test # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1109 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1110 b/tests/data/test1110 index 94cfe91054..50bd4d20cf 100644 --- a/tests/data/test1110 +++ b/tests/data/test1110 @@ -34,12 +34,10 @@ http://%HOSTIP:%HTTPPORT/1110?q=foobar#fragment # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1110?q=foobar HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1111 b/tests/data/test1111 index d9db12c7f8..1ba21bffd0 100644 --- a/tests/data/test1111 +++ b/tests/data/test1111 @@ -34,12 +34,10 @@ http://%HOSTIP:%HTTPPORT/1111?q=foobar#fragment#fragment2 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1111?q=foobar HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1115 b/tests/data/test1115 index f9d6e36456..0b1f034ee6 100644 --- a/tests/data/test1115 +++ b/tests/data/test1115 @@ -39,12 +39,10 @@ http://%HOSTIP:%HTTPPORT/1115 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1115 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1116 b/tests/data/test1116 index b72cbd60ed..ce5305d79c 100644 --- a/tests/data/test1116 +++ b/tests/data/test1116 @@ -56,12 +56,10 @@ http://%HOSTIP:%HTTPPORT/1116 -D log/heads1116 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1116 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1117 b/tests/data/test1117 index 963f1efecc..79c9fd4bb5 100644 --- a/tests/data/test1117 +++ b/tests/data/test1117 @@ -68,18 +68,17 @@ Content-Type: text/plain partial body - -^User-Agent:.* - GET /want/1117 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Range: bytes=10-22 +User-Agent: curl/%VERSION Accept: */* GET /wantmore/11170001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Range: bytes=10-22 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1118 b/tests/data/test1118 index bc776aff6c..702b2dfe8e 100644 --- a/tests/data/test1118 +++ b/tests/data/test1118 @@ -42,12 +42,10 @@ http://%HOSTIP:%HTTPPORT?email=name@example.com/1118 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /?email=name@example.com/1118 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1121 b/tests/data/test1121 index 405066ff62..839c553645 100644 --- a/tests/data/test1121 +++ b/tests/data/test1121 @@ -34,12 +34,10 @@ HTTP multiple provided Host: headers # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1121 HTTP/1.1 Host: host1 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1122 b/tests/data/test1122 index 78d50d77bd..d5b51a2cf4 100644 --- a/tests/data/test1122 +++ b/tests/data/test1122 @@ -55,12 +55,10 @@ http://%HOSTIP:%HTTPPORT/1122 --tr-encoding # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1122 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Connection: TE TE: gzip diff --git a/tests/data/test1123 b/tests/data/test1123 index bd441a995f..841a326add 100644 --- a/tests/data/test1123 +++ b/tests/data/test1123 @@ -186,12 +186,10 @@ http://%HOSTIP:%HTTPPORT/1123 --tr-encoding # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1123 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Connection: TE TE: gzip diff --git a/tests/data/test1124 b/tests/data/test1124 index 58f63f9307..61c5cfb6c4 100644 --- a/tests/data/test1124 +++ b/tests/data/test1124 @@ -54,12 +54,10 @@ http://%HOSTIP:%HTTPPORT/1124 --tr-encoding # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1124 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Connection: TE TE: gzip diff --git a/tests/data/test1125 b/tests/data/test1125 index 1883734d9b..51e3db7832 100644 --- a/tests/data/test1125 +++ b/tests/data/test1125 @@ -55,12 +55,10 @@ http://%HOSTIP:%HTTPPORT/1125 --tr-encoding -H "Connection: close" # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1125 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Connection: close, TE TE: gzip diff --git a/tests/data/test1126 b/tests/data/test1126 index 52f4db411a..4f99072c0a 100644 --- a/tests/data/test1126 +++ b/tests/data/test1126 @@ -38,12 +38,10 @@ http://%HOSTIP:%HTTPPORT/1126 -z "dec 12 12:00:00 1999 GMT" # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1126 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT diff --git a/tests/data/test1127 b/tests/data/test1127 index 3cc42c26a8..e1453a6010 100644 --- a/tests/data/test1127 +++ b/tests/data/test1127 @@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/1127 -z "dec 12 12:00:00 1999 GMT" # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1127 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT diff --git a/tests/data/test1128 b/tests/data/test1128 index a20487b434..a18f487ec9 100644 --- a/tests/data/test1128 +++ b/tests/data/test1128 @@ -48,17 +48,16 @@ http://%HOSTIP:%HTTPPORT/1128 http://%HOSTIP:%HTTPPORT/11280001 -z "dec 12 12:00 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1128 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT GET /11280001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT diff --git a/tests/data/test1129 b/tests/data/test1129 index cc52367336..449b247d7b 100644 --- a/tests/data/test1129 +++ b/tests/data/test1129 @@ -74,12 +74,10 @@ Content-Type: text/html -foo- - -^User-Agent:.* - POST /1129 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 1053700 Content-Type: application/x-www-form-urlencoded @@ -87,6 +85,7 @@ Expect: 100-continue POST /11290001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 1053700 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test1130 b/tests/data/test1130 index eb1e59f5bd..01836cd713 100644 --- a/tests/data/test1130 +++ b/tests/data/test1130 @@ -74,12 +74,10 @@ Content-Type: text/html -foo- - -^User-Agent:.* - POST /1130 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Expect: 100-continue Content-Length: 100 @@ -87,6 +85,7 @@ Content-Type: application/x-www-form-urlencoded POST /11300001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Expect: 100-continue Content-Length: 100 diff --git a/tests/data/test1131 b/tests/data/test1131 index 96843af540..64df118f71 100644 --- a/tests/data/test1131 +++ b/tests/data/test1131 @@ -74,18 +74,17 @@ Content-Type: text/html FAILURE2 - -^User-Agent:.* - PUT /1131 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 100 Expect: 100-continue PUT /11310001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 100 Expect: 100-continue diff --git a/tests/data/test1133 b/tests/data/test1133 index 738e806143..555bafcdd3 100644 --- a/tests/data/test1133 +++ b/tests/data/test1133 @@ -40,12 +40,12 @@ foo # Verify data after the test has been "shot" -^(User-Agent:|Content-Type: multipart/form-data;|Content-Type: multipart/mixed; boundary=|-------).* +^(Content-Type: multipart/form-data;|Content-Type: multipart/mixed; boundary=|-------).* POST /we/want/1133 HTTP/1.1 -User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 1264 Content-Type: multipart/form-data; boundary=----------------------------24e78000bd32 diff --git a/tests/data/test1134 b/tests/data/test1134 index e290b53696..52aafcce19 100644 --- a/tests/data/test1134 +++ b/tests/data/test1134 @@ -45,18 +45,17 @@ http://%HOSTIP:%HTTPPORT/1134 -u user1:password1 --next http://%HOSTIP:%HTTPPORT # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1134 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Basic dXNlcjE6cGFzc3dvcmQx +User-Agent: curl/%VERSION Accept: */* GET /11340001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Basic MnVzZXI6cGFzc3dvcmQy +User-Agent: curl/%VERSION Accept: */* [DISCONNECT] diff --git a/tests/data/test1138 b/tests/data/test1138 index 0c91d204d2..a69d40fd29 100644 --- a/tests/data/test1138 +++ b/tests/data/test1138 @@ -56,17 +56,15 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/1138 -L # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/are/all/twits/1138 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /we/are/all/moo.html/?name=%d8%a2%d8%ba%d8%a7%d8%b2-%d8%b3%d9%85-%d8%b2%d8%af%d8%a7%db%8c%db%8c-%d8%a7%d8%b2-%d8%a8%d8%a7%d8%b2%d8%a7%d8%b1-%d9%be%d9%88%d9%84&testcase=/11380002 HTTP/1.1 -User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1141 b/tests/data/test1141 index b0cff8e371..063d3b2842 100644 --- a/tests/data/test1141 +++ b/tests/data/test1141 @@ -54,17 +54,16 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://%HOSTIP:%HTTPPORT/want/1141 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://foo.example.com/want/11410001 HTTP/1.1 Host: foo.example.com +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1142 b/tests/data/test1142 index 5f1e2b35ad..3577ac4685 100644 --- a/tests/data/test1142 +++ b/tests/data/test1142 @@ -49,12 +49,10 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://%HOSTIP:%HTTPPORT/want/1142 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1143 b/tests/data/test1143 index 7776cfa877..8239c444ff 100644 --- a/tests/data/test1143 +++ b/tests/data/test1143 @@ -37,12 +37,10 @@ MSYS2_ARG_CONV_EXCL=http:/ # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/1143 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1144 b/tests/data/test1144 index 84c22dba24..5883555690 100644 --- a/tests/data/test1144 +++ b/tests/data/test1144 @@ -54,12 +54,10 @@ HTTP HEAD, receive no headers only body # # Verify data after the test has been "shot" - -^User-Agent:.* - HEAD /1144 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1148 b/tests/data/test1148 index c4232f083a..a4839e27c4 100644 --- a/tests/data/test1148 +++ b/tests/data/test1148 @@ -45,12 +45,10 @@ LC_NUMERIC=en_US.UTF-8 # - -^User-Agent:.* - GET /1148 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1150 b/tests/data/test1150 index e86c7e1549..f951f570eb 100644 --- a/tests/data/test1150 +++ b/tests/data/test1150 @@ -39,17 +39,16 @@ proxy # Verify data after the test has been "shot" - -^User-Agent: curl/.* - GET http://test.remote.example.com.1150:150/path HTTP/1.1 Host: test.remote.example.com.1150:150 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://test.remote.example.com.1150:1234/path/ HTTP/1.1 Host: test.remote.example.com.1150:1234 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1151 b/tests/data/test1151 index d793944c3c..e3abcbe998 100644 --- a/tests/data/test1151 +++ b/tests/data/test1151 @@ -44,12 +44,10 @@ http://%HOSTIP:%HTTPPORT/1151 -c log/cookies1151.txt # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1151 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1154 b/tests/data/test1154 index 3582eb99a8..d2bde8d5f2 100644 --- a/tests/data/test1154 +++ b/tests/data/test1154 @@ -40,12 +40,10 @@ http://%HOSTIP:%HTTPPORT/1154 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1154 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1155 b/tests/data/test1155 index 3db824d58a..90d33bd71c 100644 --- a/tests/data/test1155 +++ b/tests/data/test1155 @@ -34,12 +34,10 @@ http://%HOSTIP:%HTTPPORT/1155 -c log/cookies1155.txt # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1155 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1157 b/tests/data/test1157 index b0bbf244fd..baf12edb4f 100644 --- a/tests/data/test1157 +++ b/tests/data/test1157 @@ -45,12 +45,10 @@ http://%HOSTIP:%HTTPPORT/1157 -H @log/heads1157.txt # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1157 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1158 b/tests/data/test1158 index 62adc579d1..f2b40e01ba 100644 --- a/tests/data/test1158 +++ b/tests/data/test1158 @@ -43,12 +43,12 @@ foo # Verify data after the test has been "shot" -^(User-Agent:|Content-Type: multipart/form-data;|Content-Type: multipart/mixed; boundary=|-------).* +^(Content-Type: multipart/form-data;|Content-Type: multipart/mixed; boundary=|-------).* POST /we/want/1158 HTTP/1.1 -User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 954 Content-Type: multipart/form-data; boundary=----------------------------24e78000bd32 diff --git a/tests/data/test1159 b/tests/data/test1159 index a51601659e..ea07f238f4 100644 --- a/tests/data/test1159 +++ b/tests/data/test1159 @@ -36,12 +36,10 @@ http://%HOSTIP:%HTTPPORT/we/want/our/1159 -w '%{redirect_url}\n' # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/our/1159 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1160 b/tests/data/test1160 index 63dd0a7a0d..cc864b3d16 100644 --- a/tests/data/test1160 +++ b/tests/data/test1160 @@ -35,12 +35,10 @@ http://%HOSTIP:%HTTPPORT/1160 -c log/cookies1160.txt # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1160 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1161 b/tests/data/test1161 index ee6f1d04ad..f7b610e3e9 100644 --- a/tests/data/test1161 +++ b/tests/data/test1161 @@ -34,12 +34,10 @@ http://%HOSTIP:%HTTPPORT/1161 -c log/cookies1161.txt # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1161 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1164 b/tests/data/test1164 index a5ce6d11a7..f62b0f66ec 100644 --- a/tests/data/test1164 +++ b/tests/data/test1164 @@ -36,12 +36,10 @@ http://%HOSTIP:%HTTPPORT/1164 -w '%{size_download}\n' --http0.9 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1164 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1166 b/tests/data/test1166 index 3cae80ecda..292d09fc31 100644 --- a/tests/data/test1166 +++ b/tests/data/test1166 @@ -36,16 +36,15 @@ http://%HOSTIP:%HTTPPORT/want/1166 http://%HOSTIP:%HTTPPORT/want/1166 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/1166 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /want/1166 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1168 b/tests/data/test1168 index 283e91e019..b2f08fb619 100644 --- a/tests/data/test1168 +++ b/tests/data/test1168 @@ -59,18 +59,17 @@ http://%HOSTIP:%HTTPPORT/want/1168 -L -u "catmai#d:#DZaRJYrixKE*gFY" # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/1168 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Basic Y2F0bWFpI2Q6I0RaYVJKWXJpeEtFKmdGWQ== +User-Agent: curl/%VERSION Accept: */* GET /data/11680002.txt HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Basic Y2F0bWFpI2Q6I0RaYVJKWXJpeEtFKmdGWQ== +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1170 b/tests/data/test1170 index a4d9eb84ba..39ff3c8c9e 100644 --- a/tests/data/test1170 +++ b/tests/data/test1170 @@ -55,12 +55,10 @@ http://%HOSTIP:%HTTPPORT/1170 --tr-encoding -H "Connection:" # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1170 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Connection: TE TE: gzip diff --git a/tests/data/test1171 b/tests/data/test1171 index 0f7ee90d33..bc98d312e1 100644 --- a/tests/data/test1171 +++ b/tests/data/test1171 @@ -55,12 +55,10 @@ http://%HOSTIP:%HTTPPORT/1171 --tr-encoding -H "Connection;" # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1171 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Connection: TE TE: gzip diff --git a/tests/data/test1172 b/tests/data/test1172 index 6e61720bd5..a099057f2c 100644 --- a/tests/data/test1172 +++ b/tests/data/test1172 @@ -33,12 +33,10 @@ http://%HOSTIP:%HTTPPORT/1172 --no-http0.9 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1172 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1174 b/tests/data/test1174 index b316fde8cf..7768696ffd 100644 --- a/tests/data/test1174 +++ b/tests/data/test1174 @@ -33,12 +33,10 @@ http://%HOSTIP:%HTTPPORT/1174 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1174 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1176 b/tests/data/test1176 index 491bee16f0..ce992e341b 100644 --- a/tests/data/test1176 +++ b/tests/data/test1176 @@ -41,12 +41,10 @@ http://%HOSTIP:%HTTPPORT/1176 -o 'log/base-#0' # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1176 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1178 b/tests/data/test1178 index 6d1264c358..91ef78c8ff 100644 --- a/tests/data/test1178 +++ b/tests/data/test1178 @@ -40,13 +40,11 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://%HOSTIP:%HTTPPORT/we/want/that/page/1178 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Proxy-Authorization: Basic QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQTpCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkI= +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1197 b/tests/data/test1197 index 96d368f8b2..1abd9aeb57 100644 --- a/tests/data/test1197 +++ b/tests/data/test1197 @@ -50,18 +50,17 @@ http://%HOSTIP:%HTTPPORT/1197 -w "%{method}\n" -L -d "twinkle twinkle little sta # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /1197 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 27 Content-Type: application/x-www-form-urlencoded twinkle twinkle little starGET /11970001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test12 b/tests/data/test12 index 06dbdf56fb..8f93abbaaa 100644 --- a/tests/data/test12 +++ b/tests/data/test12 @@ -42,13 +42,11 @@ http://%HOSTIP:%HTTPPORT/want/12 -r 100-200 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/12 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Range: bytes=100-200 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1204 b/tests/data/test1204 index d2f06b68e5..50738011c4 100644 --- a/tests/data/test1204 +++ b/tests/data/test1204 @@ -61,17 +61,16 @@ http://%HOSTIP:%HTTPPORT/1204 -u testuser:testpass --anyauth # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1204 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /1204 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M= +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1205 b/tests/data/test1205 index 7e4a882c70..8509d3fd55 100644 --- a/tests/data/test1205 +++ b/tests/data/test1205 @@ -37,12 +37,10 @@ http://%HOSTIP:%HTTPPORT/1205 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1205 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1210 b/tests/data/test1210 index df931988ce..71053f2183 100644 --- a/tests/data/test1210 +++ b/tests/data/test1210 @@ -46,12 +46,10 @@ http://%HOSTIP:%HTTPPORT/1210 -J -O # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1210 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1212 b/tests/data/test1212 index a50601f788..7c2af2e548 100644 --- a/tests/data/test1212 +++ b/tests/data/test1212 @@ -37,13 +37,11 @@ http://user:secret@%HOSTIP:%HTTPPORT/ulion/1212 --socks5 non-existing-host.haxx. # Verify data after the test has been "shot" - -^User-Agent:.* - GET /ulion/1212 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Basic dXNlcjpzZWNyZXQ= +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1213 b/tests/data/test1213 index 46a6938cb3..54a8f2d99e 100644 --- a/tests/data/test1213 +++ b/tests/data/test1213 @@ -42,12 +42,10 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://we.want.that.site.com.1213/ HTTP/1.1 Host: we.want.that.site.com.1213 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1214 b/tests/data/test1214 index 73c799a4af..985fd383b6 100644 --- a/tests/data/test1214 +++ b/tests/data/test1214 @@ -42,12 +42,10 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://we.want.that.site.com.1214/?moo=foo HTTP/1.1 Host: we.want.that.site.com.1214 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1215 b/tests/data/test1215 index ed50da0b80..7aa1c4237c 100644 --- a/tests/data/test1215 +++ b/tests/data/test1215 @@ -85,21 +85,18 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://%HOSTIP:%HTTPPORT/1215 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.30.0-DEV +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://%HOSTIP:%HTTPPORT/1215 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q= -User-Agent: curl/7.30.0-DEV +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1216 b/tests/data/test1216 index c4f977b604..6227133235 100644 --- a/tests/data/test1216 +++ b/tests/data/test1216 @@ -46,18 +46,17 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://example.fake/c/1216 HTTP/1.1 Host: example.fake +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Cookie: moo3=indeed; moo2=indeed GET http://bexample.fake/c/1216 HTTP/1.1 Host: bexample.fake +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1218 b/tests/data/test1218 index 37c8f4ef02..b9914d25fd 100644 --- a/tests/data/test1218 +++ b/tests/data/test1218 @@ -39,23 +39,23 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://example.fake/c/1218 HTTP/1.1 Host: example.fake +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://example.fake/c/1218 HTTP/1.1 Host: example.fake +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Cookie: bug=fixed GET http://bexample.fake/c/1218 HTTP/1.1 Host: bexample.fake +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1223 b/tests/data/test1223 index 2885bc59ab..f448f5c146 100644 --- a/tests/data/test1223 +++ b/tests/data/test1223 @@ -37,12 +37,10 @@ http://%HOSTIP:%HTTPPORT/1223 -w 'IP %{remote_ip} and PORT %{remote_port}\n' # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1223 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1228 b/tests/data/test1228 index 50af6bc2c9..529c7e55d0 100644 --- a/tests/data/test1228 +++ b/tests/data/test1228 @@ -38,17 +38,16 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://example.fake/hoge/1228 HTTP/1.1 Host: example.fake +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://example.fake/hogege/ HTTP/1.1 Host: example.fake +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Cookie: path1=root diff --git a/tests/data/test1229 b/tests/data/test1229 index 225ba3cc43..0cb45358a8 100644 --- a/tests/data/test1229 +++ b/tests/data/test1229 @@ -65,17 +65,16 @@ http://%5cuser%22:password@%HOSTIP:%HTTPPORT/1229 --digest # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1229 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /1229 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="\\user\"", realm="testrealm", nonce="1053604145", uri="/1229", response="f2694d426040712584c156d3de72b8d6" +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1230 b/tests/data/test1230 index 860ce21a45..a439b17ed1 100644 --- a/tests/data/test1230 +++ b/tests/data/test1230 @@ -62,16 +62,15 @@ http://[1234:1234:1234::4ce]:%HTTPPORT/wanted/page/1230 -p -x %HOSTIP:%HTTPPORT # # Verify data after the test has been "shot" - -^User-Agent:.* - CONNECT [1234:1234:1234::4ce]:%HTTPPORT HTTP/1.1 Host: [1234:1234:1234::4ce]:%HTTPPORT +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive GET /wanted/page/1230 HTTP/1.1 Host: [1234:1234:1234::4ce]:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1231 b/tests/data/test1231 index 61998d1c39..7b085c5239 100644 --- a/tests/data/test1231 +++ b/tests/data/test1231 @@ -44,16 +44,15 @@ http://%HOSTIP:%HTTPPORT/../../hej/but/who/../1231?stupid=me/../1231#soo/../1231 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /hej/but/1231?stupid=me/../1231 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /hej/but/12310001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1232 b/tests/data/test1232 index 7425d44d88..7a74cb12d2 100644 --- a/tests/data/test1232 +++ b/tests/data/test1232 @@ -49,17 +49,16 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://test.remote.haxx.se.1232:8990/hej/but/1232?stupid=me/../1232 HTTP/1.1 Host: test.remote.haxx.se.1232:8990 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://test.remote.haxx.se.1232:8990/hej/but/12320001 HTTP/1.1 Host: test.remote.haxx.se.1232:8990 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1235 b/tests/data/test1235 index 9e51219ffa..3fffb42090 100644 --- a/tests/data/test1235 +++ b/tests/data/test1235 @@ -40,28 +40,25 @@ multiple requests using {}{} in the URL # Verify data after the test has been "shot" - -^User-Agent:.* - GET /12350001 HTTP/1.1 -User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled) Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /12350002 HTTP/1.1 -User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled) Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /12350001 HTTP/1.1 -User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled) Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /12350002 HTTP/1.1 -User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled) Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1237 b/tests/data/test1237 index 21da17dcfe..a016e5fb6d 100644 --- a/tests/data/test1237 +++ b/tests/data/test1237 @@ -33,13 +33,11 @@ URL with 1000+ letter user name + password # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1237 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Basic QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQTpCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkI= +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1239 b/tests/data/test1239 index b3503d9c4e..375d92b684 100644 --- a/tests/data/test1239 +++ b/tests/data/test1239 @@ -41,12 +41,10 @@ http://%HOSTIP:%HTTPPORT/1239 -z "-dec 12 12:00:00 1999 GMT" -w '%{response_code # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1239 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* If-Unmodified-Since: Sun, 12 Dec 1999 12:00:00 GMT diff --git a/tests/data/test1240 b/tests/data/test1240 index 6435950585..44ce1f69ba 100644 --- a/tests/data/test1240 +++ b/tests/data/test1240 @@ -31,16 +31,15 @@ glob [0-1] with stuff after range (7.33.0 regression) # Verify data after the test has been "shot" - -^User-Agent:.* - GET /00/1240 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /01/1240 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1241 b/tests/data/test1241 index bc6c61801a..0089828f86 100644 --- a/tests/data/test1241 +++ b/tests/data/test1241 @@ -48,17 +48,16 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://test.remote.haxx.se.1241:8990/../../hej/but/who/../1241?stupid=me/../1241 HTTP/1.1 Host: test.remote.haxx.se.1241:8990 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://test.remote.haxx.se.1241:8990/../../hej/but/who/../12410001 HTTP/1.1 Host: test.remote.haxx.se.1241:8990 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1244 b/tests/data/test1244 index 0912c09473..c2ac4a4d14 100644 --- a/tests/data/test1244 +++ b/tests/data/test1244 @@ -50,12 +50,10 @@ http://%HOSTIP:%HTTPPORT/1244 -x %HOSTIP:%HTTPPORT --next http://%HOSTIP:%HTTPPO 56 - -^User-Agent:.* - GET http://%HOSTIP:%HTTPPORT/1244 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1245 b/tests/data/test1245 index 8924bff972..d60ff2bc1d 100644 --- a/tests/data/test1245 +++ b/tests/data/test1245 @@ -42,12 +42,10 @@ ftp # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1245 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1246 b/tests/data/test1246 index a35bc89c37..bc3d2b0002 100644 --- a/tests/data/test1246 +++ b/tests/data/test1246 @@ -48,17 +48,16 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://test.remote.haxx.se.1246:%HTTPPORT/ HTTP/1.1 Host: test.remote.haxx.se.1246:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://no-scheme-url.com.1246:%HTTPPORT/ HTTP/1.1 Host: no-scheme-url.com.1246:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1248 b/tests/data/test1248 index 02dacfc8b9..7410483b8b 100644 --- a/tests/data/test1248 +++ b/tests/data/test1248 @@ -35,13 +35,11 @@ http://user:secret@%HOSTIP:%HTTPPORT/1248 --proxy http://dummy:%NOLISTENPORT/ -- # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1248 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Basic dXNlcjpzZWNyZXQ= +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1249 b/tests/data/test1249 index 1bc3cfe593..13a14630a4 100644 --- a/tests/data/test1249 +++ b/tests/data/test1249 @@ -38,13 +38,11 @@ http://user:secret@%HOSTIP:%HTTPPORT/1249 --proxy http://dummy:%NOLISTENPORT/ -- # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1249 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Basic dXNlcjpzZWNyZXQ= +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1250 b/tests/data/test1250 index bf67b7fe7c..acd670e505 100644 --- a/tests/data/test1250 +++ b/tests/data/test1250 @@ -39,13 +39,11 @@ http://user:secret@%HOSTIP:%HTTPPORT/1250 --noproxy %HOSTIP --max-time 5 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1250 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Basic dXNlcjpzZWNyZXQ= +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1251 b/tests/data/test1251 index f37a685e8d..f5cf513034 100644 --- a/tests/data/test1251 +++ b/tests/data/test1251 @@ -40,13 +40,11 @@ http://user:secret@%HOSTIP:%HTTPPORT/1251 --max-time 5 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1251 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Basic dXNlcjpzZWNyZXQ= +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1252 b/tests/data/test1252 index cbaef48b73..e68fcb9186 100644 --- a/tests/data/test1252 +++ b/tests/data/test1252 @@ -39,12 +39,10 @@ http://%HOSTIP:%HTTPPORT/1252 --proxy http://%HOSTIP:%HTTPPORT --noproxy %HOSTIP # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1252 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1253 b/tests/data/test1253 index 8f240b0af3..7ad1f86f2d 100644 --- a/tests/data/test1253 +++ b/tests/data/test1253 @@ -42,12 +42,10 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://somewhere.example.com/1253 HTTP/1.1 Host: somewhere.example.com +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1254 b/tests/data/test1254 index c05975488c..b2f27f94e8 100644 --- a/tests/data/test1254 +++ b/tests/data/test1254 @@ -42,12 +42,10 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://somewhere.example.com/1254 HTTP/1.1 Host: somewhere.example.com +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1255 b/tests/data/test1255 index d82310f67b..9148a56ce8 100644 --- a/tests/data/test1255 +++ b/tests/data/test1255 @@ -40,12 +40,10 @@ http://%HOSTIP:%HTTPPORT/1255 --noproxy %HOSTIP # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1255 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1256 b/tests/data/test1256 index e86afbb53f..1ba0a0983b 100644 --- a/tests/data/test1256 +++ b/tests/data/test1256 @@ -43,12 +43,10 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://somewhere.example.com/1256 HTTP/1.1 Host: somewhere.example.com +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1257 b/tests/data/test1257 index 16a7c1af60..b05c524ba3 100644 --- a/tests/data/test1257 +++ b/tests/data/test1257 @@ -43,12 +43,10 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://somewhere.example.com/1257 HTTP/1.1 Host: somewhere.example.com +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1258 b/tests/data/test1258 index 6fa88e16e5..297460c85e 100644 --- a/tests/data/test1258 +++ b/tests/data/test1258 @@ -36,16 +36,15 @@ http://%HOSTIP:%HTTPPORT/we/want/1258 http://%HOSTIP:%HTTPPORT/we/want?hoge=fuga # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/1258 HTTP/1.1 Host: localhost +User-Agent: curl/%VERSION Accept: */* GET /we/want?hoge=fuga HTTP/1.1 Host: localhost +User-Agent: curl/%VERSION Accept: */* Cookie: I-am=here diff --git a/tests/data/test1259 b/tests/data/test1259 index bad4ee25e2..0bfa71cdcc 100644 --- a/tests/data/test1259 +++ b/tests/data/test1259 @@ -33,13 +33,11 @@ HTTP URL with semicolon in password # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/1259 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Basic dXNlcjpwYXNzO3dvcmQ= +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1261 b/tests/data/test1261 index 7f887994e6..ef3cded578 100644 --- a/tests/data/test1261 +++ b/tests/data/test1261 @@ -36,12 +36,10 @@ http://%HOSTIP:%HTTPPORT/we/want/our/1261 -w '%{redirect_url}\n' --location --ma # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/our/1261 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1265 b/tests/data/test1265 index 5d3ef6dc8a..12d524319d 100644 --- a/tests/data/test1265 +++ b/tests/data/test1265 @@ -40,12 +40,10 @@ http://%HOST6IP:%HTTP6PORT/1265 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1265 HTTP/1.1 Host: %HOST6IP:%HTTP6PORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1266 b/tests/data/test1266 index cab11efa08..1de936e032 100644 --- a/tests/data/test1266 +++ b/tests/data/test1266 @@ -33,12 +33,10 @@ http://%HOSTIP:%HTTPPORT/1266 --http0.9 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1266 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1267 b/tests/data/test1267 index 82d37445d4..06500e87b3 100644 --- a/tests/data/test1267 +++ b/tests/data/test1267 @@ -33,12 +33,10 @@ http://%HOSTIP:%HTTPPORT/1267 --http0.9 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1267 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1270 b/tests/data/test1270 index 25799818af..680e1e47c6 100644 --- a/tests/data/test1270 +++ b/tests/data/test1270 @@ -41,12 +41,10 @@ http://%HOSTIP:%HTTPPORT/we/want/our/1270 -w '%{redirect_url}\n' -s # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/our/1270 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1271 b/tests/data/test1271 index 687a6a979b..ce89c38f2f 100644 --- a/tests/data/test1271 +++ b/tests/data/test1271 @@ -35,12 +35,10 @@ http://%HOSTIP:%HTTPPORT/we/want/our/1271 -w @log/blank1271 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/our/1271 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1280 b/tests/data/test1280 index 15c1e2fd1b..0b7bc00455 100644 --- a/tests/data/test1280 +++ b/tests/data/test1280 @@ -33,24 +33,25 @@ http://%HOSTIP:%HTTPPORT/[a-d]/1280 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /a/1280 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /b/1280 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /c/1280 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /d/1280 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1283 b/tests/data/test1283 index ac275e92e5..d4c0ad964a 100644 --- a/tests/data/test1283 +++ b/tests/data/test1283 @@ -36,12 +36,10 @@ http://%HOSTIP:%HTTPPORT/[a-a][1-1][b-b:1][2-2:1]/1283 -o "log/outfile1283_#1#2# # Verify data after the test has been "shot" - -^User-Agent:.* - GET /a1b2/1283 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1284 b/tests/data/test1284 index 8437a40825..4509a9b913 100644 --- a/tests/data/test1284 +++ b/tests/data/test1284 @@ -66,12 +66,10 @@ HTTP POST --digest with user-specified Content-Length header # Verify data after the test has been "shot" - -^User-Agent:.* - POST /1284 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 0 Content-Type: application/x-www-form-urlencoded @@ -79,6 +77,7 @@ Content-Type: application/x-www-form-urlencoded POST /1284 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1284", response="5763079608de439072861a59ac733515" +User-Agent: curl/%VERSION Accept: */* Content-Length: 11 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test1285 b/tests/data/test1285 index 16c66238ac..62828ba4f7 100644 --- a/tests/data/test1285 +++ b/tests/data/test1285 @@ -72,18 +72,17 @@ four is the number of lines # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /1285 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 0 PUT /1285 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1285", response="dc185587d5e8391b347eef194c2a3cd6" +User-Agent: curl/%VERSION Accept: */* Content-Length: 85 Expect: 100-continue diff --git a/tests/data/test1286 b/tests/data/test1286 index 41782cb0f9..c64a79b47a 100644 --- a/tests/data/test1286 +++ b/tests/data/test1286 @@ -77,9 +77,7 @@ HTTP GET --digest increasing nonce-count # Verify data after the test has been "shot" - -^User-Agent:.* - + # Reorder the fields in 'Authorization: Digest' header. # Since regular and SSPI digest auth header fields may not have the same order # or whitespace we homogenize so that both may be tested. Also: @@ -93,16 +91,19 @@ if(s/^(Authorization: Digest )([^\r\n]+)(\r?\n)$//) { $_ = $1 . join(', ', map { GET /1286 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /1286 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest cnonce=REMOVED, nc=00000001, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/1286", username="auser" +User-Agent: curl/%VERSION Accept: */* GET /12860001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest cnonce=REMOVED, nc=00000002, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/12860001", username="auser" +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1287 b/tests/data/test1287 index 976fd6ecfe..d53a72b8e1 100644 --- a/tests/data/test1287 +++ b/tests/data/test1287 @@ -68,18 +68,17 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - CONNECT test.1287:%HTTPPORT HTTP/1.1 Host: test.1287:%HTTPPORT +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive GET /we/want/that/page/1287 HTTP/1.1 Host: test.1287:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1288 b/tests/data/test1288 index d8a1e524cd..a841709bee 100644 --- a/tests/data/test1288 +++ b/tests/data/test1288 @@ -52,18 +52,17 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - CONNECT %HOSTIP.1288:%HTTPPORT HTTP/1.1 Host: %HOSTIP.1288:%HTTPPORT +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive GET /we/want/that/page/1288 HTTP/1.1 Host: %HOSTIP.1288:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1290 b/tests/data/test1290 index e556303bf1..871dcd763c 100644 --- a/tests/data/test1290 +++ b/tests/data/test1290 @@ -35,12 +35,10 @@ Verify URL globbing ignores [] # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/[]/page/1290 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1292 b/tests/data/test1292 index 880a4b4655..dee0def3eb 100644 --- a/tests/data/test1292 +++ b/tests/data/test1292 @@ -37,12 +37,10 @@ Replaced internal headers with a blank one # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1292 HTTP/1.1 Host: +User-Agent: curl/%VERSION Accept: diff --git a/tests/data/test1293 b/tests/data/test1293 index e2143d1033..df72b755a4 100644 --- a/tests/data/test1293 +++ b/tests/data/test1293 @@ -43,9 +43,6 @@ http://0 http://%HOSTIP:%HTTPPORT/1293 -F= # # Verify data after the test has been "shot" - -^User-Agent:.* - s/^--------------------------[a-z0-9]*/------------------------------/ s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/ @@ -53,6 +50,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=-------------------------- POST /1293 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 126 Content-Type: multipart/form-data; boundary=---------------------------- diff --git a/tests/data/test1294 b/tests/data/test1294 index 1c2c0ef95a..4fa1cb1d9d 100644 --- a/tests/data/test1294 +++ b/tests/data/test1294 @@ -51,12 +51,10 @@ http://%HOSTIP:%HTTPPORT/0123456790123456790123456790123456790123456790123456790 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/1294 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Among other public buildings in a certain town, which for many reasons it will be prudent to refrain from mentioning, and to which I will assign no fictitious name, there is one anciently common to most towns, great or small to wit, a workhouse; and in this workhouse was born; on a day and date which I need not trouble myself to repeat, inasmuch as it can be of no possible consequence to the reader, in this stage of the business at all events; the item of mortality whose name is prefixed to the head of this chapter: 511 diff --git a/tests/data/test1295 b/tests/data/test1295 index b929e3c6d4..50e5fa2e2a 100644 --- a/tests/data/test1295 +++ b/tests/data/test1295 @@ -51,12 +51,10 @@ http://%HOSTIP:%HTTPPORT/0123456790123456790123456790123456790123456790123456790 # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/1295 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* 012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679: 300 Content-Length: 165 diff --git a/tests/data/test1296 b/tests/data/test1296 index 386eb18fc5..55b01c4c41 100644 --- a/tests/data/test1296 +++ b/tests/data/test1296 @@ -41,13 +41,11 @@ http://user%0aname:password@%HOSTIP:%HTTPPORT/1296 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1296 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Basic dXNlcgpuYW1lOnBhc3N3b3Jk +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1297 b/tests/data/test1297 index 56a62a81c7..6cffff85dd 100644 --- a/tests/data/test1297 +++ b/tests/data/test1297 @@ -43,18 +43,17 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - CONNECT %HOSTIP.1297:%HTTPPORT HTTP/1.1 Host: %HOSTIP.1297:%HTTPPORT +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive GET /we/want/that/page/1297 HTTP/1.1 Host: %HOSTIP.1297:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1298 b/tests/data/test1298 index 061a4e1e00..6a34aa32ba 100644 --- a/tests/data/test1298 +++ b/tests/data/test1298 @@ -42,12 +42,10 @@ HTTP GET special path with --request-target # # Verify data after the test has been "shot" - -^User-Agent:.* - GET XXX HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Testno: 1298 diff --git a/tests/data/test1299 b/tests/data/test1299 index 51e0e79831..2cf293a413 100644 --- a/tests/data/test1299 +++ b/tests/data/test1299 @@ -41,12 +41,10 @@ Send "OPTIONS *" with --request-target # # Verify data after the test has been "shot" - -^User-Agent:.* - OPTIONS * HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Testno: 1299 diff --git a/tests/data/test13 b/tests/data/test13 index 18f7f81149..1216979475 100644 --- a/tests/data/test13 +++ b/tests/data/test13 @@ -31,12 +31,10 @@ http://%HOSTIP:%HTTPPORT/want/13 -X DELETE # Verify data after the test has been "shot" - -^User-Agent:.* - DELETE /want/13 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1310 b/tests/data/test1310 index 9ffe0d5861..cb9db82814 100644 --- a/tests/data/test1310 +++ b/tests/data/test1310 @@ -86,20 +86,17 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1310 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAwAAAA -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* GET /1310 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAADAAAAGAAYAE8AAAAYABgAZwAAAAAAAABAAAAACAAIAEAAAAAHAAcASAAAAAAAAAAAAAAAggEAAHRlc3R1c2VyVU5LTk9XTlpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOQ== -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1311 b/tests/data/test1311 index e47647c38b..4078d7bb41 100644 --- a/tests/data/test1311 +++ b/tests/data/test1311 @@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/1311 -J -O # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1311 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1312 b/tests/data/test1312 index bed492c16d..54659b55bd 100644 --- a/tests/data/test1312 +++ b/tests/data/test1312 @@ -47,12 +47,10 @@ CURL_TESTDIR=%PWD/log # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1312 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1313 b/tests/data/test1313 index 2331ae9ee0..3d9c0940d3 100644 --- a/tests/data/test1313 +++ b/tests/data/test1313 @@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/1313 -J -O # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1313 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1314 b/tests/data/test1314 index 3963bd93f4..55e3299e46 100644 --- a/tests/data/test1314 +++ b/tests/data/test1314 @@ -63,17 +63,16 @@ proxy # Verify data after the test has been "shot" - -^User-Agent: curl/.* - GET http://firstplace.example.com/want/1314 HTTP/1.1 Host: firstplace.example.com +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://somewhere.example.com/reply/1314 HTTP/1.1 Host: somewhere.example.com +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1315 b/tests/data/test1315 index 888ddc5c10..ffc7bdc7bd 100644 --- a/tests/data/test1315 +++ b/tests/data/test1315 @@ -40,12 +40,12 @@ dummy data # Verify data after the test has been "shot" -(^User-Agent:.*|-----+\w+) +-----+\w+ POST /we/want/1315 HTTP/1.1 -User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 797 Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763 diff --git a/tests/data/test1317 b/tests/data/test1317 index d41886a5f6..7964b10bdb 100644 --- a/tests/data/test1317 +++ b/tests/data/test1317 @@ -43,12 +43,10 @@ HTTP with --resolve # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1317 HTTP/1.1 Host: example.com:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1318 b/tests/data/test1318 index dc182dccb8..8ce468db17 100644 --- a/tests/data/test1318 +++ b/tests/data/test1318 @@ -43,16 +43,15 @@ HTTP with --resolve and same host name using different cases # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1318 HTTP/1.1 Host: MiXeDcAsE.cOm:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /13180001 HTTP/1.1 Host: mixedcase.com:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1319 b/tests/data/test1319 index 8fc968c890..b37a97055a 100644 --- a/tests/data/test1319 +++ b/tests/data/test1319 @@ -63,9 +63,6 @@ pop3://pop.1319:%POP3PORT/1319 -p -x %HOSTIP:%PROXYPORT -u user:secret # # Verify data after the test has been "shot" - -^User-Agent: - CAPA USER user @@ -76,7 +73,7 @@ QUIT CONNECT pop.1319:%POP3PORT HTTP/1.1 Host: pop.1319:%POP3PORT -User-Agent: curl/7.24.0-DEV (i686-pc-linux-gnu) libcurl/7.24.0-DEV OpenSSL/1.0.0e zlib/1.2.3.4 c-ares/1.7.6-DEV libidn/1.23 libssh2/1.4.0_DEV librtmp/2.2e +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive diff --git a/tests/data/test1320 b/tests/data/test1320 index da4079e939..2db0e3dee2 100644 --- a/tests/data/test1320 +++ b/tests/data/test1320 @@ -46,9 +46,6 @@ smtp://smtp.1320:%SMTPPORT/1320 --mail-rcpt recipient@example.com --mail-from se # # Verify data after the test has been "shot" - -^User-Agent: curl/.* - EHLO 1320 MAIL FROM: @@ -66,7 +63,7 @@ body CONNECT smtp.1320:%SMTPPORT HTTP/1.1 Host: smtp.1320:%SMTPPORT -User-Agent: curl/7.24.0-DEV (i686-pc-linux-gnu) libcurl/7.24.0-DEV OpenSSL/1.0.0e zlib/1.2.3.4 c-ares/1.7.6-DEV libidn/1.23 libssh2/1.4.0_DEV librtmp/2.2e +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive diff --git a/tests/data/test1321 b/tests/data/test1321 index cc9117774d..4607797846 100644 --- a/tests/data/test1321 +++ b/tests/data/test1321 @@ -59,9 +59,6 @@ IMAP FETCH tunneled through HTTP proxy # # Verify data after the test has been "shot" - -^User-Agent: curl/.* - A001 CAPABILITY A002 LOGIN user secret @@ -72,7 +69,7 @@ A005 LOGOUT CONNECT imap.1321:%IMAPPORT HTTP/1.1 Host: imap.1321:%IMAPPORT -User-Agent: curl/7.24.0-DEV (i686-pc-linux-gnu) libcurl/7.24.0-DEV OpenSSL/1.0.0e zlib/1.2.3.4 c-ares/1.7.6-DEV libidn/1.23 libssh2/1.4.0_DEV librtmp/2.2e +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive diff --git a/tests/data/test1322 b/tests/data/test1322 index 974989517b..71b8cb20e5 100644 --- a/tests/data/test1322 +++ b/tests/data/test1322 @@ -44,12 +44,10 @@ HTTP with --resolve and hostname with trailing dot # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1322 HTTP/1.1 Host: example.com:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1324 b/tests/data/test1324 index d7e663a0fb..0c89edbd1b 100644 --- a/tests/data/test1324 +++ b/tests/data/test1324 @@ -43,12 +43,10 @@ HTTP with --resolve and [ipv6address] # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1324 HTTP/1.1 Host: example.com:%HTTP6PORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1325 b/tests/data/test1325 index 6da1cbc6a3..bbf679df4f 100644 --- a/tests/data/test1325 +++ b/tests/data/test1325 @@ -58,18 +58,17 @@ http://%HOSTIP:%HTTPPORT/we/1325 -L -d "moo" # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /we/1325 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 3 Content-Type: application/x-www-form-urlencoded mooPOST /we/13250002 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 3 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test1328 b/tests/data/test1328 index 06088884ae..0fd0c38de8 100644 --- a/tests/data/test1328 +++ b/tests/data/test1328 @@ -54,16 +54,15 @@ HTTP GET a globbed range with -f # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /13280000 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /13280001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1331 b/tests/data/test1331 index 865abd9699..09aabf879a 100644 --- a/tests/data/test1331 +++ b/tests/data/test1331 @@ -71,18 +71,17 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://z.x.com/1331 HTTP/1.1 Host: z.x.com +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://z.x.com/1331 HTTP/1.1 Host: z.x.com Proxy-Authorization: Basic bXluYW1lOm15cGFzc3dvcmQ= +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Cookie: proxycookie=weirdo diff --git a/tests/data/test1332 b/tests/data/test1332 index 3447b2ddda..3271b5701c 100644 --- a/tests/data/test1332 +++ b/tests/data/test1332 @@ -57,19 +57,17 @@ http://%HOSTIP:%HTTPPORT/blah/1332 -L -d "moo" --post303 # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /blah/1332 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 3 Content-Type: application/x-www-form-urlencoded mooPOST /blah/moo.html&testcase=/13320002 HTTP/1.1 -User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 3 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test1333 b/tests/data/test1333 index 50ca42a29a..3ef8ed49fc 100644 --- a/tests/data/test1333 +++ b/tests/data/test1333 @@ -38,12 +38,10 @@ HTTP POST zero length, chunked-encoded # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /1333 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Transfer-Encoding: chunked Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test1334 b/tests/data/test1334 index 59116e3882..0885357fc1 100644 --- a/tests/data/test1334 +++ b/tests/data/test1334 @@ -45,12 +45,10 @@ http://%HOSTIP:%HTTPPORT/1334 -O -D log/heads1334 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1334 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1335 b/tests/data/test1335 index bb499e73f3..9cf1f3ef4f 100644 --- a/tests/data/test1335 +++ b/tests/data/test1335 @@ -45,12 +45,10 @@ http://%HOSTIP:%HTTPPORT/1335 -O -D - # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1335 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1336 b/tests/data/test1336 index ebe562b6a5..f6fcb94311 100644 --- a/tests/data/test1336 +++ b/tests/data/test1336 @@ -49,12 +49,10 @@ perl %SRCDIR/libtest/notexists.pl log/name1336 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1336 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1337 b/tests/data/test1337 index 80a99facfe..d7f556cd31 100644 --- a/tests/data/test1337 +++ b/tests/data/test1337 @@ -49,12 +49,10 @@ perl %SRCDIR/libtest/notexists.pl log/name1337 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1337 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1338 b/tests/data/test1338 index d96f80467b..8941a64a4c 100644 --- a/tests/data/test1338 +++ b/tests/data/test1338 @@ -46,12 +46,10 @@ http://%HOSTIP:%HTTPPORT/1338 -J -O -D log/heads1338 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1338 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1339 b/tests/data/test1339 index a3c1f0e54a..f08e87cdf2 100644 --- a/tests/data/test1339 +++ b/tests/data/test1339 @@ -46,12 +46,10 @@ http://%HOSTIP:%HTTPPORT/1339 -J -O -D - # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1339 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1340 b/tests/data/test1340 index 644fb2b516..c2e065db2d 100644 --- a/tests/data/test1340 +++ b/tests/data/test1340 @@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/1340 -J -O -D log/heads1340 -w "curl: Saved to filename # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1340 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1341 b/tests/data/test1341 index ae226744c9..060fc093de 100644 --- a/tests/data/test1341 +++ b/tests/data/test1341 @@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/1341 -J -O -D - -w "curl: Saved to filename %{filename_ # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1341 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1342 b/tests/data/test1342 index 1d7889d1eb..012b63437e 100644 --- a/tests/data/test1342 +++ b/tests/data/test1342 @@ -45,12 +45,10 @@ http://%HOSTIP:%HTTPPORT/1342 -i -O -D log/heads1342 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1342 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1343 b/tests/data/test1343 index a05cab04cd..636afab242 100644 --- a/tests/data/test1343 +++ b/tests/data/test1343 @@ -45,12 +45,10 @@ http://%HOSTIP:%HTTPPORT/1343 -i -O -D - # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1343 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1344 b/tests/data/test1344 index ac354f0dd4..4d8bd4affc 100644 --- a/tests/data/test1344 +++ b/tests/data/test1344 @@ -49,12 +49,10 @@ perl %SRCDIR/libtest/notexists.pl log/name1344 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1344 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1345 b/tests/data/test1345 index 6d1201e161..f69a56adf7 100644 --- a/tests/data/test1345 +++ b/tests/data/test1345 @@ -49,12 +49,10 @@ perl %SRCDIR/libtest/notexists.pl log/name1345 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1345 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1346 b/tests/data/test1346 index 347214e697..83cdaa8c4b 100644 --- a/tests/data/test1346 +++ b/tests/data/test1346 @@ -45,12 +45,10 @@ http://%HOSTIP:%HTTPPORT/1346 -i -O # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1346 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1347 b/tests/data/test1347 index 8eac42cb2b..f16abcd027 100644 --- a/tests/data/test1347 +++ b/tests/data/test1347 @@ -49,12 +49,10 @@ perl %SRCDIR/libtest/notexists.pl log/name1347 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1347 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1364 b/tests/data/test1364 index e8c981d779..777d9b2485 100644 --- a/tests/data/test1364 +++ b/tests/data/test1364 @@ -40,12 +40,10 @@ perl %SRCDIR/libtest/notexists.pl log/1364 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1364 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1365 b/tests/data/test1365 index 4a09cfd6ab..c69ee4b7ca 100644 --- a/tests/data/test1365 +++ b/tests/data/test1365 @@ -40,12 +40,10 @@ perl %SRCDIR/libtest/notexists.pl log/1365 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1365 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1366 b/tests/data/test1366 index 62e3b0c42f..c87455fc0f 100644 --- a/tests/data/test1366 +++ b/tests/data/test1366 @@ -41,12 +41,10 @@ perl %SRCDIR/libtest/notexists.pl log/1366 log/name1366 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1366 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1367 b/tests/data/test1367 index d4bd3d777b..68bc33363c 100644 --- a/tests/data/test1367 +++ b/tests/data/test1367 @@ -41,12 +41,10 @@ perl %SRCDIR/libtest/notexists.pl log/1367 log/name1367 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1367 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1368 b/tests/data/test1368 index 6a926ab68f..37805176b1 100644 --- a/tests/data/test1368 +++ b/tests/data/test1368 @@ -41,12 +41,10 @@ perl %SRCDIR/libtest/notexists.pl log/1368 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1368 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1369 b/tests/data/test1369 index 5176ed0b03..1a59446333 100644 --- a/tests/data/test1369 +++ b/tests/data/test1369 @@ -41,12 +41,10 @@ perl %SRCDIR/libtest/notexists.pl log/1369 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1369 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1370 b/tests/data/test1370 index d0abbdd689..ec5e7b54c9 100644 --- a/tests/data/test1370 +++ b/tests/data/test1370 @@ -42,12 +42,10 @@ perl %SRCDIR/libtest/notexists.pl log/1370 log/name1370 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1370 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1371 b/tests/data/test1371 index fe3977fae6..d3e187adc4 100644 --- a/tests/data/test1371 +++ b/tests/data/test1371 @@ -42,12 +42,10 @@ perl %SRCDIR/libtest/notexists.pl log/1371 log/name1371 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1371 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1372 b/tests/data/test1372 index a2b8ec9619..49c89f96f8 100644 --- a/tests/data/test1372 +++ b/tests/data/test1372 @@ -40,12 +40,10 @@ perl %SRCDIR/libtest/notexists.pl log/1372 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1372 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1373 b/tests/data/test1373 index ae906d7bd9..3ceaacaf9b 100644 --- a/tests/data/test1373 +++ b/tests/data/test1373 @@ -40,12 +40,10 @@ perl %SRCDIR/libtest/notexists.pl log/1373 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1373 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1374 b/tests/data/test1374 index f8d9d0dd05..e143b41db9 100644 --- a/tests/data/test1374 +++ b/tests/data/test1374 @@ -41,12 +41,10 @@ perl %SRCDIR/libtest/notexists.pl log/1374 log/name1374 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1374 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1375 b/tests/data/test1375 index 595f03ac13..f6219a1ea5 100644 --- a/tests/data/test1375 +++ b/tests/data/test1375 @@ -41,12 +41,10 @@ perl %SRCDIR/libtest/notexists.pl log/1375 log/name1375 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1375 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1376 b/tests/data/test1376 index f34c277450..1d12c4c6a5 100644 --- a/tests/data/test1376 +++ b/tests/data/test1376 @@ -40,12 +40,10 @@ perl %SRCDIR/libtest/notexists.pl log/1376 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1376 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1377 b/tests/data/test1377 index f542b11c77..f24561654e 100644 --- a/tests/data/test1377 +++ b/tests/data/test1377 @@ -41,12 +41,10 @@ perl %SRCDIR/libtest/notexists.pl log/1377 log/name1377 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1377 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test14 b/tests/data/test14 index 21a4865b45..f6c568ede4 100644 --- a/tests/data/test14 +++ b/tests/data/test14 @@ -30,13 +30,10 @@ http://%HOSTIP:%HTTPPORT/want/14 -i --head # Verify data after the test has been "shot" - -^User-Agent:.* - HEAD /want/14 HTTP/1.1 -User-Agent: curl/7.4.2-pre4 (sparc-sun-solaris2.7) libcurl 7.4.2-pre4 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1400 b/tests/data/test1400 index c0d409bac0..eea8d3fbe1 100644 --- a/tests/data/test1400 +++ b/tests/data/test1400 @@ -37,13 +37,10 @@ http://%HOSTIP:%HTTPPORT/we/want/1400 --libcurl log/test1400.c # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/1400 HTTP/1.1 -User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1401 b/tests/data/test1401 index ec3b25cc95..b20607c310 100644 --- a/tests/data/test1401 +++ b/tests/data/test1401 @@ -41,14 +41,11 @@ http://%HOSTIP:%HTTPPORT/we/want/1401 --libcurl log/test1401.c --basic -u fake:u # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/1401 HTTP/1.1 Host: %HOSTIP:%HTTPPORT -User-Agent: stripped Authorization: Basic ZmFrZTp1c2Vy +User-Agent: MyUA Accept: */* Cookie: chocolate=chip X-Files: Mulder diff --git a/tests/data/test1402 b/tests/data/test1402 index bf7eb7b828..2965547905 100644 --- a/tests/data/test1402 +++ b/tests/data/test1402 @@ -38,13 +38,10 @@ http://%HOSTIP:%HTTPPORT/we/want/1402 --libcurl log/test1402.c -d "foo=bar" -d " # Verify data after the test has been "shot" - -^User-Agent:.* - POST /we/want/1402 HTTP/1.1 -User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 16 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test1403 b/tests/data/test1403 index 731d274b39..6d21ce85e0 100644 --- a/tests/data/test1403 +++ b/tests/data/test1403 @@ -38,13 +38,10 @@ http://%HOSTIP:%HTTPPORT/we/want/1403 --libcurl log/test1403.c -G -d "foo=bar" - # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/1403?foo=bar&baz=quux HTTP/1.1 -User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1404 b/tests/data/test1404 index d3c66a9d57..8f61ec00fb 100644 --- a/tests/data/test1404 +++ b/tests/data/test1404 @@ -44,12 +44,12 @@ dummy data # Verify data after the test has been "shot" -(^User-Agent:.*|-----+\w+) +-----+\w+ POST /we/want/1404 HTTP/1.1 -User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 882 Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763 diff --git a/tests/data/test1408 b/tests/data/test1408 index bf775ed398..6d3131fb68 100644 --- a/tests/data/test1408 +++ b/tests/data/test1408 @@ -55,16 +55,15 @@ HTTP receive cookies over IPV6 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /path/14080001 HTTP/1.1 Host: %HOST6IP:%HTTP6PORT +User-Agent: curl/%VERSION Accept: */* GET /path/14080002 HTTP/1.1 Host: %HOST6IP:%HTTP6PORT +User-Agent: curl/%VERSION Accept: */* Cookie: time=1 diff --git a/tests/data/test1411 b/tests/data/test1411 index 3ffd586de9..93e3b4b8b1 100644 --- a/tests/data/test1411 +++ b/tests/data/test1411 @@ -46,12 +46,10 @@ http://%HOSTIP:%HTTPPORT/1411 -T log/empty1411 # # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /1411 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 0 diff --git a/tests/data/test1412 b/tests/data/test1412 index 36d3d1d93b..808ed17f2f 100644 --- a/tests/data/test1412 +++ b/tests/data/test1412 @@ -106,29 +106,27 @@ four is the number of lines # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1412 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /1412 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/1412", response="0390dbe89e31adca0413d11f91f30e7f" -User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* GET /14120001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT -User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* GET /14120001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/14120001", response="0085df91870374c8bf4e94415e7fbf8e" -User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1413 b/tests/data/test1413 index 6e889a8a20..96467f169f 100644 --- a/tests/data/test1413 +++ b/tests/data/test1413 @@ -56,16 +56,15 @@ http://%HOSTIP:%HTTPPORT/this/1413 -L # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /this/1413 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /this/moo.html/14130002 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1415 b/tests/data/test1415 index 94ce02c598..7c9e389f95 100644 --- a/tests/data/test1415 +++ b/tests/data/test1415 @@ -53,12 +53,10 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://example.com/we/want/1415 HTTP/1.1 Host: example.com +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1416 b/tests/data/test1416 index 546575e5db..f6e9bbfe4c 100644 --- a/tests/data/test1416 +++ b/tests/data/test1416 @@ -44,12 +44,10 @@ http://%HOSTIP:%HTTPPORT/1416 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1416 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1417 b/tests/data/test1417 index 4d3971ea8e..a141b11d26 100644 --- a/tests/data/test1417 +++ b/tests/data/test1417 @@ -56,12 +56,10 @@ http://%HOSTIP:%HTTPPORT/1417 -D log/heads1417 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1417 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1418 b/tests/data/test1418 index c137b1c590..51d2e5f0af 100644 --- a/tests/data/test1418 +++ b/tests/data/test1418 @@ -93,26 +93,27 @@ http://%HOSTIP:%HTTPPORT/1418 -u testuser:testpass --anyauth http://%HOSTIP:%HTT # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1418 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /1418 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="loonie", nonce="314156592", uri="/1418", response="986238b7e0077754944c966f56d9bc77" +User-Agent: curl/%VERSION Accept: */* GET /14180003 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /14180003 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="loonie", nonce="314156592", uri="/14180003", response="1c6390a67bac3283a9b023402f3b3540" +User-Agent: curl/%VERSION Accept: */* [DISCONNECT] diff --git a/tests/data/test1419 b/tests/data/test1419 index f29ce4444e..6d05f0b5a0 100644 --- a/tests/data/test1419 +++ b/tests/data/test1419 @@ -51,16 +51,15 @@ http://%HOSTIP:%HTTPPORT/1419 --anyauth http://%HOSTIP:%HTTPPORT/14190003 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1419 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /14190003 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* [DISCONNECT] diff --git a/tests/data/test1421 b/tests/data/test1421 index dea49e7819..c219770e3e 100644 --- a/tests/data/test1421 +++ b/tests/data/test1421 @@ -55,17 +55,16 @@ Content-Length: 6 -foo- - -^User-Agent:.* - GET http://test.remote.haxx.se.1421:8990/ HTTP/1.1 Host: test.remote.haxx.se.1421:8990 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://different.remote.haxx.se.1421:8990/ HTTP/1.1 Host: different.remote.haxx.se.1421:8990 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1422 b/tests/data/test1422 index cbb2d63bc4..4108091f41 100644 --- a/tests/data/test1422 +++ b/tests/data/test1422 @@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/1422 -J -O file://%PWD/log/name1422 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1422 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1423 b/tests/data/test1423 index 908ff8c29c..b0fcef3ba3 100644 --- a/tests/data/test1423 +++ b/tests/data/test1423 @@ -40,12 +40,10 @@ perl %SRCDIR/libtest/notexists.pl log/1423 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1423 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1424 b/tests/data/test1424 index 17bc46a1d2..8f922e620b 100644 --- a/tests/data/test1424 +++ b/tests/data/test1424 @@ -57,12 +57,10 @@ http://%HOSTIP:%HTTPPORT/1424 -z "dec 12 11:00:00 1999 GMT" -o log/outfile1424 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1424 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT diff --git a/tests/data/test1425 b/tests/data/test1425 index ce9ba97fb353c22bd5527edc98d878faba4ae96a..7122cd6371f1f33ab2409ceb39fab6aeaa36183a 100644 GIT binary patch delta 42 ycmdnTyOVdrS(eFfS5tVFUnGl@6l- delta 46 zcmdnVyN`FnSr*yilA_E4JFd9U;?yEt$Mn>^5-U9|E*pKY_~cV8R-5HnXE6c*ifs@H diff --git a/tests/data/test1426 b/tests/data/test1426 index 851d8c3fb432d6cfab44fc9a97c8dfd2d075fbdf..1344b8ebd3e19186caf8d47aab37c6e0913f4d82 100644 GIT binary patch delta 42 ycmey*^NVN0HI~WWSj;6ui&Kkq9n(|uN~{!;ON(;!Rl{6^f<68HHfytnFaiK^5-U9|E*pKY_~gqhR+}|ggBSs#JP=#} diff --git a/tests/data/test1428 b/tests/data/test1428 index f09c02dd95..0ff74d4beb 100644 --- a/tests/data/test1428 +++ b/tests/data/test1428 @@ -60,13 +60,10 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - CONNECT test.1428:%HTTPPORT HTTP/1.1 Host: test.1428:%HTTPPORT -User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3 +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive header-type: proxy @@ -75,7 +72,7 @@ header-type: proxy GET /we/want/that/page/1428 HTTP/1.1 Host: test.1428:%HTTPPORT Authorization: Basic aWFtOm15OjtzZWxm -User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* header-type: server diff --git a/tests/data/test1429 b/tests/data/test1429 index b6a66c75f8..4f3989cf56 100644 --- a/tests/data/test1429 +++ b/tests/data/test1429 @@ -57,12 +57,10 @@ Funny-head: yesyes -foo- 234 - -^User-Agent:.* - GET /1429 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1430 b/tests/data/test1430 index e3c9b1d607..5acc7f12e5 100644 --- a/tests/data/test1430 +++ b/tests/data/test1430 @@ -40,12 +40,10 @@ http://%HOSTIP:%HTTPPORT/1430 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1430 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1431 b/tests/data/test1431 index bec3ebbde7..58500879c1 100644 --- a/tests/data/test1431 +++ b/tests/data/test1431 @@ -40,12 +40,10 @@ http://%HOSTIP:%HTTPPORT/1431 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1431 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1432 b/tests/data/test1432 index 7f41c65be5..fadbe83851 100644 --- a/tests/data/test1432 +++ b/tests/data/test1432 @@ -41,12 +41,10 @@ http://%HOSTIP:%HTTPPORT/1432 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1432 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1433 b/tests/data/test1433 index a159daff3a..6656114d5b 100644 --- a/tests/data/test1433 +++ b/tests/data/test1433 @@ -41,12 +41,10 @@ http://%HOSTIP:%HTTPPORT/1433 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1433 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1434 b/tests/data/test1434 index 0b33bb958c..55031be71e 100644 --- a/tests/data/test1434 +++ b/tests/data/test1434 @@ -76,13 +76,11 @@ http://%HOSTIP:%HTTPPORT/1434 -C 100 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1434 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Range: bytes=100- +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1435 b/tests/data/test1435 index bd171a4531..73262498e2 100644 --- a/tests/data/test1435 +++ b/tests/data/test1435 @@ -33,12 +33,10 @@ simple HTTP GET over Unix socket - -^User-Agent:.* - GET /1435 HTTP/1.1 Host: server-interpreted.example.com +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1436 b/tests/data/test1436 index e40a3bf4be..040b3b3899 100644 --- a/tests/data/test1436 +++ b/tests/data/test1436 @@ -47,20 +47,20 @@ HTTP requests with multiple connections over Unix socket - -^User-Agent:.* - GET /14360001 HTTP/1.1 Host: one.example.com +User-Agent: curl/%VERSION Accept: */* GET /14360002 HTTP/1.1 Host: two.example.com +User-Agent: curl/%VERSION Accept: */* GET /14360003 HTTP/1.1 Host: one.example.com +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1437 b/tests/data/test1437 index 6a48444fb3..07346a9e8c 100644 --- a/tests/data/test1437 +++ b/tests/data/test1437 @@ -65,18 +65,16 @@ http://%HOSTIP:%HTTPPORT/1437 -u testuser:testpass --digest # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1437 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /1437 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/1437", response="4376eb639bf8e7343a6e7b56e1b89c4f", algorithm=MD5 -User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1438 b/tests/data/test1438 index 8aaedb71e6..14818829e2 100644 --- a/tests/data/test1438 +++ b/tests/data/test1438 @@ -48,11 +48,9 @@ HTTP GET /1438 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* - -^User-Agent:.* - diff --git a/tests/data/test1439 b/tests/data/test1439 index 91edd22482..a76ccf002a 100644 --- a/tests/data/test1439 +++ b/tests/data/test1439 @@ -48,11 +48,9 @@ testdata GET /1439 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* - -^User-Agent:.* - diff --git a/tests/data/test1443 b/tests/data/test1443 index 6968867068..7da739e54e 100644 --- a/tests/data/test1443 +++ b/tests/data/test1443 @@ -52,12 +52,10 @@ perl -e 'exit((stat("log/1443"))[9] != 960898200)' # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1443 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1448 b/tests/data/test1448 index 87ffed60d1..38c0227564 100644 --- a/tests/data/test1448 +++ b/tests/data/test1448 @@ -59,16 +59,15 @@ http://åäö.se:%HTTPPORT/1448 --resolve xn--4cab6c.se:%HTTPPORT:%HOSTIP -L --c # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1448 HTTP/1.1 Host: xn--4cab6c.se:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /14480001 HTTP/1.1 Host: xn--4cab6c.se:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1455 b/tests/data/test1455 index 8483d7bb89..b8a864f81e 100644 --- a/tests/data/test1455 +++ b/tests/data/test1455 @@ -47,9 +47,6 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - s/^PROXY TCP4 %CLIENTIP %HOSTIP (\d*) %HTTPPORT/proxy-line/ @@ -57,6 +54,7 @@ s/^PROXY TCP4 %CLIENTIP %HOSTIP (\d*) %HTTPPORT/proxy-line/ proxy-line GET /1455 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Testno: 1455 diff --git a/tests/data/test1456 b/tests/data/test1456 index 16a78b2af6..59e0739189 100644 --- a/tests/data/test1456 +++ b/tests/data/test1456 @@ -50,10 +50,6 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent: - - # Strip off the (random) local port number. This test used to use a fixed # local port number that frequently causes the test to fail @@ -63,6 +59,7 @@ s/PROXY TCP6 ::1 ::1 (\d+) (\d+)/PROXY TCP6 ::1 ::1 $2/ PROXY TCP6 ::1 ::1 %HTTP6PORT GET /1456 HTTP/1.1 Host: %HOST6IP:%HTTP6PORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1457 b/tests/data/test1457 index 575748f46b..ab447ac547 100644 --- a/tests/data/test1457 +++ b/tests/data/test1457 @@ -51,11 +51,9 @@ line2 GET /1457 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* - -^User-Agent:.* - diff --git a/tests/data/test1458 b/tests/data/test1458 index 072e43ce90..c4f25f57e3 100644 --- a/tests/data/test1458 +++ b/tests/data/test1458 @@ -43,12 +43,10 @@ HTTP with wildcard --resolve # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1458 HTTP/1.1 Host: example.com:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1460 b/tests/data/test1460 index d7b30c5e83..1cc13353e9 100644 --- a/tests/data/test1460 +++ b/tests/data/test1460 @@ -47,9 +47,6 @@ initial content # # Verify data after the test has been "shot" - -^User-Agent:.* - # Warning: --include and --remote-header-name cannot be combined. 2 diff --git a/tests/data/test1465 b/tests/data/test1465 index 65608dd37498aaa543047703f225692b236f6db8..d1e553865c7243b700073b1bd5fc38d4c27ff498 100644 GIT binary patch delta 94 zcmZ1^@kngLB&NxmnAD9t@{3EX6jVL@gF`$6tW-ThLIMK(gF<+@LW@(2bRE-E^MKOH lrA0aVs$s4{!Jhtplf9WcHe0aVW#&Z{p3knb*^%QRGXSz59(@1+ delta 325 zcmaDPwn$>bBqrJ7lA_E4JFd9U;?yEt$Mn>^5-U9|E*pKY_~d>jt$HLGh2+wr9DQ>= zLkm441&vHI3p3qS{KKcfFmU`xi3Yi6EW(rk6 zHTs5nhI%HvTpszwB~}Wm9{#~0o&i>>9w8wC0scWDyj+gS$*BcEDJ^}i$v>E?>y^Pa zs~0Pzq^2d7=9DOuf}EQOa;`#IVo_#lu|j!fNrpmMYEf}!ex44}J)RJU9u3~+S z&|udfM|W4h5FLdWCC%u#7^PTkeU)m%TCh(GQd9J~logyqgM9o0LgImrjt_GU@^p&~ baCHsR+1$%~n3)r%P-(IvyYl8n_J_;>MW1Lr diff --git a/tests/data/test15 b/tests/data/test15 index 3b1fa43696..a82fa0cf63 100644 --- a/tests/data/test15 +++ b/tests/data/test15 @@ -44,12 +44,10 @@ Content-Length: 26 Repeated nonsense-headers http://%HOSTIP:%HTTPPORT/want/15 200 26 - -^User-Agent:.* - GET /want/15 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test150 b/tests/data/test150 index e9fde393bd..2179163de3 100644 --- a/tests/data/test150 +++ b/tests/data/test150 @@ -83,20 +83,17 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - GET /150 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* GET /150 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q= -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1502 b/tests/data/test1502 index 4c084d644f..9e7bcf2574 100644 --- a/tests/data/test1502 +++ b/tests/data/test1502 @@ -45,9 +45,6 @@ http://google.com:%HTTPPORT/1502 %HTTPPORT %HOSTIP # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1502 HTTP/1.1 Host: google.com:%HTTPPORT diff --git a/tests/data/test1503 b/tests/data/test1503 index 8665de60c0..288639463c 100644 --- a/tests/data/test1503 +++ b/tests/data/test1503 @@ -45,9 +45,6 @@ http://google.com:%HTTPPORT/1503 %HTTPPORT %HOSTIP # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1503 HTTP/1.1 Host: google.com:%HTTPPORT diff --git a/tests/data/test1504 b/tests/data/test1504 index b8463c526c..5ca66076e0 100644 --- a/tests/data/test1504 +++ b/tests/data/test1504 @@ -45,9 +45,6 @@ http://google.com:%HTTPPORT/1504 %HTTPPORT %HOSTIP # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1504 HTTP/1.1 Host: google.com:%HTTPPORT diff --git a/tests/data/test1505 b/tests/data/test1505 index c6e5a7ca1b..14e1141d43 100644 --- a/tests/data/test1505 +++ b/tests/data/test1505 @@ -45,9 +45,6 @@ http://google.com:%HTTPPORT/1505 %HTTPPORT %HOSTIP # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1505 HTTP/1.1 Host: google.com:%HTTPPORT diff --git a/tests/data/test151 b/tests/data/test151 index 8f20d1d8b5..03a55b4dcf 100644 --- a/tests/data/test151 +++ b/tests/data/test151 @@ -34,13 +34,10 @@ http://%HOSTIP:%HTTPPORT/151 # Verify data after the test has been "shot" - -^User-Agent: curl/.* - GET /151 HTTP/1.1 -User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled) Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test152 b/tests/data/test152 index 2cc521614c..2c48b03795 100644 --- a/tests/data/test152 +++ b/tests/data/test152 @@ -35,13 +35,10 @@ http://%HOSTIP:%HTTPPORT/152 --fail # Verify data after the test has been "shot" - -^User-Agent: curl/.* - GET /152 HTTP/1.1 -User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled) Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1524 b/tests/data/test1524 index ed0c0476e1..3490540207 100644 --- a/tests/data/test1524 +++ b/tests/data/test1524 @@ -55,20 +55,18 @@ moo # # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /blah/1524 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 4 Expect: 100-continue moo GET /blah/moo.html&testcase=/15240002 HTTP/1.1 -User-Agent: this should be ignored Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test153 b/tests/data/test153 index 1f55f39b67..a582595aca 100644 --- a/tests/data/test153 +++ b/tests/data/test153 @@ -89,34 +89,34 @@ http://%HOSTIP:%HTTPPORT/1530001 -u testuser:testpass --digest http://%HOSTIP:%H ^Authorization.*cnonce -^User-Agent:.* GET /1530001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /1530001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1530001", response="f4f83139396995bac665f24a1f1055c7" -User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* GET /1530002 HTTP/1.1 Host: %HOSTIP:%HTTPPORT -User-Agent: curl/7.11.0-CVS (i686-pc-linux-gnu) libcurl/7.11.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS +User-Agent: curl/%VERSION Accept: */* GET /1530002 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1530002", response="f84511b014fdd0ba6494f42871079c32" -User-Agent: curl/7.11.0-CVS (i686-pc-linux-gnu) libcurl/7.11.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS +User-Agent: curl/%VERSION Accept: */* GET /1530002 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="testrealm", nonce="999999", uri="/1530002", cnonce="MTA4MzIy", nc="00000001", qop="auth", response="25291c357671604a16c0242f56721c07", algorithm=MD5 -User-Agent: curl/7.11.0-CVS (i686-pc-linux-gnu) libcurl/7.11.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test154 b/tests/data/test154 index 3d693f4b3f..616051cbc4 100644 --- a/tests/data/test154 +++ b/tests/data/test154 @@ -82,12 +82,10 @@ four is the number of lines # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /154 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 85 Expect: 100-continue @@ -95,7 +93,7 @@ Expect: 100-continue PUT /154 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/154", response="b71551e12d1c456e47d8388ecb2edeca" -User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* Content-Length: 85 Expect: 100-continue diff --git a/tests/data/test155 b/tests/data/test155 index 0cfd10eead..6e19a4f262 100644 --- a/tests/data/test155 +++ b/tests/data/test155 @@ -108,12 +108,10 @@ four is the number of lines # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /155 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 85 Expect: 100-continue @@ -121,13 +119,14 @@ Expect: 100-continue PUT /155 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= +User-Agent: curl/%VERSION Accept: */* Content-Length: 0 PUT /155 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q= -User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* Content-Length: 85 Expect: 100-continue diff --git a/tests/data/test1551 b/tests/data/test1551 index 507266a851..c41a14643b 100644 --- a/tests/data/test1551 +++ b/tests/data/test1551 @@ -47,9 +47,6 @@ http://%HOSTIP:%HTTPPORT/1551 - -^User-Agent:.* - GET /1551 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test1556 b/tests/data/test1556 index 0f99abd815..06f5732c80 100644 --- a/tests/data/test1556 +++ b/tests/data/test1556 @@ -46,9 +46,6 @@ http://%HOSTIP:%HTTPPORT/1556 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1556 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test156 b/tests/data/test156 index 098de218de..fafedc2993 100644 --- a/tests/data/test156 +++ b/tests/data/test156 @@ -40,13 +40,10 @@ four is the number of lines # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /156 HTTP/1.1 -User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 85 Expect: 100-continue diff --git a/tests/data/test1561 b/tests/data/test1561 index 69352fda2f..bfdb439dfe 100644 --- a/tests/data/test1561 +++ b/tests/data/test1561 @@ -73,18 +73,15 @@ Cookies set over HTTP can't override secure ones - -^User-Agent:.* - GET /15610001 HTTP/1.1 Host: www.example.com -User-Agent: curl/7.62.0-DEV +User-Agent: curl/%VERSION Accept: */* GET /15610002 HTTP/1.1 Host: www.example.com -User-Agent: curl/7.62.0-DEV +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1562 b/tests/data/test1562 index 59cb9ccba9..af29f54bc8 100644 --- a/tests/data/test1562 +++ b/tests/data/test1562 @@ -48,21 +48,21 @@ Expire secure cookies over HTTPS - -^User-Agent:.* - GET /15620001 HTTP/1.1 Host: www.example.com +User-Agent: curl/%VERSION Accept: */* GET /15620002 HTTP/1.1 Host: www.example.com +User-Agent: curl/%VERSION Accept: */* Cookie: foo=123 GET /15620001 HTTP/1.1 Host: www.example.com +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1563 b/tests/data/test1563 index a3597b9b53..7d88ddc683 100644 --- a/tests/data/test1563 +++ b/tests/data/test1563 @@ -33,15 +33,13 @@ http://%HOSTIP:%HTTPPORT/15630001 -L -H "Host: www.example.com" - -^User-Agent:.* - 1 GET /15630001 HTTP/1.1 Host: www.example.com +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1566 b/tests/data/test1566 index cc3ac474a2..90cb40a5e9 100644 --- a/tests/data/test1566 +++ b/tests/data/test1566 @@ -46,12 +46,10 @@ downloaded already # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1566 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* If-None-Match: "123456" diff --git a/tests/data/test1567 b/tests/data/test1567 index 088ebf4971..ff779df08d 100644 --- a/tests/data/test1567 +++ b/tests/data/test1567 @@ -48,9 +48,6 @@ http://%HOSTIP:%HTTPPORT/1567 - -^User-Agent:.* - GET /1567 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test157 b/tests/data/test157 index 77700f6ade..fee7a6a447 100644 --- a/tests/data/test157 +++ b/tests/data/test157 @@ -34,12 +34,10 @@ http://%HOSTIP:%HTTPPORT/157 -u testuser:testpass --anyauth # Verify data after the test has been "shot" - -^User-Agent:.* - GET /157 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test158 b/tests/data/test158 index dca51b163e..238399a05b 100644 --- a/tests/data/test158 +++ b/tests/data/test158 @@ -31,14 +31,13 @@ http://%HOSTIP:%HTTPPORT/158 -F name=daniel # Verify data after the test has been "shot" -^User-Agent:.* ^Content-Type: multipart/form-data.* ^-----------------------.* POST /158 HTTP/1.1 -User-Agent: curl/7.11.2-CVS (i686-pc-linux-gnu) libcurl/7.11.2-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 145 Content-Type: multipart/form-data; boundary=----------------------------4f12fcdaa3bc diff --git a/tests/data/test159 b/tests/data/test159 index a56986fbaf..bb94583bd9 100644 --- a/tests/data/test159 +++ b/tests/data/test159 @@ -69,14 +69,11 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - GET /159 HTTP/1.0 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1591 b/tests/data/test1591 index 526933a0ec..ce0c2687a8 100644 --- a/tests/data/test1591 +++ b/tests/data/test1591 @@ -40,9 +40,6 @@ more than one byte # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /bzz/1591 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test1593 b/tests/data/test1593 index 405aa84e5b..6719a3261f 100644 --- a/tests/data/test1593 +++ b/tests/data/test1593 @@ -35,9 +35,6 @@ http://%HOSTIP:%HTTPPORT/1593 - -^User-Agent:.* - # Note here the lack of If-Modified-Since GET /1593 HTTP/1.1 diff --git a/tests/data/test1594 b/tests/data/test1594 index 4907ca2bef..f29fdd6871 100644 --- a/tests/data/test1594 +++ b/tests/data/test1594 @@ -36,9 +36,6 @@ http://%HOSTIP:%HTTPPORT/1594 - -^User-Agent:.* - GET /1594 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test1595 b/tests/data/test1595 index 29b2b865f4..0216788e0b 100644 --- a/tests/data/test1595 +++ b/tests/data/test1595 @@ -35,9 +35,6 @@ http://%HOSTIP:%HTTPPORT/1595 - -^User-Agent:.* - GET /1595 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test1596 b/tests/data/test1596 index 77a10f08a8..62ceab4b88 100644 --- a/tests/data/test1596 +++ b/tests/data/test1596 @@ -36,9 +36,6 @@ http://%HOSTIP:%HTTPPORT/1596 - -^User-Agent:.* - GET /1596 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test16 b/tests/data/test16 index 399aa94206..f8510adcf8 100644 --- a/tests/data/test16 +++ b/tests/data/test16 @@ -40,13 +40,11 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://we.want.that.site.com/16 HTTP/1.1 Host: we.want.that.site.com Proxy-Authorization: Basic ZmFrZUB1c2VyOmxvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29uZw== +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test160 b/tests/data/test160 index df80aef974..4b1c5eddc7 100644 --- a/tests/data/test160 +++ b/tests/data/test160 @@ -56,16 +56,15 @@ Connection: close surprise2 - -^User-Agent:.* - GET /want/160 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /wantmore/1600001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test162 b/tests/data/test162 index 29791d9af8..d15474585d 100644 --- a/tests/data/test162 +++ b/tests/data/test162 @@ -44,14 +44,11 @@ http://%HOSTIP:%HTTPPORT/162 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:b # Verify data after the test has been "shot" - -^User-Agent: curl/.* - GET http://%HOSTIP:%HTTPPORT/162 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled) +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test163 b/tests/data/test163 index b4e2d260fa..e4f7206121 100644 --- a/tests/data/test163 +++ b/tests/data/test163 @@ -46,12 +46,12 @@ yes please # Verify data after the test has been "shot" -^(User-Agent:|Content-Type: multipart/form-data;|------------).* +^(Content-Type: multipart/form-data;|------------).* POST /we/want/163 HTTP/1.1 -User-Agent: curl/7.11.2-CVS (i686-pc-linux-gnu) libcurl/7.11.2-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.0.0 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 304 Content-Type: multipart/form-data; boundary=----------------------------c2d1767eb6ac diff --git a/tests/data/test1630 b/tests/data/test1630 index 1d381c7b0e..7bf4066361 100644 --- a/tests/data/test1630 +++ b/tests/data/test1630 @@ -41,13 +41,11 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://we.want.that.site.com/1630 HTTP/1.1 Host: we.want.that.site.com Proxy-Authorization: Basic ZmFrZUB1c2VyOmxvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29uZw== +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test1633 b/tests/data/test1633 index 5d29ef139e..6b6e1eb9f4 100644 --- a/tests/data/test1633 +++ b/tests/data/test1633 @@ -68,28 +68,29 @@ http://%HOSTIP:%HTTPPORT/1633 -d moo --retry 1 -L # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /1633 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 3 Content-Type: application/x-www-form-urlencoded mooGET /16330002 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* POST /1633 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 3 Content-Type: application/x-www-form-urlencoded mooGET /16330002 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test164 b/tests/data/test164 index 9240611dd5..97e2c5eac4 100644 --- a/tests/data/test164 +++ b/tests/data/test164 @@ -54,13 +54,11 @@ http://%HOSTIP:%HTTPPORT/want/164 -r 0-10,12-15 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/164 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Range: bytes=0-10,12-15 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test165 b/tests/data/test165 index 47de3919b3..355394272f 100644 --- a/tests/data/test165 +++ b/tests/data/test165 @@ -49,17 +49,16 @@ http://www.åäö.se/page/165 -x %HOSTIP:%HTTPPORT http://www.große.de/page/165 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://www.xn--4cab6c.se/page/165 HTTP/1.1 Host: www.xn--4cab6c.se +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://www.xn--groe-xna.de/page/165 HTTP/1.1 Host: www.xn--groe-xna.de +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test166 b/tests/data/test166 index f170752e61..697a2452ae 100644 --- a/tests/data/test166 +++ b/tests/data/test166 @@ -38,12 +38,12 @@ data inside the file # Verify data after the test has been "shot" -^(User-Agent:|Content-Type: multipart/form-data;|------------).* +^(Content-Type: multipart/form-data;|------------).* POST /we/want/166 HTTP/1.1 -User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 223 Content-Type: multipart/form-data; boundary=----------------------------b0b3d6d23991 diff --git a/tests/data/test167 b/tests/data/test167 index e08555ecc3..5067e779a4 100644 --- a/tests/data/test167 +++ b/tests/data/test167 @@ -57,14 +57,11 @@ http://data.from.server.requiring.digest.hohoho.com/167 --proxy http://%HOSTIP:% # Verify data after the test has been "shot" - -^User-Agent: curl/.* - GET http://data.from.server.requiring.digest.hohoho.com/167 HTTP/1.1 Host: data.from.server.requiring.digest.hohoho.com Proxy-Authorization: Basic Zm9vOmJhcg== -User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive @@ -72,7 +69,7 @@ GET http://data.from.server.requiring.digest.hohoho.com/167 HTTP/1.1 Host: data.from.server.requiring.digest.hohoho.com Proxy-Authorization: Basic Zm9vOmJhcg== Authorization: Digest username="digest", realm="weirdorealm", nonce="12345", uri="/167", response="13c7c02a252cbe1c46d8669898a3be26" -User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test168 b/tests/data/test168 index fb87620448..ddad8bb779 100644 --- a/tests/data/test168 +++ b/tests/data/test168 @@ -71,20 +71,17 @@ http://data.from.server.requiring.digest.hohoho.com/168 --proxy http://%HOSTIP:% # Verify data after the test has been "shot" - -^User-Agent: curl/.* - GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1 Host: data.from.server.requiring.digest.hohoho.com -User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1 Host: data.from.server.requiring.digest.hohoho.com Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/168", response="fb8608e00ad9239a3dedb14bc8575976" -User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive @@ -92,7 +89,7 @@ GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1 Host: data.from.server.requiring.digest.hohoho.com Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/168", response="fb8608e00ad9239a3dedb14bc8575976" Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/168", response="ca87f2d768a231e2d637a55698d5c416" -User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.3 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test169 b/tests/data/test169 index 209dd9d90b..6d30b2aded 100644 --- a/tests/data/test169 +++ b/tests/data/test169 @@ -101,28 +101,25 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent: curl/.* - GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1 Host: data.from.server.requiring.digest.hohoho.com Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.3 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1 Host: data.from.server.requiring.digest.hohoho.com Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q= -User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.3 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1 Host: data.from.server.requiring.digest.hohoho.com Authorization: Digest username="digest", realm="r e a l m", nonce="abcdef", uri="/169", response="95d48591985a03c4b49cb962aa7bd3e6" -User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.3 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test170 b/tests/data/test170 index 9b41ddd7fe..58c2a3fe15 100644 --- a/tests/data/test170 +++ b/tests/data/test170 @@ -33,14 +33,11 @@ http://a.galaxy.far.far.away/170 --proxy http://%HOSTIP:%HTTPPORT --proxy-user f # Verify data after the test has been "shot" - -^User-Agent: curl/.* - POST http://a.galaxy.far.far.away/170 HTTP/1.1 Host: a.galaxy.far.far.away Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 libidn/0.4.3 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Content-Length: 0 diff --git a/tests/data/test1700 b/tests/data/test1700 index 9ab46c9cde..ff1e2724f0 100644 --- a/tests/data/test1700 +++ b/tests/data/test1700 @@ -54,17 +54,18 @@ http://%HOSTIP:%HTTP2PORT/1700 --http2 http://%HOSTIP:%HTTP2PORT/17000001 # Verify data after the test has been "shot" -^User-Agent:.* ^X-Forwarded-Proto:.* ^Via:.* GET /1700 HTTP/1.1 Host: %HOSTIP:%HTTP2PORT +User-Agent: curl/%VERSION Accept: */* GET /17000001 HTTP/1.1 Host: %HOSTIP:%HTTP2PORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1701 b/tests/data/test1701 index 4943288772..d898617341 100644 --- a/tests/data/test1701 +++ b/tests/data/test1701 @@ -45,13 +45,13 @@ http://%HOSTIP:%HTTP2PORT/1701 --http2 -d "datatosend" # Verify data after the test has been "shot" -^User-Agent:.* ^X-Forwarded-Proto:.* ^Via:.* POST /1701 HTTP/1.1 Host: %HOSTIP:%HTTP2PORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 10 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test1702 b/tests/data/test1702 index 903a737c9a..15757674dc 100644 --- a/tests/data/test1702 +++ b/tests/data/test1702 @@ -44,13 +44,13 @@ http://%HOSTIP:%HTTP2PORT/1702 --http2 --head # Verify data after the test has been "shot" -^User-Agent:.* ^X-Forwarded-Proto:.* ^Via:.* HEAD /1702 HTTP/1.1 Host: %HOSTIP:%HTTP2PORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test171 b/tests/data/test171 index 482c0b7e23..d6a8230331 100644 --- a/tests/data/test171 +++ b/tests/data/test171 @@ -40,12 +40,10 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://z.x.com/171 HTTP/1.1 Host: z.x.com +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test172 b/tests/data/test172 index ad3628429e..dda8a38cf6 100644 --- a/tests/data/test172 +++ b/tests/data/test172 @@ -42,12 +42,10 @@ http://%HOSTIP:%HTTPPORT/we/want/172 -b log/jar172.txt -b "tool=curl; name=fool" # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/172 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Cookie: nodomain=value; partmatch=present; tool=curl; name=fool diff --git a/tests/data/test173 b/tests/data/test173 index 865ef7ba23..1484cbe038 100644 --- a/tests/data/test173 +++ b/tests/data/test173 @@ -46,12 +46,12 @@ line8 # Verify data after the test has been "shot" -^(User-Agent:|Content-Type: multipart/form-data;|------------).* +^(Content-Type: multipart/form-data;|------------).* POST /we/want/173 HTTP/1.1 -User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 360 Content-Type: multipart/form-data; boundary=----------------------------5dbea401cd8c diff --git a/tests/data/test174 b/tests/data/test174 index 9767f2f52d..e5a9d6fcb2 100644 --- a/tests/data/test174 +++ b/tests/data/test174 @@ -35,13 +35,10 @@ http://%HOSTIP:%HTTPPORT/174 -u testuser:testpass --anyauth -d "junkelijunk" # Verify data after the test has been "shot" - -^User-Agent:.* - POST /174 HTTP/1.1 -User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 11 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test175 b/tests/data/test175 index 9e005f1f59..8b49a32b55 100644 --- a/tests/data/test175 +++ b/tests/data/test175 @@ -62,20 +62,17 @@ http://%HOSTIP:%HTTPPORT/175 -u auser:apasswd --digest -d "junkelijunk" # Verify data after the test has been "shot" - -^User-Agent:.* - POST /175 HTTP/1.1 -User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 0 Content-Type: application/x-www-form-urlencoded POST /175 HTTP/1.1 -User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 11 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test176 b/tests/data/test176 index e18837af1f..5fe310facc 100644 --- a/tests/data/test176 +++ b/tests/data/test176 @@ -64,21 +64,18 @@ http://%HOSTIP:%HTTPPORT/176 -u auser:apasswd --ntlm -d "junkelijunk" # Verify data after the test has been "shot" - -^User-Agent:.* - POST /176 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6 +User-Agent: curl/%VERSION Accept: */* Content-Length: 0 Content-Type: application/x-www-form-urlencoded POST /176 HTTP/1.1 Host: %HOSTIP:%HTTPPORT -User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6 +User-Agent: curl/%VERSION Accept: */* Content-Length: 11 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test177 b/tests/data/test177 index 495dea9b43..e31f1b7fa2 100644 --- a/tests/data/test177 +++ b/tests/data/test177 @@ -38,13 +38,10 @@ http://%HOSTIP:%HTTPPORT/177 -u auser:apasswd --digest -d "junkelijunk" # Verify data after the test has been "shot" - -^User-Agent:.* - POST /177 HTTP/1.1 -User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 0 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test178 b/tests/data/test178 index d22d8149fc..b67e353ac4 100644 --- a/tests/data/test178 +++ b/tests/data/test178 @@ -41,12 +41,10 @@ http://%HOSTIP:%HTTPPORT/178 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /178 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test179 b/tests/data/test179 index 3a94c00bad..9f7bdedcf2 100644 --- a/tests/data/test179 +++ b/tests/data/test179 @@ -45,12 +45,10 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://supertrooper.fake/c/179 HTTP/1.1 Host: supertrooper.fake +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Cookie: moo2=indeed diff --git a/tests/data/test18 b/tests/data/test18 index e1d76398cf..0fe92f79b8 100644 --- a/tests/data/test18 +++ b/tests/data/test18 @@ -47,23 +47,20 @@ multiple requests using {} in URL # Verify data after the test has been "shot" - -^User-Agent:.* - GET /18 HTTP/1.1 -User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled) Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /180002 HTTP/1.1 -User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled) Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /180003 HTTP/1.1 -User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled) Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test180 b/tests/data/test180 index 0b2ca0373f..1074e267c8 100644 --- a/tests/data/test180 +++ b/tests/data/test180 @@ -44,12 +44,10 @@ the # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /we/want/180 HTTP/1.0 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 78 diff --git a/tests/data/test1800 b/tests/data/test1800 index c308c99b0f..89f4292b3d 100644 --- a/tests/data/test1800 +++ b/tests/data/test1800 @@ -39,12 +39,10 @@ http://%HOSTIP:%HTTPPORT/1800 --http2 - -^User-Agent:.* - GET /1800 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Connection: Upgrade, HTTP2-Settings Upgrade: %H2CVER diff --git a/tests/data/test1801 b/tests/data/test1801 index b827ab51ee..15367d2218 100644 --- a/tests/data/test1801 +++ b/tests/data/test1801 @@ -49,12 +49,10 @@ http://%HOSTIP:%HTTPPORT/1801 --http2 - -^User-Agent:.* - GET /1801 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Connection: Upgrade, HTTP2-Settings Upgrade: %H2CVER diff --git a/tests/data/test181 b/tests/data/test181 index b6b55cb997..c2f813579f 100644 --- a/tests/data/test181 +++ b/tests/data/test181 @@ -44,12 +44,10 @@ the # Verify data after the test has been "shot" - -^User-Agent:.* - POST /we/want/181 HTTP/1.0 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 79 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test183 b/tests/data/test183 index cf992a26fa..d72081c471 100644 --- a/tests/data/test183 +++ b/tests/data/test183 @@ -37,19 +37,16 @@ proxy # Verify data after the test has been "shot" - -^User-Agent: curl/.* - GET http://deathstar.another.galaxy/183 HTTP/1.1 -User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.6b zlib/1.1.4 libidn/0.4.6 Host: deathstar.another.galaxy +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://a.galaxy.far.far.away/183 HTTP/1.1 -User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.6b zlib/1.1.4 libidn/0.4.6 Host: a.galaxy.far.far.away +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test184 b/tests/data/test184 index 42e652e3bd..1afb10df80 100644 --- a/tests/data/test184 +++ b/tests/data/test184 @@ -57,18 +57,16 @@ proxy # Verify data after the test has been "shot" - -^User-Agent: curl/.* - GET http://deathstar.another.galaxy/184 HTTP/1.1 Host: another.visitor.stay.a.while.stay.foreeeeeever -User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.6b zlib/1.1.4 libidn/0.4.6 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://yet.another.host/184 HTTP/1.1 Host: yet.another.host +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test185 b/tests/data/test185 index 3bc58a041a..ba48fd87bb 100644 --- a/tests/data/test185 +++ b/tests/data/test185 @@ -57,18 +57,16 @@ proxy # Verify data after the test has been "shot" - -^User-Agent: curl/.* - GET http://deathstar.another.galaxy/185 HTTP/1.1 Host: another.visitor.stay.a.while.stay.foreeeeeever -User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.6b zlib/1.1.4 libidn/0.4.6 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://deathstar.another.galaxy/go/west/185 HTTP/1.1 Host: another.visitor.stay.a.while.stay.foreeeeeever +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test186 b/tests/data/test186 index 4abc74a2b3..f5a75c6fd9 100644 --- a/tests/data/test186 +++ b/tests/data/test186 @@ -36,12 +36,12 @@ http://%HOSTIP:%HTTPPORT/we/want/186 -F "name=daniel;type=moo/foo" -F "html= -^(User-Agent:|Content-Type: multipart/form-data;|------------).* +^(Content-Type: multipart/form-data;|------------).* POST /we/want/186 HTTP/1.1 -User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.7d zlib/1.2.1.1 c-ares/1.2.0 libidn/0.5.2 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 320 Content-Type: multipart/form-data; boundary=----------------------------212d9006ceb5 diff --git a/tests/data/test187 b/tests/data/test187 index b82a6c60e2..a186541220 100644 --- a/tests/data/test187 +++ b/tests/data/test187 @@ -60,16 +60,15 @@ http://%HOSTIP:%HTTPPORT?oh=what-weird=test/187 -L # Verify data after the test has been "shot" - -^User-Agent:.* - GET /?oh=what-weird=test/187 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /root/1870002.txt?coolsite=yes HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test188 b/tests/data/test188 index d8ca1cd479..14e95c8e86 100644 --- a/tests/data/test188 +++ b/tests/data/test188 @@ -57,20 +57,17 @@ http://%HOSTIP:%HTTPPORT/188 -C 50 -L # Verify data after the test has been "shot" - -^User-Agent:.* - GET /188 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Range: bytes=50- -User-Agent: curl/7.6 (sparc-sun-solaris2.7) libcurl 7.6-pre4 (SSL 0.9.6) (krb4 enabled) +User-Agent: curl/%VERSION Accept: */* GET /188 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Range: bytes=50- -User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.7d zlib/1.2.1.2 libidn/0.5.2 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test189 b/tests/data/test189 index 65780f8040..3435a52bed 100644 --- a/tests/data/test189 +++ b/tests/data/test189 @@ -51,20 +51,17 @@ http://%HOSTIP:%HTTPPORT/189 -C 50 -L # Verify data after the test has been "shot" - -^User-Agent:.* - GET /189 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Range: bytes=50- -User-Agent: curl/7.6 (sparc-sun-solaris2.7) libcurl 7.6-pre4 (SSL 0.9.6) (krb4 enabled) +User-Agent: curl/%VERSION Accept: */* GET /189 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Range: bytes=50- -User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.7d zlib/1.2.1.2 libidn/0.5.2 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1904 b/tests/data/test1904 index 7602854728..f75e87dab6 100644 --- a/tests/data/test1904 +++ b/tests/data/test1904 @@ -61,20 +61,17 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - CONNECT test.1904:%HTTPPORT HTTP/1.1 Host: test.1904:%HTTPPORT -User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3 +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive GET /we/want/that/page/1904 HTTP/1.1 Host: test.1904:%HTTPPORT -User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1905 b/tests/data/test1905 index 0459b10b46..1fafddf607 100644 --- a/tests/data/test1905 +++ b/tests/data/test1905 @@ -39,9 +39,6 @@ http://%HOSTIP:%HTTPPORT/we/want/1905 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/1905 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test1906 b/tests/data/test1906 index 0ff2b2be04..0c476a154a 100644 --- a/tests/data/test1906 +++ b/tests/data/test1906 @@ -39,9 +39,6 @@ http://%HOSTIP:%HTTPPORT/1906 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1906 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test1907 b/tests/data/test1907 index 93f37051e7..85cabde16e 100644 --- a/tests/data/test1907 +++ b/tests/data/test1907 @@ -37,9 +37,6 @@ lib1907 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1907 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test1908 b/tests/data/test1908 index 00ce98a6aa..b63e03ad30 100644 --- a/tests/data/test1908 +++ b/tests/data/test1908 @@ -57,9 +57,6 @@ lib1908 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1908 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test1909 b/tests/data/test1909 index bde0e5e0f7..ba082529ae 100644 --- a/tests/data/test1909 +++ b/tests/data/test1909 @@ -43,16 +43,15 @@ HTTP GET --retry-all-errors to overcome partial transfer # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1909 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /1909 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1910 b/tests/data/test1910 index cd2e2cf46a..cd44c0269a 100644 --- a/tests/data/test1910 +++ b/tests/data/test1910 @@ -49,9 +49,6 @@ lib1910 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /1910 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test192 b/tests/data/test192 index 42cebc031f..9a54a1a064 100644 --- a/tests/data/test192 +++ b/tests/data/test192 @@ -36,12 +36,10 @@ http://%HOSTIP:%HTTPPORT/192 -w "%{num_connects}\n" # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /192 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test193 b/tests/data/test193 index c5425bb3f2..6a9c674e06 100644 --- a/tests/data/test193 +++ b/tests/data/test193 @@ -48,16 +48,15 @@ http://%HOSTIP:%HTTPPORT/193 -w "%{num_connects}\n" -L # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /193 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /193 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test194 b/tests/data/test194 index 730446f79f..323ac0f38d 100644 --- a/tests/data/test194 +++ b/tests/data/test194 @@ -55,13 +55,11 @@ http://%HOSTIP:%HTTPPORT/want/194 -C 87 --fail # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/194 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Range: bytes=87- +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test197 b/tests/data/test197 index 4d06cc5da0..052a0ad34b 100644 --- a/tests/data/test197 +++ b/tests/data/test197 @@ -44,16 +44,15 @@ http://%HOSTIP:%HTTPPORT/197 --retry 1000 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /197 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /197 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test198 b/tests/data/test198 index 0200366c5a..56dd74b4c1 100644 --- a/tests/data/test198 +++ b/tests/data/test198 @@ -53,16 +53,15 @@ http://%HOSTIP:%HTTPPORT/198 --retry 1000 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /198 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /198 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test199 b/tests/data/test199 index 72675b5356..69a3cecc6d 100644 --- a/tests/data/test199 +++ b/tests/data/test199 @@ -42,16 +42,15 @@ HTTP with -d, -G and {} # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /199?foo=moo&moo=poo HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /199?foo=moo&moo=poo HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2 b/tests/data/test2 index 9f9c506189..bd53ed58c9 100644 --- a/tests/data/test2 +++ b/tests/data/test2 @@ -36,13 +36,11 @@ HTTP GET with user and password # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Basic ZmFrZTp1c2Vy +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2001 b/tests/data/test2001 index 9232499f9e..4286f1d1e9 100644 --- a/tests/data/test2001 +++ b/tests/data/test2001 @@ -63,12 +63,10 @@ moo # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /20010001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* USER anonymous diff --git a/tests/data/test2002 b/tests/data/test2002 index efe75fa3b0..cad7cdf828 100644 --- a/tests/data/test2002 +++ b/tests/data/test2002 @@ -72,12 +72,10 @@ moo # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /20020001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* USER anonymous diff --git a/tests/data/test2003 b/tests/data/test2003 index 68ae714291..12b4722d9d 100644 --- a/tests/data/test2003 +++ b/tests/data/test2003 @@ -72,12 +72,10 @@ moo # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /20030001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* USER anonymous @@ -104,6 +102,7 @@ SIZE 20030002 RETR 20030002 GET /20030001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* QUIT diff --git a/tests/data/test2005 b/tests/data/test2005 index f78b4be56b..f26bf239a2 100644 --- a/tests/data/test2005 +++ b/tests/data/test2005 @@ -64,12 +64,10 @@ perl %SRCDIR/libtest/notexists.pl log/2005 log/name2005 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2005 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2006 b/tests/data/test2006 index 4cb61192d7..addf86f014 100644 --- a/tests/data/test2006 +++ b/tests/data/test2006 @@ -73,12 +73,10 @@ perl %SRCDIR/libtest/notexists.pl log/2006 log/name2006 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2006 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2007 b/tests/data/test2007 index 738ac35f96..4c456151a3 100644 --- a/tests/data/test2007 +++ b/tests/data/test2007 @@ -74,12 +74,10 @@ perl %SRCDIR/libtest/notexists.pl log/2007 log/name2007 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2007 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2008 b/tests/data/test2008 index b29ba911b8..ec41adb35d 100644 --- a/tests/data/test2008 +++ b/tests/data/test2008 @@ -66,12 +66,10 @@ perl %SRCDIR/libtest/notexists.pl log/2008 log/name2008 log/outfile2008 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2008 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2009 b/tests/data/test2009 index 3cf4e4c48f..aa71a0ac1f 100644 --- a/tests/data/test2009 +++ b/tests/data/test2009 @@ -67,12 +67,10 @@ perl %SRCDIR/libtest/notexists.pl log/2009 log/name2009 log/outfile2009 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2009 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2010 b/tests/data/test2010 index 08f1bfaa44..cd0c483545 100644 --- a/tests/data/test2010 +++ b/tests/data/test2010 @@ -66,12 +66,10 @@ perl %SRCDIR/libtest/notexists.pl log/2010 log/name2010 log/outfile2010 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2010 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2011 b/tests/data/test2011 index a84502317c..1d081afcbf 100644 --- a/tests/data/test2011 +++ b/tests/data/test2011 @@ -64,12 +64,10 @@ perl %SRCDIR/libtest/notexists.pl log/2011 log/name2011 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2011 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2012 b/tests/data/test2012 index 6751269d59..ae627a9af9 100644 --- a/tests/data/test2012 +++ b/tests/data/test2012 @@ -63,12 +63,10 @@ perl %SRCDIR/libtest/notexists.pl log/2012 log/name2012 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2012 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2023 b/tests/data/test2023 index 382b6cb8a3..0b155b2d2e 100644 --- a/tests/data/test2023 +++ b/tests/data/test2023 @@ -128,9 +128,6 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - GET /20230100 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test2024 b/tests/data/test2024 index cd06b7c9f5..c062b4c0f8 100644 --- a/tests/data/test2024 +++ b/tests/data/test2024 @@ -142,9 +142,6 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - GET /20240100 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test2025 b/tests/data/test2025 index 282c698501..7a8fff1527 100644 --- a/tests/data/test2025 +++ b/tests/data/test2025 @@ -224,9 +224,6 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - GET /20250100 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test2026 b/tests/data/test2026 index afbd4f31e4..a505737d73 100644 --- a/tests/data/test2026 +++ b/tests/data/test2026 @@ -178,9 +178,6 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - GET /20260100 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test2027 b/tests/data/test2027 index 3302a155dc..3983e88548 100644 --- a/tests/data/test2027 +++ b/tests/data/test2027 @@ -201,9 +201,6 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - GET /20270100 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test2028 b/tests/data/test2028 index 92a6371616..c7b70c8f21 100644 --- a/tests/data/test2028 +++ b/tests/data/test2028 @@ -260,9 +260,6 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - GET /20280100 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test2029 b/tests/data/test2029 index 59a793ebe2..67313c414f 100644 --- a/tests/data/test2029 +++ b/tests/data/test2029 @@ -197,9 +197,6 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - GET /20290100 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test2030 b/tests/data/test2030 index a158a907a9..1d281ab9f9 100644 --- a/tests/data/test2030 +++ b/tests/data/test2030 @@ -249,9 +249,6 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - GET /20300100 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test2031 b/tests/data/test2031 index 9acfeef72d..dabba37490 100644 --- a/tests/data/test2031 +++ b/tests/data/test2031 @@ -263,9 +263,6 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - GET /20310100 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test2032 b/tests/data/test2032 index 8200b8de5d..52574fe77a 100644 --- a/tests/data/test2032 +++ b/tests/data/test2032 @@ -95,9 +95,6 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - GET /20320100 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test2034 b/tests/data/test2034 index 9bf0a817c6..57e3d86278 100644 --- a/tests/data/test2034 +++ b/tests/data/test2034 @@ -45,12 +45,10 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2034 HTTP/1.1 Host: localhost:%HTTPSPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2036 b/tests/data/test2036 index 4b2ec43a81..f022d1444d 100644 --- a/tests/data/test2036 +++ b/tests/data/test2036 @@ -29,9 +29,6 @@ HTTP, -O with no slash at all in the URL # # Verify data after the test has been "shot" - -^User-Agent:.* - 23 diff --git a/tests/data/test2037 b/tests/data/test2037 index d630538e20..84a6676cd1 100644 --- a/tests/data/test2037 +++ b/tests/data/test2037 @@ -45,12 +45,11 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0 # # Verify data after the test has been "shot" - -^User-Agent:.* GET /2037 HTTP/1.1 Host: localhost:%HTTPSPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2040 b/tests/data/test2040 index ac600174ec..cec8a6bcc8 100644 --- a/tests/data/test2040 +++ b/tests/data/test2040 @@ -47,17 +47,16 @@ HTTP Basic authorization, then without authorization # Verify data after the test has been "shot" - -^User-Agent:.* - GET /20400100 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M= +User-Agent: curl/%VERSION Accept: */* GET /20400200 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2041 b/tests/data/test2041 index 50018e4012..d10abaa023 100644 --- a/tests/data/test2041 +++ b/tests/data/test2041 @@ -45,12 +45,10 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2041 HTTP/1.1 Host: localhost:%HTTPSPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2046 b/tests/data/test2046 index ec49c86398..e85c00f231 100644 --- a/tests/data/test2046 +++ b/tests/data/test2046 @@ -59,16 +59,15 @@ http://åäö.se:%HTTPPORT/2046 --resolve xn--4cab6c.se:%HTTPPORT:%HOSTIP -w "%{ # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2046 HTTP/1.1 Host: xn--4cab6c.se:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /20460001 HTTP/1.1 Host: xn--4cab6c.se:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2047 b/tests/data/test2047 index 1471d00511..cda2f918e6 100644 --- a/tests/data/test2047 +++ b/tests/data/test2047 @@ -61,17 +61,16 @@ http://åäö.se/2047 -x %HOSTIP:%HTTPPORT -w "%{num_connects}\n%{num_redirects} # # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://xn--4cab6c.se/2047 HTTP/1.1 Host: xn--4cab6c.se +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://xn--4cab6c.se/20470001 HTTP/1.1 Host: xn--4cab6c.se +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test2049 b/tests/data/test2049 index efa576e98d..0653e59003 100644 --- a/tests/data/test2049 +++ b/tests/data/test2049 @@ -38,24 +38,25 @@ http://www1.example.com:8081/2049 --connect-to ::%HOSTIP:%HTTPPORT --next http:/ # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2049 HTTP/1.1 Host: www1.example.com:8081 +User-Agent: curl/%VERSION Accept: */* GET /2049 HTTP/1.1 Host: www2.example.com:8082 +User-Agent: curl/%VERSION Accept: */* GET /2049 HTTP/1.1 Host: www3.example.com:8083 +User-Agent: curl/%VERSION Accept: */* GET /2049 HTTP/1.1 Host: www4.example.com:8084 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2050 b/tests/data/test2050 index 5eef3dae2d..d4b7e6417b 100644 --- a/tests/data/test2050 +++ b/tests/data/test2050 @@ -61,18 +61,17 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - CONNECT connect.example.com.2050:%HTTPPORT HTTP/1.1 Host: connect.example.com.2050:%HTTPPORT +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive GET /2050 HTTP/1.1 Host: www.example.com.2050 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2051 b/tests/data/test2051 index e8c6bed1d3..97f1138004 100644 --- a/tests/data/test2051 +++ b/tests/data/test2051 @@ -38,20 +38,20 @@ http://%HOSTIP:%HTTPPORT/2051 -w "%{num_connects}\n" --next --connect-to ::%HOST # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2051 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /2051 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /2051 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2052 b/tests/data/test2052 index 082002f2c7..70549db629 100644 --- a/tests/data/test2052 +++ b/tests/data/test2052 @@ -38,16 +38,15 @@ http://www.example.com:%HTTPPORT/2052 --resolve www.example.com:%HTTPPORT:%HOSTI # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2052 HTTP/1.1 Host: www.example.com:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /2052 HTTP/1.1 Host: www.example.com:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2053 b/tests/data/test2053 index 98e78454ec..abf1366cc0 100644 --- a/tests/data/test2053 +++ b/tests/data/test2053 @@ -38,16 +38,15 @@ http://10.0.0.1:8081/2053 --connect-to 10.0.0.1:8081:%HOSTIP:%HTTPPORT --next ht # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2053 HTTP/1.1 Host: 10.0.0.1:8081 +User-Agent: curl/%VERSION Accept: */* GET /2053 HTTP/1.1 Host: [fc00::1]:8082 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2054 b/tests/data/test2054 index 2a0b54ebc0..a79c59ca3a 100644 --- a/tests/data/test2054 +++ b/tests/data/test2054 @@ -38,24 +38,25 @@ http://%HOSTIP:%HTTPPORT/2054 --connect-to foo::bar: --connect-to :123::456 --ne # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2054 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /2054 HTTP/1.1 Host: www.example.com:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /2054 HTTP/1.1 Host: %HOSTIP:8083 +User-Agent: curl/%VERSION Accept: */* GET /2054 HTTP/1.1 Host: www.example.com:8084 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2055 b/tests/data/test2055 index a5fac62be5..5608b81f93 100644 --- a/tests/data/test2055 +++ b/tests/data/test2055 @@ -62,18 +62,17 @@ http://www.example.com.2055/2055 --connect-to ::connect.example.com.2055:%HTTPPO # # Verify data after the test has been "shot" - -^User-Agent:.* - CONNECT connect.example.com.2055:%HTTPPORT HTTP/1.1 Host: connect.example.com.2055:%HTTPPORT +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive GET /2055 HTTP/1.1 Host: www.example.com.2055 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2056 b/tests/data/test2056 index 5d2584eec0..fc3d14773d 100644 --- a/tests/data/test2056 +++ b/tests/data/test2056 @@ -53,13 +53,11 @@ CURL_STUB_GSS_CREDS="KRB5_Alice" # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2056 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Negotiate IktSQjVfQWxpY2UiOkhUVFBAMTI3LjAuMC4xOjE6QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQQ== +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2057 b/tests/data/test2057 index 92d7824c17..f9c379076d 100644 --- a/tests/data/test2057 +++ b/tests/data/test2057 @@ -69,18 +69,17 @@ CURL_STUB_GSS_CREDS="NTLM_Alice" # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2057 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Negotiate Ik5UTE1fQWxpY2UiOkhUVFBAMTI3LjAuMC4xOjI6QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQQ== +User-Agent: curl/%VERSION Accept: */* GET /2057 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Negotiate Ik5UTE1fQWxpY2UiOkhUVFBAMTI3LjAuMC4xOjM6QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQQ== +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2058 b/tests/data/test2058 index 613dff0013..e1a8014666 100644 --- a/tests/data/test2058 +++ b/tests/data/test2058 @@ -81,14 +81,11 @@ test # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://%HOSTIP:%HTTPPORT/2058 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Content-Range: bytes 2-4/5 -User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Content-Length: 0 @@ -97,6 +94,7 @@ GET http://%HOSTIP:%HTTPPORT/2058 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/2058", response="fbed69f9f3fd304c8f1acb1a43eb32688b933c0e28055c16b926cbcec070aeed", algorithm=SHA-256 Content-Range: bytes 2-4/5 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Content-Length: 3 diff --git a/tests/data/test2059 b/tests/data/test2059 index 15799ae07f..4b3ed0f502 100644 --- a/tests/data/test2059 +++ b/tests/data/test2059 @@ -81,14 +81,11 @@ test # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://%HOSTIP:%HTTPPORT/2059 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Content-Range: bytes 2-4/5 -User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Content-Length: 0 @@ -97,6 +94,7 @@ GET http://%HOSTIP:%HTTPPORT/2059 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="fddc3bc7b753b73ab0848fd83cb20cbbca971258eb8d20c941dd5e0b010d66be", realm="testrealm", nonce="1053604144", uri="/2059", response="fc09be8192851e284e73e8b719b32a2f6f91cca0594e68713da8c49dc2c1656e", algorithm=SHA-512-256, userhash=true Content-Range: bytes 2-4/5 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Content-Length: 3 diff --git a/tests/data/test206 b/tests/data/test206 index f99ac4c71e..494326495f 100644 --- a/tests/data/test206 +++ b/tests/data/test206 @@ -85,22 +85,21 @@ http://test.remote.haxx.se.206:8990/path/2060002 --proxy http://%HOSTIP:%HTTPPOR # Verify data after the test has been "shot" - -^User-Agent: curl/.* - CONNECT test.remote.haxx.se.206:8990 HTTP/1.1 Host: test.remote.haxx.se.206:8990 +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive CONNECT test.remote.haxx.se.206:8990 HTTP/1.1 Host: test.remote.haxx.se.206:8990 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.206:8990", response="003e36decb4dbf6366b3ecb9b87c24ec" +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive GET /path/2060002 HTTP/1.1 -User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4 Host: test.remote.haxx.se.206:8990 +User-Agent: curl/%VERSION Accept: */* [DISCONNECT] diff --git a/tests/data/test2060 b/tests/data/test2060 index 05ce35103c..dfb4bd5b36 100644 --- a/tests/data/test2060 +++ b/tests/data/test2060 @@ -81,14 +81,11 @@ test # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://%HOSTIP:%HTTPPORT/2060 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Content-Range: bytes 2-4/5 -User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Content-Length: 0 @@ -97,6 +94,7 @@ GET http://%HOSTIP:%HTTPPORT/2060 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/2060", response="3ce1e25ffa611bdbe90e2ab367b9602fa223db9f6de76ac667f0d6157e2178a6", algorithm=SHA-512-256 Content-Range: bytes 2-4/5 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Content-Length: 3 diff --git a/tests/data/test2061 b/tests/data/test2061 index bee88e34a0..6953423a36 100644 --- a/tests/data/test2061 +++ b/tests/data/test2061 @@ -65,18 +65,16 @@ http://%HOSTIP:%HTTPPORT/2061 -u testuser:testpass --digest # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2061 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /2061 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/2061", response="9dc55255f1a2537b838311674b621d45346b862a81631bb20e4ce356ef25062d", algorithm=SHA-256 -User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2062 b/tests/data/test2062 index f6d4aff24d..6075263de3 100644 --- a/tests/data/test2062 +++ b/tests/data/test2062 @@ -65,18 +65,16 @@ http://%HOSTIP:%HTTPPORT/2062 -u testuser:testpass --digest # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2062 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /2062 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/2062", response="2af735ec3508f4dff99248ffbbe9de9002bfd7cc770cfa2b026cb334042a54e3", algorithm=SHA-512-256 -User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2063 b/tests/data/test2063 index af9a9f0aa7..557e593613 100644 --- a/tests/data/test2063 +++ b/tests/data/test2063 @@ -65,18 +65,16 @@ http://%HOSTIP:%HTTPPORT/2063 -u testuser:testpass --digest # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2063 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /2063 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="75af8a3500f771e58a52093a25e7905d6e428a511285c12ea1420c73078dfd61", realm="testrealm", nonce="1053604145", uri="/2063", response="43f7ab531dff687b5dc75617daa59d1fd67d648341d6d2655ca65ef5064cfb51", algorithm=SHA-512-256, userhash=true -User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2064 b/tests/data/test2064 index bfaaa05e8f..fc196f2583 100644 --- a/tests/data/test2064 +++ b/tests/data/test2064 @@ -65,18 +65,16 @@ http://%HOSTIP:%HTTPPORT/2064 -u testuser:test2pass --digest # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2064 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /2064 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/2064", response="a9c3ec1036068b336cbabefe9dfcad52ee8b89bc7c91ddbb5bb415c6acdf38a5", algorithm=SHA-256 -User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2065 b/tests/data/test2065 index d18b008ad8..f352e6bcc2 100644 --- a/tests/data/test2065 +++ b/tests/data/test2065 @@ -65,18 +65,16 @@ http://%HOSTIP:%HTTPPORT/2065 -u testuser:test2pass --digest # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2065 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /2065 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/2065", response="5a5f20b0e601aeddc6f96422c2332d49ff431c49ab143b5f836ef76e9ac78f5e", algorithm=SHA-512-256 -User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2066 b/tests/data/test2066 index b6effee0e4..31a143d696 100644 --- a/tests/data/test2066 +++ b/tests/data/test2066 @@ -65,18 +65,16 @@ http://%HOSTIP:%HTTPPORT/2066 -u testuser:test2pass --digest # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2066 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /2066 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="75af8a3500f771e58a52093a25e7905d6e428a511285c12ea1420c73078dfd61", realm="testrealm", nonce="2053604145", uri="/2066", response="a2e2ae589f575fb132991d6f550ef14bf7ef697d2fef1242d2498f07eafc77dc", algorithm=SHA-512-256, userhash=true -User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2067 b/tests/data/test2067 index c203343e60..0ae407606f 100644 --- a/tests/data/test2067 +++ b/tests/data/test2067 @@ -66,12 +66,10 @@ HTTP POST --digest with SHA256 and user-specified Content-Length header # Verify data after the test has been "shot" - -^User-Agent:.* - POST /2067 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 0 Content-Type: application/x-www-form-urlencoded @@ -79,6 +77,7 @@ Content-Type: application/x-www-form-urlencoded POST /2067 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/2067", response="67b97af219c92fa7e8685e5bebb8e74892f6c6792e911c52bd2dfbf0b49272eb", algorithm=SHA-256 +User-Agent: curl/%VERSION Accept: */* Content-Length: 11 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test2068 b/tests/data/test2068 index 5a197ce27d..21003bdb26 100644 --- a/tests/data/test2068 +++ b/tests/data/test2068 @@ -66,12 +66,10 @@ HTTP POST --digest with SHA-512-256, userhash=false and user-specified Content-L # Verify data after the test has been "shot" - -^User-Agent:.* - POST /2068 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 0 Content-Type: application/x-www-form-urlencoded @@ -79,6 +77,7 @@ Content-Type: application/x-www-form-urlencoded POST /2068 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/2068", response="4bc9c97a72f1856bcec9b0e1518c6b7ee28773f91357d56840bdc30bd89ca68f", algorithm=SHA-512-256 +User-Agent: curl/%VERSION Accept: */* Content-Length: 11 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test2069 b/tests/data/test2069 index 99fd71d0ee..fb3d15dcd0 100644 --- a/tests/data/test2069 +++ b/tests/data/test2069 @@ -66,12 +66,10 @@ HTTP POST --digest with SHA-512-256, userhash=true and user-specified Content-Le # Verify data after the test has been "shot" - -^User-Agent:.* - POST /2069 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 0 Content-Type: application/x-www-form-urlencoded @@ -79,6 +77,7 @@ Content-Type: application/x-www-form-urlencoded POST /2069 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="fddc3bc7b753b73ab0848fd83cb20cbbca971258eb8d20c941dd5e0b010d66be", realm="testrealm", nonce="1053604144", uri="/2069", response="ff13d977110a471f30de75e747976e4de78d7a3d2425cd23ff46e67f4bc9ead7", algorithm=SHA-512-256, userhash=true +User-Agent: curl/%VERSION Accept: */* Content-Length: 11 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test207 b/tests/data/test207 index caff810579..1ce2338a3d 100644 --- a/tests/data/test207 +++ b/tests/data/test207 @@ -48,12 +48,10 @@ http://%HOSTIP:%HTTPPORT/207 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /207 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2070 b/tests/data/test2070 index f03c87b492..1039e84a52 100644 --- a/tests/data/test2070 +++ b/tests/data/test2070 @@ -49,12 +49,10 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2070 HTTP/1.1 Host: localhost:%HTTPSPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2073 b/tests/data/test2073 index ed942f018b..160ddbbcb9 100644 --- a/tests/data/test2073 +++ b/tests/data/test2073 @@ -42,11 +42,12 @@ http://%HOSTIP:%HTTPPORT/2073 -F 'name=a;filename=a.pdf' --next http://%HOSTIP:% # Verify data after the test has been "shot" -^(User-Agent:|Content-Type: multipart/form-data;|------------).* +^(Content-Type: multipart/form-data;|------------).* POST /2073 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 189 @@ -56,6 +57,7 @@ Content-Type: application/pdf a POST /2073 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 184 diff --git a/tests/data/test2074 b/tests/data/test2074 index ecff8fe7e9..e3e18126ce 100644 --- a/tests/data/test2074 +++ b/tests/data/test2074 @@ -43,13 +43,11 @@ http://%HOSTIP:%HTTPPORT/2074 --oauth2-bearer mF_9.B5f-4.1JqM # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2074 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Bearer mF_9.B5f-4.1JqM +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2076 b/tests/data/test2076 index 2c477b1a53..5974286f68 100644 --- a/tests/data/test2076 +++ b/tests/data/test2076 @@ -57,17 +57,16 @@ HTTP with digest auth and URI contains query # Verify data after the test has been "shot" - -^User-Agent:.* - GET /2076?query HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /2076?query HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/2076?query", response="5758bd3bbde7f33236e6ccd278eb59af" +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2078 b/tests/data/test2078 index 51ace296a6..c881b0499f 100644 --- a/tests/data/test2078 +++ b/tests/data/test2078 @@ -38,12 +38,10 @@ http://%HOSTIP:%HTTPPORT/2078 -u : --negotiate --data name=value 0 - -^User-Agent:.* - POST /2078 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 10 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test208 b/tests/data/test208 index 1c86558a85..abb30df97c 100644 --- a/tests/data/test208 +++ b/tests/data/test208 @@ -50,13 +50,11 @@ the # Verify data after the test has been "shot" - -^User-Agent:.* - PUT ftp://daniel:mysecret@host.com/we/want/208 HTTP/1.1 Host: host.com:21 Authorization: Basic ZGFuaWVsOm15c2VjcmV0 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Content-Length: 78 diff --git a/tests/data/test209 b/tests/data/test209 index 67a7fc513d..afe16bfa6b 100644 --- a/tests/data/test209 +++ b/tests/data/test209 @@ -101,23 +101,22 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent: curl/.* - CONNECT test.remote.example.com.209:%HTTPPORT HTTP/1.1 Host: test.remote.example.com.209:%HTTPPORT Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive CONNECT test.remote.example.com.209:%HTTPPORT HTTP/1.1 Host: test.remote.example.com.209:%HTTPPORT Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q= +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive GET /path/2090002 HTTP/1.1 -User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4 Host: test.remote.example.com.209:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test2100 b/tests/data/test2100 index 83aa7287b548eba38d8887ee0692bdcb636b8711..4352f61b43b7ba7a27024289ac485fbcc609f2c3 100644 GIT binary patch delta 41 wcmaFQ^NMGK6YJz8);p4+#i>QQj_Ij+B~}W_rA0aVs$s4{!JhtplWo|H0YoAWB>(^b delta 45 xcmaFG^PXpe6RT`-Nl|8j9amgvacYsSV|r>{iItufmyJGHe6l_3{mGVWh5&Rf4~qZ* diff --git a/tests/data/test213 b/tests/data/test213 index e6d7cd55ab..bb579971d0 100644 --- a/tests/data/test213 +++ b/tests/data/test213 @@ -101,23 +101,22 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent: curl/.* - CONNECT test.remote.example.com.213:%HTTPPORT HTTP/1.0 Host: test.remote.example.com.213:%HTTPPORT Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive CONNECT test.remote.example.com.213:%HTTPPORT HTTP/1.0 Host: test.remote.example.com.213:%HTTPPORT Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q= +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive POST /path/2130002 HTTP/1.1 -User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4 Host: test.remote.example.com.213:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 6 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test214 b/tests/data/test214 index 930182f5d3..3f305ee198 100644 --- a/tests/data/test214 +++ b/tests/data/test214 @@ -40,12 +40,10 @@ MSYS2_ARG_CONV_EXCL=http:// # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /{}\/214 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test217 b/tests/data/test217 index 4ab51a2f31..b06734473a 100644 --- a/tests/data/test217 +++ b/tests/data/test217 @@ -41,12 +41,10 @@ proxy # Verify data after the test has been "shot" - -^User-Agent: curl/.* - CONNECT test.remote.example.com.217:%HTTPPORT HTTP/1.1 Host: test.remote.example.com.217:%HTTPPORT +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive diff --git a/tests/data/test218 b/tests/data/test218 index 138c4b7b17..4951c264bf 100644 --- a/tests/data/test218 +++ b/tests/data/test218 @@ -39,12 +39,10 @@ just some tiny teeny contents # # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /218 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Transfer-Encoding: chunked Expect: 100-continue diff --git a/tests/data/test22 b/tests/data/test22 index f45f8627c9..57dd7ddaaa 100644 --- a/tests/data/test22 +++ b/tests/data/test22 @@ -32,13 +32,10 @@ get HTTP with URL > 10000 bytes # Verify data after the test has been "shot" - -^User-Agent: curl/.* - GET /aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/22 HTTP/1.1 -User-Agent: curl/7.4.2 (sparc-sun-solaris2.7) libcurl 7.4.2 (SSL 0.9.6) Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test220 b/tests/data/test220 index 7fd264345f..4b2e41672d 100644 --- a/tests/data/test220 +++ b/tests/data/test220 @@ -54,15 +54,13 @@ http://%HOSTIP:%HTTPPORT/220 --compressed # # Verify data after the test has been "shot" - -^User-Agent:.* - s/^Accept-Encoding: .*/Accept-Encoding: xxx/ GET /220 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Accept-Encoding: xxx diff --git a/tests/data/test221 b/tests/data/test221 index 3a85439d0f..3fab37f52c 100644 --- a/tests/data/test221 +++ b/tests/data/test221 @@ -54,15 +54,13 @@ http://%HOSTIP:%HTTPPORT/221 --compressed # # Verify data after the test has been "shot" - -^User-Agent:.* - s/^Accept-Encoding: .*/Accept-Encoding: xxx/ GET /221 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Accept-Encoding: xxx diff --git a/tests/data/test222 b/tests/data/test222 index 865266e07e..27d169fed9 100644 --- a/tests/data/test222 +++ b/tests/data/test222 @@ -185,15 +185,13 @@ http://%HOSTIP:%HTTPPORT/222 --compressed # # Verify data after the test has been "shot" - -^User-Agent:.* - s/^Accept-Encoding: .*/Accept-Encoding: xxx/ GET /222 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Accept-Encoding: xxx diff --git a/tests/data/test223 b/tests/data/test223 index 884967e3f6..52bbb7c6f9 100644 --- a/tests/data/test223 +++ b/tests/data/test223 @@ -75,15 +75,13 @@ http://%HOSTIP:%HTTPPORT/223 --compressed # # Verify data after the test has been "shot" - -^User-Agent:.* - s/^Accept-Encoding: .*/Accept-Encoding: xxx/ GET /223 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Accept-Encoding: xxx diff --git a/tests/data/test224 b/tests/data/test224 index a56046873a..b632ffd29b 100644 --- a/tests/data/test224 +++ b/tests/data/test224 @@ -90,15 +90,13 @@ http://%HOSTIP:%HTTPPORT/224 --compressed # # Verify data after the test has been "shot" - -^User-Agent:.* - s/^Accept-Encoding: .*/Accept-Encoding: xxx/ GET /224 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Accept-Encoding: xxx diff --git a/tests/data/test230 b/tests/data/test230 index 2174434b39..eb696da026 100644 --- a/tests/data/test230 +++ b/tests/data/test230 @@ -186,15 +186,13 @@ http://%HOSTIP:%HTTPPORT/230 --compressed # # Verify data after the test has been "shot" - -^User-Agent:.* - s/^Accept-Encoding: .*/Accept-Encoding: xxx/ GET /230 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Accept-Encoding: xxx diff --git a/tests/data/test232 b/tests/data/test232 index d0860c6163..e0e703422e 100644 --- a/tests/data/test232 +++ b/tests/data/test232 @@ -185,15 +185,13 @@ http://%HOSTIP:%HTTPPORT/232 --compressed # # Verify data after the test has been "shot" - -^User-Agent:.* - s/^Accept-Encoding: .*/Accept-Encoding: xxx/ GET /232 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Accept-Encoding: xxx diff --git a/tests/data/test233 b/tests/data/test233 index a38d8c95e1..eb732eae65 100644 --- a/tests/data/test233 +++ b/tests/data/test233 @@ -75,20 +75,19 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://first.host.it.is/we/want/that/page/233 HTTP/1.1 Host: first.host.it.is Proxy-Authorization: Basic dGVzdGluZzp0aGlz Authorization: Basic aWFtOm15c2VsZg== +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://goto.second.host.now/2330002 HTTP/1.1 Host: goto.second.host.now Proxy-Authorization: Basic dGVzdGluZzp0aGlz +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test234 b/tests/data/test234 index 9e197cd1d3..3c5146a373 100644 --- a/tests/data/test234 +++ b/tests/data/test234 @@ -77,14 +77,12 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://first.host.it.is/we/want/that/page/234 HTTP/1.1 Host: first.host.it.is Proxy-Authorization: Basic dGVzdGluZzp0aGlz Authorization: Basic aWFtOm15c2VsZg== +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive @@ -92,6 +90,7 @@ GET http://goto.second.host.now/2340002 HTTP/1.1 Host: goto.second.host.now Proxy-Authorization: Basic dGVzdGluZzp0aGlz Authorization: Basic aWFtOm15c2VsZg== +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test239 b/tests/data/test239 index b6f387933d..b9e1872355 100644 --- a/tests/data/test239 +++ b/tests/data/test239 @@ -76,14 +76,11 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent: curl/.* - POST http://%HOSTIP:%HTTPPORT/239 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Content-Length: 0 @@ -92,7 +89,7 @@ Content-Type: application/x-www-form-urlencoded POST http://%HOSTIP:%HTTPPORT/239 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q= -User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Content-Length: 6 diff --git a/tests/data/test24 b/tests/data/test24 index a2b28a9fdb..54147eddfd 100644 --- a/tests/data/test24 +++ b/tests/data/test24 @@ -30,13 +30,10 @@ http://%HOSTIP:%HTTPPORT/24 --fail --silent --show-error # Verify data after the test has been "shot" - -^User-Agent: curl/.* - GET /24 HTTP/1.1 -User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled) Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test240 b/tests/data/test240 index cd8594d63f..0d452ee259 100644 --- a/tests/data/test240 +++ b/tests/data/test240 @@ -45,12 +45,10 @@ HTTP-IPv6 GET # # Verify data after the test has been "shot" - -^User-Agent: - GET /240 HTTP/1.1 Host: %HOST6IP:%HTTP6PORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test241 b/tests/data/test241 index 46eae1f724..e530aaff52 100644 --- a/tests/data/test241 +++ b/tests/data/test241 @@ -43,12 +43,10 @@ HTTP-IPv6 GET (using ip6-localhost) # # Verify data after the test has been "shot" - -^User-Agent: - GET /241 HTTP/1.1 Host: ip6-localhost:%HTTP6PORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test242 b/tests/data/test242 index 9457c58c3c..aee927ea7b 100644 --- a/tests/data/test242 +++ b/tests/data/test242 @@ -40,13 +40,11 @@ HTTP-IPv6 GET with username+password in URL # # Verify data after the test has been "shot" - -^User-Agent: - GET /242 HTTP/1.1 Host: %HOST6IP:%HTTP6PORT Authorization: Basic Zm9vYmFyOmJhcmZvbw== +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test243 b/tests/data/test243 index f7b2386b52..87826a82ea 100644 --- a/tests/data/test243 +++ b/tests/data/test243 @@ -97,13 +97,10 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent: curl/.* - POST http://%HOSTIP:%HTTPPORT/243 HTTP/1.1 Host: %HOSTIP:%HTTPPORT -User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Content-Length: 6 @@ -112,7 +109,7 @@ Content-Type: application/x-www-form-urlencoded postitPOST http://%HOSTIP:%HTTPPORT/243 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Content-Length: 0 @@ -121,7 +118,7 @@ Content-Type: application/x-www-form-urlencoded POST http://%HOSTIP:%HTTPPORT/243 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q= -User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Content-Length: 6 diff --git a/tests/data/test245 b/tests/data/test245 index cbb5ee31d6..5750b4fa3b 100644 --- a/tests/data/test245 +++ b/tests/data/test245 @@ -63,13 +63,10 @@ http://%HOSTIP:%HTTPPORT/245 -u auser:apasswd --digest -d "junkelijunk" # Verify data after the test has been "shot" - -^User-Agent:.* - POST /245 HTTP/1.1 Host: %HOSTIP:%HTTPPORT -User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6 +User-Agent: curl/%VERSION Accept: */* Content-Length: 0 Content-Type: application/x-www-form-urlencoded @@ -77,7 +74,7 @@ Content-Type: application/x-www-form-urlencoded POST /245 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/245", response="379a439b1737ba257c1d2f103914b18b" -User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 +User-Agent: curl/%VERSION Accept: */* Content-Length: 11 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test246 b/tests/data/test246 index acf47da5df..b5469f3e51 100644 --- a/tests/data/test246 +++ b/tests/data/test246 @@ -73,13 +73,10 @@ http://%HOSTIP:%HTTPPORT/246 -u auser:apasswd --digest -d "junkelijunk" # Verify data after the test has been "shot" - -^User-Agent:.* - POST /246 HTTP/1.1 Host: %HOSTIP:%HTTPPORT -User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6 +User-Agent: curl/%VERSION Accept: */* Content-Length: 0 Content-Type: application/x-www-form-urlencoded @@ -87,7 +84,7 @@ Content-Type: application/x-www-form-urlencoded POST /246 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/246", response="761e6fc9a760c39d587092e8d840e740" -User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 +User-Agent: curl/%VERSION Accept: */* Content-Length: 11 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test249 b/tests/data/test249 index 4f99c2af70..6b3dc6ef1d 100644 --- a/tests/data/test249 +++ b/tests/data/test249 @@ -39,12 +39,10 @@ http://%HOSTIP:%HTTPPORT/249 -z "dec 12 12:00:00 1999 GMT" # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /249 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT diff --git a/tests/data/test25 b/tests/data/test25 index 15030ae926..d694cdc75e 100644 --- a/tests/data/test25 +++ b/tests/data/test25 @@ -73,38 +73,35 @@ http://%HOSTIP:%HTTPPORT/want/25 -L --max-redirs 5 # Verify data after the test has been "shot" - -^User-Agent: curl/.* - GET /want/25 HTTP/1.1 -User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled) Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /want/data/reply/25 HTTP/1.1 -User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled) Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /want/data/reply/data/reply/25 HTTP/1.1 -User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled) Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /want/data/reply/data/reply/data/reply/25 HTTP/1.1 -User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled) Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /want/data/reply/data/reply/data/reply/data/reply/25 HTTP/1.1 -User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled) Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /want/data/reply/data/reply/data/reply/data/reply/data/reply/25 HTTP/1.1 -User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled) Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test256 b/tests/data/test256 index 1567c62926..e873d579cd 100644 --- a/tests/data/test256 +++ b/tests/data/test256 @@ -45,14 +45,12 @@ proxy 33 - -^User-Agent:.* - GET http://%HOSTIP:%HTTPPORT/want/256 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Proxy-Authorization: Basic ZGFuaWVsOnN0ZW5iZXJn Range: bytes=78- +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test257 b/tests/data/test257 index 59a419bb17..e43baf56ea 100644 --- a/tests/data/test257 +++ b/tests/data/test257 @@ -85,27 +85,24 @@ machine anotherone.com login user2 password passwd2 # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://supersite.com/want/257 HTTP/1.1 Host: supersite.com Authorization: Basic dXNlcjE6cGFzc3dkMQ== -User-Agent: curl/7.14.0-CVS (i686-pc-linux-gnu) libcurl/7.14.0-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://anotherone.com/2570002 HTTP/1.1 Host: anotherone.com Authorization: Basic dXNlcjI6cGFzc3dkMg== -User-Agent: curl/7.14.0-CVS (i686-pc-linux-gnu) libcurl/7.14.0-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://athird.com/2570003 HTTP/1.1 Host: athird.com -User-Agent: curl/7.14.0-CVS (i686-pc-linux-gnu) libcurl/7.14.0-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test258 b/tests/data/test258 index 6c10564b87..c89d5f37ea 100644 --- a/tests/data/test258 +++ b/tests/data/test258 @@ -77,12 +77,12 @@ bar # Verify data after the test has been "shot" -^(User-Agent:|Content-Type: multipart/form-data;|------).* +^(Content-Type: multipart/form-data;|------).* POST http://remotehost:54321/we/want/258 HTTP/1.1 Host: remotehost:54321 -User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Content-Length: 409 @@ -107,8 +107,8 @@ bar ------------------------------7c633d5c27ce-- POST http://remotehost:54321/we/want/258 HTTP/1.1 Host: remotehost:54321 -User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/258", response="2501654ca391f0b5c8c12a1da77e34cd" +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Content-Length: 409 diff --git a/tests/data/test259 b/tests/data/test259 index 58d25120fa..d1da024329 100644 --- a/tests/data/test259 +++ b/tests/data/test259 @@ -73,12 +73,12 @@ bar # Verify data after the test has been "shot" -^(User-Agent:|Content-Type: multipart/form-data;|------).* +^(Content-Type: multipart/form-data;|------).* POST http://remotehost:54321/we/want/259 HTTP/1.1 Host: remotehost:54321 -User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Expect: 100-continue @@ -104,8 +104,8 @@ bar ------------------------------7c633d5c27ce-- POST http://remotehost:54321/we/want/259 HTTP/1.1 Host: remotehost:54321 -User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/259", response="b479994d13e60f3aa192a67c5892ddc5" +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Expect: 100-continue diff --git a/tests/data/test26 b/tests/data/test26 index 072dbf7d36..073fed3d36 100644 --- a/tests/data/test26 +++ b/tests/data/test26 @@ -31,13 +31,10 @@ http://%HOSTIP:%HTTPPORT/want/26 -o - -o - # Verify data after the test has been "shot" - -^User-Agent: curl.* - GET /want/26 HTTP/1.1 -User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled) Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test260 b/tests/data/test260 index 589e86e8a6..1e6dbe2e05 100644 --- a/tests/data/test260 +++ b/tests/data/test260 @@ -42,12 +42,10 @@ HTTP GET URL without slash but with questionmark # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /?260 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test262 b/tests/data/test262 index 4c28f22d7c4195d92b757c8f1600b451dfe39f4b..8f803cfbf459bc9e4b35d373bdd645390a748601 100644 GIT binary patch delta 41 wcmey!@rGl=E9S{uEM}6S#i>QQj_Ij+B~}W_rA0aVs$s4{!JhtplkHfH0XtL;$N&HU delta 45 xcmaFE@sVT0D`wf^lA_E4JFd9U;?yEt$Mn>^5-U9|E*pKY_~hrzmXobn3;~YF5G?=z diff --git a/tests/data/test263 b/tests/data/test263 index e10c20741f..6c054a11d9 100644 --- a/tests/data/test263 +++ b/tests/data/test263 @@ -41,12 +41,10 @@ HTTP-IPv6 GET with proxy specified using IPv6-numerical address # # Verify data after the test has been "shot" - -^User-Agent: - GET http://veryveryremotesite.com/263 HTTP/1.1 Host: veryveryremotesite.com +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test264 b/tests/data/test264 index 5aca0e6c5c..836c979a61 100644 --- a/tests/data/test264 +++ b/tests/data/test264 @@ -37,13 +37,11 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://we.want.that.site.com/264 HTTP/1.1 Host: we.want.that.site.com Proxy-Authorization: Basic ZmFrZTp1c2Vy +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test265 b/tests/data/test265 index a27633afcc..c620473032 100644 --- a/tests/data/test265 +++ b/tests/data/test265 @@ -102,23 +102,22 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent: curl/.* - CONNECT test.remote.example.com.265:%HTTPPORT HTTP/1.1 Host: test.remote.example.com.265:%HTTPPORT Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive CONNECT test.remote.example.com.265:%HTTPPORT HTTP/1.1 Host: test.remote.example.com.265:%HTTPPORT Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q= +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive POST /path/2650002 HTTP/1.1 -User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4 Host: test.remote.example.com.265:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 6 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test266 b/tests/data/test266 index 6b07a782bc..0997ae7b6a 100644 --- a/tests/data/test266 +++ b/tests/data/test266 @@ -56,12 +56,10 @@ http://%HOSTIP:%HTTPPORT/266 -D log/heads266 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /266 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test267 b/tests/data/test267 index a0c3d33c62..ed10b22a3d 100644 --- a/tests/data/test267 +++ b/tests/data/test267 @@ -82,14 +82,11 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - POST /267 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* Header1: yes Header2: no @@ -99,7 +96,7 @@ Content-Type: application/x-www-form-urlencoded POST /267 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q= -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* Header1: yes Header2: no diff --git a/tests/data/test268 b/tests/data/test268 index c9c7311abb..70a5a73dd1 100644 --- a/tests/data/test268 +++ b/tests/data/test268 @@ -42,12 +42,10 @@ HTTP POST a non-existing file # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /268 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 0 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test269 b/tests/data/test269 index 6b7159b0b5..ffecfedbf3 100644 --- a/tests/data/test269 +++ b/tests/data/test269 @@ -40,12 +40,10 @@ http://%HOSTIP:%HTTPPORT/269 --ignore-content-length # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /269 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test27 b/tests/data/test27 index 6fed3d9949..54b4f8a623 100644 --- a/tests/data/test27 +++ b/tests/data/test27 @@ -33,21 +33,21 @@ Get same cookie page several times # Verify data after the test has been "shot" - -^User-Agent: curl.* - GET /want/27 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /want/27 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Cookie: thewinneris=nowayyouwin GET /want/27 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Cookie: thewinneris=nowayyouwin diff --git a/tests/data/test273 b/tests/data/test273 index ce0be331e6..45c293512e 100644 --- a/tests/data/test273 +++ b/tests/data/test273 @@ -65,18 +65,16 @@ http://%HOSTIP:%HTTPPORT/273 -u testuser:testpass --digest # Verify data after the test has been "shot" - -^User-Agent:.* - GET /273 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /273 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/273", response="576ae57b1db0039f8c0de43ef58e49e3" -User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test274 b/tests/data/test274 index 579341c824..dd1b816de1 100644 --- a/tests/data/test274 +++ b/tests/data/test274 @@ -34,13 +34,10 @@ http://%HOSTIP:%HTTPPORT/want/274 -L --max-redirs 0 # Verify data after the test has been "shot" - -^User-Agent: curl/.* - GET /want/274 HTTP/1.1 -User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled) Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test275 b/tests/data/test275 index 6065b4d811..cff99d588f 100644 --- a/tests/data/test275 +++ b/tests/data/test275 @@ -64,14 +64,11 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - CONNECT remotesite.com.275:%HTTPPORT HTTP/1.1 Host: remotesite.com.275:%HTTPPORT Proxy-Authorization: Basic eW91YXJlOnlvdXJzZWxm -User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3 +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive @@ -79,11 +76,13 @@ Proxy-Connection: Keep-Alive GET /we/want/that/page/275 HTTP/1.1 Host: remotesite.com.275:%HTTPPORT Authorization: Basic aWFtOm15c2VsZg== +User-Agent: curl/%VERSION Accept: */* GET /we/want/that/page/275 HTTP/1.1 Host: remotesite.com.275:%HTTPPORT Authorization: Basic aWFtOm15c2VsZg== +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test276 b/tests/data/test276 index 34e2235e10..2fa554d9d8 100644 --- a/tests/data/test276 +++ b/tests/data/test276 @@ -59,16 +59,15 @@ HTTP Location: following with multiple question marks in URLs # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want?uri=http://anything/276?secondq/276 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /data/2760002.txt?coolsite=http://anotherurl/?a_second/2760002 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test277 b/tests/data/test277 index d3e9d0fa49..7b60d40ea2 100644 --- a/tests/data/test277 +++ b/tests/data/test277 @@ -33,17 +33,14 @@ http://%HOSTIP:%HTTPPORT/want/277 -F name=daniel -H "Content-Type: text/info" # Verify data after the test has been "shot" - -^User-Agent:.* - s/^--------------------------[a-z0-9]*/--------------------------/ s/boundary=------------------------[a-z0-9]*/boundary=------------------------/ POST /want/277 HTTP/1.1 -User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 146 Content-Type: text/info; boundary=------------------------ diff --git a/tests/data/test278 b/tests/data/test278 index 620f56b173..d706c33ce4 100644 --- a/tests/data/test278 +++ b/tests/data/test278 @@ -37,13 +37,11 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://we.want.that.site.com/278 HTTP/1.1 Host: we.want.that.site.com Proxy-Authorization: Basic ZmFrZTo= +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test279 b/tests/data/test279 index d5f4194f10..d26ddd9d8c 100644 --- a/tests/data/test279 +++ b/tests/data/test279 @@ -38,13 +38,11 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://we.want.that.site.com/279 HTTP/1.1 Host: we.want.that.site.com Proxy-Authorization: Basic ZmFrZTo= +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test28 b/tests/data/test28 index 1f80d5f486..703c6d35b0 100644 --- a/tests/data/test28 +++ b/tests/data/test28 @@ -58,16 +58,15 @@ http://%HOSTIP:%HTTPPORT/want/28 -L # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/28 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /online/1,1795,Welcome,00.html/280002.txt?logout=TRUE HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test281 b/tests/data/test281 index d399fc05b6..f78b0c1465 100644 --- a/tests/data/test281 +++ b/tests/data/test281 @@ -46,12 +46,10 @@ Weird 22 - -^User-Agent:.* - PUT /we/want/281 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 38 Expect: 100-continue diff --git a/tests/data/test282 b/tests/data/test282 index aa8aba5a2c..578c102a54 100644 --- a/tests/data/test282 +++ b/tests/data/test282 @@ -32,12 +32,10 @@ http://%HOSTIP:%HTTPPORT/282 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /282 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test29 b/tests/data/test29 index 9a7bd9ef9f..b8a59c34a3 100644 --- a/tests/data/test29 +++ b/tests/data/test29 @@ -36,12 +36,10 @@ http://%HOSTIP:%HTTPPORT/want/29 -m 2 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/29 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test292 b/tests/data/test292 index 800e8d1787..12d131dbf3 100644 --- a/tests/data/test292 +++ b/tests/data/test292 @@ -43,12 +43,10 @@ http://%HOSTIP:%HTTPPORT/292 --max-filesize 1000 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /292 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test293 b/tests/data/test293 index d75fc9a3c3..2181a8216d 100644 --- a/tests/data/test293 +++ b/tests/data/test293 @@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/293 --max-filesize 2 63 - -^User-Agent:.* - GET /293 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test299 b/tests/data/test299 index cfa743020f..b3fa473611 100644 --- a/tests/data/test299 +++ b/tests/data/test299 @@ -39,13 +39,11 @@ FTP over HTTP proxy with user:pass not in url # Verify data after the test has been "shot" - -^User-Agent:.* - GET ftp://michal:aybabtu@host.com/we/want/299 HTTP/1.1 Host: host.com:21 Authorization: Basic bWljaGFsOmF5YmFidHU= +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test3 b/tests/data/test3 index 0fe2764670..0dc3b4618a 100644 --- a/tests/data/test3 +++ b/tests/data/test3 @@ -43,13 +43,11 @@ HTTP POST with auth and contents but with content-length set to 0 # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /3 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Basic ZmFrZTotdXNlcg== +User-Agent: curl/%VERSION Accept: */* Content-Length: 37 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test30 b/tests/data/test30 index 70b8005f5d..ab4425db59 100644 --- a/tests/data/test30 +++ b/tests/data/test30 @@ -27,12 +27,10 @@ http://%HOSTIP:%HTTPPORT/want/30 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/30 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test300 b/tests/data/test300 index 7b4222d123..63e308d6df 100644 --- a/tests/data/test300 +++ b/tests/data/test300 @@ -39,12 +39,10 @@ simple HTTPS GET # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /300 HTTP/1.1 Host: %HOSTIP:%HTTPSPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test3000 b/tests/data/test3000 index e62e531686..1fc58f2f37 100644 --- a/tests/data/test3000 +++ b/tests/data/test3000 @@ -44,12 +44,10 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /3000 HTTP/1.1 Host: localhost:%HTTPSPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test3001 b/tests/data/test3001 index 706c3f7529..a16bdb45ae 100644 --- a/tests/data/test3001 +++ b/tests/data/test3001 @@ -44,12 +44,10 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /3001 HTTP/1.1 Host: localhost:%HTTPSPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test3008 b/tests/data/test3008 index 154ce20562..0010eeb86c 100644 --- a/tests/data/test3008 +++ b/tests/data/test3008 @@ -43,12 +43,10 @@ http://%HOSTIP:%HTTPPORT/this/is/the/3008 -O --output-dir %PWD/log # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /this/is/the/3008 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test3009 b/tests/data/test3009 index ec4bcea4d9..f9bf11b0e7 100644 --- a/tests/data/test3009 +++ b/tests/data/test3009 @@ -43,12 +43,10 @@ http://%HOSTIP:%HTTPPORT/this/is/the/3009 -O --output-dir %PWD/not-there # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /this/is/the/3009 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test301 b/tests/data/test301 index c404695789..760497a17c 100644 --- a/tests/data/test301 +++ b/tests/data/test301 @@ -40,13 +40,11 @@ HTTPS GET with user and password # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /301 HTTP/1.1 Host: %HOSTIP:%HTTPSPORT Authorization: Basic ZmFrZTp1c2Vy +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test3011 b/tests/data/test3011 index fcf7610508..267d6eeeb4 100644 --- a/tests/data/test3011 +++ b/tests/data/test3011 @@ -43,12 +43,10 @@ http://%HOSTIP:%HTTPPORT/this/is/the/3011 -O --output-dir %PWD/log/tmp --create- # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /this/is/the/3011 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test3012 b/tests/data/test3012 index 0a64faac4a..b4441cb187 100644 --- a/tests/data/test3012 +++ b/tests/data/test3012 @@ -46,12 +46,10 @@ http://%HOSTIP:%HTTPPORT/this/is/the/3012 -OJ --output-dir %PWD/log # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /this/is/the/3012 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test3013 b/tests/data/test3013 index d2fcfa4c01..206b9e37ac 100644 --- a/tests/data/test3013 +++ b/tests/data/test3013 @@ -46,16 +46,15 @@ http://%HOSTIP:%HTTPPORT/this/is/the/3013 -O --output-dir %PWD/log http://%HOSTI # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /this/is/the/3013 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /another/3013 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test3014 b/tests/data/test3014 index 7fab42fcd2..e36a0e02b7 100644 --- a/tests/data/test3014 +++ b/tests/data/test3014 @@ -48,11 +48,9 @@ testdata GET /1439 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* - -^User-Agent:.* - diff --git a/tests/data/test3015 b/tests/data/test3015 index 9adc88a350..9c86d024b2 100644 --- a/tests/data/test3015 +++ b/tests/data/test3015 @@ -57,16 +57,15 @@ http://%HOSTIP:%HTTPPORT/3015 -w "%{num_headers}\n" -L -o/dev/null # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /3015 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /30150001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test302 b/tests/data/test302 index 3eb9e7aeed..bdef98eea2 100644 --- a/tests/data/test302 +++ b/tests/data/test302 @@ -43,9 +43,6 @@ HTTPS GET over HTTP proxy fails 56 - -^User-Agent:.* - diff --git a/tests/data/test303 b/tests/data/test303 index 01dd9ebb19..e05da5b2f5 100644 --- a/tests/data/test303 +++ b/tests/data/test303 @@ -39,12 +39,10 @@ HTTPS with 8 secs timeout # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/303 HTTP/1.1 Host: %HOSTIP:%HTTPSPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test304 b/tests/data/test304 index 01d3a2d679..50baf1ca73 100644 --- a/tests/data/test304 +++ b/tests/data/test304 @@ -41,12 +41,12 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa # Verify data after the test has been "shot" -^(User-Agent:|Content-Type: multipart/form-data;|------).* +^(Content-Type: multipart/form-data;|------).* POST /we/want/304 HTTP/1.1 -User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 Host: %HOSTIP:%HTTPSPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 1386 Content-Type: multipart/form-data; boundary=----------------------------c3b2ef7f0bb8 diff --git a/tests/data/test305 b/tests/data/test305 index 858a0040e1..f60226cba3 100644 --- a/tests/data/test305 +++ b/tests/data/test305 @@ -25,9 +25,6 @@ https://%HOSTIP:%HTTPSPORT/want/305 --cacert moooo # Verify data after the test has been "shot" - -^User-Agent:.* - 77 diff --git a/tests/data/test306 b/tests/data/test306 index 17306f949b..b9150af875 100644 --- a/tests/data/test306 +++ b/tests/data/test306 @@ -52,12 +52,10 @@ HTTPS GET, receive no headers only data! # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /306 HTTP/1.1 Host: %HOSTIP:%HTTPSPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test307 b/tests/data/test307 index 03c2b3c2d0..5fb9faa474 100644 --- a/tests/data/test307 +++ b/tests/data/test307 @@ -43,12 +43,10 @@ simple HTTPS GET with openssl engine # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /307 HTTP/1.1 Host: %HOSTIP:%HTTPSPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test309 b/tests/data/test309 index 80246a9c07..c766fca674 100644 --- a/tests/data/test309 +++ b/tests/data/test309 @@ -65,16 +65,15 @@ HTTP Location: redirect to HTTPS URL # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/309 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /data/3090002.txt?coolsite=yes HTTP/1.1 Host: %HOSTIP:%HTTPSPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test31 b/tests/data/test31 index 633b480a97..0bf5633572 100644 --- a/tests/data/test31 +++ b/tests/data/test31 @@ -86,12 +86,10 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/31 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test310 b/tests/data/test310 index e7a9379aba..128c9176d0 100644 --- a/tests/data/test310 +++ b/tests/data/test310 @@ -44,12 +44,10 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /310 HTTP/1.1 Host: localhost:%HTTPSPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test314 b/tests/data/test314 index f4703cdebc..899200dc19 100644 --- a/tests/data/test314 +++ b/tests/data/test314 @@ -181,15 +181,13 @@ http://%HOSTIP:%HTTPPORT/314 --compressed # # Verify data after the test has been "shot" - -^User-Agent:.* - s/^Accept-Encoding: .*/Accept-Encoding: xxx/ GET /314 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Accept-Encoding: xxx diff --git a/tests/data/test315 b/tests/data/test315 index c75d9ae7b7..605bb0f2d1 100644 --- a/tests/data/test315 +++ b/tests/data/test315 @@ -71,15 +71,13 @@ http://%HOSTIP:%HTTPPORT/315 --compressed # # Verify data after the test has been "shot" - -^User-Agent:.* - s/^Accept-Encoding: .*/Accept-Encoding: xxx/ GET /315 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Accept-Encoding: xxx diff --git a/tests/data/test316 b/tests/data/test316 index a293b46cdb..6b95b37fd7 100644 --- a/tests/data/test316 +++ b/tests/data/test316 @@ -181,15 +181,13 @@ http://%HOSTIP:%HTTPPORT/316 --compressed # # Verify data after the test has been "shot" - -^User-Agent:.* - s/^Accept-Encoding: .*/Accept-Encoding: xxx/ GET /316 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Accept-Encoding: xxx diff --git a/tests/data/test317 b/tests/data/test317 index 68a9b5c797..b7723c72c1 100644 --- a/tests/data/test317 +++ b/tests/data/test317 @@ -75,13 +75,11 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://first.host.it.is/we/want/that/page/317 HTTP/1.1 Host: first.host.it.is Proxy-Authorization: Basic dGVzdGluZzp0aGlz +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Authorization: s3cr3t @@ -89,6 +87,7 @@ Authorization: s3cr3t GET http://goto.second.host.now/3170002 HTTP/1.1 Host: goto.second.host.now Proxy-Authorization: Basic dGVzdGluZzp0aGlz +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test318 b/tests/data/test318 index fd82c7aedb..6e3621e7ca 100644 --- a/tests/data/test318 +++ b/tests/data/test318 @@ -75,13 +75,11 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://first.host.it.is/we/want/that/page/318 HTTP/1.1 Host: first.host.it.is Proxy-Authorization: Basic dGVzdGluZzp0aGlz +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Authorization: s3cr3t @@ -89,6 +87,7 @@ Authorization: s3cr3t GET http://goto.second.host.now/3180002 HTTP/1.1 Host: goto.second.host.now Proxy-Authorization: Basic dGVzdGluZzp0aGlz +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Authorization: s3cr3t diff --git a/tests/data/test319 b/tests/data/test319 index 6a61a143a0..855ea3e56e 100644 --- a/tests/data/test319 +++ b/tests/data/test319 @@ -44,12 +44,10 @@ http://%HOSTIP:%HTTPPORT/319 --raw # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /319 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test32 b/tests/data/test32 index 992ffcbcfd..e2c5edfbae 100644 --- a/tests/data/test32 +++ b/tests/data/test32 @@ -42,13 +42,10 @@ HTTP with -d and -G # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /32?foo=moo&moo=poo HTTP/1.1 -User-Agent: curl/7.9.5 (i686-pc-linux-gnu) libcurl 7.9.5-cvs (OpenSSL 0.9.5) (ipv6 enabled) Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test325 b/tests/data/test325 index 922f37ba2b..93d7e21a3a 100644 --- a/tests/data/test325 +++ b/tests/data/test325 @@ -49,12 +49,10 @@ HTTPS with attempted redirect to denied HTTP # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /325 HTTP/1.1 Host: %HOSTIP:%HTTPSPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test326 b/tests/data/test326 index 1a4aae5f94..09ca9c0add 100644 --- a/tests/data/test326 +++ b/tests/data/test326 @@ -53,12 +53,10 @@ http://%HOSTIP:%HTTPPORT/326 --raw # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /326 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test327 b/tests/data/test327 index 3a1c071622..808a4e9d17 100644 --- a/tests/data/test327 +++ b/tests/data/test327 @@ -49,16 +49,15 @@ http://%HOSTIP:%HTTPPORT/we/want/327 -b none -c log/cookies327 http://%HOSTIP:%H # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/327 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /we/want/3270002 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Cookie: foobar=name diff --git a/tests/data/test328 b/tests/data/test328 index 93c00e1824..bc353a578e 100644 --- a/tests/data/test328 +++ b/tests/data/test328 @@ -42,12 +42,12 @@ http://%HOSTIP:%HTTPPORT/hello/328 --compressed # Verify data after the test has been "shot" -^User-Agent:.* ^Accept-Encoding:.* GET /hello/328 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test329 b/tests/data/test329 index 2274d475b1..e766c83ef6 100644 --- a/tests/data/test329 +++ b/tests/data/test329 @@ -52,17 +52,16 @@ http://%HOSTIP:%HTTPPORT/we/want/329 -b log/jar329.txt -H "Host: host.foo.com" h # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/329 HTTP/1.1 Host: host.foo.com +User-Agent: curl/%VERSION Accept: */* Cookie: test=no GET /we/want/3290002 HTTP/1.1 Host: host.foo.com +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test33 b/tests/data/test33 index 9f7c31fb15..6b3c9d72c5 100644 --- a/tests/data/test33 +++ b/tests/data/test33 @@ -42,14 +42,11 @@ http://%HOSTIP:%HTTPPORT/33 -Tlog/test33.txt -C 50 # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /33 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Content-Range: bytes 50-99/100 -User-Agent: curl/7.6 (sparc-sun-solaris2.7) libcurl 7.6-pre4 (SSL 0.9.6) (krb4 enabled) +User-Agent: curl/%VERSION Accept: */* Content-Length: 50 Expect: 100-continue diff --git a/tests/data/test330 b/tests/data/test330 index 6cda172f66..40cc09740a 100644 --- a/tests/data/test330 +++ b/tests/data/test330 @@ -73,18 +73,17 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://first.host.it.is/we/want/that/page/317 HTTP/1.1 Host: first.host.it.is +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Cookie: test=yes GET http://goto.second.host.now/3170002 HTTP/1.1 Host: goto.second.host.now +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test331 b/tests/data/test331 index 2ffac81f71..f6b008543c 100644 --- a/tests/data/test331 +++ b/tests/data/test331 @@ -48,17 +48,16 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://moo/we/want/331 HTTP/1.1 Host: moo +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://moo/we/want/3310002 HTTP/1.1 Host: moo +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive Cookie: moo=yes diff --git a/tests/data/test334 b/tests/data/test334 index c02a65b8d2..f43af23818 100644 --- a/tests/data/test334 +++ b/tests/data/test334 @@ -31,12 +31,10 @@ http://%HOSTIP:%HTTPPORT/want/334 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/334 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test335 b/tests/data/test335 index 91d9818275..e3e1950f12 100644 --- a/tests/data/test335 +++ b/tests/data/test335 @@ -73,20 +73,17 @@ http://digest:alot@data.from.server.requiring.digest.hohoho.com/335 --proxy http # Verify data after the test has been "shot" - -^User-Agent: curl/.* - GET http://data.from.server.requiring.digest.hohoho.com/335 HTTP/1.1 Host: data.from.server.requiring.digest.hohoho.com -User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://data.from.server.requiring.digest.hohoho.com/335 HTTP/1.1 Host: data.from.server.requiring.digest.hohoho.com Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/335", response="f61609cd8f5bb205ef4e169b2c5626cb" -User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive @@ -94,7 +91,7 @@ GET http://data.from.server.requiring.digest.hohoho.com/335 HTTP/1.1 Host: data.from.server.requiring.digest.hohoho.com Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/335", response="f61609cd8f5bb205ef4e169b2c5626cb" Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/335", response="08a2e2e684047f4219a38ddc189ac00c" -User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.3 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test338 b/tests/data/test338 index 0c040c28a9..83fe7263d8 100644 --- a/tests/data/test338 +++ b/tests/data/test338 @@ -45,16 +45,15 @@ http://%HOSTIP:%HTTPPORT/338 --next http://%HOSTIP:%HTTPPORT/338 --anyauth -u fo # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /338 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /338 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* [DISCONNECT] diff --git a/tests/data/test339 b/tests/data/test339 index 8da212e557..eca35947d5 100644 --- a/tests/data/test339 +++ b/tests/data/test339 @@ -46,12 +46,10 @@ http://%HOSTIP:%HTTPPORT/339 --etag-save log/etag339 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /339 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test34 b/tests/data/test34 index a332b8c4bd..fa4928d5c4 100644 --- a/tests/data/test34 +++ b/tests/data/test34 @@ -52,12 +52,10 @@ http://%HOSTIP:%HTTPPORT/34 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /34 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test341 b/tests/data/test341 index 5e952ad98f..726000d163 100644 --- a/tests/data/test341 +++ b/tests/data/test341 @@ -46,9 +46,6 @@ http://%HOSTIP:%HTTPPORT/341 --etag-compare log/etag341 # # Verify data after the test has been "shot" - -^User-Agent:.* - 26 diff --git a/tests/data/test342 b/tests/data/test342 index 75295cfa87..5a1615f1d8 100644 --- a/tests/data/test342 +++ b/tests/data/test342 @@ -44,12 +44,10 @@ http://%HOSTIP:%HTTPPORT/342 --etag-compare log/etag342 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /342 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* If-None-Match: "21025-dc7-39462498" diff --git a/tests/data/test343 b/tests/data/test343 index 5d877827f6..6e80776290 100644 --- a/tests/data/test343 +++ b/tests/data/test343 @@ -44,12 +44,10 @@ http://%HOSTIP:%HTTPPORT/343 --etag-compare log/etag343 --etag-save log/out343 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /343 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* If-None-Match: "21025-dc7-39462498" diff --git a/tests/data/test344 b/tests/data/test344 index 2b730d5241..5672366ecb 100644 --- a/tests/data/test344 +++ b/tests/data/test344 @@ -41,12 +41,10 @@ http://%HOSTIP:%HTTPPORT/344 --etag-compare log/etag344 --etag-save log/etag344 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /344 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* If-None-Match: "" diff --git a/tests/data/test345 b/tests/data/test345 index c30c06de96..87687324e4 100644 --- a/tests/data/test345 +++ b/tests/data/test345 @@ -44,12 +44,10 @@ http://%HOSTIP:%HTTPPORT/345 --etag-compare log/etag345 --etag-save log/etag345 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /345 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* If-None-Match: "21025-dc7-39462498" diff --git a/tests/data/test346 b/tests/data/test346 index 64923117e6..3ec7a1a9e2 100644 --- a/tests/data/test346 +++ b/tests/data/test346 @@ -44,14 +44,12 @@ HTTP GET over proxy with credentials using blank passwords # - -^User-Agent:.* - GET http://remote.example/346 HTTP/1.1 Host: remote.example Proxy-Authorization: Basic cHVzZXI6 Authorization: Basic c3VzZXI6 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test347 b/tests/data/test347 index 702c270f9c..3d55a5bd24 100644 --- a/tests/data/test347 +++ b/tests/data/test347 @@ -46,12 +46,10 @@ http://%HOSTIP:%HTTPPORT/347 --etag-save log/etag347 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /347 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test35 b/tests/data/test35 index 85733a456c2ce467ebd7526553eb01ddf098efc8..5b6aba0afb7ca6d0e8f682378d130bdbf2b3dd21 100644 GIT binary patch delta 41 wcmZ3*wv=syI@4r#COgT{;?yEt$Mn>^5-Ww|(xM!F)iBqfU{8O)$<0j50TRs(YybcN delta 45 xcmZ3=wu)_oI+JX1Nl|8j9amgvacYsSV|r>{iItufmyJGHe6k9Y - -^User-Agent:.* - GET /355 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test356 b/tests/data/test356 index c1234b4506..469ab0d1e1 100644 --- a/tests/data/test356 +++ b/tests/data/test356 @@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/356 --alt-svc "log/altsvc-356" # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /356 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test357 b/tests/data/test357 index d0437c6851..9e7ed86a5f 100644 --- a/tests/data/test357 +++ b/tests/data/test357 @@ -68,18 +68,17 @@ the # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /we/want/357 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 78 Expect: 100-continue PUT /we/want/357 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 78 diff --git a/tests/data/test36 b/tests/data/test36 index 4e3fd8c871..91db26ec62 100644 --- a/tests/data/test36 +++ b/tests/data/test36 @@ -52,12 +52,10 @@ http://%HOSTIP:%HTTPPORT/36 56 - -^User-Agent:.* - GET /36 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test37 b/tests/data/test37 index 7687623009..1dedfde79c 100644 --- a/tests/data/test37 +++ b/tests/data/test37 @@ -33,12 +33,10 @@ http://%HOSTIP:%HTTPPORT/37 52 - -^User-Agent:.* - GET /37 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test38 b/tests/data/test38 index db257f2f86..518aae95ba 100644 --- a/tests/data/test38 +++ b/tests/data/test38 @@ -41,13 +41,11 @@ download on. 33 - -^User-Agent:.* - GET /want/38 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Range: bytes=78- +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test39 b/tests/data/test39 index 3c6c57328b..de9a516312 100644 --- a/tests/data/test39 +++ b/tests/data/test39 @@ -40,12 +40,12 @@ foo # Verify data after the test has been "shot" -^(User-Agent:|Content-Type: multipart/form-data;|-------).* +^(Content-Type: multipart/form-data;|-------).* POST /we/want/39 HTTP/1.1 -User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 1184 Content-Type: multipart/form-data; boundary=----------------------------24e78000bd32 diff --git a/tests/data/test393 b/tests/data/test393 index f03e9a246d..67ce1c10fa 100644 --- a/tests/data/test393 +++ b/tests/data/test393 @@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/393 --max-filesize 2000000 63 - -^User-Agent:.* - GET /393 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test394 b/tests/data/test394 index b82039b4d7..ec7a06d92c 100644 --- a/tests/data/test394 +++ b/tests/data/test394 @@ -46,12 +46,10 @@ http://%HOSTIP:%HTTPPORT/394 8 - -^User-Agent:.* - GET /394 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test395 b/tests/data/test395 index 2a569bf3b6..fae55dbf0d 100644 --- a/tests/data/test395 +++ b/tests/data/test395 @@ -42,12 +42,10 @@ http://%HOSTIP:%HTTPPORT/395 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /395 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test396 b/tests/data/test396 index 1dd03421fa..01be58ac30 100644 --- a/tests/data/test396 +++ b/tests/data/test396 @@ -185,15 +185,13 @@ http://%HOSTIP:%HTTPPORT/396 --compressed # # Verify data after the test has been "shot" - -^User-Agent:.* - s/^Accept-Encoding: .*/Accept-Encoding: xxx/ GET /396 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Accept-Encoding: xxx diff --git a/tests/data/test397 b/tests/data/test397 index 6f872e2ac7..0afd21c604 100644 --- a/tests/data/test397 +++ b/tests/data/test397 @@ -181,15 +181,13 @@ http://%HOSTIP:%HTTPPORT/397 --compressed # # Verify data after the test has been "shot" - -^User-Agent:.* - s/^Accept-Encoding: .*/Accept-Encoding: xxx/ GET /397 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Accept-Encoding: xxx diff --git a/tests/data/test4 b/tests/data/test4 index 542347db5f..fe5789ad66 100644 --- a/tests/data/test4 +++ b/tests/data/test4 @@ -37,12 +37,10 @@ Replaced internal and added custom HTTP headers # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /4 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION extra-header: here Accept: replaced X-Custom-Header: @@ -51,6 +49,7 @@ X-Test2: foo; GET /4 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION extra-header: here Accept: replaced X-Custom-Header: diff --git a/tests/data/test40 b/tests/data/test40 index 6be0d16156..42bd8e13bc 100644 --- a/tests/data/test40 +++ b/tests/data/test40 @@ -56,17 +56,15 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/40 -L # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/are/all/twits/40 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /we/are/all/moo.html/?name=d+a+niel&testcase=/400002 HTTP/1.1 -User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test42 b/tests/data/test42 index e303f3a27b..abb3412eee 100644 --- a/tests/data/test42 +++ b/tests/data/test42 @@ -56,17 +56,15 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/42 -L # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/are/all/twits/42 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /we/are/all/m%20o%20o.html/420002 HTTP/1.1 -User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test43 b/tests/data/test43 index 1960170137..28035c8999 100644 --- a/tests/data/test43 +++ b/tests/data/test43 @@ -63,17 +63,16 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://%HOSTIP:%HTTPPORT/want/43 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://%HOSTIP:%HTTPPORT/want/data/430002.txt?coolsite=yes HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test430 b/tests/data/test430 index d4dc530dd7..4a669ff7ed 100644 --- a/tests/data/test430 +++ b/tests/data/test430 @@ -70,12 +70,10 @@ Three -K uses with --next and --data in each # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /4300001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* a: a Content-Length: 1 @@ -83,6 +81,7 @@ Content-Type: application/x-www-form-urlencoded aPOST /4300002 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* b: b Content-Length: 1 @@ -90,6 +89,7 @@ Content-Type: application/x-www-form-urlencoded bPOST /4300003 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* c: c Content-Length: 1 diff --git a/tests/data/test431 b/tests/data/test431 index 48a1b20a16..8f045482be 100644 --- a/tests/data/test431 +++ b/tests/data/test431 @@ -64,12 +64,10 @@ Two -K uses with --next and then one on cmdline # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /4310001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* a: a Content-Length: 1 @@ -77,6 +75,7 @@ Content-Type: application/x-www-form-urlencoded aPOST /4310002 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* b: b Content-Length: 1 @@ -84,6 +83,7 @@ Content-Type: application/x-www-form-urlencoded bPOST /4310003 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* c: c Content-Length: 1 diff --git a/tests/data/test432 b/tests/data/test432 index b3401b6877..a7bc37886e 100644 --- a/tests/data/test432 +++ b/tests/data/test432 @@ -69,12 +69,10 @@ Use -K with --next and --config from within # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /4320001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* a: a Content-Length: 1 @@ -82,6 +80,7 @@ Content-Type: application/x-www-form-urlencoded aPOST /4320002 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* b: b Content-Length: 1 @@ -89,6 +88,7 @@ Content-Type: application/x-www-form-urlencoded bPOST /4320003 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* c: c Content-Length: 1 diff --git a/tests/data/test433 b/tests/data/test433 index 90e54f05f2..e7cb4d225d 100644 --- a/tests/data/test433 +++ b/tests/data/test433 @@ -42,12 +42,10 @@ Verify XDG_CONFIG_HOME use to find .curlrc # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /433 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* a: a Content-Length: 11 diff --git a/tests/data/test434 b/tests/data/test434 index 2ab0fc1afd..a2bcc0cbdf 100644 --- a/tests/data/test434 +++ b/tests/data/test434 @@ -35,12 +35,10 @@ http # - -^User-Agent:.* - GET /434 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test44 b/tests/data/test44 index 8220a1aa11..4b1fa450bd 100644 --- a/tests/data/test44 +++ b/tests/data/test44 @@ -40,12 +40,12 @@ bar # Verify data after the test has been "shot" -^(User-Agent:|Content-Type: multipart/form-data;|------).* +^(Content-Type: multipart/form-data;|------).* POST /we/want/44 HTTP/1.1 -User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 408 Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce diff --git a/tests/data/test45 b/tests/data/test45 index 3eb9ba943f..1381920d99 100644 --- a/tests/data/test45 +++ b/tests/data/test45 @@ -59,16 +59,15 @@ simple HTTP Location: without protocol in initial URL # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/45 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /want/data.cgi?moo=http://&/450002 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test46 b/tests/data/test46 index 4ea259255d..c54a7f1fa0 100644 --- a/tests/data/test46 +++ b/tests/data/test46 @@ -59,12 +59,10 @@ domain..tld FALSE /want FALSE 0 empty # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/46 HTTP/1.1 Host: domain..tld:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Cookie: empty=; mooo2=indeed2; mooo=indeed diff --git a/tests/data/test47 b/tests/data/test47 index bd779d346b..2048f52299 100644 --- a/tests/data/test47 +++ b/tests/data/test47 @@ -35,12 +35,10 @@ http://%HOSTIP:%HTTPPORT/47 -0 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /47 HTTP/1.0 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test48 b/tests/data/test48 index 7ee05ad377..36bf656684 100644 --- a/tests/data/test48 +++ b/tests/data/test48 @@ -36,16 +36,15 @@ HTTP with -d and -G and -I # # Verify data after the test has been "shot" - -^User-Agent:.* - HEAD /48?foo=moo&moo=poo HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* HEAD /48?foo=moo&moo=poo HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* [DISCONNECT] diff --git a/tests/data/test49 b/tests/data/test49 index 4a4175e322..9192f92a15 100644 --- a/tests/data/test49 +++ b/tests/data/test49 @@ -56,17 +56,15 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/49 -L # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/are/all/twits/49 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /we/are/all/moo.html/490002 HTTP/1.1 -User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test490 b/tests/data/test490 index 86ebb01124..6f77b7111a 100644 --- a/tests/data/test490 +++ b/tests/data/test490 @@ -45,12 +45,10 @@ surprise! # # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /490 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 10 Expect: 100-continue @@ -58,6 +56,7 @@ Expect: 100-continue surprise! PUT /490 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 10 Expect: 100-continue diff --git a/tests/data/test491 b/tests/data/test491 index c230dfb782..87cebf1abd 100644 --- a/tests/data/test491 +++ b/tests/data/test491 @@ -45,12 +45,10 @@ surprise! # # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /491 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 10 Expect: 100-continue diff --git a/tests/data/test492 b/tests/data/test492 index ddb0405ef7..ab3c01fc2e 100644 --- a/tests/data/test492 +++ b/tests/data/test492 @@ -48,12 +48,10 @@ second 492 contents # # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /one/first492 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Testno: 492 Content-Length: 19 @@ -62,6 +60,7 @@ Expect: 100-continue first 492 contents PUT /two/first492 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Testno: 492 Content-Length: 19 @@ -70,6 +69,7 @@ Expect: 100-continue first 492 contents PUT /one/second492 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Testno: 492 Content-Length: 20 @@ -78,6 +78,7 @@ Expect: 100-continue second 492 contents PUT /two/second492 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Testno: 492 Content-Length: 20 diff --git a/tests/data/test5 b/tests/data/test5 index b98d27b3b0..6138820261 100644 --- a/tests/data/test5 +++ b/tests/data/test5 @@ -39,12 +39,10 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://%HOSTIP:%HTTPPORT/we/want/that/page/5 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test50 b/tests/data/test50 index 84b05da7b4..777caa259f 100644 --- a/tests/data/test50 +++ b/tests/data/test50 @@ -56,17 +56,15 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/50 -L # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/are/all/twits/50 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /we/are/moo.html/500002 HTTP/1.1 -User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test51 b/tests/data/test51 index b58c3570e7..7d9740ae95 100644 --- a/tests/data/test51 +++ b/tests/data/test51 @@ -56,17 +56,15 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/51 -L # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/are/all/twits/51 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /510002 HTTP/1.1 -User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test512 b/tests/data/test512 index d259f40dff..dd5cc0a073 100644 --- a/tests/data/test512 +++ b/tests/data/test512 @@ -40,9 +40,6 @@ http://%HOSTIP:%HTTPPORT/512 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /512 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test514 b/tests/data/test514 index ca37a5d659..82f8041fdf 100644 --- a/tests/data/test514 +++ b/tests/data/test514 @@ -44,9 +44,6 @@ http://%HOSTIP:%HTTPPORT/514 # # Verify data after the test has been "shot" - -^User-Agent:.* - HEAD /514 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test515 b/tests/data/test515 index 526f1e136a..bea2fe6f95 100644 --- a/tests/data/test515 +++ b/tests/data/test515 @@ -39,9 +39,6 @@ http://%HOSTIP:%HTTPPORT/515 # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /515 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test516 b/tests/data/test516 index 9bc175bd4c..c41d15e7ed 100644 --- a/tests/data/test516 +++ b/tests/data/test516 @@ -40,9 +40,6 @@ http://%HOSTIP:%HTTPPORT/516 # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /516 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test52 b/tests/data/test52 index 14fa42bfd0..196ff041c2 100644 --- a/tests/data/test52 +++ b/tests/data/test52 @@ -56,17 +56,15 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/52 -L # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/are/all/twits/52 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /we/are/all/twits/520002 HTTP/1.1 -User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test522 b/tests/data/test522 index 89a0dbf51e..8fc07c390a 100644 --- a/tests/data/test522 +++ b/tests/data/test522 @@ -43,9 +43,6 @@ http://%HOSTIP/522 %HTTPPORT # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /522 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test523 b/tests/data/test523 index c00a0969d4..03d456b05c 100644 --- a/tests/data/test523 +++ b/tests/data/test523 @@ -49,9 +49,6 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://www.example.com:19999/523 HTTP/1.1 Host: www.example.com:19999 diff --git a/tests/data/test53 b/tests/data/test53 index 679a4fa84f..bffd063e57 100644 --- a/tests/data/test53 +++ b/tests/data/test53 @@ -40,12 +40,10 @@ HTTP, junk session cookies # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/53 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Cookie: mooo=indeed diff --git a/tests/data/test54 b/tests/data/test54 index 66dbe9ddb3..24f081954f 100644 --- a/tests/data/test54 +++ b/tests/data/test54 @@ -32,12 +32,10 @@ http://%HOSTIP:%HTTPPORT/want/54 -L # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/54 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test540 b/tests/data/test540 index 871c558fba..8f53b072c6 100644 --- a/tests/data/test540 +++ b/tests/data/test540 @@ -79,9 +79,6 @@ http://test.remote.example.com/path/540 http://%HOSTIP:%HTTPPORT silly:person cu # Verify data after the test has been "shot" - -^User-Agent: curl/.* - GET http://test.remote.example.com/path/540 HTTP/1.1 Host: custom.set.host.name diff --git a/tests/data/test544 b/tests/data/test544 index 78cb5a45e1..4bf9a6cbb3 100644 --- a/tests/data/test544 +++ b/tests/data/test544 @@ -40,9 +40,6 @@ http://%HOSTIP:%HTTPPORT/544 # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /544 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test547 b/tests/data/test547 index e4ec398935..5401e06c89 100644 --- a/tests/data/test547 +++ b/tests/data/test547 @@ -100,13 +100,9 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent: curl/.* - POST http://test.remote.example.com/path/547 HTTP/1.1 Host: test.remote.example.com -User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Accept: */* Proxy-Connection: Keep-Alive Content-Length: 36 @@ -116,7 +112,6 @@ this is the blurb we want to upload POST http://test.remote.example.com/path/547 HTTP/1.1 Host: test.remote.example.com Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Accept: */* Proxy-Connection: Keep-Alive Content-Length: 0 @@ -125,7 +120,6 @@ Content-Type: application/x-www-form-urlencoded POST http://test.remote.example.com/path/547 HTTP/1.1 Host: test.remote.example.com Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q= -User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Accept: */* Proxy-Connection: Keep-Alive Content-Length: 36 diff --git a/tests/data/test548 b/tests/data/test548 index d636ab1b61..3ce5ae1eae 100644 --- a/tests/data/test548 +++ b/tests/data/test548 @@ -100,13 +100,9 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent: curl/.* - POST http://test.remote.example.com/path/548 HTTP/1.1 Host: test.remote.example.com -User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Accept: */* Proxy-Connection: Keep-Alive Content-Length: 36 @@ -116,7 +112,6 @@ this is the blurb we want to upload POST http://test.remote.example.com/path/548 HTTP/1.1 Host: test.remote.example.com Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Accept: */* Proxy-Connection: Keep-Alive Content-Length: 0 @@ -125,7 +120,6 @@ Content-Type: application/x-www-form-urlencoded POST http://test.remote.example.com/path/548 HTTP/1.1 Host: test.remote.example.com Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q= -User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Accept: */* Proxy-Connection: Keep-Alive Content-Length: 36 diff --git a/tests/data/test549 b/tests/data/test549 index a9f1ca21c1..93c442aaea 100644 --- a/tests/data/test549 +++ b/tests/data/test549 @@ -49,9 +49,6 @@ ftp://www.example.com/moo/549 http://%HOSTIP:%HTTPPORT # # Verify data after the test has been "shot" - -^User-Agent:.* - GET ftp://www.example.com/moo/549;type=i HTTP/1.1 Host: www.example.com:21 diff --git a/tests/data/test55 b/tests/data/test55 index 6623856085..216f13cefe 100644 --- a/tests/data/test55 +++ b/tests/data/test55 @@ -48,17 +48,15 @@ http://%HOSTIP:%HTTPPORT/55 -L - -^User-Agent:.* - GET /55 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /550002 HTTP/1.1 -User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test550 b/tests/data/test550 index 1eff72a17b..bd8f4223e1 100644 --- a/tests/data/test550 +++ b/tests/data/test550 @@ -49,9 +49,6 @@ ftp://www.example.com/moo/550 http://%HOSTIP:%HTTPPORT ascii # # Verify data after the test has been "shot" - -^User-Agent:.* - GET ftp://www.example.com/moo/550;type=a HTTP/1.1 Host: www.example.com:21 diff --git a/tests/data/test551 b/tests/data/test551 index bb31a36f85..30c0ed940e 100644 --- a/tests/data/test551 +++ b/tests/data/test551 @@ -75,9 +75,6 @@ http://test.remote.example.com/path/551 http://%HOSTIP:%HTTPPORT s1lly:pers0n # Verify data after the test has been "shot" - -^User-Agent: curl/.* - POST http://test.remote.example.com/path/551 HTTP/1.1 Host: test.remote.example.com diff --git a/tests/data/test552 b/tests/data/test552 index a02023a598fddc088f4813a688e4f5b67608b4b8..1177d9e1cf0f54d2cd4398d00fc0b25d975e8971 100644 GIT binary patch delta 22 ecmaEShhy&@jt!~o&E4$n-Rz9pyV;p;r~v?WaR~hY delta 58 zcmdmchvV@bjt!~o%Ecu`nFV%SaiPVjMY@jZsd*(<3dyBKIr@59TsHb(+2$nn_9S-3 K?MduRx77fTkra6V diff --git a/tests/data/test553 b/tests/data/test553 index bd937f016a..8b2cc7f247 100644 --- a/tests/data/test553 +++ b/tests/data/test553 @@ -41,9 +41,6 @@ http://%HOSTIP:%HTTPPORT/path/553 # Verify data after the test has been "shot" - -^User-Agent: curl/.* - POST /path/553 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test555 b/tests/data/test555 index ed8117f8fa..506cbb4a04 100644 --- a/tests/data/test555 +++ b/tests/data/test555 @@ -105,13 +105,9 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent: curl/.* - POST http://test.remote.example.com/path/555 HTTP/1.1 Host: test.remote.example.com -User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Accept: */* Proxy-Connection: Keep-Alive Content-Length: 36 @@ -121,7 +117,6 @@ this is the blurb we want to upload POST http://test.remote.example.com/path/555 HTTP/1.1 Host: test.remote.example.com Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Accept: */* Proxy-Connection: Keep-Alive Content-Length: 0 @@ -130,7 +125,6 @@ Content-Type: application/x-www-form-urlencoded POST http://test.remote.example.com/path/555 HTTP/1.1 Host: test.remote.example.com Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q= -User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Accept: */* Proxy-Connection: Keep-Alive Content-Length: 36 diff --git a/tests/data/test556 b/tests/data/test556 index 549b9a4a2c..72a8b9e477 100644 --- a/tests/data/test556 +++ b/tests/data/test556 @@ -38,9 +38,6 @@ http://%HOSTIP:%HTTPPORT # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /556 HTTP/1.2 Host: ninja diff --git a/tests/data/test560 b/tests/data/test560 index 8d005541f2..72a35e4b84 100644 --- a/tests/data/test560 +++ b/tests/data/test560 @@ -43,9 +43,6 @@ https://%HOSTIP:%HTTPSPORT/560 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /560 HTTP/1.1 Host: %HOSTIP:%HTTPSPORT diff --git a/tests/data/test561 b/tests/data/test561 index 359e54cca1..2f244617cb 100644 --- a/tests/data/test561 +++ b/tests/data/test561 @@ -50,9 +50,6 @@ FTP RETR with CURLOPT_PROXY_TRANSFER_MODE, ASCII transfer and type=i # # Verify data after the test has been "shot" - -^User-Agent:.* - GET ftp://www.example.com/moo/561;type=i HTTP/1.1 Host: www.example.com:21 diff --git a/tests/data/test57 b/tests/data/test57 index 0724eac822..5011e6eb00 100644 --- a/tests/data/test57 +++ b/tests/data/test57 @@ -35,12 +35,10 @@ HTTP content-type with spaces in text/html; charset=ISO-8859-4 - -^User-Agent:.* - GET /57 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test573 b/tests/data/test573 index e3299b8202..b76f259c9d 100644 --- a/tests/data/test573 +++ b/tests/data/test573 @@ -45,9 +45,6 @@ http://%HOSTIP:%HTTPPORT/573 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /573 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test58 b/tests/data/test58 index 1bd53fa275..f2eafe23a5 100644 --- a/tests/data/test58 +++ b/tests/data/test58 @@ -35,12 +35,10 @@ a few bytes # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /we/want/58te%5B%5Dst.txt HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 12 Expect: 100-continue diff --git a/tests/data/test580 b/tests/data/test580 index 13965598f4..b448ee337c 100644 --- a/tests/data/test580 +++ b/tests/data/test580 @@ -45,9 +45,6 @@ http://%HOSTIP:%HTTPPORT/580 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /580 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test581 b/tests/data/test581 index 83d7b604ec..92871c3e61 100644 --- a/tests/data/test581 +++ b/tests/data/test581 @@ -45,9 +45,6 @@ http://%HOSTIP:%HTTPPORT/581 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /581 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test585 b/tests/data/test585 index 2096e81c32..ecde4beb0f 100644 --- a/tests/data/test585 +++ b/tests/data/test585 @@ -56,9 +56,6 @@ http://%HOSTIP:%HTTPPORT/585 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /585 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test589 b/tests/data/test589 index 451bb15bda..81f7881001 100644 --- a/tests/data/test589 +++ b/tests/data/test589 @@ -41,9 +41,6 @@ http://%HOSTIP:%HTTPPORT/589 # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /589 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test59 b/tests/data/test59 index 9c96017780..b93f99d6ca 100644 --- a/tests/data/test59 +++ b/tests/data/test59 @@ -34,12 +34,10 @@ HTTP URL with slash but with "parameter" # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /?mooo/59 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test590 b/tests/data/test590 index 5ddc823a56..cb24cbb569 100644 --- a/tests/data/test590 +++ b/tests/data/test590 @@ -98,27 +98,22 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent: curl/.* - + GET http://test.remote.example.com/path/590 HTTP/1.1 Host: test.remote.example.com -User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Accept: */* Proxy-Connection: Keep-Alive GET http://test.remote.example.com/path/590 HTTP/1.1 Host: test.remote.example.com Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Accept: */* Proxy-Connection: Keep-Alive GET http://test.remote.example.com/path/590 HTTP/1.1 Host: test.remote.example.com Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAAAgACAHAAAAAIAAgAcgAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAAIWYOdZV0iKA8ytf+dU+Bz9TpMJ4mBKu221lY3VybGhvc3Q= -User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13 Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test6 b/tests/data/test6 index 0e7dc9b249..09664cdbb8 100644 --- a/tests/data/test6 +++ b/tests/data/test6 @@ -35,12 +35,10 @@ http://%HOSTIP:%HTTPPORT/we/want/that/page/6 -b "name=contents;name2=content2" # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/that/page/6 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Cookie: name=contents;name2=content2 diff --git a/tests/data/test60 b/tests/data/test60 index 0dd717f8db..09cd54f839 100644 --- a/tests/data/test60 +++ b/tests/data/test60 @@ -37,12 +37,10 @@ more than one byte # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /bzz/60 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Transfer-Encoding: chunked Content-Length: 1 diff --git a/tests/data/test61 b/tests/data/test61 index 2bf6490f79..67bee52e9a 100644 --- a/tests/data/test61 +++ b/tests/data/test61 @@ -51,12 +51,10 @@ http://%HOSTIP:%HTTPPORT/we/want/61 -c log/jar61.txt -H "Host: www.host.foo.com" # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/61 HTTP/1.1 Host: www.host.foo.com +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test62 b/tests/data/test62 index 82bc0d7836..03afba6c08 100644 --- a/tests/data/test62 +++ b/tests/data/test62 @@ -46,17 +46,16 @@ http://%HOSTIP:%HTTPPORT/we/want/62 http://%HOSTIP:%HTTPPORT/we/want/62?hoge=fug # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/62 HTTP/1.1 Host: www.host.foo.com +User-Agent: curl/%VERSION Accept: */* Cookie: test2=yes; test=yes GET /we/want/62?hoge=fuga HTTP/1.1 Host: www.host.foo.com +User-Agent: curl/%VERSION Accept: */* Cookie: test2=yes; test=yes diff --git a/tests/data/test63 b/tests/data/test63 index e7d7a4615c..b330c6afec 100644 --- a/tests/data/test63 +++ b/tests/data/test63 @@ -40,13 +40,11 @@ proxy # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://we.want.that.site.com/63 HTTP/1.1 Host: we.want.that.site.com Proxy-Authorization: Basic ZmFrZTp1c2Vy +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test64 b/tests/data/test64 index 804a6fa807..1e7a96eed9 100644 --- a/tests/data/test64 +++ b/tests/data/test64 @@ -65,18 +65,16 @@ http://%HOSTIP:%HTTPPORT/64 -u testuser:testpass --digest # Verify data after the test has been "shot" - -^User-Agent:.* - GET /64 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /64 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/64", response="c55f7f30d83d774a3d2dcacf725abaca" -User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test65 b/tests/data/test65 index f0b9742136..606523183f 100644 --- a/tests/data/test65 +++ b/tests/data/test65 @@ -65,18 +65,16 @@ http://%HOSTIP:%HTTPPORT/65 -u testuser:test2pass --digest # Verify data after the test has been "shot" - -^User-Agent:.* - GET /65 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /65 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/65", response="66d68d3251f1839576ba7c766cf9205b" -User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test658 b/tests/data/test658 index 2ed6d6429a..acf1846a69 100644 --- a/tests/data/test658 +++ b/tests/data/test658 @@ -38,9 +38,6 @@ http://%HOSTIP:%HTTPPORT/658 - -^User-Agent:.* - GET /658 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test659 b/tests/data/test659 index 048c0d0f24..f191a8e89c 100644 --- a/tests/data/test659 +++ b/tests/data/test659 @@ -42,9 +42,6 @@ proxy - -^User-Agent:.* - GET http://www.example.com:80/ HTTP/1.1 Host: www.example.com diff --git a/tests/data/test66 b/tests/data/test66 index 7b9af29538..23bb9e9c11 100644 --- a/tests/data/test66 +++ b/tests/data/test66 @@ -29,12 +29,10 @@ http://%HOSTIP:%HTTPPORT/66 --http0.9 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /66 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test662 b/tests/data/test662 index 53d97c39d6..3140c61c1e 100644 --- a/tests/data/test662 +++ b/tests/data/test662 @@ -59,17 +59,16 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://example.com/please/gimme/662 HTTP/1.1 Host: example.com +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://example.net/tes%20t%20case=/6620002 HTTP/1.1 Host: example.net +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test663 b/tests/data/test663 index c9c05a02d2..487be25031 100644 --- a/tests/data/test663 +++ b/tests/data/test663 @@ -63,17 +63,16 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://example.com/gimme/663?foobar HTTP/1.1 Host: example.com +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://example.net/there/tes%20t%20case=/6630002?+yes+no HTTP/1.1 Host: example.net +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test669 b/tests/data/test669 index 64cfc06591..47b974ca3a 100644 --- a/tests/data/test669 +++ b/tests/data/test669 @@ -34,17 +34,14 @@ http://%HOSTIP:%HTTPPORT/we/want/669 -H 'Content-type: multipart/form-data; char # Verify data after the test has been "shot" - -^User-Agent:.* - s/^--------------------------[a-z0-9]*/------------------------------/ s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/ POST /we/want/669 HTTP/1.1 -User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 242 Content-Type: multipart/form-data; charset=utf-8; boundary=---------------------------- diff --git a/tests/data/test67 b/tests/data/test67 index c0ccaf8f8e..8138c7418b 100644 --- a/tests/data/test67 +++ b/tests/data/test67 @@ -82,20 +82,17 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - GET /67 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* GET /67 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q= -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test674 b/tests/data/test674 index d1f1a86544..38ed39ef5f 100644 --- a/tests/data/test674 +++ b/tests/data/test674 @@ -39,9 +39,6 @@ http://%HOSTIP:%HTTPPORT/674 - -^User-Agent:.* - GET /674 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test68 b/tests/data/test68 index 1eaff6e7d3..57ab2580ce 100644 --- a/tests/data/test68 +++ b/tests/data/test68 @@ -81,20 +81,17 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - GET /68 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* GET /68 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q= -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test69 b/tests/data/test69 index 309f0394af..cc3178a6c0 100644 --- a/tests/data/test69 +++ b/tests/data/test69 @@ -98,25 +98,22 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - GET /69 HTTP/1.1 Host: %HOSTIP:%HTTPPORT -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* GET /69 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* GET /69 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q= -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test7 b/tests/data/test7 index 62731de130..317b235b9c 100644 --- a/tests/data/test7 +++ b/tests/data/test7 @@ -38,12 +38,10 @@ http://%HOSTIP:%HTTPPORT/we/want/7 -b none -D log/heads7.txt # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/7 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test70 b/tests/data/test70 index 9057d6a4b7..7057153e95 100644 --- a/tests/data/test70 +++ b/tests/data/test70 @@ -68,19 +68,16 @@ http://%HOSTIP:%HTTPPORT/70 -u testuser:testpass --anyauth # Verify data after the test has been "shot" - -^User-Agent:.* - GET /70 HTTP/1.1 Host: %HOSTIP:%HTTPPORT -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* GET /70 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/70", response="2c9a6f00af0d86497b177b90e90c688a" -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test700 b/tests/data/test700 index ac63fa59af..f43590db30 100644 --- a/tests/data/test700 +++ b/tests/data/test700 @@ -44,12 +44,10 @@ HTTP GET via SOCKS4 proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /700 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test701 b/tests/data/test701 index 799597f389..3b687ff01b 100644 --- a/tests/data/test701 +++ b/tests/data/test701 @@ -44,12 +44,10 @@ HTTP GET via SOCKS5 proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /701 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test708 b/tests/data/test708 index e8bffc3653..85aa95ed45 100644 --- a/tests/data/test708 +++ b/tests/data/test708 @@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/708 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /708 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test709 b/tests/data/test709 index fa7fbc0176..a2631521cb 100644 --- a/tests/data/test709 +++ b/tests/data/test709 @@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/709 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /709 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test710 b/tests/data/test710 index 884eb50a04..92df2f3580 100644 --- a/tests/data/test710 +++ b/tests/data/test710 @@ -44,12 +44,10 @@ http://%HOSTIP:%HTTPPORT/710 --proxy socks5://%HOSTIP:%SOCKSPORT # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /710 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test717 b/tests/data/test717 index dae50d9f21..5de8fcb694 100644 --- a/tests/data/test717 +++ b/tests/data/test717 @@ -55,12 +55,10 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /717 HTTP/1.1 Host: %HOSTIP:1 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test72 b/tests/data/test72 index 8e3adaa50d..1160121b26 100644 --- a/tests/data/test72 +++ b/tests/data/test72 @@ -67,19 +67,16 @@ http://%HOSTIP:%HTTPPORT/72 -u testuser:testpass --anyauth # Verify data after the test has been "shot" - -^User-Agent:.* - GET /72 HTTP/1.1 Host: %HOSTIP:%HTTPPORT -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* GET /72 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/72", response="9fcd1330377365a09bbcb33b2cbb25bd" -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test73 b/tests/data/test73 index 70408a8658..893377987e 100644 --- a/tests/data/test73 +++ b/tests/data/test73 @@ -35,12 +35,10 @@ http://%HOSTIP:%HTTPPORT/we/want/73 -c log/jar73.txt -H "Host: host.NOT_DISCLOSE # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/73 HTTP/1.1 Host: host.NOT_DISCLOSED.se +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test74 b/tests/data/test74 index dbe0e9c138..1a7d73fc35 100644 --- a/tests/data/test74 +++ b/tests/data/test74 @@ -50,16 +50,15 @@ HTTP, urlglob {}-retrieval and -o #[num] usage # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /74 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /740001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test75 b/tests/data/test75 index 62aeb119da..7bee044435 100644 --- a/tests/data/test75 +++ b/tests/data/test75 @@ -32,9 +32,6 @@ HTTP, urlglob retrieval with bad range # # Verify data after the test has been "shot" - -^User-Agent:.* - 3 diff --git a/tests/data/test76 b/tests/data/test76 index b6c47cd88a..fc4a30d03b 100644 --- a/tests/data/test76 +++ b/tests/data/test76 @@ -29,9 +29,6 @@ http://%HOSTIP:%NOLISTENPORT/76/ -O # # Verify data after the test has been "shot" - -^User-Agent:.* - 23 diff --git a/tests/data/test77 b/tests/data/test77 index 6a92158c8d..81ea637200 100644 --- a/tests/data/test77 +++ b/tests/data/test77 @@ -42,12 +42,10 @@ http://%HOSTIP:%HTTPPORT/77 -z "dec 12 12:00:00 1999 GMT" # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /77 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT diff --git a/tests/data/test78 b/tests/data/test78 index 6768000b46..d7f7d0fb0c 100644 --- a/tests/data/test78 +++ b/tests/data/test78 @@ -54,12 +54,10 @@ http://%HOSTIP:%HTTPPORT/78 -z "dec 12 11:00:00 1999 GMT" # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /78 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT diff --git a/tests/data/test79 b/tests/data/test79 index 9bc8366817..e967bae0f8 100644 --- a/tests/data/test79 +++ b/tests/data/test79 @@ -42,12 +42,10 @@ ftp://%HOSTIP:%HTTPPORT/we/want/that/page/79 -x %HOSTIP:%HTTPPORT # # Verify data after the test has been "shot" - -^User-Agent:.* - GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/79 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test8 b/tests/data/test8 index 2fc1900609..02c6c06204 100644 --- a/tests/data/test8 +++ b/tests/data/test8 @@ -55,12 +55,10 @@ perl -e 'if ("%HOSTIP" !~ /\.0\.0\.1$/) {print "Test only works for HOSTIPs endi # Verify data after the test has been "shot" - -^User-Agent:.* - GET /we/want/8 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Cookie: name with space=is weird but; trailingspace=removed; cookie=perhaps; cookie=yes; foobar=name; blexp=yesyes diff --git a/tests/data/test80 b/tests/data/test80 index 3e61eddde5..26b74f78ef 100644 --- a/tests/data/test80 +++ b/tests/data/test80 @@ -63,14 +63,11 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - CONNECT test.80:%HTTPPORT HTTP/1.0 Host: test.80:%HTTPPORT Proxy-Authorization: Basic eW91YXJlOnlvdXJzZWxm -User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3 +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive @@ -78,7 +75,7 @@ Proxy-Connection: Keep-Alive GET /we/want/that/page/80 HTTP/1.1 Host: test.80:%HTTPPORT Authorization: Basic aWFtOm15c2VsZg== -User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test81 b/tests/data/test81 index 29e558d9c4..6a49125576 100644 --- a/tests/data/test81 +++ b/tests/data/test81 @@ -82,21 +82,18 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://%HOSTIP:%HTTPPORT/81 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive GET http://%HOSTIP:%HTTPPORT/81 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q= -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test82 b/tests/data/test82 index 88d5da84dc..138c8ee40e 100644 --- a/tests/data/test82 +++ b/tests/data/test82 @@ -41,14 +41,11 @@ http://%HOSTIP:%HTTPPORT/82 --proxy-user testuser:testpass -x http://%HOSTIP:%HT # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://%HOSTIP:%HTTPPORT/82 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Proxy-Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M= -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test83 b/tests/data/test83 index 400e0a0f3c..6d7446d18b 100644 --- a/tests/data/test83 +++ b/tests/data/test83 @@ -60,13 +60,10 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - CONNECT test.83:%HTTPPORT HTTP/1.1 Host: test.83:%HTTPPORT -User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3 +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive @@ -74,7 +71,7 @@ Proxy-Connection: Keep-Alive GET /we/want/that/page/83 HTTP/1.1 Host: test.83:%HTTPPORT Authorization: Basic aWFtOm15OjtzZWxm -User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test84 b/tests/data/test84 index 4cfde6dbb7..37533e00d9 100644 --- a/tests/data/test84 +++ b/tests/data/test84 @@ -41,14 +41,11 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://%HOSTIP:%HTTPPORT/we/want/that/page/84 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Basic aWFtOm15c2VsZg== -User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test85 b/tests/data/test85 index 8b4cd6abcc..ebdc370524 100644 --- a/tests/data/test85 +++ b/tests/data/test85 @@ -44,15 +44,12 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://%HOSTIP:%HTTPPORT/we/want/that/page/85 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Proxy-Authorization: Basic dGVzdGluZzp0aGlz Authorization: Basic aWFtOm15c2VsZg== -User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test86 b/tests/data/test86 index a69509ae22..26b66c4313 100644 --- a/tests/data/test86 +++ b/tests/data/test86 @@ -64,23 +64,20 @@ HTTP, urlglob []-retrieval and -o #[num] usage # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /860001 HTTP/1.1 -User-Agent: curl/7.10.7-pre4 (i686-pc-linux-gnu) libcurl/7.10.7-pre4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /860002 HTTP/1.1 -User-Agent: curl/7.10.7-pre4 (i686-pc-linux-gnu) libcurl/7.10.7-pre4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /860003 HTTP/1.1 -User-Agent: curl/7.10.7-pre4 (i686-pc-linux-gnu) libcurl/7.10.7-pre4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test88 b/tests/data/test88 index e2d019c06e..40b0e8f4d8 100644 --- a/tests/data/test88 +++ b/tests/data/test88 @@ -75,19 +75,17 @@ four is the number of lines # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /88 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 0 PUT /88 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/88", response="78a49fa53d0c228778297687d4168e71" -User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* Content-Length: 85 Expect: 100-continue diff --git a/tests/data/test89 b/tests/data/test89 index fc620cb236..0537fa5d46 100644 --- a/tests/data/test89 +++ b/tests/data/test89 @@ -115,32 +115,29 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - GET /89 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* GET /89 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q= -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* GET /you/890010 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.10.8-pre1 (i686-pc-linux-gnu) libcurl/7.10.8-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS +User-Agent: curl/%VERSION Accept: */* GET /you/890010 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADYzMjE3MzIxAAAAAAAAAAAAAAAAAAAAAEcJ4YHOeb5ga2TCPwDhkyUIuHjBUHcLaHRlc3R1c2VyY3VybGhvc3Q= -User-Agent: curl/7.10.8-pre1 (i686-pc-linux-gnu) libcurl/7.10.8-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test9 b/tests/data/test9 index 53fe25eda4..adef69419c 100644 --- a/tests/data/test9 +++ b/tests/data/test9 @@ -40,12 +40,12 @@ bar # Verify data after the test has been "shot" -^(User-Agent:|Content-Type: multipart/form-data;|------------).* +^(Content-Type: multipart/form-data;|------------).* POST /we/want/9 HTTP/1.1 -User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 407 Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763 diff --git a/tests/data/test90 b/tests/data/test90 index d40b5a5711..91d569d08a 100644 --- a/tests/data/test90 +++ b/tests/data/test90 @@ -153,40 +153,39 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - GET /90 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /90 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* GET /90 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q= -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* GET /you/900010 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* GET /you/900010 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.10.8-pre1 (i686-pc-linux-gnu) libcurl/7.10.8-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS +User-Agent: curl/%VERSION Accept: */* GET /you/900010 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADYzMjE3MzIxAAAAAAAAAAAAAAAAAAAAAEcJ4YHOeb5ga2TCPwDhkyUIuHjBUHcLaHRlc3R1c2VyY3VybGhvc3Q= -User-Agent: curl/7.10.8-pre1 (i686-pc-linux-gnu) libcurl/7.10.8-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test91 b/tests/data/test91 index 4942bfddfe..314a655148 100644 --- a/tests/data/test91 +++ b/tests/data/test91 @@ -99,25 +99,22 @@ chkhostname curlhost # Verify data after the test has been "shot" - -^User-Agent:.* - GET /91 HTTP/1.1 Host: %HOSTIP:%HTTPPORT -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* GET /91 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* GET /91 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAgACABwAAAABgAGAHgAAAAIAAgAfgAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAAKBS3rdGYZEGsqW8otYHWXWBxC5mCuFmYm15ZG9tYWlubXlzZWxmY3VybGhvc3Q= -User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test92 b/tests/data/test92 index 728d271b07..7e03f0a129 100644 --- a/tests/data/test92 +++ b/tests/data/test92 @@ -54,13 +54,11 @@ http://%HOSTIP:%HTTPPORT/want/92 -C 87 # Verify data after the test has been "shot" - -^User-Agent:.* - GET /want/92 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Range: bytes=87- +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test93 b/tests/data/test93 index 58e47bc6bc..684e56cd49 100644 --- a/tests/data/test93 +++ b/tests/data/test93 @@ -39,12 +39,10 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - GET http://%HOSTIP:%HTTPPORT/93 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Proxy-Connection: Keep-Alive diff --git a/tests/data/test94 b/tests/data/test94 index 4ca53c63b8..6d54e78703 100644 --- a/tests/data/test94 +++ b/tests/data/test94 @@ -45,13 +45,10 @@ https://test.anything.really.com:94 --proxy1.0 %HOSTIP:%HTTPPORT 56 - -^User-Agent:.* - CONNECT test.anything.really.com:94 HTTP/1.0 -User-Agent: curl/7.11.0-CVS (i686-pc-linux-gnu) libcurl/7.11.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 Host: test.anything.really.com:94 +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive diff --git a/tests/data/test95 b/tests/data/test95 index afc00aedec..0b16c3cd12 100644 --- a/tests/data/test95 +++ b/tests/data/test95 @@ -60,20 +60,17 @@ proxy # # Verify data after the test has been "shot" - -^User-Agent:.* - CONNECT test.95:%HTTPPORT HTTP/1.1 -User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3 Host: test.95:%HTTPPORT +User-Agent: curl/%VERSION Proxy-Connection: Keep-Alive POST /we/want/that/page/95 HTTP/1.1 -User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3 Host: test.95:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 27 Content-Type: application/x-www-form-urlencoded diff --git a/tests/data/test97 b/tests/data/test97 index c1065bb196..d76941196d 100644 --- a/tests/data/test97 +++ b/tests/data/test97 @@ -36,12 +36,10 @@ HTTP POST with custom content-type # # Verify data after the test has been "shot" - -^User-Agent:.* - POST /97 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Type: silly/type Content-Length: 14 diff --git a/tests/data/test970 b/tests/data/test970 index bc5af5ba7e..ab1fc53a64 100644 --- a/tests/data/test970 +++ b/tests/data/test970 @@ -51,12 +51,10 @@ http://%HOSTIP:%HTTPPORT/970 --write-out '%{json}' -o log/out970 # # Verify data after the test has been "shot" - -^User-Agent:.* - GET /970 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test98 b/tests/data/test98 index b6d1182c66..ef0cded2ff 100644 --- a/tests/data/test98 +++ b/tests/data/test98 @@ -39,12 +39,10 @@ data on stdin # # Verify data after the test has been "shot" - -^User-Agent:.* - PUT /98 HTTP/1.1 Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION Accept: */* Content-Length: 14 Expect: 100-continue diff --git a/tests/data/test99 b/tests/data/test99 index 9797600cf5..2bbee7809e 100644 --- a/tests/data/test99 +++ b/tests/data/test99 @@ -55,13 +55,11 @@ http://%HOSTIP:%HTTPPORT/99 -C 9999999999 33 - -^User-Agent:.* - GET /99 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Range: bytes=9999999999- +User-Agent: curl/%VERSION Accept: */* diff --git a/tests/runtests.pl b/tests/runtests.pl index 3255221827..6a08e14e0e 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -163,6 +163,7 @@ my $TELNETPORT=$noport; # TELNET server port with negotiation my $HTTPUNIXPATH; # HTTP server Unix domain socket path my $SSHSRVMD5 = "[uninitialized]"; # MD5 of ssh server public key +my $VERSION; # curl's reported version number my $srcdir = $ENV{'srcdir'} || '.'; my $CURL="../src/curl".exe_ext('TOOL'); # what curl executable to run on the tests @@ -2863,8 +2864,9 @@ sub checksystem { for(@version) { chomp; - if($_ =~ /^curl/) { + if($_ =~ /^curl ([^ ]*)/) { $curl = $_; + $VERSION = $1; $curl =~ s/^(.*)(libcurl.*)/$1/g; $libcurl = $2; @@ -3261,6 +3263,7 @@ sub subVariables { $$thing =~ s/${prefix}CURL/$CURL/g; $$thing =~ s/${prefix}PWD/$pwd/g; $$thing =~ s/${prefix}POSIX_PWD/$posix_pwd/g; + $$thing =~ s/${prefix}VERSION/$VERSION/g; my $file_pwd = $pwd; if($file_pwd !~ /^\//) {