]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
tests: use `crlf=yes` attribute more
authorViktor Szakats <commit@vsz.me>
Thu, 30 Oct 2025 14:46:17 +0000 (15:46 +0100)
committerViktor Szakats <commit@vsz.me>
Fri, 31 Oct 2025 14:01:08 +0000 (15:01 +0100)
To make special newlines more explicit and visible.
Mostly in `<protocol>` sections, some in `<data*>` and `<upload>`.

Reducing the number of `tests/data/test*`:
- CRLF newlines from 21535 to 11337.
- files with mixed newlines from 1335 to 707.

Also delete empty `<protocol>` sections.

Closes #19284

1182 files changed:
tests/data/test100
tests/data/test1000
tests/data/test1003
tests/data/test1004
tests/data/test1005
tests/data/test1006
tests/data/test101
tests/data/test1010
tests/data/test1011
tests/data/test1012
tests/data/test1015
tests/data/test102
tests/data/test1021
tests/data/test1024
tests/data/test1025
tests/data/test1028
tests/data/test1029
tests/data/test103
tests/data/test1031
tests/data/test1032
tests/data/test1033
tests/data/test1036
tests/data/test1037
tests/data/test1038
tests/data/test1039
tests/data/test104
tests/data/test1040
tests/data/test1042
tests/data/test1043
tests/data/test1044
tests/data/test1045
tests/data/test1046
tests/data/test1047
tests/data/test1048
tests/data/test105
tests/data/test1054
tests/data/test1056
tests/data/test1057
tests/data/test1058
tests/data/test1059
tests/data/test106
tests/data/test1060
tests/data/test1061
tests/data/test1062
tests/data/test1066
tests/data/test1067
tests/data/test107
tests/data/test1070
tests/data/test1074
tests/data/test1076
tests/data/test1077
tests/data/test1078
tests/data/test1079
tests/data/test108
tests/data/test1080
tests/data/test1081
tests/data/test1082
tests/data/test1083
tests/data/test1086
tests/data/test1087
tests/data/test1088
tests/data/test1089
tests/data/test109
tests/data/test1090
tests/data/test1091
tests/data/test1092
tests/data/test1095
tests/data/test1096
tests/data/test1097
tests/data/test11
tests/data/test110
tests/data/test1100
tests/data/test1101
tests/data/test1102
tests/data/test1103
tests/data/test1104
tests/data/test1105
tests/data/test1106
tests/data/test1107
tests/data/test1108
tests/data/test1109
tests/data/test111
tests/data/test1110
tests/data/test1111
tests/data/test1112
tests/data/test1113
tests/data/test1115
tests/data/test1116
tests/data/test1117
tests/data/test1118
tests/data/test112
tests/data/test1120
tests/data/test1121
tests/data/test1122
tests/data/test1123
tests/data/test1124
tests/data/test1125
tests/data/test1126
tests/data/test1127
tests/data/test1128
tests/data/test1129
tests/data/test113
tests/data/test1130
tests/data/test1131
tests/data/test1137
tests/data/test114
tests/data/test1141
tests/data/test1142
tests/data/test1143
tests/data/test1144
tests/data/test1147
tests/data/test1148
tests/data/test1149
tests/data/test115
tests/data/test1150
tests/data/test1151
tests/data/test1152
tests/data/test1153
tests/data/test1154
tests/data/test1155
tests/data/test1157
tests/data/test1159
tests/data/test1160
tests/data/test1161
tests/data/test1162
tests/data/test1163
tests/data/test1164
tests/data/test1166
tests/data/test1168
tests/data/test117
tests/data/test1170
tests/data/test1171
tests/data/test1172
tests/data/test1174
tests/data/test1176
tests/data/test1178
tests/data/test118
tests/data/test1180
tests/data/test1181
tests/data/test1183
tests/data/test1184
tests/data/test1187
tests/data/test1188
tests/data/test119
tests/data/test1197
tests/data/test12
tests/data/test120
tests/data/test1200
tests/data/test1201
tests/data/test1202
tests/data/test1203
tests/data/test1204
tests/data/test1205
tests/data/test121
tests/data/test1210
tests/data/test1212
tests/data/test1213
tests/data/test1214
tests/data/test1215
tests/data/test1216
tests/data/test1217
tests/data/test1218
tests/data/test1219
tests/data/test122
tests/data/test1221
tests/data/test1223
tests/data/test1224
tests/data/test1225
tests/data/test1226
tests/data/test1227
tests/data/test1228
tests/data/test1229
tests/data/test123
tests/data/test1230
tests/data/test1231
tests/data/test1232
tests/data/test1233
tests/data/test1235
tests/data/test1237
tests/data/test1239
tests/data/test124
tests/data/test1240
tests/data/test1241
tests/data/test1244
tests/data/test1245
tests/data/test1246
tests/data/test1248
tests/data/test1249
tests/data/test1250
tests/data/test1251
tests/data/test1252
tests/data/test1253
tests/data/test1254
tests/data/test1255
tests/data/test1256
tests/data/test1257
tests/data/test1258
tests/data/test1259
tests/data/test126
tests/data/test1261
tests/data/test1262
tests/data/test1265
tests/data/test1266
tests/data/test1267
tests/data/test127
tests/data/test1270
tests/data/test1271
tests/data/test1272
tests/data/test1273
tests/data/test1274
tests/data/test1277
tests/data/test128
tests/data/test1280
tests/data/test1282
tests/data/test1283
tests/data/test1284
tests/data/test1286
tests/data/test1287
tests/data/test1288
tests/data/test129
tests/data/test1290
tests/data/test1292
tests/data/test1293
tests/data/test1294
tests/data/test1295
tests/data/test1296
tests/data/test1297
tests/data/test1298
tests/data/test1299
tests/data/test13
tests/data/test130
tests/data/test131
tests/data/test1310
tests/data/test1311
tests/data/test1312
tests/data/test1313
tests/data/test1314
tests/data/test1316
tests/data/test1317
tests/data/test1318
tests/data/test1319
tests/data/test132
tests/data/test1320
tests/data/test1321
tests/data/test1322
tests/data/test1324
tests/data/test1325
tests/data/test1326
tests/data/test1327
tests/data/test1328
tests/data/test133
tests/data/test1331
tests/data/test1332
tests/data/test1333
tests/data/test1334
tests/data/test1335
tests/data/test1336
tests/data/test1337
tests/data/test1338
tests/data/test1339
tests/data/test134
tests/data/test1340
tests/data/test1341
tests/data/test1342
tests/data/test1343
tests/data/test1344
tests/data/test1345
tests/data/test1346
tests/data/test1347
tests/data/test1348
tests/data/test1349
tests/data/test135
tests/data/test1350
tests/data/test1351
tests/data/test1352
tests/data/test1353
tests/data/test1354
tests/data/test1355
tests/data/test1356
tests/data/test1357
tests/data/test1358
tests/data/test1359
tests/data/test136
tests/data/test1360
tests/data/test1361
tests/data/test1362
tests/data/test1363
tests/data/test1364
tests/data/test1365
tests/data/test1366
tests/data/test1367
tests/data/test1368
tests/data/test1369
tests/data/test137
tests/data/test1370
tests/data/test1371
tests/data/test1372
tests/data/test1373
tests/data/test1374
tests/data/test1375
tests/data/test1376
tests/data/test1377
tests/data/test1378
tests/data/test1379
tests/data/test138
tests/data/test1380
tests/data/test1381
tests/data/test1382
tests/data/test1383
tests/data/test1384
tests/data/test1385
tests/data/test1386
tests/data/test1387
tests/data/test1388
tests/data/test1389
tests/data/test139
tests/data/test1390
tests/data/test1391
tests/data/test1392
tests/data/test1393
tests/data/test14
tests/data/test140
tests/data/test1400
tests/data/test1401
tests/data/test1402
tests/data/test1403
tests/data/test1405
tests/data/test1406
tests/data/test1407
tests/data/test1408
tests/data/test141
tests/data/test1411
tests/data/test1412
tests/data/test1413
tests/data/test1415
tests/data/test1416
tests/data/test1417
tests/data/test142
tests/data/test1420
tests/data/test1422
tests/data/test1423
tests/data/test1424
tests/data/test1425
tests/data/test1426
tests/data/test1428
tests/data/test1429
tests/data/test143
tests/data/test1430
tests/data/test1431
tests/data/test1432
tests/data/test1433
tests/data/test1434
tests/data/test1435
tests/data/test1436
tests/data/test1437
tests/data/test1438
tests/data/test1439
tests/data/test144
tests/data/test1443
tests/data/test1444
tests/data/test1448
tests/data/test1449
tests/data/test145
tests/data/test1455
tests/data/test1456
tests/data/test1457
tests/data/test1458
tests/data/test146
tests/data/test1465
tests/data/test1466
tests/data/test1467
tests/data/test1468
tests/data/test147
tests/data/test1470
tests/data/test1473
tests/data/test1475
tests/data/test1479
tests/data/test148
tests/data/test1480
tests/data/test1481
tests/data/test1482
tests/data/test1483
tests/data/test1484
tests/data/test1485
tests/data/test1487
tests/data/test149
tests/data/test1492
tests/data/test1493
tests/data/test1494
tests/data/test1495
tests/data/test1496
tests/data/test1497
tests/data/test1499
tests/data/test15
tests/data/test150
tests/data/test1501
tests/data/test1502
tests/data/test1503
tests/data/test1504
tests/data/test1505
tests/data/test1506
tests/data/test1507
tests/data/test151
tests/data/test1510
tests/data/test1512
tests/data/test1513
tests/data/test1514
tests/data/test1517
tests/data/test1518
tests/data/test1519
tests/data/test152
tests/data/test1520
tests/data/test153
tests/data/test1531
tests/data/test1532
tests/data/test1533
tests/data/test1534
tests/data/test1535
tests/data/test1536
tests/data/test1540
tests/data/test1541
tests/data/test1542
tests/data/test1543
tests/data/test1546
tests/data/test1547
tests/data/test1551
tests/data/test1552
tests/data/test1553
tests/data/test1555
tests/data/test1556
tests/data/test1561
tests/data/test1562
tests/data/test1563
tests/data/test1566
tests/data/test1567
tests/data/test1568
tests/data/test1569
tests/data/test157
tests/data/test1570
tests/data/test1571
tests/data/test1572
tests/data/test1575
tests/data/test1576
tests/data/test1577
tests/data/test1578
tests/data/test158
tests/data/test1580
tests/data/test1581
tests/data/test1582
tests/data/test159
tests/data/test1591
tests/data/test1593
tests/data/test1594
tests/data/test1595
tests/data/test1596
tests/data/test1598
tests/data/test16
tests/data/test160
tests/data/test161
tests/data/test1613
tests/data/test1617
tests/data/test162
tests/data/test1631
tests/data/test1632
tests/data/test1633
tests/data/test1634
tests/data/test1635
tests/data/test164
tests/data/test165
tests/data/test167
tests/data/test1670
tests/data/test168
tests/data/test169
tests/data/test17
tests/data/test170
tests/data/test1700
tests/data/test1701
tests/data/test1702
tests/data/test1704
tests/data/test171
tests/data/test1711
tests/data/test172
tests/data/test174
tests/data/test175
tests/data/test176
tests/data/test177
tests/data/test178
tests/data/test179
tests/data/test1800
tests/data/test1801
tests/data/test182
tests/data/test183
tests/data/test184
tests/data/test185
tests/data/test186
tests/data/test187
tests/data/test188
tests/data/test189
tests/data/test190
tests/data/test1904
tests/data/test1905
tests/data/test1906
tests/data/test1907
tests/data/test1908
tests/data/test1909
tests/data/test191
tests/data/test1910
tests/data/test1919
tests/data/test192
tests/data/test193
tests/data/test1933
tests/data/test1934
tests/data/test1935
tests/data/test1936
tests/data/test1937
tests/data/test195
tests/data/test1955
tests/data/test1956
tests/data/test1957
tests/data/test1958
tests/data/test1959
tests/data/test196
tests/data/test1964
tests/data/test197
tests/data/test1970
tests/data/test1971
tests/data/test1972
tests/data/test1974
tests/data/test1975
tests/data/test1977
tests/data/test198
tests/data/test199
tests/data/test2
tests/data/test2005
tests/data/test2023
tests/data/test2024
tests/data/test2025
tests/data/test2026
tests/data/test2027
tests/data/test2028
tests/data/test2029
tests/data/test2030
tests/data/test2031
tests/data/test2032
tests/data/test2033
tests/data/test2034
tests/data/test2037
tests/data/test2039
tests/data/test2040
tests/data/test2041
tests/data/test2046
tests/data/test2047
tests/data/test2049
tests/data/test2050
tests/data/test2051
tests/data/test2052
tests/data/test2053
tests/data/test2054
tests/data/test2055
tests/data/test2056
tests/data/test2057
tests/data/test2061
tests/data/test2062
tests/data/test2063
tests/data/test2064
tests/data/test2065
tests/data/test2066
tests/data/test2067
tests/data/test2068
tests/data/test2069
tests/data/test207
tests/data/test2070
tests/data/test2073
tests/data/test2074
tests/data/test2076
tests/data/test2078
tests/data/test2079
tests/data/test2081
tests/data/test2087
tests/data/test2088
tests/data/test2089
tests/data/test209
tests/data/test210
tests/data/test2100
tests/data/test211
tests/data/test213
tests/data/test214
tests/data/test215
tests/data/test216
tests/data/test217
tests/data/test22
tests/data/test220
tests/data/test221
tests/data/test222
tests/data/test223
tests/data/test224
tests/data/test227
tests/data/test228
tests/data/test229
tests/data/test230
tests/data/test2300
tests/data/test2301
tests/data/test2302
tests/data/test2303
tests/data/test2304
tests/data/test2306
tests/data/test2308
tests/data/test2309
tests/data/test232
tests/data/test233
tests/data/test234
tests/data/test235
tests/data/test236
tests/data/test237
tests/data/test238
tests/data/test239
tests/data/test24
tests/data/test240
tests/data/test2401
tests/data/test2404
tests/data/test2405
tests/data/test241
tests/data/test242
tests/data/test243
tests/data/test244
tests/data/test245
tests/data/test246
tests/data/test247
tests/data/test248
tests/data/test249
tests/data/test25
tests/data/test250
tests/data/test2501
tests/data/test2502
tests/data/test251
tests/data/test252
tests/data/test254
tests/data/test256
tests/data/test257
tests/data/test26
tests/data/test260
tests/data/test261
tests/data/test262
tests/data/test263
tests/data/test264
tests/data/test265
tests/data/test266
tests/data/test267
tests/data/test269
tests/data/test27
tests/data/test270
tests/data/test273
tests/data/test274
tests/data/test276
tests/data/test277
tests/data/test278
tests/data/test279
tests/data/test28
tests/data/test280
tests/data/test282
tests/data/test287
tests/data/test29
tests/data/test290
tests/data/test291
tests/data/test292
tests/data/test293
tests/data/test294
tests/data/test295
tests/data/test296
tests/data/test297
tests/data/test298
tests/data/test299
tests/data/test3
tests/data/test30
tests/data/test300
tests/data/test3000
tests/data/test3001
tests/data/test3002
tests/data/test3003
tests/data/test3004
tests/data/test3005
tests/data/test3006
tests/data/test3007
tests/data/test3008
tests/data/test3009
tests/data/test301
tests/data/test3011
tests/data/test3012
tests/data/test3013
tests/data/test3014
tests/data/test3015
tests/data/test3023
tests/data/test3024
tests/data/test3027
tests/data/test3028
tests/data/test303
tests/data/test3031
tests/data/test3032
tests/data/test3035
tests/data/test306
tests/data/test307
tests/data/test309
tests/data/test31
tests/data/test310
tests/data/test3100
tests/data/test3101
tests/data/test3102
tests/data/test314
tests/data/test315
tests/data/test316
tests/data/test317
tests/data/test318
tests/data/test319
tests/data/test320
tests/data/test3201
tests/data/test3202
tests/data/test3204
tests/data/test3206
tests/data/test3215
tests/data/test325
tests/data/test326
tests/data/test327
tests/data/test328
tests/data/test329
tests/data/test330
tests/data/test331
tests/data/test334
tests/data/test335
tests/data/test336
tests/data/test337
tests/data/test339
tests/data/test34
tests/data/test340
tests/data/test341
tests/data/test342
tests/data/test343
tests/data/test344
tests/data/test345
tests/data/test346
tests/data/test347
tests/data/test348
tests/data/test349
tests/data/test350
tests/data/test351
tests/data/test352
tests/data/test353
tests/data/test354
tests/data/test355
tests/data/test356
tests/data/test36
tests/data/test361
tests/data/test362
tests/data/test363
tests/data/test365
tests/data/test366
tests/data/test367
tests/data/test368
tests/data/test369
tests/data/test37
tests/data/test371
tests/data/test372
tests/data/test373
tests/data/test374
tests/data/test376
tests/data/test379
tests/data/test38
tests/data/test380
tests/data/test381
tests/data/test383
tests/data/test385
tests/data/test386
tests/data/test387
tests/data/test389
tests/data/test391
tests/data/test392
tests/data/test393
tests/data/test394
tests/data/test395
tests/data/test396
tests/data/test397
tests/data/test398
tests/data/test4
tests/data/test40
tests/data/test400
tests/data/test4000
tests/data/test401
tests/data/test402
tests/data/test403
tests/data/test406
tests/data/test407
tests/data/test408
tests/data/test409
tests/data/test410
tests/data/test412
tests/data/test413
tests/data/test414
tests/data/test415
tests/data/test416
tests/data/test417
tests/data/test42
tests/data/test43
tests/data/test430
tests/data/test431
tests/data/test432
tests/data/test433
tests/data/test434
tests/data/test435
tests/data/test436
tests/data/test437
tests/data/test440
tests/data/test441
tests/data/test442
tests/data/test443
tests/data/test444
tests/data/test45
tests/data/test457
tests/data/test46
tests/data/test47
tests/data/test471
tests/data/test473
tests/data/test475
tests/data/test476
tests/data/test477
tests/data/test478
tests/data/test479
tests/data/test483
tests/data/test486
tests/data/test49
tests/data/test493
tests/data/test494
tests/data/test495
tests/data/test5
tests/data/test50
tests/data/test500
tests/data/test505
tests/data/test51
tests/data/test510
tests/data/test511
tests/data/test512
tests/data/test514
tests/data/test515
tests/data/test516
tests/data/test518
tests/data/test519
tests/data/test52
tests/data/test520
tests/data/test521
tests/data/test522
tests/data/test523
tests/data/test524
tests/data/test525
tests/data/test526
tests/data/test527
tests/data/test528
tests/data/test529
tests/data/test53
tests/data/test530
tests/data/test531
tests/data/test532
tests/data/test533
tests/data/test534
tests/data/test535
tests/data/test537
tests/data/test538
tests/data/test539
tests/data/test54
tests/data/test541
tests/data/test542
tests/data/test546
tests/data/test549
tests/data/test55
tests/data/test550
tests/data/test556
tests/data/test56
tests/data/test560
tests/data/test561
tests/data/test562
tests/data/test563
tests/data/test564
tests/data/test565
tests/data/test566
tests/data/test567
tests/data/test569
tests/data/test57
tests/data/test570
tests/data/test573
tests/data/test574
tests/data/test575
tests/data/test580
tests/data/test581
tests/data/test584
tests/data/test585
tests/data/test586
tests/data/test589
tests/data/test59
tests/data/test590
tests/data/test595
tests/data/test597
tests/data/test598
tests/data/test6
tests/data/test61
tests/data/test62
tests/data/test627
tests/data/test63
tests/data/test64
tests/data/test644
tests/data/test646
tests/data/test647
tests/data/test648
tests/data/test649
tests/data/test65
tests/data/test650
tests/data/test651
tests/data/test652
tests/data/test653
tests/data/test658
tests/data/test659
tests/data/test66
tests/data/test660
tests/data/test661
tests/data/test662
tests/data/test663
tests/data/test667
tests/data/test669
tests/data/test67
tests/data/test670
tests/data/test671
tests/data/test672
tests/data/test673
tests/data/test674
tests/data/test675
tests/data/test676
tests/data/test677
tests/data/test678
tests/data/test679
tests/data/test68
tests/data/test681
tests/data/test682
tests/data/test683
tests/data/test684
tests/data/test685
tests/data/test687
tests/data/test688
tests/data/test689
tests/data/test69
tests/data/test693
tests/data/test695
tests/data/test696
tests/data/test698
tests/data/test7
tests/data/test70
tests/data/test700
tests/data/test701
tests/data/test706
tests/data/test707
tests/data/test708
tests/data/test709
tests/data/test710
tests/data/test711
tests/data/test712
tests/data/test713
tests/data/test714
tests/data/test715
tests/data/test717
tests/data/test718
tests/data/test719
tests/data/test72
tests/data/test720
tests/data/test721
tests/data/test73
tests/data/test74
tests/data/test742
tests/data/test744
tests/data/test753
tests/data/test754
tests/data/test756
tests/data/test757
tests/data/test762
tests/data/test77
tests/data/test775
tests/data/test78
tests/data/test79
tests/data/test794
tests/data/test796
tests/data/test797
tests/data/test799
tests/data/test8
tests/data/test80
tests/data/test800
tests/data/test801
tests/data/test802
tests/data/test803
tests/data/test804
tests/data/test805
tests/data/test806
tests/data/test807
tests/data/test808
tests/data/test809
tests/data/test81
tests/data/test810
tests/data/test811
tests/data/test812
tests/data/test813
tests/data/test814
tests/data/test815
tests/data/test816
tests/data/test817
tests/data/test818
tests/data/test819
tests/data/test82
tests/data/test820
tests/data/test821
tests/data/test822
tests/data/test823
tests/data/test824
tests/data/test825
tests/data/test826
tests/data/test827
tests/data/test828
tests/data/test83
tests/data/test830
tests/data/test831
tests/data/test832
tests/data/test833
tests/data/test834
tests/data/test835
tests/data/test836
tests/data/test837
tests/data/test838
tests/data/test839
tests/data/test84
tests/data/test840
tests/data/test841
tests/data/test842
tests/data/test843
tests/data/test844
tests/data/test845
tests/data/test846
tests/data/test847
tests/data/test848
tests/data/test849
tests/data/test85
tests/data/test850
tests/data/test851
tests/data/test852
tests/data/test853
tests/data/test854
tests/data/test855
tests/data/test856
tests/data/test857
tests/data/test858
tests/data/test859
tests/data/test86
tests/data/test860
tests/data/test861
tests/data/test862
tests/data/test863
tests/data/test864
tests/data/test865
tests/data/test866
tests/data/test867
tests/data/test868
tests/data/test869
tests/data/test870
tests/data/test871
tests/data/test872
tests/data/test873
tests/data/test874
tests/data/test876
tests/data/test877
tests/data/test878
tests/data/test879
tests/data/test880
tests/data/test881
tests/data/test882
tests/data/test883
tests/data/test884
tests/data/test885
tests/data/test886
tests/data/test887
tests/data/test888
tests/data/test889
tests/data/test89
tests/data/test890
tests/data/test891
tests/data/test892
tests/data/test893
tests/data/test895
tests/data/test897
tests/data/test898
tests/data/test90
tests/data/test900
tests/data/test901
tests/data/test902
tests/data/test903
tests/data/test904
tests/data/test905
tests/data/test906
tests/data/test907
tests/data/test908
tests/data/test909
tests/data/test91
tests/data/test910
tests/data/test911
tests/data/test912
tests/data/test913
tests/data/test914
tests/data/test915
tests/data/test916
tests/data/test917
tests/data/test918
tests/data/test919
tests/data/test92
tests/data/test920
tests/data/test921
tests/data/test922
tests/data/test923
tests/data/test924
tests/data/test925
tests/data/test926
tests/data/test927
tests/data/test928
tests/data/test929
tests/data/test93
tests/data/test930
tests/data/test932
tests/data/test933
tests/data/test934
tests/data/test935
tests/data/test936
tests/data/test937
tests/data/test938
tests/data/test939
tests/data/test94
tests/data/test940
tests/data/test941
tests/data/test942
tests/data/test943
tests/data/test944
tests/data/test945
tests/data/test946
tests/data/test947
tests/data/test948
tests/data/test949
tests/data/test950
tests/data/test951
tests/data/test952
tests/data/test953
tests/data/test954
tests/data/test955
tests/data/test956
tests/data/test957
tests/data/test958
tests/data/test959
tests/data/test960
tests/data/test961
tests/data/test962
tests/data/test963
tests/data/test964
tests/data/test965
tests/data/test966
tests/data/test967
tests/data/test968
tests/data/test969
tests/data/test973
tests/data/test974
tests/data/test975
tests/data/test976
tests/data/test980
tests/data/test981
tests/data/test982
tests/data/test983
tests/data/test984
tests/data/test987
tests/data/test988
tests/data/test989
tests/data/test99
tests/data/test992
tests/data/test993
tests/data/test997
tests/data/test998
tests/data/test999

index b7554383ea304a7024c6a306ed7faa0e4cb94c43..152633ba8016f022c45356ca54a52c76385b385b 100644 (file)
@@ -41,15 +41,15 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD test-%TESTNUMBER\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD test-%TESTNUMBER
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index fe94010ac313d4a0c75fda2cbf766e7962e61104..e679207d304c25eb9bdad4458042421bad243468 100644 (file)
@@ -31,12 +31,12 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ -I
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index c4a1bb001af7bae93788cb448fc899f8d73f2b9d..a4104d216bc20524ba39c5f137c11f6ceb11f666 100644 (file)
@@ -33,16 +33,16 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 33faaafb197b829c8973443cfe9aa316bf19c344..d7c0ae51760a88390cb4f31b2a0dd5aa19ede65e 100644 (file)
@@ -46,12 +46,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy ""
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 1827fbdc8cad0f3f8cd66185df9fd716942f7e54..356de5a55636fb15cf6cd6c3a469652eda6b033f 100644 (file)
@@ -33,16 +33,16 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 13d426d05395e2b9340a73b018f818f663babc8f..a714a899bc1c648fd8cd1b4fa0b5d5cecafa74a9 100644 (file)
@@ -34,16 +34,16 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 3febc5e72aa5ebffce1f157a70f91c0fc1717304..6f0d79efce0e81c3d1ba63f37e3eafc92252e26c 100644 (file)
@@ -43,14 +43,14 @@ ftp://%HOSTIP:%FTPPORT/ -P %CLIENTIP
 ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
 ^EPRT \|1\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|\d{1,5}\|
 </strip>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-PORT 127,0,0,1,243,212\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+PORT 127,0,0,1,243,212
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index d45efdc8a5e4e29cb5b7e4873ecb3f7d59ca74fb..7f5701d32e730c5a5acabedaaa7be7d51a7c6150 100644 (file)
@@ -42,16 +42,16 @@ ftp://%HOSTIP:%FTPPORT//list/this/path/%TESTNUMBER/ ftp://%HOSTIP:%FTPPORT//list
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE A\r
-LIST /list/this/path/%TESTNUMBER\r
-EPSV\r
-LIST /list/this/path/%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE A
+LIST /list/this/path/%TESTNUMBER
+EPSV
+LIST /list/this/path/%TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index d6a3d1aa7d072a14bfd458646beef124a8f9cb8c..0ef87ae1a6b8882142a103872b36482fd21d8f9a 100644 (file)
@@ -56,19 +56,19 @@ http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo"
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-POST /blah/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 3\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-mooGET /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+POST /blah/%TESTNUMBER 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=/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index da6ec61922d070f51ea6e0d8beaaca78e6226faa..5ced62b24d48d7cd450c9b6eef9848bc7afd5655 100644 (file)
@@ -56,21 +56,21 @@ http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post301
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /blah/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 3\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-mooPOST /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 3\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /blah/%TESTNUMBER 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=/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 3
+Content-Type: application/x-www-form-urlencoded
+
 moo
 </protocol>
 </verify>
index fc26149121d6130f2b22bcc9a872ec93038ffa64..52a7d3e9572e359318a678ef3ab6f2afa7ea2f70 100644 (file)
@@ -38,14 +38,14 @@ content to _?!#$'|<>
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 119\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 119
+Content-Type: application/x-www-form-urlencoded
+
 my+name+is+moo%5B%5D&y e s=s_i_r&v_alue=content+to+_%3F%21%23%24%27%7C%3C%3E%0A&content+to+_%3F%21%23%24%27%7C%3C%3E%0A
 </protocol>
 </verify>
index 7037986f46a961b14338baba6929faacf3e9777d..99fda2dcc9cd756c91975bfb6e0a4549c8fd5b5f 100644 (file)
@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-PASV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+PASV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index bb34615fd6118e8164f0ba30de0f8339947fbb7e..25fb2bfc3c1d257bb7470561d74be3b51c846ed8 100644 (file)
@@ -106,29 +106,29 @@ http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --prox
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
-Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Proxy-Connection: Keep-Alive\r
-\r
-CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
-Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
-Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Proxy-Connection: Keep-Alive\r
-\r
-CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
-Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
-Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-User-Agent: curl/%VERSION\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET /path/%TESTNUMBER0002 HTTP/1.1\r
-Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
+GET /path/%TESTNUMBER0002 HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 55deec98bbdb01ce14d3539de7b356e940539413..24c5e6ca67eba1c2d01dfa6dc071642f3ba549d9 100644 (file)
@@ -84,23 +84,23 @@ cookies
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /data/%TESTNUMBER0002.txt HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /want/%TESTNUMBER0003.txt HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: firstcookie=want\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /data/%TESTNUMBER0002.txt HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /want/%TESTNUMBER0003.txt HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Cookie: firstcookie=want
+
 </protocol>
 </verify>
 </testcase>
index 762e34a8354e15c8e9bf5b4998bdc52e4e568e2b..c08a157d570c75bbbff7c593627bf0590542e43e 100644 (file)
@@ -84,25 +84,25 @@ cookies
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: forcedcookie=yes\r
-\r
-GET /data/%TESTNUMBER0002.txt HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: forcedcookie=yes\r
-\r
-GET /want/%TESTNUMBER0003.txt HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: firstcookie=want; forcedcookie=yes\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Cookie: forcedcookie=yes
+
+GET /data/%TESTNUMBER0002.txt HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Cookie: forcedcookie=yes
+
+GET /want/%TESTNUMBER0003.txt HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Cookie: firstcookie=want; forcedcookie=yes
+
 </protocol>
 </verify>
 </testcase>
index 3e36597322fd8b9c3c89bb9ad34244ac05082d00..81728c68646720cdd2a8a4466b130e5c7ff0765d 100644 (file)
@@ -52,20 +52,20 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER0002\r
-RETR %TESTNUMBER0002\r
-QUIT\r
+<protocol crlf="yes">
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER0002
+RETR %TESTNUMBER0002
+QUIT
 </protocol>
 <stdout>
 HTTP/1.1 302 OK\r
index da393cb41b82571d0d1c8b4a73e66eae4d71f707..f37146a7478768faa95f673d418aa3966fce6b5b 100644 (file)
@@ -36,12 +36,12 @@ http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url} %{url} %{ex
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/our/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/our/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout>
 HTTP/1.1 301 This is a weirdo text message swsclose\r
index 52e5645bc0eab1ce9928cc07591e474b7c0d819d..d6283c62bb5e75262596eba6306c0d9ec3da00eb 100644 (file)
@@ -38,17 +38,17 @@ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER -P -
 ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
 ^EPRT \|1\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|\d{1,5}\|
 </strip>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD a\r
-CWD path\r
-PORT 127,0,0,1,0,0\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD a
+CWD path
+PORT 127,0,0,1,0,0
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 305a0f7eb57e94b4fc4d22ce2dda0aeb9cc910cc..39f374b05807a9b060d54507012e03dcc4549838 100644 (file)
@@ -59,17 +59,17 @@ http://%HOSTIP:%HTTPPORT/want/this/%TESTNUMBER -L
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/this/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /want/this/%TESTNUMBER?coolsite=yes/%TESTNUMBER0002.txt HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/this/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /want/this/%TESTNUMBER?coolsite=yes/%TESTNUMBER0002.txt HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 5456542ae3ed92318f794d08ce44a83ee3c0b1e8..d6d4f9ec4c64ea2538ad14b0f6f049c65c1c89f0 100644 (file)
@@ -42,13 +42,13 @@ HTTP HEAD with --range
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-HEAD /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=1-3\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+HEAD /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=1-3
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index b19bf1ce96fd90582ff07f8522405e90190eff41..460e7f8806bafc3e1b377e8b78322d966df52d12 100644 (file)
@@ -47,12 +47,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index f777a6ff7dd7fb374ec1b39f65dadf24a040bc6e..b5aeea8dd998cda7fb89984d237e79ec3104394c 100644 (file)
@@ -40,17 +40,17 @@ This is the start!!
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-PASV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-REST 20\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+PASV
+TYPE I
+SIZE %TESTNUMBER
+REST 20
+RETR %TESTNUMBER
+QUIT
 </protocol>
 <file name="%LOGDIR/curl%TESTNUMBER.out">
 This is the start!!
index 18c9e5266a40d5ca174ace734090dd4c996ab0eb..d540a003737d14df53d7a43ea5b9d36ce802eaa4 100644 (file)
@@ -39,16 +39,16 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C -
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-PASV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+PASV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index c2e60a0a49944b58de1db6adbb205f0176566f09..294c7b94c16b4a0c033c4b8d40e485baaca4bb6a 100644 (file)
@@ -34,15 +34,15 @@ worx?
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-APPE %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+APPE %TESTNUMBER
+QUIT
 </protocol>
 <upload>
 cr@p******** that we're gonna upload
index a032c2f9ab5cc8dca28ff66391b7feccb9eca184..6637c5721bd54f4ae4ba35302dddc38e5a8f78d1 100644 (file)
@@ -34,15 +34,15 @@ worx?
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-STOR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+STOR %TESTNUMBER
+QUIT
 </protocol>
 <upload>
 this is the *****cr@p******** that we're gonna upload
index 3674f1da0a8dd918dc09f63f2c22219691215ae4..fda73d0ee55a92a997dbbd8cc9732b4bbc2a36f5 100644 (file)
@@ -27,17 +27,17 @@ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER --head
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD a\r
-CWD path\r
-MDTM %TESTNUMBER\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-REST 0\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD a
+CWD path
+MDTM %TESTNUMBER
+TYPE I
+SIZE %TESTNUMBER
+REST 0
+QUIT
 </protocol>
 </verify>
 </testcase>
index bd1e5b0e3238f5e03a77c429ec4417d845bf2288..18dab6c5782e873f2c695fd668fcdd80b010afe0 100644 (file)
@@ -65,13 +65,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C -
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=100-\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=100-
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index a2a5c62f36c24e75c5704b14a14f09afa597d476..3fb798048f1886c4d0316bf9d2be5779d26b6d3e 100644 (file)
@@ -80,13 +80,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 200
 <errorcode>
 33
 </errorcode>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=200-\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=200-
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index ea850a1f97df1dadfd54d03a39c65b90da2a9c88..d3ca56b0377d42c8d87b433080d90539d7055c85 100644 (file)
@@ -70,13 +70,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C -
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=40-\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=40-
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 471f099a3f1defca05fe16dcf33095972fa32f4e..5486b344eda10a299a001e14d7e02677557bb441 100644 (file)
@@ -38,16 +38,16 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -I
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD blalbla\r
-MDTM %TESTNUMBER\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-REST 0\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD blalbla
+MDTM %TESTNUMBER
+TYPE I
+SIZE %TESTNUMBER
+REST 0
+QUIT
 </protocol>
 <stdout>
 Last-Modified: Sat, 26 Jul 2008 10:26:59 GMT\r
index e8745bf2de36b75ced1bd682623856ac9ac5372e..6fdfbfe2059bc5dfb44aee2b04cb09fe2cd19509 100644 (file)
@@ -39,12 +39,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --interface %CLIENTIP
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index fd05b3d5357b5829ecf700f560f05f4e8100ef68..3cf9d57bca3e0ce06f8d5a300b11c0696aba3c2b 100644 (file)
@@ -43,12 +43,12 @@ HTTP-IPv6 GET with numeric localhost --interface
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOST6IP:%HTTP6PORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOST6IP:%HTTP6PORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index b863bd0061bdef115721c53937b42626976e36f8..772cd4d17bf6f814471b7d62fc8c9939a5ca49a7 100644 (file)
@@ -43,14 +43,14 @@ ftp://%HOSTIP:%FTPPORT/ --interface %CLIENTIP
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index cf90020fef74330e1e137d1bc2b54bdcafbffff8..3a58d7b51e868492fbeec451962f5c70da1fc0bd 100644 (file)
@@ -48,14 +48,14 @@ FTP-IPv6 dir list PASV with localhost --interface
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index 2a26ac7ecafb4beb0ee60616f81c830e7b36686e..f0a5e4bc2aa7191db69851054d58f5d81a6a3a5b 100644 (file)
@@ -37,15 +37,15 @@ ftp://userdude:passfellow@%HOSTIP:%FTPPORT/%TESTNUMBER --use-ascii
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER userdude\r
-PASS passfellow\r
-PWD\r
-EPSV\r
-PASV\r
-TYPE A\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER userdude
+PASS passfellow
+PWD
+EPSV
+PASV
+TYPE A
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index b0425e545c9221bfb36faaf4fef2bfe82e423d16..49ca87ba33c0db3c7aece1183e5a0852804b75c7 100644 (file)
@@ -58,21 +58,21 @@ http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d @%LOGDIR/test%TESTNUMBER.txt --p
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /blah/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 10\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-field=dataPOST /blah/moo/testcase/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 10\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /blah/%TESTNUMBER 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/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 10
+Content-Type: application/x-www-form-urlencoded
+
 field=data
 </protocol>
 </verify>
index 302b9c541276eaa29642792d54520e7ea5de76a6..c0b74ec83f56c1e97b668f9d877c5afb000c7e4f 100644 (file)
@@ -66,17 +66,17 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/are/all/twits/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /moo/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOST6IP:%HTTP6PORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /moo/%TESTNUMBER0002 HTTP/1.1
+Host: %HOST6IP:%HTTP6PORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index a7cb3bc61ef2e1a2d1b8b2dbc4d5dc415f635366..0a6f1bcd09d65451efe3e7bdbfcbbc5b0a5a3c0a 100644 (file)
@@ -36,17 +36,17 @@ FTP retrieve a byte-range relative to end of file
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-REST 52\r
-RETR %TESTNUMBER\r
-ABOR\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+REST 52
+RETR %TESTNUMBER
+ABOR
+QUIT
 </protocol>
 </verify>
 </testcase>
index 794d2ef22a7f9c48f5ff2a9d1727f3da350c8226..ec7a59c80b476c69b3d42843c351b18320691b57 100644 (file)
@@ -39,13 +39,13 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -r -101
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=-101\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=-101
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 5da753e59459205c9dd661e35ad7509b037ec431..44a3ed8a5348152bf70b5bfccad41651ddcf1a0e 100644 (file)
@@ -46,12 +46,12 @@ ftp://test-number:%TESTNUMBER/wanted/page -p -x %HOSTIP:%HTTPPORT
 <errorcode>
 56
 </errorcode>
-<protocol>
-CONNECT test-number:%TESTNUMBER HTTP/1.1\r
-Host: test-number:%TESTNUMBER\r
-User-Agent: curl/%VERSION\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+CONNECT test-number:%TESTNUMBER HTTP/1.1
+Host: test-number:%TESTNUMBER
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index b5e1e6929b3aae26f0085ea733c41818f436fe53..3e1784c1d6036fafb9423f2c9b6332f10596c6bc 100644 (file)
@@ -35,17 +35,17 @@ FTP GET with type=A style ASCII URL using %20 codes
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD /\r
-CWD path with  spaces\r
-CWD and things2\r
-EPSV\r
-TYPE A\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD /
+CWD path with  spaces
+CWD and things2
+EPSV
+TYPE A
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index b64e202e81b2c7095ae7ff063f306e410316f1e2..d87124a7f547179dd1f7f1046cd0fe27b873a6ee 100644 (file)
@@ -83,23 +83,23 @@ http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy http://
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1\r
-Host: test.remote.haxx.se.%TESTNUMBER:8990\r
-User-Agent: curl/%VERSION\r
-Proxy-Connection: Keep-Alive\r
-\r
-CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1\r
-Host: test.remote.haxx.se.%TESTNUMBER:8990\r
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.%TESTNUMBER:8990", response="e1fbed39c26f4efe284adc0e576ff638"\r
-User-Agent: curl/%VERSION\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET /path/%TESTNUMBER0002 HTTP/1.1\r
-Host: test.remote.haxx.se.%TESTNUMBER:8990\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.%TESTNUMBER:8990", response="e1fbed39c26f4efe284adc0e576ff638"
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
+GET /path/%TESTNUMBER0002 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 1ec22f9426394de9161848181369da41d462542c..46ad8f98f73bd5ecc58981008d20dd63d83ca226 100644 (file)
@@ -88,23 +88,23 @@ http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy http://
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1\r
-Host: test.remote.haxx.se.%TESTNUMBER:8990\r
-User-Agent: curl/%VERSION\r
-Proxy-Connection: Keep-Alive\r
-\r
-CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1\r
-Host: test.remote.haxx.se.%TESTNUMBER:8990\r
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.%TESTNUMBER:8990", response="4e23449fa93224834299e7282a70472c"\r
-User-Agent: curl/%VERSION\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET /path/%TESTNUMBER0002 HTTP/1.1\r
-Host: test.remote.haxx.se.%TESTNUMBER:8990\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.%TESTNUMBER:8990", response="4e23449fa93224834299e7282a70472c"
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
+GET /path/%TESTNUMBER0002 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index c6033457015f22c0f526705ccf866016fe79c79b..5b8c36f55facc20f7fdb1571ec9a1ee1409351c5 100644 (file)
@@ -34,16 +34,16 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 5b2b178f096964998a896e1ad736aba649b2343f..7ac4903d1f81a4e417e330aed840d5b0c79bc722 100644 (file)
@@ -41,17 +41,17 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/want/%TESTNUM
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /want/%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /want/%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout>
 HTTP/1.1 200 OK\r
index 8bb2233e36e51d33caa591f050d1b077d58a593f..85a5f8bc3fdbcd5bebf582e088fe9848a7e1a54d 100644 (file)
@@ -59,19 +59,19 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER --silent --location --referer "firston
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Referer: firstone.html\r
-\r
-GET /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Referer: http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Referer: firstone.html
+
+GET /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Referer: http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER
+
 </protocol>
 <stderr nonewline="yes">
 |http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER|
index a741b7667f8b6c20e450b99ae5896717a65b6d3e..48ef6cc7c42948db269d270bf6576a543378ba88 100644 (file)
@@ -38,14 +38,14 @@ that FTP
 works
   so does it?
 </upload>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-STOR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+STOR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index a2665039bb2cb4004cc092f999cd9320fe99cbaf..7f2b4fb09b3fff0020c04e2b90301786c93663f5 100644 (file)
@@ -48,15 +48,15 @@ Here's 2000 x 'O':
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Expect: 100-continue\r
-Content-Length: 2313\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Expect: 100-continue
+Content-Length: 2313
+Content-Type: application/x-www-form-urlencoded
+
 This creates 
 </protocol>
 </verify>
index 183d51a571d0321dbad4e3bfbe998a8cded126ca..77d4caac726205a3ee8497531f3f674d2630bb1b 100644 (file)
@@ -60,17 +60,17 @@ Connection: close
 surprise2
 </stdout>
 
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /wantmore/%TESTNUMBER0001 HTTP/1.0\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /wantmore/%TESTNUMBER0001 HTTP/1.0
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 258d14e6a8fd3cafbc5ae27d39c0217269649fee..8613a9a922293170397ac2f03efc4765ae9b5e91 100644 (file)
@@ -56,21 +56,21 @@ http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post302
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /blah/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 3\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-mooPOST /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 3\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /blah/%TESTNUMBER 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=/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 3
+Content-Type: application/x-www-form-urlencoded
+
 moo
 </protocol>
 </verify>
index 5162eb3420a6f2ecc2e2f030b7e1211be31e9e59..847aa013d23f8ed9dbe1f5949772c51c5d337655 100644 (file)
@@ -57,19 +57,19 @@ FTP over HTTP proxy with downgrade to HTTP 1.0
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER0002 HTTP/1.0\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER0002 HTTP/1.0
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 97b30853fc0c9c7869ee5c1f2c3fcadfd3b848d3..9ec0f44eec01900bd1c7eb0e2cd5c341a3384604 100644 (file)
@@ -60,17 +60,17 @@ User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
-<protocol>
-GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /we/want/that/page/%TESTNUMBER HTTP/1.0\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /we/want/that/page/%TESTNUMBER HTTP/1.0
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout>
 HTTP/1.1 200 Mighty fine indeed\r
index 83de2aedbf356131f3b265d1f8fc67293f319182..418a25db0ac98d08f8c0a4c94fba71deb6db7ea0 100644 (file)
@@ -59,18 +59,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 <errorcode>
 52
 </errorcode>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="e340c7cdca0950462070f46ee139e9f7"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="e340c7cdca0950462070f46ee139e9f7"
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 20ef6577ed5bd360cffef0d0db9d713780f390e7..b639781b59bff9258a2256b975217c5627fef2ab 100644 (file)
@@ -36,17 +36,17 @@ Moooooooooooo
 ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
 ^EPRT \|1\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|\d{1,5}\|
 </strip>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD CWD\r
-CWD STOR\r
-CWD RETR\r
-PORT 127,0,0,1,5,109\r
-TYPE I\r
-STOR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD CWD
+CWD STOR
+CWD RETR
+PORT 127,0,0,1,5,109
+TYPE I
+STOR %TESTNUMBER
+QUIT
 </protocol>
 <upload>
 Moooooooooooo
index 6b9dd5a136ddad88f7f6488ae019b62d47112c56..6848f61bf0eb46a1b323664afa982378c5f0a75f 100644 (file)
@@ -36,17 +36,17 @@ http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/wan
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/our/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /we/want/our/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/our/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /we/want/our/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout>
 HTTP/1.1 301 This is a weirdo text message swsclose\r
index 557be4fe65a364c67ca97863c280336b3590d175..418804d330038e0e603fd53219f89edf2c1ac8af 100644 (file)
@@ -44,17 +44,17 @@ http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/wan
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/our/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /we/want/our/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/our/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /we/want/our/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout>
 HTTP/1.1 301 This is a weirdo text message swsclose\r
index 40e7b6a70c067b1fd98576e4df4ce826970b927f..cc9d461cfe09070add939dec44c7143348c1a865 100644 (file)
@@ -42,12 +42,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -4 --interface 127.0.0.1
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index dae302b110d4a05524384aebc10706f7800657a6..eb3fc7cfc30503fa2e34d136c08e59c929c98345 100644 (file)
@@ -46,12 +46,12 @@ HTTP-IPv6 GET with ip6-localhost --interface
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOST6IP:%HTTP6PORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOST6IP:%HTTP6PORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 8b7828fb2f91faa3c3b76c5e29e5a4eafdec0d5d..562ebbad92980db103a14da600b9c44675512dba 100644 (file)
@@ -49,14 +49,14 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -m 5
 <errorcode>
 28
 </errorcode>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 </protocol>
 </verify>
 </testcase>
index daf4c8094956e0b1fc8a0c7ae17837e77e5f0111..6891fd1b8490460034ec62cc5eeb5e2aabb1bb6d 100644 (file)
@@ -88,26 +88,26 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1\r
-Host: first.host.it.is\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1\r
-Host: first.host.it.is\r
-Authorization: Basic %b64[iam:myself]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://goto.second.host.now/%TESTNUMBER1002 HTTP/1.1\r
-Host: goto.second.host.now\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 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/%TESTNUMBER1000 HTTP/1.1
+Host: first.host.it.is
+Authorization: Basic %b64[iam:myself]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://goto.second.host.now/%TESTNUMBER1002 HTTP/1.1
+Host: goto.second.host.now
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 11a88fc40ab032443f3918842ea37d2c09fb8935..08d418a72eca6d7f3cadde95f3838384b30d6e30 100644 (file)
@@ -89,27 +89,27 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1\r
-Host: first.host.it.is\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1\r
-Host: first.host.it.is\r
-Authorization: Basic %b64[iam:myself]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://goto.second.host.now/%TESTNUMBER1002 HTTP/1.1\r
-Host: goto.second.host.now\r
-Authorization: Basic %b64[iam:myself]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 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/%TESTNUMBER1000 HTTP/1.1
+Host: first.host.it.is
+Authorization: Basic %b64[iam:myself]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://goto.second.host.now/%TESTNUMBER1002 HTTP/1.1
+Host: goto.second.host.now
+Authorization: Basic %b64[iam:myself]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index c36f21cbbe0929bd79325c4e53292acca65d307d..b65f0ddd4f7c8a16937981ad449abb2f05566f95 100644 (file)
@@ -50,17 +50,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n%{num_redirects}\n%{si
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <stdout>
index d466437f21355cd9517f0c66d0c010e8e7137eea..19e22caf822bf15ff031191a4854f80f08c44218 100644 (file)
@@ -31,14 +31,14 @@ Moooooooooooo
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-APPE %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+APPE %TESTNUMBER
+QUIT
 </protocol>
 <upload>
 Moooooooooooo
index ffd81bc610bb0c963eaf619c7520e0d039f6a177..454913ac1be7685f8c63e1e140dd822d9cd45f0a 100644 (file)
@@ -57,17 +57,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n%{num_redirects}\n%{si
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <stdout>
index 445d31655f73ef5f448f7dbacb8a4a870f2684c8..47eb46a1128808fa5ca28e25335542bc2d4c2266 100644 (file)
@@ -30,18 +30,18 @@ FTP URL with type=i
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD /\r
-CWD tmp\r
-CWD moo\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD /
+CWD tmp
+CWD moo
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 3d7b741ea7466d15092acb737c02b0614805b9a7..2c5fbb81cdc0acc53dfc4f781d11833a8039df28 100644 (file)
@@ -43,13 +43,13 @@ FTP with type=i over HTTP proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER;type=i HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER;type=i HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 8e23ae6a3a162f23b42cc05408262f53afb0bdca..942aa0e10cc852ec36aff129accc1c478f51a34c 100644 (file)
@@ -66,18 +66,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="test \"this\" realm!!", nonce="1053604145", uri="/%TESTNUMBER", response="df3246f44d2bc8de0e9f8fc4d7cf6e95"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="test \"this\" realm!!", nonce="1053604145", uri="/%TESTNUMBER", response="df3246f44d2bc8de0e9f8fc4d7cf6e95"
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index e7b16392473d1c30a96913f1c1e5ad424202aff0..6a3818c0739010adf76209dabd195fd1b4096334 100644 (file)
@@ -33,19 +33,19 @@ ftp://%HOSTIP:%FTPPORT/dir/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/dir/%TESTNUMBER
 <errorcode>
 78
 </errorcode>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD dir\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-EPSV\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD dir
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+EPSV
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 106a8537b879e3296209ac4850658f3073f21850..84b9300d49b99f77c91ce2e0ef3cd2eb4b5b270d 100644 (file)
@@ -59,20 +59,20 @@ http://test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT/%TESTNUMBER --proxy http
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-CONNECT test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
-Host: test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT\r
-Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Proxy-Connection: Keep-Alive\r
-\r
-POST /%TESTNUMBER HTTP/1.1\r
-Host: test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 11\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+CONNECT test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT
+Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
+POST /%TESTNUMBER HTTP/1.1
+Host: test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 11
+Content-Type: application/x-www-form-urlencoded
+
 dummy=value
 </protocol>
 
index 5affc6bde28d24855856d63edfda01542cf4a6e4..60164d6d62f2d1bcbd6167587ee949e06b05d91c 100644 (file)
@@ -59,17 +59,17 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index e53fcd1377afdad03a1d6e323652bd8294d07049..f8418fbbcacc1f76ba8ee3698b751f09aee7752f 100644 (file)
@@ -36,17 +36,17 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 20
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-PASV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-REST 20\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+PASV
+TYPE I
+SIZE %TESTNUMBER
+REST 20
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 10bf811eddd673672e5d0d34e71fd2b1ac136ffa..500a05b31a57ad50e712a60b4afa6c81b6baf522 100644 (file)
@@ -80,28 +80,28 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm -L -d "stuff to
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 0\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 18\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-stuff to send awayGET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 0
+Content-Type: application/x-www-form-urlencoded
+
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 18
+Content-Type: application/x-www-form-urlencoded
+
+stuff to send awayGET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index e70f256abc506fda7f454c322b0db3db5f73ed38..9e2dff25be6eba347ac3baed07a2dbd731c19a54 100644 (file)
@@ -42,13 +42,13 @@ http://user:secret@%HOSTIP:%HTTPPORT/gimme/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /gimme/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[user:secret]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /gimme/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user:secret]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 16994d953340b9c35b498983ad8ce3700afefd86..aacb156903836d6c7f3d544f82427a333a0bb375 100644 (file)
@@ -34,18 +34,18 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-SYST\r
-SITE NAMEFMT 1\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+SYST
+SITE NAMEFMT 1
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index a53b504bdc071d47207b6e353b4a74edd35dd589..604178710760b853f7e4db2e3e18b3dc41535340 100644 (file)
@@ -33,16 +33,16 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-SYST\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+SYST
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 9c5d659bc3373d599fe6ef6c43493ebe80c953e7..c0fabfc1d586604b73bfaf8bded3f7de4fbfb154 100644 (file)
@@ -69,20 +69,20 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://%HOSTIP:%HTTPPORT/want/data/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-Cookie: test2=true\r
-\r
+<protocol crlf="yes">
+GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://%HOSTIP:%HTTPPORT/want/data/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+Cookie: test2=true
+
 </protocol>
 </verify>
 </testcase>
index 68922dc770ca2da9d98b10055b720cdbf859f124..cb828bf0488e18d2a80e9003ade281af395052b6 100644 (file)
@@ -45,14 +45,14 @@ local-http
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /we/want/%TESTNUMBER?parm1=this*that/other/thing&parm2=foobar/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 33\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /we/want/%TESTNUMBER?parm1=this*that/other/thing&parm2=foobar/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 33
+Content-Type: application/x-www-form-urlencoded
+
 userid=myname&password=mypassword
 </protocol>
 <file name="%LOGDIR/cookie%TESTNUMBER.txt" mode="text">
index e3acdac16be5ffdea0a8d4c2137ce9caaeb80a5d..e8bb0a52afa28fbd9e45ab0d3e72690bfa9cbd44 100644 (file)
@@ -44,13 +44,13 @@ ftp://%HOSTIP:23456/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET ftp://%HOSTIP:23456/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:23456\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET ftp://%HOSTIP:23456/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:23456
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 8b31c76f839770a2f08887361d8b032162fbb24c..3eeb0457e4e1bb5084cfef841e4848b0e5ecde9c 100644 (file)
@@ -38,16 +38,16 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-pret
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-PRET RETR %TESTNUMBER\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+PRET RETR %TESTNUMBER
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index c6008af300594bfa7e60acf5fff64ce5dc192d49..107ef8d55caa6dc8a58cb20341b9974cd309bfe6 100644 (file)
@@ -31,11 +31,11 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-pret
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-PRET RETR %TESTNUMBER\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+PRET RETR %TESTNUMBER
 </protocol>
 # we expect that the server doesn't understand PRET
 <errorcode>
index 93aa9e4dbce9972b50a83b93c5a7a3396e0c31a6..da640789f7b94d695830e7b4e3048f0306f5c34a 100644 (file)
@@ -33,12 +33,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER#test
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index a46f7aef1d24b1128d87fc51beef957dbe1fc7de..4044fdd41d832284218bc5208dee0c7dd42a5f7f 100644 (file)
@@ -32,14 +32,14 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 2000
 <errorcode>
 36
 </errorcode>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 165a8acd86211266f92a70df8a765eda7121a76a..d2dfcc4f350c3c95e93998c1d15b52fa74e185e4 100644 (file)
@@ -34,12 +34,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER?q=foobar#fragment
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER?q=foobar HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER?q=foobar HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 157cd2751cbe2edae76cc57959a09b38c657a51e..f68668a520a4e7c76591d14b2a3151518a22735b 100644 (file)
@@ -34,12 +34,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER?q=foobar#fragment#fragment2
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER?q=foobar HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER?q=foobar HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 2ef60a9eb7d21a7596c47e6afa9ffe25cd57dc04..8d42cea80fa08db45ef2999533d3328a0ea2ca49 100644 (file)
@@ -52,16 +52,16 @@ FTPS download with strict timeout and slow data transfer
 <errorcode>
 28
 </errorcode>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PBSZ 0\r
-PROT C\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PBSZ 0
+PROT C
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 </protocol>
 </verify>
 </testcase>
index 744c012ee144f5ec5f5a8bc1065104d5b81829c3..474c6aadc4940bd1991b12fac97c0978daf48418 100644 (file)
@@ -40,45 +40,45 @@ FTP wildcard download - changed fnmatch, 2x perform (DOS LIST response)
 0
 </errorcode>
 # THERE SHOULD NOT BE "SIZE"! and one "USER/PASS"
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD fully_simulated\r
-CWD DOS\r
-EPSV\r
-TYPE A\r
-LIST\r
-EPSV\r
-TYPE I\r
-RETR chmod1\r
-EPSV\r
-RETR chmod2\r
-EPSV\r
-RETR chmod3\r
-EPSV\r
-RETR empty_file.dat\r
-EPSV\r
-RETR file.txt\r
-EPSV\r
-RETR someothertext.txt\r
-EPSV\r
-TYPE A\r
-LIST\r
-EPSV\r
-TYPE I\r
-RETR chmod1\r
-EPSV\r
-RETR chmod2\r
-EPSV\r
-RETR chmod3\r
-EPSV\r
-RETR empty_file.dat\r
-EPSV\r
-RETR file.txt\r
-EPSV\r
-RETR someothertext.txt\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD fully_simulated
+CWD DOS
+EPSV
+TYPE A
+LIST
+EPSV
+TYPE I
+RETR chmod1
+EPSV
+RETR chmod2
+EPSV
+RETR chmod3
+EPSV
+RETR empty_file.dat
+EPSV
+RETR file.txt
+EPSV
+RETR someothertext.txt
+EPSV
+TYPE A
+LIST
+EPSV
+TYPE I
+RETR chmod1
+EPSV
+RETR chmod2
+EPSV
+RETR chmod3
+EPSV
+RETR empty_file.dat
+EPSV
+RETR file.txt
+EPSV
+RETR someothertext.txt
+QUIT
 </protocol>
 <stdout>
 This file should have permissions 444
index 40ce7c15e19a36bb1d27c0f5f1b1bcc57951d33b..176570992ee422a3c7f178a28634244ed1dc19ab 100644 (file)
@@ -39,12 +39,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 8feed326eaaae0cd4dfa7f5a7458ac4e9c678415..0775bb42db3f13067b324e2ca71a479df73a4a25 100644 (file)
@@ -60,12 +60,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/heads%TESTNUMBER">
 HTTP/1.1 200 funky chunky!\r
index 67df822c9e7e13243b3ad3afeba156a6d41c6fab..c133501027c5d00d6d93b5d20507284deb8580bc 100644 (file)
@@ -69,19 +69,19 @@ Content-Type: text/plain
 partial body
 </stdout>
 
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=10-22\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /wantmore/%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=10-22\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=10-22
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /wantmore/%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=10-22
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 3daa8a63e7d0009ed15a9210289ecef07681ce6b..13f686f4034cb3b9864ac18e8187879810e1adb0 100644 (file)
@@ -42,12 +42,12 @@ http://%HOSTIP:%HTTPPORT?email=name@example.com/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /?email=name@example.com/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /?email=name@example.com/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 41bbc025d9602c30b42614f73dd727ccc2fd00d6..9a73da35a57c47379597e8c93fb6c6e42b7b7fab 100644 (file)
@@ -31,14 +31,14 @@ worx?
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-APPE %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+APPE %TESTNUMBER
+QUIT
 </protocol>
 <upload>
  gonna upload
index 464b8ac09726e857480c1f1d12396d16308a1b1d..9a96aed2bc16206c7523e59cd6a099b2c2c3d37b 100644 (file)
@@ -32,11 +32,11 @@ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER
 # Verify data after the test has been "shot"
 <verify>
 # Strip all valid kinds of PORT and EPRT that curl can send
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD a\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD a
 </protocol>
 # CURLE_OPERATION_TIMEDOUT is 28
 <errorcode>
index 3eec862d6d1fa24a2e36603c5b996c5d240b5a77..0804c59e26a8d3387bd586df3fe7292e6b6795fe 100644 (file)
@@ -34,12 +34,12 @@ HTTP multiple provided Host: headers
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: host1\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: host1
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index d0ce3ffaf043691cc42d65589d94f7c476965b67..cbd74b2ea90aefd9074405ef07c406e0ba478ec7 100644 (file)
@@ -61,14 +61,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-TE: gzip\r
-Connection: TE\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+TE: gzip
+Connection: TE
+
 </protocol>
 </verify>
 </testcase>
index a01aae69beb06117d743403f70a0ecddb27d0a7b..2a1b10605fce7b18c188db5a5ba0df6b72f87343 100644 (file)
@@ -171,14 +171,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-TE: gzip\r
-Connection: TE\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+TE: gzip
+Connection: TE
+
 </protocol>
 </verify>
 </testcase>
index fdc172398ff89f4404aec0fbbb55ef6929dfffa5..33415aab798da7a6c3e91dca9cad5ebe8802eb99 100644 (file)
@@ -62,14 +62,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-TE: gzip\r
-Connection: TE\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+TE: gzip
+Connection: TE
+
 </protocol>
 </verify>
 </testcase>
index 3b4d58b2e6058f4298ff214d94d6691acf429386..1f1f1538358990bcfb85ced4955c32f0632574c2 100644 (file)
@@ -61,14 +61,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection: close"
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-TE: gzip\r
-Connection: close, TE\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+TE: gzip
+Connection: close, TE
+
 </protocol>
 </verify>
 </testcase>
index b25820b0cfa594811592116d2f3aa179f5d70f22..9fb7c5a832d2b07d2d19cbc415772d83b0bfad49 100644 (file)
@@ -38,13 +38,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
+
 </protocol>
 </verify>
 </testcase>
index fa3ee85fe7b03d55a1b01d7f73f1c2d70860b90d..8f2b6b1103ec08610eb105b2c207c0e4decc03fe 100644 (file)
@@ -47,13 +47,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
+
 </protocol>
 </verify>
 </testcase>
index 37b5b522ed3070c3daa4938c24822da93e27be3d..977ed4d8be425705438d2b5710671ad488d07e69 100644 (file)
@@ -48,19 +48,19 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -z
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT\r
-\r
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
+
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
+
 </protocol>
 
 <stdout>
index 99e390c50023749cb738be47eeac7a78de7a90c7..44b0f3ab82683e572404491492ed1bf533294acf 100644 (file)
@@ -74,23 +74,23 @@ Content-Type: text/html
 
 -foo-
 </stdout>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 1053700\r
-Content-Type: application/x-www-form-urlencoded\r
-Expect: 100-continue\r
-\r
-POST /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 1053700\r
-Content-Type: application/x-www-form-urlencoded\r
-Expect: 100-continue\r
-\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 1053700
+Content-Type: application/x-www-form-urlencoded
+Expect: 100-continue
+
+POST /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 1053700
+Content-Type: application/x-www-form-urlencoded
+Expect: 100-continue
+
 </protocol>
 <limits>
 Maximum allocated: 3200000
index 1c0a8b246c6b9968cb66d5a75957aff2c2383e13..463da9c624ee877686d0dd12b1f3472e383dc527 100644 (file)
@@ -30,8 +30,8 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 <errorcode>
 67
 </errorcode>
-<protocol>
-USER anonymous\r
+<protocol crlf="yes">
+USER anonymous
 </protocol>
 </verify>
 </testcase>
index bdab216d812a71c881c6876270701532b761b085..59ca8c52eb6287aa89da55b836d76ed31cf57b8f 100644 (file)
@@ -75,23 +75,23 @@ Content-Type: text/html
 
 -foo-
 </stdout>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Expect: 100-continue\r
-Content-Length: 100\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-POST /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Expect: 100-continue\r
-Content-Length: 100\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Expect: 100-continue
+Content-Length: 100
+Content-Type: application/x-www-form-urlencoded
+
+POST /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Expect: 100-continue
+Content-Length: 100
+Content-Type: application/x-www-form-urlencoded
+
 </protocol>
 </verify>
 </testcase>
index 20ad5cfd85e7335a18d8446fbd6e95dd5a0f9424..e9c37395e573b677204fd2389093ef7c2093182c 100644 (file)
@@ -75,21 +75,21 @@ Content-Type: text/html
 
 FAILURE2
 </stdout>
-<protocol>
-PUT /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Expect: 100-continue\r
-Content-Length: 100\r
-\r
-PUT /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Expect: 100-continue\r
-Content-Length: 100\r
-\r
+<protocol crlf="yes">
+PUT /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Expect: 100-continue
+Content-Length: 100
+
+PUT /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Expect: 100-continue
+Content-Length: 100
+
 </protocol>
 </verify>
 </testcase>
index cb20aee313ec9a065f566eb421f5049570addd9a..241f740aa7e774c5ac36d1fd2f51091f12193645 100644 (file)
@@ -38,15 +38,15 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ignore-content-length
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-PASV\r
-TYPE I\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+PASV
+TYPE I
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 8a545f2a85326b1fc01d0a10a7f3f6af3513ad2e..ce43a93d4f37752d74eb84d86920efa13bf71756 100644 (file)
@@ -30,9 +30,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 <errorcode>
 67
 </errorcode>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
 </protocol>
 </verify>
 </testcase>
index 727cbcd5653a6cc06bb7215aee56208d3b49da57..68eea75dc22be568e1c3e38b759f36ef4e099f36 100644 (file)
@@ -54,19 +54,19 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://foo.example.com/want/%TESTNUMBER0001 HTTP/1.1\r
-Host: foo.example.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://foo.example.com/want/%TESTNUMBER0001 HTTP/1.1
+Host: foo.example.com
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index c35190006f5156e3705c2ddc2b1cf2f15e2e6bff..64793147cc09b5db078e799d74b0d0f344e7744c 100644 (file)
@@ -49,13 +49,13 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 # 3, CURLE_URL_MALFORMAT for the four slashes
 <errorcode>
index e9053b179436d0f4541fee153cfd1b98778df02e..b845a657626000cbc9e4baa361671b5eb6adf96f 100644 (file)
@@ -37,12 +37,12 @@ MSYS2_ARG_CONV_EXCL=http:/
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index be51dae13d4baad63a5d14d6c5673b6c5615ae21..7915cb610bd331fc4ff5dd6253178c7329fb3cf1 100644 (file)
@@ -54,12 +54,12 @@ HTTP HEAD, receive no headers only body
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-HEAD /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+HEAD /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <errorcode>
 8
index 9298e48a18128c0a5a34582ab521f026bdcfd471..5f27abc59b0e5c783f0280d1ab37d28784c438ed 100644 (file)
@@ -51,14 +51,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H @%LOGDIR/heads%TESTNUMBER.txt
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-One: 1\r
-Two: 2\r
- And A Funny One : wohoo\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+One: 1
+Two: 2
+ And A Funny One : wohoo
+
 </protocol>
 </verify>
 </testcase>
index 5653ef61049d9ce0bb60871ae0c00e203911aa89..ba37c8dd30a8fec0807763d3f25c9a7207428c5d 100644 (file)
@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -# --stderr %LOGDIR/stderrlog%TESTNUMBER
 
 #
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 # Check that the progress finished at 100% and has the right bar width.
index d4e97d540d50fc724bcabd8ec5b9740d91b3a928..f5239aea254903014a8ed6d43aaffa81fab155e7 100644 (file)
@@ -42,21 +42,21 @@ ftp://%HOSTIP:%FTPPORT/list/this/path/%TESTNUMBER/ --ftp-method multicwd --next
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD list\r
-CWD this\r
-CWD path\r
-CWD %TESTNUMBER\r
-EPSV\r
-TYPE A\r
-LIST\r
-CWD /\r
-EPSV\r
-LIST list/this/path/%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD list
+CWD this
+CWD path
+CWD %TESTNUMBER
+EPSV
+TYPE A
+LIST
+CWD /
+EPSV
+LIST list/this/path/%TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 22f75c0b6e8113d8f36d172d1810e6fb016dd242..62ec4ea827ea3777c628505430d50364c6b2c3f1 100644 (file)
@@ -32,13 +32,13 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 <errorcode>
 13
 </errorcode>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-PASV\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+PASV
+QUIT
 </protocol>
 </verify>
 </testcase>
index cafc00cd075998863b02a7877bcceb6e581ad54a..e4d0ed01a673fc335ea31b5dbe2b7a771d78ffc7 100644 (file)
@@ -39,19 +39,19 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://test.remote.example.com.%TESTNUMBER:150/path HTTP/1.1\r
-Host: test.remote.example.com.%TESTNUMBER:150\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://test.remote.example.com.%TESTNUMBER:1234/path/ HTTP/1.1\r
-Host: test.remote.example.com.%TESTNUMBER:1234\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://test.remote.example.com.%TESTNUMBER:150/path HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:150
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://test.remote.example.com.%TESTNUMBER:1234/path/ HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:1234
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index dd916a61334d4861402de296be4af43357fba5ea..f8b14ebb4eec638dfbc161409d0d7b9a2a81efc7 100644 (file)
@@ -48,12 +48,12 @@ cookies
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/cookies%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
index 1823bab4a9afa1297e7fd907147af50748700b5b..f02104f2cf50f970f236a1e0987c6bcc652aba4c 100644 (file)
@@ -45,15 +45,15 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD test-%TESTNUMBER\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD test-%TESTNUMBER
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index a74b1838ceca7cf2de5859ac82e4ecf4183baced..5198092bce4197f82241e0b4348c64323e617d5a 100644 (file)
@@ -45,15 +45,15 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD test-%TESTNUMBER\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD test-%TESTNUMBER
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index bd08ce26c10de3623bd2d0ac2187fe4bf8865b5e..27bfc17ae4a97b78099fa4b03e8df0822c6cb7b1 100644 (file)
@@ -40,12 +40,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 # 100 == CURLE_TOO_LARGE
 <errorcode>
index 579328d9253a421c9f7a0f1e9b13e7c978ee9ae3..195028a4d47ce226e5b2e139c5fd6765484e20a5 100644 (file)
@@ -37,12 +37,12 @@ cookies
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/cookies%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
index 4e246e7031b588d9363d94409cf0005b0accd816..b13536773f7f770e0bc5cc67ec0bee6b348a2415 100644 (file)
@@ -45,12 +45,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H @%LOGDIR/heads%TESTNUMBER.txt
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 6ef2e4ad66e7e2d7527938b9ef951ab7f8169858..769e84db3c322fce677459e1c7265524e1de28aa 100644 (file)
@@ -36,12 +36,12 @@ http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n'
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/our/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/our/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout>
 HTTP/1.1 301 This is a weirdo text message swsclose\r
index d503945fe35530fb027043e6b6e6bd050b73c766..b5b55a4d29ab3132da1dc3e15dd236cb17175c2f 100644 (file)
@@ -38,12 +38,12 @@ cookies
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/cookies%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
index dd8f9c9ebfc117b3293276c562915bafd9e9649a..4dbb0a4a7b6d411db7720a740df5bb6797fa0567 100644 (file)
@@ -37,12 +37,12 @@ cookies
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/cookies%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
index b6b394139e22a039cdd4f858ec67fc90aca6a24c..9f8f931936e37e88e17518c4bab637537dc0452f 100644 (file)
@@ -37,16 +37,16 @@ MSYS2_ARG_CONV_EXCL=ftp://
 </setenv>
 </client>
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD fully_simulated\r
-CWD DOS\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD fully_simulated
+CWD DOS
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 # 78 == CURLE_REMOTE_FILE_NOT_FOUND
 <errorcode>
index a109b511bcc7e163c17e21847e276a3e3096cd86..006e612f98e5e112a26ed4769f73925e497106bd 100644 (file)
@@ -33,16 +33,16 @@ FTP wildcard with pattern ending with an open-bracket
 </command>
 </client>
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD fully_simulated\r
-CWD DOS\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD fully_simulated
+CWD DOS
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 # 78 == CURLE_REMOTE_FILE_NOT_FOUND
 <errorcode>
index 40422da8b7412dcad7a3b675641ffb0722eff671..c5c25d339db92ab578adeac2f19c87f58be9ced7 100644 (file)
@@ -31,12 +31,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%{size_download}\n' --http0.9
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout mode="text">
 208
index 92e8ff40469b378fb7f9f2b5748f43d7d671d839..6720c09d31f76a7047757e1765cf973ac45c2e46 100644 (file)
@@ -36,17 +36,17 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/want/%TESTNUM
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 2bba7eccd393629b10e301feb24c2f84df77ead4..04403597de8a4d171ee401e95150e49a8ae5ba6c 100644 (file)
@@ -59,19 +59,19 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -u "catmai#d:#DZaRJYrixKE*gFY"
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[catmai#d:#DZaRJYrixKE*gFY]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /data/%TESTNUMBER0002.txt HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[catmai#d:#DZaRJYrixKE*gFY]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[catmai#d:#DZaRJYrixKE*gFY]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /data/%TESTNUMBER0002.txt HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[catmai#d:#DZaRJYrixKE*gFY]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 3bd5cb57f1ecd279d27f68f6ffd817e9a4352886..8811dd95364b229878d7ef700d7e97768f9e80c7 100644 (file)
@@ -31,14 +31,14 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 <errorcode>
 17
 </errorcode>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-PASV\r
-TYPE I\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+PASV
+TYPE I
+QUIT
 </protocol>
 </verify>
 </testcase>
index d6271714bd1161ece0a6e68d9041c09b84c2ae99..499044e39902d11a2ee0743d7d5f16c437c2723d 100644 (file)
@@ -61,14 +61,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection:"
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-TE: gzip\r
-Connection: TE\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+TE: gzip
+Connection: TE
+
 </protocol>
 </verify>
 </testcase>
index 486aadb94b5d67d3ff3be63d2fedb296d86cfa1f..5dd570add8d2f0a09fd1d15fc9e60de0277ed470 100644 (file)
@@ -61,14 +61,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection;"
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-TE: gzip\r
-Connection: TE\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+TE: gzip
+Connection: TE
+
 </protocol>
 </verify>
 </testcase>
index 0de4713d39c8a80e9c630204b27efab721b36fb0..6afe814c0489e84691141bcdaa1fcbfaecf5277b 100644 (file)
@@ -33,12 +33,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --no-http0.9
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 # unsupported protocol
 <errorcode>
index 48938a7be3f5572a60c1b8e0d50135fc3dc25c4a..21dd5d54b659c3d76fa8a8390e8dcd5b116a725d 100644 (file)
@@ -33,12 +33,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 # unsupported protocol
 <errorcode>
index 86d23a2ccc2803736711c0632ebfcaf071388ece..6bfe6a6f6a6255941127edf45970c70dc30a1f07 100644 (file)
@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o '%LOGDIR/base-#0'
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/base-#0">
 HTTP/1.1 200 OK\r
index 52eea37fec1f441cb85f9ea6aa8b99bbe85bf6a3..6f5fdd7161abc13ef62ce04916b3aaf11c70a096 100644 (file)
@@ -40,14 +40,14 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Proxy-Authorization: Basic %b64[AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Proxy-Authorization: Basic %b64[AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 9b5b8708eb6b8c76c0044301a42126364917f521..190dc79c122383467c5945a800f033137dce35dc 100644 (file)
@@ -34,16 +34,16 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 <errorcode>
 19
 </errorcode>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-PASV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+PASV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index d04542ef965c8d71777ee3654efc831959e9b06a..8607f825525d8392f631541793c9cb90f751d1d0 100644 (file)
@@ -36,13 +36,13 @@ HTTP GET request with proxy and -H "Proxy-Connection: keep-alive"
 </client>
 
 <verify>
-<protocol>
-GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 9cdf3fa4640a3fbc81e685351b96c8c5bb1565bb..8fe4587dfcb0543bb3924a63aa6e689611583b6a 100644 (file)
@@ -36,13 +36,13 @@ HTTP GET request with proxy and "Proxy-Connection: Keep-Alive"
 </client>
 
 <verify>
-<protocol>
-GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 5f795ed66601258ebe55dea15f4b9a532471b6fb..34cba4aa518719bd02f0ac36f639a6824748ee1f 100644 (file)
@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 
 # Verify that the %TESTNUMBER has been resolved to %TESTNUMBER
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 268da350fbe8c9fa27562605a6cc07067a368332..0f5d8c91f0d2cd51f3fdab29fd0303581e9510e4 100644 (file)
@@ -71,17 +71,17 @@ User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
-<protocol>
-GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP.%TESTNUMBER:%HTTPPORT\r
-Accept: */*\r
-User-Agent: %TESTNUMBER-agent\r
-\r
-GET /we/want/that/page/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP.%TESTNUMBER:%HTTPPORT\r
-Accept: */*\r
-User-Agent: %TESTNUMBER-agent\r
-\r
+<protocol crlf="yes">
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
+Accept: */*
+User-Agent: %TESTNUMBER-agent
+
+GET /we/want/that/page/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
+Accept: */*
+User-Agent: %TESTNUMBER-agent
+
 </protocol>
 <stdout>
 HTTP/1.1 200 Mighty fine indeed\r
index aaa8d107b381c0a2d656fed974050fc97cf0978a..5fbf4efd34721ac982ac0d77b57b732256b445c3 100644 (file)
@@ -41,26 +41,26 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 s/^--------------------------[A-Za-z0-9]*/------------------------------/
 s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
 </strippart>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-Content-Type: multipart/mixed; boundary=----------------------------\r
-Mime-Version: 1.0\r
-\r
-------------------------------\r
-\r
-This is the mail text\r
-------------------------------\r
-Content-Disposition: attachment; filename="strange\\file\"name"\r
-\r
-File content\r
---------------------------------\r
-.\r
+<upload crlf="yes">
+Content-Type: multipart/mixed; boundary=----------------------------
+Mime-Version: 1.0
+
+------------------------------
+
+This is the mail text
+------------------------------
+Content-Disposition: attachment; filename="strange\\file\"name"
+
+File content
+--------------------------------
+.
 </upload>
 </verify>
 </testcase>
index 702856245d976ca378aea4ef32404f2817f1cd77..6c7f8261e209f17373c76c3dc07799edb7433ac0 100644 (file)
@@ -32,17 +32,17 @@ http
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/our/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /we/want/our/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/our/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /we/want/our/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stderr mode="text">
 0 says 22 The requested URL returned error: 404
index 4426def0bde43c339454015f1162bf7c95fa7e52..8ddb2e2ef3de098eaaadae29139318a9f1b6b15e 100644 (file)
@@ -38,14 +38,14 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
 ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
 ^EPRT \|1\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|\d{1,5}\|
 </strip>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 22bf8dbbe8d6b8f34c282d698bbb38309a1ebddb..2daf7939d856bd5c0124f2e8a324c2c568f224bb 100644 (file)
@@ -50,19 +50,19 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{method}\n" -L -d "twinkle twinkle lit
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 27\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-twinkle twinkle little starGET /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+POST /%TESTNUMBER 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 /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <stdout>
index 48380a1e9b93f77f69f159c1af3b53e7a97ed7d1..71cfdb6e6827d6ba05b6ef93a7defbabb36c64ac 100644 (file)
@@ -42,13 +42,13 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -r 100-200
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=100-200\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=100-200
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 64628b6599fc2748d9b6323dd16711a20a9ccd7c..7799f5644ab37cfacedeecf27774f95111be924a 100644 (file)
@@ -37,17 +37,17 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "-DELE file"
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-PASV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-DELE file\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+PASV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+DELE file
+QUIT
 </protocol>
 </verify>
 </testcase>
index 342077b8a5d86f209ab021632ce5c501b56abb7d..bf40f1c8a493f6fc21abfa565cd34c9917e84869 100644 (file)
@@ -32,8 +32,8 @@ gopher://%HOSTIP:%GOPHERPORT/1/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-/%TESTNUMBER\r
+<protocol crlf="yes">
+/%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
index f4c1a483865ecdf3b75b1590ac686609ad1a0c0d..aec07681e133d4ed4b33de3b510a78daebd682d8 100644 (file)
@@ -32,8 +32,8 @@ gopher://%HOSTIP:%GOPHERPORT/1/selector/SELECTOR/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-/selector/SELECTOR/%TESTNUMBER\r
+<protocol crlf="yes">
+/selector/SELECTOR/%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
index ab1d51c0f81b20882ff3aa3471d68742b92c5800..586e658d66d02fc13b2b7eda399239b3e73289a9 100644 (file)
@@ -33,8 +33,8 @@ Gopher query
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-/the/search/engine     query succeeded/%TESTNUMBER\r
+<protocol crlf="yes">
+/the/search/engine     query succeeded/%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
index 267fc15cb79100c386a4737ffc1641b8d001e765..29f9bed0ad184d0a22ddf1e916fabe4e31e3e393 100644 (file)
@@ -36,8 +36,8 @@ Gopher IPv6 index
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-/moo/%TESTNUMBER\r
+<protocol crlf="yes">
+/moo/%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
index 97bebe7ba6f4b9589338ee5ab028d73aaaa9fcb7..89d14ad1f87d96b9d2e3530a14bac6918f1aa083 100644 (file)
@@ -61,18 +61,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[testuser:testpass]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[testuser:testpass]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 547ef0d1d142501b45e00d26ef5a16c70ae4f6a6..6fa833893a9d0455b2fd6903b11c2683240a676f 100644 (file)
@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 3625d0e3e041d98ee1a85d7c4543afdfc78cdea0..6d18f564b30ab4433b84c97e48a4c65620028a84 100644 (file)
@@ -35,17 +35,17 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "-DELE after_transfer" -Q "DELE before_tra
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-DELE before_transfer\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-DELE after_transfer\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+DELE before_transfer
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+DELE after_transfer
+QUIT
 </protocol>
 </verify>
 </testcase>
index 09f830c72bfa52c553225666e4804e638bba4523..d709a6f72a5f177c47958ff3a8a59bfa8b6f1cc1 100644 (file)
@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER?junk -J -O --output-dir %LOGDIR
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER?junk HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER?junk HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/%TESTNUMBER">
 12345
index e67878d9062bb098351d30c73288f5ec986987bb..fa7add16774e06a5eb0c0dbf366f9e63df687a88 100644 (file)
@@ -40,13 +40,13 @@ http://user:secret@%HOSTIP:%HTTPPORT/ulion/%TESTNUMBER --socks5 non-existing-hos
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /ulion/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[user:secret]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /ulion/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user:secret]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 195329ecb200a5cfbd75d45b20d19be6a4135d3a..9a511c002294ac80dfa9e15ce4db77db583d633d 100644 (file)
@@ -42,13 +42,13 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://we.want.that.site.com.%TESTNUMBER/ HTTP/1.1\r
-Host: we.want.that.site.com.%TESTNUMBER\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://we.want.that.site.com.%TESTNUMBER/ HTTP/1.1
+Host: we.want.that.site.com.%TESTNUMBER
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index fc8a94eaf70f9bb8f01a648f3e971a04adcd90df..b80d0071c25d4b86bf33b6f149844366655bcedd 100644 (file)
@@ -42,13 +42,13 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://we.want.that.site.com.%TESTNUMBER/?moo=foo HTTP/1.1\r
-Host: we.want.that.site.com.%TESTNUMBER\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://we.want.that.site.com.%TESTNUMBER/?moo=foo HTTP/1.1
+Host: we.want.that.site.com.%TESTNUMBER
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 31c8723913ac1f73e2bf2190145e5611c63d5173..c405ce04d08c639828ff1d18675199be2e685d49 100644 (file)
@@ -76,21 +76,21 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm --proxy http://
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 6341ba473c33854c0340fadd9d6931e637d2db3f..7301aa571c2126e9b05fba0522140e3c85b3f0ad 100644 (file)
@@ -47,20 +47,20 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://example.fake/c/%TESTNUMBER HTTP/1.1\r
-Host: example.fake\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-Cookie: moo3=indeed; moo2=indeed\r
-\r
-GET http://bexample.fake/c/%TESTNUMBER HTTP/1.1\r
-Host: bexample.fake\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://example.fake/c/%TESTNUMBER 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/%TESTNUMBER HTTP/1.1
+Host: bexample.fake
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 691c88e73203a63a6a4b4942a9de881cd71cd5d1..86e1f3693afedcb9cfb89c06c71cdf68a26a744a 100644 (file)
@@ -37,21 +37,21 @@ ftp://%HOSTIP:%FTPPORT/get/file/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/get/file/agai
 ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
 ^EPRT \|1\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|\d{1,5}\|
 </strip>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD get/file\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-CWD /this/is/the/path\r
-CWD get/file/again\r
-EPSV\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD get/file
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+CWD /this/is/the/path
+CWD get/file/again
+EPSV
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index afbc2b5646743fc49763cb7a2cc3672868ac92fd..8b0aa9cf58744fc0ef202ab6b94cdd900fbc3005 100644 (file)
@@ -40,26 +40,26 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://example.fake/c/%TESTNUMBER HTTP/1.1\r
-Host: example.fake\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://example.fake/c/%TESTNUMBER HTTP/1.1\r
-Host: example.fake\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-Cookie: bug=fixed\r
-\r
-GET http://bexample.fake/c/%TESTNUMBER HTTP/1.1\r
-Host: bexample.fake\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://example.fake/c/%TESTNUMBER HTTP/1.1
+Host: example.fake
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://example.fake/c/%TESTNUMBER HTTP/1.1
+Host: example.fake
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+Cookie: bug=fixed
+
+GET http://bexample.fake/c/%TESTNUMBER HTTP/1.1
+Host: bexample.fake
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 454654399b924bf33f046485ecd723e639e2f547..23ffe3bd643d127732b0c797edba21050dbd7209 100644 (file)
@@ -37,13 +37,13 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 1f007c1ce036d0814e0611efdb4998326cc09cd5..7aacf2aa0fd2922e826fb128f2a9d18ef3e78042 100644 (file)
@@ -31,15 +31,15 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 5
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-PASV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+PASV
+TYPE I
+SIZE %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index c2fd7a5dddc5c9b8efaf62019cae0bc04dd6e514..565e83073a1bf5e64c6e835318d0182f3e386c04 100644 (file)
@@ -39,14 +39,14 @@ content to _?!#$'|<>
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER?my+name+is+moo%5b%5d&yes=s+i+r&v_alue=content+to+_%3f%21%23%24%27%7c%3c%3e%0a&content+to+_%3f%21%23%24%27%7c%3c%3e%0a&%3d%3d HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 24\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER?my+name+is+moo%5b%5d&yes=s+i+r&v_alue=content+to+_%3f%21%23%24%27%7c%3c%3e%0a&content+to+_%3f%21%23%24%27%7c%3c%3e%0a&%3d%3d HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 24
+Content-Type: application/x-www-form-urlencoded
+
 start=once+upon+the+time
 </protocol>
 </verify>
index 6c1ee00189e7848b361df7e98249ed63b5222dd9..11b0206ee18a5c49daee3e9277cbdf7e2845eb9a 100644 (file)
@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w 'IP %{remote_ip} and PORT %{remote_port}
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout>
 HTTP/1.1 200 OK
index 64ba4482c58624d51c7244a3fc81ca9eee09b5ed..904fe38932c1f8604fee35cbab29e93a25936572 100644 (file)
@@ -34,16 +34,16 @@ ftp://%HOSTIP:%FTPPORT//%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD /\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD /
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index b20363c3e45c1124f50f31f23499cd39e2612787..51cdaa0a020c8cbf0e96217dfe550f3e7730ec62 100644 (file)
@@ -34,23 +34,23 @@ ftp://%HOSTIP:%FTPPORT//foo/%TESTNUMBER ftp://%HOSTIP:%FTPPORT//foo/bar/%TESTNUM
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD /\r
-CWD foo\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-CWD /\r
-CWD foo\r
-CWD bar\r
-EPSV\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD /
+CWD foo
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+CWD /
+CWD foo
+CWD bar
+EPSV
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 08e706b9b0166461653a44a8d0c29b50139eeea3..8e7c4719161007afb2f0d460b6184468fdd37c71 100644 (file)
@@ -34,16 +34,16 @@ ftp://%HOSTIP:%FTPPORT//%TESTNUMBER --ftp-method singlecwd
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD /\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD /
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 30477a46a0b89c6b3eac657c92a0573c7cda3a44..3c3fbfeb7a976bd3c14c24b0168e14cad58b78ce 100644 (file)
@@ -34,15 +34,15 @@ ftp://%HOSTIP:%FTPPORT//%TESTNUMBER --ftp-method nocwd
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE /%TESTNUMBER\r
-RETR /%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE /%TESTNUMBER
+RETR /%TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index a4df51c46ccf5b499eeea4dcfd1425a6f248826f..64f49257afa0c361a607792bd9a97c8b15723f48 100644 (file)
@@ -39,20 +39,20 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://example.fake/hoge/%TESTNUMBER HTTP/1.1\r
-Host: example.fake\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://example.fake/hogege/ HTTP/1.1\r
-Host: example.fake\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-Cookie: path1=root\r
-\r
+<protocol crlf="yes">
+GET http://example.fake/hoge/%TESTNUMBER 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
+
 </protocol>
 </verify>
 </testcase>
index cc179499ad2242b1b3ac6991bcd2cf63e14a7e63..c225e7d4723e2afd9f3b0d67983fdf796958e0ad 100644 (file)
@@ -66,18 +66,18 @@ http://%5cuser%22:password@%HOSTIP:%HTTPPORT/%TESTNUMBER --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="\\user\"", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="f2694d426040712584c156d3de72b8d6"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="\\user\"", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="f2694d426040712584c156d3de72b8d6"
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 8ccd69cf6816490da107e6d273758fb45bcc8ea6..249f89ab552021d6c607160fe46cc389f9a2c76a 100644 (file)
@@ -28,13 +28,13 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C 51
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+QUIT
 </protocol>
 </verify>
 </testcase>
index fbcff60393b04d9091f941206db8c2cea5479d42..507580d1c3fdcf3b8ec2dce996404f5500302bb9 100644 (file)
@@ -62,17 +62,17 @@ http://[1234:1234:1234::4ce]:%HTTPPORT/wanted/page/%TESTNUMBER -p -x %HOSTIP:%HT
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CONNECT [1234:1234:1234::4ce]:%HTTPPORT HTTP/1.1\r
-Host: [1234:1234:1234::4ce]:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET /wanted/page/%TESTNUMBER HTTP/1.1\r
-Host: [1234:1234:1234::4ce]:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+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/%TESTNUMBER HTTP/1.1
+Host: [1234:1234:1234::4ce]:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 2c7c8bb0009d3b1de007c9d5deecffd95087b204..5573bfc1ae661c902192d511480271c17182c618 100644 (file)
@@ -44,17 +44,17 @@ http://%HOSTIP:%HTTPPORT/../../hej/but/who/../%TESTNUMBER?stupid=me/../%TESTNUMB
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /hej/but/%TESTNUMBER?stupid=me/../%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /hej/but/%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /hej/but/%TESTNUMBER?stupid=me/../%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /hej/but/%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 28d2eee735d76ae232fa309d2e587198d69a450c..278c4e4bd9fbc93334b316e401c701568c0f8e22 100644 (file)
@@ -49,19 +49,19 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://test.remote.haxx.se.%TESTNUMBER:8990/hej/but/%TESTNUMBER?stupid=me/../%TESTNUMBER HTTP/1.1\r
-Host: test.remote.haxx.se.%TESTNUMBER:8990\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://test.remote.haxx.se.%TESTNUMBER:8990/hej/but/%TESTNUMBER0001 HTTP/1.1\r
-Host: test.remote.haxx.se.%TESTNUMBER:8990\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://test.remote.haxx.se.%TESTNUMBER:8990/hej/but/%TESTNUMBER?stupid=me/../%TESTNUMBER HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://test.remote.haxx.se.%TESTNUMBER:8990/hej/but/%TESTNUMBER0001 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 95635334968db0b4c2328311d47aac2641780e4f..e8b45cd0406746b88a907579aa43858a509591ce 100644 (file)
@@ -32,16 +32,16 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-PASV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+PASV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 56664f3f0e82f228082cc3521af78bcf69708215..553d59779539104ba4b41551362651cf04ca307b 100644 (file)
@@ -40,27 +40,27 @@ multiple requests using {}{} in the URL
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout>
 HTTP/1.1 200 OK\r
index e81d872aa9929aac9add6833fd7146f2446a6823..2dec456bb472d7372ca5b6da9cfc37e248518f2c 100644 (file)
@@ -33,13 +33,13 @@ URL with 1000+ letter user name + password
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 601f45459de0f1ced45ef5f1effcf1677ae86858..5f430220f3f9365322ceb8cb510e8af9c796e674 100644 (file)
@@ -41,13 +41,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "-dec 12 12:00:00 1999 GMT" -w '%{respon
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-If-Unmodified-Since: Sun, 12 Dec 1999 12:00:00 GMT\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+If-Unmodified-Since: Sun, 12 Dec 1999 12:00:00 GMT
+
 </protocol>
 <stdout nonewline="yes">
 HTTP/1.1 200 OK
index d2717949c9303c070b172429024ff37db77fe050..e89f8c557d4842f4f7ae3f731a5305fdd334433b 100644 (file)
@@ -32,16 +32,16 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-PASV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+PASV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 5e99f8aff095badb5f93f327139172754d0c8b76..59656d6ca1c5252eb57610cbf929bc2895814a59 100644 (file)
@@ -31,17 +31,17 @@ glob [0-1] with stuff after range (7.33.0 regression)
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /00/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /01/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /00/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /01/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index e114ad326a5ffc550d79e273233ecdd63413713f..d6ea187601bf8c2eb07c028bc400fdbd8e44c0fd 100644 (file)
@@ -48,19 +48,19 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER?stupid=me/../%TESTNUMBER HTTP/1.1\r
-Host: test.remote.haxx.se.%TESTNUMBER:8990\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER0001 HTTP/1.1\r
-Host: test.remote.haxx.se.%TESTNUMBER:8990\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER?stupid=me/../%TESTNUMBER HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER0001 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index fa8ac90753c57237dcbabb77a8bb0d660478e411..238c0c609f3c6b5e1bdb2b606efadb0a2947b93e 100644 (file)
@@ -50,13 +50,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -x %HOSTIP:%HTTPPORT --next http://%HOSTIP:
 <errorcode>
 56
 </errorcode>
-<protocol>
-GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 0814e7dc328a476a99b5598ab23090996e724f70..ad096eaca575c06de49ce7e109054ef23690da0a 100644 (file)
@@ -42,12 +42,12 @@ ftp
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 # 1 - Protocol ftp not supported or disabled in libcurl
 <errorcode>
index 7723192fa14e1b35b15455aef76b72350c86b2e9..33859c46951256655a686905da7a5e970565c3af 100644 (file)
@@ -48,19 +48,19 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://test.remote.haxx.se.%TESTNUMBER:%HTTPPORT/ HTTP/1.1\r
-Host: test.remote.haxx.se.%TESTNUMBER:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://no-scheme-url.com.%TESTNUMBER:%HTTPPORT/ HTTP/1.1\r
-Host: no-scheme-url.com.%TESTNUMBER:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://test.remote.haxx.se.%TESTNUMBER:%HTTPPORT/ HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://no-scheme-url.com.%TESTNUMBER:%HTTPPORT/ HTTP/1.1
+Host: no-scheme-url.com.%TESTNUMBER:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 515b873519a5442f918b04ebbd8a1e984a951555..4e9a5ae483bbbb441f2bc46f393b9c3c518adffd 100644 (file)
@@ -38,13 +38,13 @@ http://user:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://dummy:%NOLISTENP
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[user:secret]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user:secret]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 83c79bff8408ebfdd3f3b00e65e559b24f17dff9..00ffa64aee0de862aee05c6952f201359ac6c5f4 100644 (file)
@@ -41,13 +41,13 @@ http://user:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://dummy:%NOLISTENP
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[user:secret]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user:secret]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 905810a45160644360b7337816903cb1e4ab3878..cc82fe9f571119e4a34037456a13b5ea2528ccdb 100644 (file)
@@ -39,13 +39,13 @@ http://user:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --noproxy %HOSTIP --max-time 5
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[user:secret]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user:secret]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 3f1503575b778254fd4bbbafc664ecba4e3bd182..4703d6a4347afde79882547d2e06ddc77ea89184 100644 (file)
@@ -40,13 +40,13 @@ http://user:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --max-time 5
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[user:secret]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user:secret]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 0da6012d57f715ad3e26c9593d5cd45d72058e5a..6daa4b167189da3310235f0f7cba7c7baf4e43cc 100644 (file)
@@ -42,12 +42,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --noproxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index f6c4153f8667bc89cf3f34749237439b1dbfc341..615a5c0d991fce2e4d3056d3cc8d37eebdeb466c 100644 (file)
@@ -42,13 +42,13 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1\r
-Host: somewhere.example.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1
+Host: somewhere.example.com
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 07e77ed2a2eccae494baa1ba49a1ae86506a07d7..56299ffac2e2230eaa7d48e954d5419c1398dc26 100644 (file)
@@ -42,13 +42,13 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1\r
-Host: somewhere.example.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1
+Host: somewhere.example.com
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 9316051b99186cb7843353170eef33084b823180..78f0b47cffc7bc7ef3caefb20a54d456f7011e6b 100644 (file)
@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --noproxy %HOSTIP
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index b5dd610c0d0b0dcd1818df7026c0bc89af254fa7..312b3ad6be16b3a486bbf6f2284b52ffc2451e88 100644 (file)
@@ -44,13 +44,13 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1\r
-Host: somewhere.example.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1
+Host: somewhere.example.com
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 47245e9dd0a6ef8f873bdec119059658ed7e9c56..2812b9f0328a8f29ee96dafcaa9491470c14bd6d 100644 (file)
@@ -44,13 +44,13 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1\r
-Host: somewhere.example.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1
+Host: somewhere.example.com
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index ae4a33e4b2286b0244914244c63025b4d057995b..81518de97effd9e34729af6d527274a80d98bbb0 100644 (file)
@@ -39,18 +39,18 @@ cookies
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/%TESTNUMBER HTTP/1.1\r
-Host: localhost\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /we/want?hoge=fuga HTTP/1.1\r
-Host: localhost\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: I-am=here\r
-\r
+<protocol crlf="yes">
+GET /we/want/%TESTNUMBER 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
+
 </protocol>
 </verify>
 </testcase>
index 981e8d77b790c7f91e72b01fd257dfd6a801ef01..4b98a5e467f60492aaf1bca995a6490d98dc61ed 100644 (file)
@@ -33,13 +33,13 @@ HTTP URL with semicolon in password
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[user:pass]b64%O3dvcmQ=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user:pass]b64%O3dvcmQ=
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index b830fc77819fa68d6b58551284151328fff9aa02..f23feaabacbb28520a56425b611aab52ee416f70 100644 (file)
@@ -32,17 +32,17 @@ ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD blalbla\r
-CWD lululul\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD blalbla
+CWD lululul
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 17a8af82c03b5b0b4f7ea3968006f1d111cd57b1..7cfb8d762c094055941a4dd8a5f7421ed6e0a790 100644 (file)
@@ -36,12 +36,12 @@ http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n' --locati
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/our/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/our/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 # CURLE_TOO_MANY_REDIRECTS
 <errorcode>
index 0a7046ce9382c942efd95162dbefbd155bb70b46..d094f3ece57193ddeaca8cf902ee562f18becfd5 100644 (file)
@@ -28,13 +28,13 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "-1 jan 2001"
 </client>
 
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD blalbla\r
-MDTM %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD blalbla
+MDTM %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index d5cc00b7105cda3a9f98aa83dfa384017369f3df..05dea240638e26bf1f4b6ec53a27e145bf7578e8 100644 (file)
@@ -46,12 +46,12 @@ http://%HOST6IP:%HTTP6PORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOST6IP:%HTTP6PORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOST6IP:%HTTP6PORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 83975116dc4884b0303fe6915e52153fa0a28178..733724c75a3d5f6dd267d8d5254b4bccf30ede3a 100644 (file)
@@ -33,12 +33,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 42cf40c31dfbbc617f4b18cd38ac99e65f708f32..b94ea3dc2e8539716419b54c5df6126f72e72d9c 100644 (file)
@@ -33,12 +33,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index ebf122d018e4c60e98851fb564b90fec878bafd9..72f813649cedcfa8379eb19384b91ca0b53f4524 100644 (file)
@@ -29,18 +29,18 @@ ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER --disable-epsv
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-CWD to\r
-CWD file\r
-PASV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+CWD to
+CWD file
+PASV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 1e1fa67bb54f5fc5f2d2bca6ba496efa0c42ee4b..22e056d9c80285789572663ea1063c3989226323 100644 (file)
@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n' -s
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/our/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/our/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <stdout>
index 3cc994b716d24ad2012ff4984bd51d4947725c67..2e3f3128a2c5546ce067dd50eec06bfa83d342a4 100644 (file)
@@ -35,12 +35,12 @@ http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w @%LOGDIR/blank%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/our/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/our/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 41fc3ef76f8eed56cacd2637d152cda6f1fb06c2..ea2dd0331c7a10d7e34ab3f5ab186cd81ccd97e9 100644 (file)
@@ -36,8 +36,8 @@ Gophers index
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-/%TESTNUMBER\r
+<protocol crlf="yes">
+/%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
index fb5d47b2d409779ecab00713e9bfeba08380452c..c78ea0294324b511074615533fe3eb9647a0e5f7 100644 (file)
@@ -69,13 +69,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C - -f
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=100-\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=100-
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 1568c1aa6f9ef0396d84c032f1f0a2897371f910..dd53c1596430c9872cdc33feb6247ae138a7d030 100644 (file)
@@ -43,12 +43,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/out%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/out%TESTNUMBER">
 HTTP/1.1 200 OK\r
index 52a0f675a2e87ad03c890b573d472baa9c2345e8..7c7554bf0f92d4f1b8b85cafe8336f44935b4434 100644 (file)
@@ -178,15 +178,15 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding --compressed
 <strippart>
 s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
 </strippart>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-TE: gzip\r
-Accept-Encoding: xxx\r
-Connection: TE\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+TE: gzip
+Accept-Encoding: xxx
+Connection: TE
+
 </protocol>
 </verify>
 </testcase>
index 089717da7964b4b9600dd09f5f26e15d990387d3..86a48f0f7302fdeded6e0e4ebaf5f6dcddcca962 100644 (file)
@@ -35,23 +35,23 @@ the
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-STOR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+STOR %TESTNUMBER
+QUIT
 </protocol>
-<upload>
-file\r
-with Unix newlines\r
-meant to be\r
-converted\r
-with\r
-the\r
---crlf option\r
+<upload crlf="yes">
+file
+with Unix newlines
+meant to be
+converted
+with
+the
+--crlf option
 </upload>
 </verify>
 </testcase>
index 081cbbe547a182d0161ffb5769af10dee5558542..5d2023357ef36e8e5169e19e065e78fcda5aa363 100644 (file)
@@ -33,27 +33,27 @@ http://%HOSTIP:%HTTPPORT/[a-d]/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /a/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /b/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /c/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /d/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /a/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /b/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /c/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /d/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index a54166be96613bd9aba88a4ed331924cd668317e..ba5d545dca6b0436c5110ad90b56778d2522894c 100644 (file)
@@ -29,9 +29,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
 </protocol>
 
 # 67 == CURLE_LOGIN_DENIED
index 1e8e9d44744e8095be25621812fb8dda2b5c95aa..93bca79a1cea81a3750b3728ba8d1050b8f7ef7e 100644 (file)
@@ -36,12 +36,12 @@ http://%HOSTIP:%HTTPPORT/[a-a][1-1][b-b:1][2-2:1]/%TESTNUMBER -o "%LOGDIR/outfil
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /a1b2/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /a1b2/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/outfile%TESTNUMBER_a1b2.dump">
 HTTP/1.1 200 OK\r
index 925150b6e7435ee4911b8106751e4e119fc20b29..a319b0cf4792e356c87a627db048a2cddec883ab 100644 (file)
@@ -67,22 +67,22 @@ HTTP POST --digest with user-specified Content-Length header
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 0\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="5763079608de439072861a59ac733515"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 11\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 0
+Content-Type: application/x-www-form-urlencoded
+
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="5763079608de439072861a59ac733515"
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 11
+Content-Type: application/x-www-form-urlencoded
+
 junkelijunk
 </protocol>
 </verify>
index b8b47e7ef50941979a365c29cf159411235f999e..90f5e40be70ac9d8e7d59d456cec1ed931692705 100644 (file)
@@ -89,24 +89,24 @@ HTTP GET --digest increasing nonce-count
 <strippart>
 if(s/^(Authorization: Digest )([^\r\n]+)(\r?\n)$//) { $_ = $1 . join(', ', map { s/^(cnonce=)"[a-zA-Z0-9+\/=]+"$/$1REMOVED/; s/^(response=)"[a-f0-9]{32}"$/$1REMOVED/; s/^qop="auth"$/qop=auth/; $_ } sort split(/, */, $2)) . $3; }
 </strippart>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest cnonce=REMOVED, nc=00000001, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/%TESTNUMBER", username="auser"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest cnonce=REMOVED, nc=00000002, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/%TESTNUMBER0001", username="auser"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest cnonce=REMOVED, nc=00000001, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/%TESTNUMBER", username="auser"
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest cnonce=REMOVED, nc=00000002, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/%TESTNUMBER0001", username="auser"
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index c9d2a6cb2db1bf372cbaa61aeaa5230e33a0e326..314f1efe037e0f4be7b6448ae456946b9a40748c 100644 (file)
@@ -76,12 +76,12 @@ User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
-<protocol>
-GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: test.%TESTNUMBER:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: test.%TESTNUMBER:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/stderr%TESTNUMBER" mode="text">
 * Ignoring Content-Length in CONNECT 200 response
index e94bd5104d295674e2c9fbefde6f7c2e9c566fc1..0581d0e7b07d061f5e4101fcd7eacab78283a208 100644 (file)
@@ -59,12 +59,12 @@ User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
-<protocol>
-GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 # This test is structured to test all the expectations of
index 22e071d3e15bb8c90d911e15bb633ba6dca994d6..c01842f07d000b082d06b6934515430b37254a4e 100644 (file)
@@ -42,12 +42,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 # CURLE_UNSUPPORTED_PROTOCOL
 <errorcode>
index 959247863ec732708518feb6f82ac9e2df50c367..293a2131c8573ed9e1ba17e6862394b229d8c2ca 100644 (file)
@@ -35,12 +35,12 @@ Verify URL globbing ignores []
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/[]/page/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/[]/page/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index e674bfd89c1dfdb193627a27b409d6f09bb562ee..71b2aefa215bf537cf245ded25bb4b98633ddbee 100644 (file)
@@ -37,12 +37,12 @@ Replaced internal headers with a blank one
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host:\r
-User-Agent: curl/%VERSION\r
-Accept:\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host:
+User-Agent: curl/%VERSION
+Accept:
+
 </protocol>
 </verify>
 </testcase>
index afecfaf2f9bc508c7dd931107ac61b153c512456..ec71b8a6a580a348ac50b4b0aa795214f822bbe9 100644 (file)
@@ -50,19 +50,19 @@ http://0 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F=
 s/^--------------------------[A-Za-z0-9]*/------------------------------/
 s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
 </strippart>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 138\r
-Content-Type: multipart/form-data; boundary=----------------------------\r
-\r
-------------------------------\r
-Content-Disposition: form-data\r
-\r
-\r
---------------------------------\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 138
+Content-Type: multipart/form-data; boundary=----------------------------
+
+------------------------------
+Content-Disposition: form-data
+
+
+--------------------------------
 </protocol>
 </verify>
 </testcase>
index 58e2d379e0cb3d71f1a2fbc300896735c76075fa..887023959bd2e3a3a241cac10297f95a6b467df6 100644 (file)
@@ -51,13 +51,13 @@ http://%HOSTIP:%HTTPPORT/0123456790123456790123456790123456790123456790123456790
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-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 ___, 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\r
-\r
+<protocol crlf="yes">
+GET /012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/%TESTNUMBER 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 ___, 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
+
 </protocol>
 </verify>
 </testcase>
index 5c963cae43e8b4034014a13c6040cb247bae54d8..bfd13c73f63565b47a22e23a109f2f67a29e8654 100644 (file)
@@ -51,15 +51,15 @@ http://%HOSTIP:%HTTPPORT/0123456790123456790123456790123456790123456790123456790
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679: 300\r
-Content-Length: 165\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679: 300
+Content-Length: 165
+Content-Type: application/x-www-form-urlencoded
+
 Mr. Sherlock Holmes, who was usually very late in the mornings, save upon those not infrequent occasions when he was up all night, was seated at the breakfast table.
 </protocol>
 <stdout>
index 316cc63bd71d2ac4de5bd0b35fdea2ec9049f663..253c8c6c7a5062e81343f550d0a4525d0d4bf3ee 100644 (file)
@@ -41,13 +41,13 @@ http://user%0aname:password@%HOSTIP:%HTTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[user%0aname:password]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user%0aname:password]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 386154af30b34a20b1714a120096adba190c5193..eda49ba5f92e6a555bfe755172e6d0e262a387fa 100644 (file)
@@ -50,12 +50,12 @@ User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
-<protocol>
-GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 # 52 - got nothing
 <errorcode>
index cebe4a9f71f694841b97cdc54980efc45bb57323..60c1b7b17e3d2c9562ef7a9df6746c56802ebf72 100644 (file)
@@ -42,13 +42,13 @@ HTTP GET special path with --request-target
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET XXX HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Testno: %TESTNUMBER\r
-\r
+<protocol crlf="yes">
+GET XXX HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Testno: %TESTNUMBER
+
 </protocol>
 </verify>
 </testcase>
index 11ac0c41f7ebf745e42559bb239a3ce9071d14a6..a0781bc9e598f3e9dafe541f517795d6e32fdf2d 100644 (file)
@@ -41,13 +41,13 @@ Send "OPTIONS *" with --request-target
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-OPTIONS * HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Testno: %TESTNUMBER\r
-\r
+<protocol crlf="yes">
+OPTIONS * HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Testno: %TESTNUMBER
+
 </protocol>
 </verify>
 </testcase>
index b8bcf164944ed8952ac41715860a7b12cfb2d0d7..90c53724d8a1caf65eb478f3fe6b6acaf12266a8 100644 (file)
@@ -31,12 +31,12 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -X DELETE
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-DELETE /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+DELETE /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 2c4dfe85eb54e3a69e59b5462b6f17604c9133a6..91bde4910661ba3e0b8403eacb08bf303bd0d41e 100644 (file)
@@ -50,14 +50,14 @@ default login userdef password passwddef
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER user1\r
-PASS passwd1\r
-PWD\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER user1
+PASS passwd1
+PWD
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index 4a73de2850133bb2d22c041be630ba2ff990e85d..4cff26ac5c5b27057e9e0e2745879013b7959985 100644 (file)
@@ -47,14 +47,14 @@ machine %HOSTIP login user2 password passwd2
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER user2\r
-PASS passwd2\r
-PWD\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER user2
+PASS passwd2
+PWD
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index 49bb0d36df4443bfff4cd1930f3edcefe2b01598..4d164596c9d2a59b4af63f92eb41614ec5d3af49 100644 (file)
@@ -40,12 +40,12 @@ http://%HOSTIP:%HTTPPORT/junk -J -O --show-headers --output-dir %LOGDIR
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /junk HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /junk HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/name%TESTNUMBER">
 HTTP/1.1 200 OK
index 1a14547ced3dd882223c478f0c67f9f53c4e1ff6..e5942fe1d6574abfa62950c006e84955a428ac10 100644 (file)
@@ -39,12 +39,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O --output-dir %LOGDIR
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/name%TESTNUMBER">
 12345
index b67fdded7966c87b74580a5cc4abe11ed00e5627..fcf3cbc0a113cedeae24d88cf48c76cf2eca55e8 100644 (file)
@@ -39,12 +39,12 @@ HTTP GET with -J, Content-Disposition and ; in filename
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/name%TESTNUMBER;weird">
 12345
index 922dbc7613ac0070bebaaae0e73bd05d96073aab..16ce2bbf10081b80b508d9798c6ce84485c264f4 100644 (file)
@@ -39,12 +39,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O --output-dir %LOGDIR
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/name%TESTNUMBER">
 12345
index 40cd18971cba296c140fb465215ccf355cca98cb..3043466de3a990894f31c73a2ca7dc97c8df94d2 100644 (file)
@@ -63,19 +63,19 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://firstplace.example.com/want/%TESTNUMBER HTTP/1.1\r
-Host: firstplace.example.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://somewhere.example.com/reply/%TESTNUMBER HTTP/1.1\r
-Host: somewhere.example.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://firstplace.example.com/want/%TESTNUMBER HTTP/1.1
+Host: firstplace.example.com
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://somewhere.example.com/reply/%TESTNUMBER HTTP/1.1
+Host: somewhere.example.com
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 2218b6e1474230da0ef40d97878aa7363f780cfa..08d9ec7b8509672786d83d17353245460cf0b47e 100644 (file)
@@ -60,14 +60,14 @@ ftp://ftp.%TESTNUMBER:%FTPPORT/ -p -x %HOSTIP:%PROXYPORT
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index 6ef065280d9efc721703139f2dcef58dd4a63584..d81358997e30e8483ed530ff9db18ac17c9cd35b 100644 (file)
@@ -43,12 +43,12 @@ HTTP with --resolve
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: example.com:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: example.com:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index b7cc434eb3af877737da982d8c2a89db19533348..18188785d287b05c22478795a832ddbdec40bc44 100644 (file)
@@ -43,17 +43,17 @@ HTTP with --resolve and same host name using different cases
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: MiXeDcAsE.cOm:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: mixedcase.com:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: MiXeDcAsE.cOm:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: mixedcase.com:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 2dd8870955b4a839c925a40e445b30236d93f149..a4b32eec21033349bed99ab7b29165dae2e362db 100644 (file)
@@ -63,12 +63,12 @@ pop3://pop.%TESTNUMBER:%POP3PORT/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT -u user:se
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-USER user\r
-PASS secret\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+USER user
+PASS secret
+RETR %TESTNUMBER
+QUIT
 </protocol>
 <proxy>
 CONNECT pop.%TESTNUMBER:%POP3PORT HTTP/1.1\r
index 77d47c8fd2e7d7a86f86a05de3a48f81d8039f0f..d9b89436ebb54c6ce3113d7d011c15e745112e0b 100644 (file)
@@ -47,14 +47,14 @@ machine %HOSTIP login user2 password passwd2
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER mary\r
-PASS mark\r
-PWD\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER mary
+PASS mark
+PWD
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index 9237ea5722e7f93952f9f8c628735c2a631e92c1..5061e8bed7309b057a78ed3ca744e93b4fc8f68c 100644 (file)
@@ -46,19 +46,19 @@ smtp://smtp.%TESTNUMBER:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-body\r
-.\r
+<upload crlf="yes">
+From: different
+To: another
+
+body
+.
 </upload>
 <proxy>
 CONNECT smtp.%TESTNUMBER:%SMTPPORT HTTP/1.1\r
index 4fe83fefbb72eedc0d6b6ffdca53aa642d1c7e4f..0ccd858c0d86e9111c897cf7c27ab5ac70cf07df 100644 (file)
@@ -59,12 +59,12 @@ IMAP FETCH tunneled through HTTP proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 <proxy>
 CONNECT imap.%TESTNUMBER:%IMAPPORT HTTP/1.1\r
index a7095271091188765814118e23e77ca2eb302939..6f87503432e2e92780d5f6759b396186db07cbde 100644 (file)
@@ -44,12 +44,12 @@ HTTP with --resolve and hostname with trailing dot
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: example.com.:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: example.com.:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 7669da7b67ea1cc3fe163769301ea7bf2af2e6f3..30b404fe23a6ae792c59260cb7137cba46b29ab1 100644 (file)
@@ -48,12 +48,12 @@ HTTP with --resolve and [ipv6address]
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: example.com:%HTTP6PORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: example.com:%HTTP6PORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 67b31d58fe7fe9a726c27822fad1af7b46bb0d95..622981bd455c66406e3971276c733d585f6b89ff 100644 (file)
@@ -58,21 +58,21 @@ http://%HOSTIP:%HTTPPORT/we/%TESTNUMBER -L -d "moo"
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /we/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 3\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-mooPOST /we/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 3\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /we/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 3
+Content-Type: application/x-www-form-urlencoded
+
+mooPOST /we/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 3
+Content-Type: application/x-www-form-urlencoded
+
 moo
 </protocol>
 </verify>
index 89e5a79c73585a17371fa0478986d2bfff1de63e..c712faea6fbcf500445bd9633991c9bade5ced02 100644 (file)
@@ -40,9 +40,9 @@ telnet://%HOSTIP:%HTTPPORT --upload-file -
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/%TESTNUMBER HTTP/1.0\r
-\r
+<protocol crlf="yes">
+GET /we/want/%TESTNUMBER HTTP/1.0
+
 </protocol>
 </verify>
 </testcase>
index c54f2a8898ebef2bbdbdc13f4b130bed3fef99aa..cf1c9c7fbd4c8ac937f8013f290173d22b26f139 100644 (file)
@@ -39,9 +39,9 @@ telnet://%HOSTIP:%HTTPPORT -T %LOGDIR/%TESTNUMBER.txt
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/%TESTNUMBER HTTP/1.0\r
-\r
+<protocol crlf="yes">
+GET /we/want/%TESTNUMBER HTTP/1.0
+
 </protocol>
 </verify>
 </testcase>
index e913e19cea57839c0ad46992d4fd02194134755d..b650946a419ccd48aa91bcfb46e93454a3f2e394 100644 (file)
@@ -54,17 +54,17 @@ HTTP GET a globbed range with -f
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER0000 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER0000 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 4a2c46cde4b80fac87a3890f7344489d18d02bc2..c125ed9f0436cc333d866f7caa1f1502308c58c9 100644 (file)
@@ -47,14 +47,14 @@ machine %HOSTIP login mary password drfrank
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER mary\r
-PASS drfrank\r
-PWD\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER mary
+PASS drfrank
+PWD
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index ed74623112408f3835f939af90f48ae337bd3a5a..9c211cf366631aa2868e5d824c03e16a968cd97f 100644 (file)
@@ -72,21 +72,21 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://z.x.com/%TESTNUMBER HTTP/1.1\r
-Host: z.x.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://z.x.com/%TESTNUMBER HTTP/1.1\r
-Host: z.x.com\r
-Proxy-Authorization: Basic %b64[myname:mypassword]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-Cookie: proxycookie=weirdo\r
-\r
+<protocol crlf="yes">
+GET http://z.x.com/%TESTNUMBER HTTP/1.1
+Host: z.x.com
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://z.x.com/%TESTNUMBER HTTP/1.1
+Host: z.x.com
+Proxy-Authorization: Basic %b64[myname:mypassword]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+Cookie: proxycookie=weirdo
+
 </protocol>
 </verify>
 </testcase>
index 835294082329d714a40cfa7ca5488884b410b10a..c852d84b5d6ff73b6d435fe6fa9e262455713df0 100644 (file)
@@ -57,21 +57,21 @@ http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post303
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /blah/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 3\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-mooPOST /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 3\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /blah/%TESTNUMBER 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=/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 3
+Content-Type: application/x-www-form-urlencoded
+
 moo
 </protocol>
 </verify>
index 5a5dd63a2d9a5c6b4da59223014d01a116f562a8..050b041163b1b14ee4dcd4a1cb28fbc60ba4c86c 100644 (file)
@@ -38,16 +38,16 @@ HTTP POST zero length, chunked-encoded
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Transfer-Encoding: chunked\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-0\r
-\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Transfer-Encoding: chunked
+Content-Type: application/x-www-form-urlencoded
+
+0
+
 </protocol>
 </verify>
 </testcase>
index 1a13864c2ea1710ddbacbe57a24189fb3212a19e..2c12a7ce7a358733f2d459cfeefbe81d963223ff 100644 (file)
@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER --output-dir
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/%TESTNUMBER">
index 146ff6d91828df93447ef28dbf1ee07a6f778aed..f98e879d41f066a75e3415da9e9ee787a0161d42 100644 (file)
@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D - --output-dir="%LOGDIR"
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/%TESTNUMBER">
index dd93b5f9fc1ff54942249c8bc7802dfa03d0edcd..fabb3cf06856facc6f2b84d0bf87deda081117ba 100644 (file)
@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER --output-dir
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/%TESTNUMBER">
index 5dbddeea61d9fcd7372430d3e1dc9087e7fdf5d4..97815624200eb861a7be44d8fa5726830972eb4a 100644 (file)
@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D - --output-dir %LOGDIR
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/%TESTNUMBER">
index bc7b641e6ed7398faade83608a15e8dc4d8fbd06..beb58447cd67a5160ee7d96cc6825e3b1f640161 100644 (file)
@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D %LOGDIR/heads%TESTNUMBER --output-
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/%TESTNUMBER">
index a3533841d17441ee57729973a76cffc6cae62029..f6ee7ac0570db827ccad7f75ae6f91191b421a57 100644 (file)
@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D - --output-dir %LOGDIR
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/%TESTNUMBER">
index 207e4f5d47412865959e4b8c037c9b91493e71c3..57403acf90d62e7c1682088a88a571dd01632694 100644 (file)
@@ -49,14 +49,14 @@ machine %HOSTIP login user2 password passwd2
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER romulus\r
-PASS rhemus\r
-PWD\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER romulus
+PASS rhemus
+PWD
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index 9b6c092da3bc73b9b0c95fce0778a5ad1fda373e..91072c0aac6f5e5a3c346d95d1736b5b75436aea 100644 (file)
@@ -39,12 +39,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D %LOGDIR/heads%TESTNUMBER -w "curl
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/name%TESTNUMBER">
index 74cfd3b3542330606ab367534c65fa1b199306a0..0dcd2d03a8a79ce9f949bee6b9ae54467766fad2 100644 (file)
@@ -39,12 +39,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D - -w "curl saved to filename %{fil
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/name%TESTNUMBER">
index 6d039f7ee36e6718a3989c8bc5582af03cb1e136..15e1f8ece0dfd2c1a02e1d89faa906d6394c4e79 100644 (file)
@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER --output-
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/%TESTNUMBER">
index c6a18f2ba7d2cb51398389054ab0abe4b2fa835e..66401d14153cd963d423851bf5c786a666addf60 100644 (file)
@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D - --output-dir %LOGDIR
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/%TESTNUMBER">
index de440520e0502b3f5173e4e7bc382351838696e6..50d9456932ca758d651b9333ad04251faf3c57c0 100644 (file)
@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER --output-
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/%TESTNUMBER">
index a093e5d8cf704ebc3f60ed37862533458048f149..ac5cb063dd58ec77b465a409a095f3185bc4999a 100644 (file)
@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D - --output-dir %LOGDIR
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/%TESTNUMBER">
index af2a35cbabffcc2fe90c2dcfe0762fd8e69eff32..81b170ecb96fc741fcc105b79d199d0ffd79d0ad 100644 (file)
@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O --output-dir %LOGDIR
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/%TESTNUMBER">
index bbef9f409c0b5b9e22b829f9dfd47b424c545764..e1e14cf568ae37b8196f6e52db305051694a3275 100644 (file)
@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O --output-dir %LOGDIR
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/%TESTNUMBER">
index b99ab58f8d3ad50f2fa2ed5dda4dd3d7e2a54220..e072169f85775dcec2cb388547e0ed6c0c1b16ff 100644 (file)
@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O --output-dir %LOGDIR
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/file%TESTNUMBER">
index 03f91ae23a80c2f2bd20faf21c768570241a1dbe..63c06e2983dfe155948f97d606f1c76bfa11a654 100644 (file)
@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER --out
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/file%TESTNUMBER">
index 3dc1d531f5b351c882cb5282f31b7c343f190d48..2780c03354bfc05d65d45f9e6bf1da3483167180 100644 (file)
@@ -38,17 +38,17 @@ FTP retrieve a byte-range
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-REST 4\r
-RETR %TESTNUMBER\r
-ABOR\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+REST 4
+RETR %TESTNUMBER
+ABOR
+QUIT
 </protocol>
 </verify>
 </testcase>
index 60d3620773fb682f440c3482d5386aaf12302403..5d7a365394197b292efd057e113c85c4430cc6e6 100644 (file)
@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D - --output-dir %LOGDIR
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/file%TESTNUMBER">
index 05a22ce6297880dea7ad28ec3ca84cb393574223..d05f9b026c3858cce7fd51fbcecf630bca508b27 100644 (file)
@@ -30,16 +30,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D %LOGDIR/heads%TESTNUMBER --
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/file%TESTNUMBER">
index ae94e5aad452ba0d055a1a52d0126931c3fe228f..db093ab72b7ddea3d0e342ea812090ee7073b30d 100644 (file)
@@ -30,16 +30,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D - --output-dir %LOGDIR
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/file%TESTNUMBER">
index 45aad1c4babafb92b13ec883b694d1b687641c77..45308f1cf150e410e79b9c3c4ad8142493280554 100644 (file)
@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D %LOGDIR/heads%TESTNUMBER --
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/file%TESTNUMBER">
index c7ff933cc1dfa1288c661cb828c74d3db9d78485..dfba8ba3a5acb1e03d76c8a9a360ec8e885e1e9c 100644 (file)
@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D - --output-dir %LOGDIR
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/file%TESTNUMBER">
index 7158a6e99fee7e833c96cf49595c1367cbf70cf6..30f40eac39e1b2cfccf35eb299d4d5a5bccea444 100644 (file)
@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i --output-dir %LOGDIR
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/file%TESTNUMBER">
index e690747f1684578efedce87daf57b17d2a18b326..55161e1437845e6fe5482dae4ab703b2175086d1 100644 (file)
@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O --output-dir %LOGDIR
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/file%TESTNUMBER">
index 926fd538d95f95f75256a0d77be511d888efdfa0..25ce6b24b763b1ddf1b11d1acd9bd69345fd3e79 100644 (file)
@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER --out
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/file%TESTNUMBER">
index 14fc95afeed9216b87ff1140a4f070c58dee54fc..c5e3ce80fb1c3d92e2315ae9856bc2e158c2319e 100644 (file)
@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D - --output-dir %LOGDIR
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/file%TESTNUMBER">
index c26ac187b46ed8b471c84fd89def6b363ce54db6..e7d005860073111a139c478a6aee7a9671e4c636 100644 (file)
@@ -38,16 +38,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D %LOGDIR/heads%TESTNUMBER --
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/file%TESTNUMBER">
index ef0b2c49ac74c4ca12b05e45bda18d27152e5d70..949ae2ebb2d4a1dd6e65c5c88436bc35a678bb27 100644 (file)
@@ -28,15 +28,15 @@ FTP with user and no password
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER user\r
-PASS \r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER user
+PASS 
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index a7ed493023c319c59be1be666b923c809c14db16..794ba6453671cdf77cd5979daba4ff905e9252e9 100644 (file)
@@ -38,16 +38,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D - --output-dir %LOGDIR
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/file%TESTNUMBER">
index 18c9f5f08c976a2c2c5c7c97f7e1d65704512d01..13138941d7035e6d25647d390261a6706a54e55c 100644 (file)
@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D %LOGDIR/heads%TESTNUMBER --
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/file%TESTNUMBER">
index 261950969b7960774541927a3a493a2963c399a6..1ffa1a2e9aad1a2cb838bd4e77b3206e7c620499 100644 (file)
@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D - --output-dir %LOGDIR
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/file%TESTNUMBER">
index 022940257d207be42291ef98447da87b7ed6133b..876304a39cfd692615ba319bd3c861eff080265d 100644 (file)
@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i --output-dir %LOGDIR
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/file%TESTNUMBER">
index 2b3b566f6ab476126c6742aa9b5422340d2e0342..05b10105bb64f4b3c49d44786dfa977cc8ceb4fc 100644 (file)
@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/he
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/outfile%TESTNUMBER">
index 1a28a77ede8dae8ff0c3bfa97a70e5ae9227feb8..8643199f2dbc834d6c8afcfb59436e12c3ef6d16 100644 (file)
@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D -
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/outfile%TESTNUMBER">
index 1107c22811508cea65212fa8f7baafbcf7f76984..2b8d65ed2015c9b79e83b76cde2f1fc0e05ca5cd 100644 (file)
@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/he
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/outfile%TESTNUMBER">
index 5d1efa3a955c111398bd316babcb28230416e15b..d665b770d1026c4b64b98ece1da1ee09a0e111d6 100644 (file)
@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D -
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/outfile%TESTNUMBER">
index c9ee021691737ceab053e01d0ccea9c7c7e15b4c..cbe8d64d6b42e1453584690204768499ed103ae8 100644 (file)
@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/outfile%TESTNUMBER">
index 93627e6a484a4b08df2dd524770ecd257efd3c5d..bc818ce774d45f076f6f1945f912f5a287c6218a 100644 (file)
@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D -
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/outfile%TESTNUMBER">
index 33b93589ec3699cdb351c3d782e794898bd53cad..43c4fcebf18a94925eb6361c7510e3d336509a7e 100644 (file)
@@ -31,17 +31,17 @@ ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD blalbla\r
-CWD lululul\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD blalbla
+CWD lululul
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 637444c540e678798d30425e6b697c06ede8228a..0a08c0b8e3bb2380e495f8f8fb8809899059ccd1 100644 (file)
@@ -39,12 +39,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/outfile%TESTNUMBER">
index d05c1a15bf0022ffb09a6110ce85cfb5d833a99f..145a0a7a535fe30d240a6eecdba159f6ba3cd8db 100644 (file)
@@ -39,12 +39,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D -
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/outfile%TESTNUMBER">
index a39a243c99ddfdc8603f01405717f05e1dec9ee4..c005a39a74bf6f4fef73f243c3f3198caacada9a 100644 (file)
@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/outfile%TESTNUMBER">
index 7d94775d6ffca4c77996bdc6f880148bcff082be..33634c92fbab010551e5bd20c662da1629d27aad 100644 (file)
@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D -
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/outfile%TESTNUMBER">
index 95af862faa182dcac43d86cecf49f4bb7371e3df..6dda004788819b3854dd5b059a9262b9ba2133e0 100644 (file)
@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/outfile%TESTNUMBER">
index f56a7d90b368a9b8e42a3e29a297e03675e5d539..c226dc566f7a4c80493f6ae84d7316e814470a4e 100644 (file)
@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D -
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/outfile%TESTNUMBER">
index 5b3280b0336e244a56687e0fc28a10ea122dd387..ce11a423b774ef9d1a66e21077a81f20934701e5 100644 (file)
@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/outfile%TESTNUMBER">
index 4bdc864bc1ee90397f69d404bdfcde143d51e1bb..52495d524b7489a2508c9bce46fa7546e45539ba 100644 (file)
@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/outfile%TESTNUMBER">
index 199679cab6364f5c3dfec8b8f814b899627efd1b..42e0c4654165cff79e86411dc25d7371441a6060 100644 (file)
@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/download%TESTNUMBER">
index 39b66ebe3b38c713c55ea419367865f1ab2e0c8e..5faf44ac1bb3ed24f784acb0825ff42ef9732e61 100644 (file)
@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D %L
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/download%TESTNUMBER">
index db3b6ec7df268ae3727fe22676066b07ffe84204..765039d70c322c9163c91f65772835436fb47c66 100644 (file)
@@ -34,17 +34,17 @@ ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD blalbla\r
-CWD lululul\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD blalbla
+CWD lululul
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index cca8020eb04747f626693d7f79acbb721ffb7d80..02db86ac271f34c272910486eae27be416d3ee17 100644 (file)
@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D -
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/download%TESTNUMBER">
index 3455369a981f6d9f37aee4c46c96a08f557b788e..4ae53c38cb35bb5c532664410c064a35275ee7bc 100644 (file)
@@ -30,16 +30,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/download%TESTNUMBER">
index 78d05a32154497582609d552f712b045a43397f7..bce914faa6827e23a77afe04cab9de0cdc874b8c 100644 (file)
@@ -30,16 +30,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/download%TESTNUMBER">
index 96c3e9a2785813e9f59fe44f5a7fca995ed706ba..23a9ec55bae8909f5a83accd125334ff6389bb33 100644 (file)
@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/download%TESTNUMBER">
index 4251c42a1e7f4a64f9fec60e39a524cfb9298395..459a4e0236b1fc19d918fed55f38216ac97955c1 100644 (file)
@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/download%TESTNUMBER">
index c14ddba20f69950e2dd5dc4c455fb9187a037c29..33a5bb75de3d286efe337b25b842036ccf96089d 100644 (file)
@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/download%TESTNUMBER">
index 72f13ca582831ff11fab453023900e8cf31ee394..622afb41c0d4eb0e67032a1554acd29f1b639691 100644 (file)
@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/download%TESTNUMBER">
index 43c28cc582e379431f2bb65071f8d3300dc13191..44b7d8aea2c57c9f5c4524a0d3acdb08a2af335f 100644 (file)
@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D %L
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/download%TESTNUMBER">
index 0a3c173e50b4f5a6a0d09a47735ee72ebdc325d6..6bb799727956c2533bcbf59c3b51c0bf35140733 100644 (file)
@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D -
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/download%TESTNUMBER">
index 0c648309e55640467c517c423ccfddebd249f2aa..5c6979bd31952ffaddef69cd46a333d41b9d4df2 100644 (file)
@@ -38,16 +38,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/download%TESTNUMBER">
index 160f628e2cb0f9a8ca7478a78fe03143bb5695d8..bde3f2d3b48a6dff0405edeaafaffa61e705421f 100644 (file)
@@ -31,17 +31,17 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "1 jan 1989"
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD blalbla\r
-MDTM %TESTNUMBER\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD blalbla
+MDTM %TESTNUMBER
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 6b3f4dad3eb56ef66a5a516010d8f7a97d20de00..e263fef96966956eeb5692ab38505ef1543c5ae1 100644 (file)
@@ -38,16 +38,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/download%TESTNUMBER">
index 447a57829188ca21bd307a7ec8e8687485645b4b..063294b8e7b61bffaa82df88843b230de0dd74b2 100644 (file)
@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/download%TESTNUMBER">
index 4af7966889e38c4f9132e6c950fa56b85a89a96b..824cc214c2d93ba8c7a8b9ba89c699405f00291d 100644 (file)
@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/download%TESTNUMBER">
index 492da66fc01db947f5309f3cdc9ae3d84cd034b3..08946ee9ec9fce593db78c6145e2cd94c13f0020 100644 (file)
@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE file%TESTNUMBER\r
-RETR file%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
+QUIT
 </protocol>
 
 <file1 name="%LOGDIR/download%TESTNUMBER">
index 1bffda78d75f2e0b13d346867a36f4be79f5fc68..32ff62746e2a21f1893f29d54b66dff539688063 100644 (file)
@@ -30,12 +30,12 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -i --head
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-HEAD /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+HEAD /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 5e29f5c7c758515381422b68a28077a2eb649440..0910ff3dc2b12be0ac6a103ac61cfc48c81b1b51 100644 (file)
@@ -30,13 +30,13 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "1 jan 2004"
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD blalbla\r
-MDTM %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD blalbla
+MDTM %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 4a9e1e66a5fceb7e74b59c526e2036a67977dedf..1ff85505ca28cccdf2ae6dbb64a2802a796b68d1 100644 (file)
@@ -40,12 +40,12 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stripfile>
 s/(USERAGENT, \")[^\"]+/${1}stripped/
index bb5a7a97ac25b769b9d7536b1ddbb4c3325ead8a..5cb90eeacb4b07d8c35bca93f4ff7790ab51f6ff 100644 (file)
@@ -48,16 +48,16 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[fake:user]b64%\r
-User-Agent: MyUA\r
-Accept: */*\r
-Cookie: chocolate=chip\r
-X-Files: Mulder\r
-X-Men: cyclops, iceman\r
-\r
+<protocol crlf="yes">
+GET /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[fake:user]b64%
+User-Agent: MyUA
+Accept: */*
+Cookie: chocolate=chip
+X-Files: Mulder
+X-Men: cyclops, iceman
+
 </protocol>
 <stripfile>
 # CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with
index c973e7d8f8cae1002cfe9023555da9201112c08a..9c0330532db41068380eea737e08b0a52d568304 100644 (file)
@@ -41,14 +41,14 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /we/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 16\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 16
+Content-Type: application/x-www-form-urlencoded
+
 foo=bar&baz=quux
 </protocol>
 <stripfile>
index a03da1d6d648d1bc4eb533d7043ee946f6e2037a..a6e56d9ff05a1870535ebcf288edf72953e7856e 100644 (file)
@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/%TESTNUMBER?foo=bar&baz=quux HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/%TESTNUMBER?foo=bar&baz=quux HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stripfile>
 # curl's default user-agent varies with version, libraries etc.
index b4560aa05213ae5ba033b49dd70c712c6e40e0d0..1860f408c8e7e26b08d2bd2904534bf432d5ea29 100644 (file)
@@ -45,21 +45,21 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FA
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-NOOP 1\r
-FAIL\r
-EPSV\r
-PASV\r
-TYPE I\r
-NOOP 2\r
-FAIL HARD\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-NOOP 3\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+NOOP 1
+FAIL
+EPSV
+PASV
+TYPE I
+NOOP 2
+FAIL HARD
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+NOOP 3
+QUIT
 </protocol>
 <file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
 /********* Sample code generated by the curl command line tool **********
index a41276c45dce24b23f17e3072d1074a22ec172ca..bee4b337a4c942113725a5b25d11970e014c861b 100644 (file)
@@ -47,20 +47,20 @@ ftp
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com> SIZE=38\r
-RCPT TO:<recipient.one@example.com>\r
-RCPT TO:<recipient.two@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com> SIZE=38
+RCPT TO:<recipient.one@example.com>
+RCPT TO:<recipient.two@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-body\r
-.\r
+<upload crlf="yes">
+From: different
+To: another
+
+body
+.
 </upload>
 <file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
 /********* Sample code generated by the curl command line tool **********
index 94724a6faed9b4b2db443c87a47668352c946f4a..cb838fc067155f7669e68ff0be76c143d431bfa3 100644 (file)
@@ -42,12 +42,12 @@ ftp
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-USER user\r
-PASS secret\r
-LIST %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+USER user
+PASS secret
+LIST %TESTNUMBER
+QUIT
 </protocol>
 <file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
 /********* Sample code generated by the curl command line tool **********
index 5c7f6493dfeaf8d720ed0221bc73df8229711c26..d46634ebee3408473ae8dc37d2a60af36dcd024d 100644 (file)
@@ -56,18 +56,18 @@ HTTP receive cookies over IPV6
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /path/%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOST6IP:%HTTP6PORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /path/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOST6IP:%HTTP6PORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: time=1\r
-\r
+<protocol crlf="yes">
+GET /path/%TESTNUMBER0001 HTTP/1.1
+Host: %HOST6IP:%HTTP6PORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /path/%TESTNUMBER0002 HTTP/1.1
+Host: %HOST6IP:%HTTP6PORT
+User-Agent: curl/%VERSION
+Accept: */*
+Cookie: time=1
+
 </protocol>
 </verify>
 </testcase>
index 425a98f2a63124d3a81fe64977693ba9a1b8ea2b..7a7b4f648bc8b2534dc624490c0e327e02c397aa 100644 (file)
@@ -32,16 +32,16 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -I
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD blalbla\r
-MDTM %TESTNUMBER\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-REST 0\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD blalbla
+MDTM %TESTNUMBER
+TYPE I
+SIZE %TESTNUMBER
+REST 0
+QUIT
 </protocol>
 <stdout>
 Last-Modified: Wed, 09 Apr 2003 10:26:59 GMT\r
index 9c75a225cc2df5988e608d901b0cdf375e6cdbe2..f70cfa48563a6fd20e13a3b7c0138a831272ae6c 100644 (file)
@@ -46,13 +46,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/empty%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-PUT /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 0\r
-\r
+<protocol crlf="yes">
+PUT /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 0
+
 </protocol>
 </verify>
 </testcase>
index 56e016a0c0617baf1e99d5b9f017c4f7083bcdac..7b665f12abcd104410bc4fd2bcc5c05e977e45ee 100644 (file)
@@ -101,29 +101,29 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth http://%HOST
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER", response="0390dbe89e31adca0413d11f91f30e7f"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER0001", response="0085df91870374c8bf4e94415e7fbf8e"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER", response="0390dbe89e31adca0413d11f91f30e7f"
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER0001", response="0085df91870374c8bf4e94415e7fbf8e"
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 1ab4c1a818dc97246c1e27ac3cbeec54304209ec..c88f769824bd3ba9eddecd452fe59e17eec138e0 100644 (file)
@@ -56,17 +56,17 @@ http://%HOSTIP:%HTTPPORT/this/%TESTNUMBER -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /this/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /this/moo.html/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /this/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /this/moo.html/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 1e7090092f11c9b3f83d6cb30691dd21e332b2be..cfccdf3974782e495ab3ae5d37639f946bbe0b9b 100644 (file)
@@ -64,13 +64,13 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://example.com/we/want/%TESTNUMBER HTTP/1.1\r
-Host: example.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://example.com/we/want/%TESTNUMBER HTTP/1.1
+Host: example.com
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 
 <file name="%LOGDIR/jar%TESTNUMBER.txt" mode="text">
index 1af3b61f080301582732c46eceefdc5f2cee9264..d0efdf665d953f93dc6c95873087aa733916692b 100644 (file)
@@ -44,12 +44,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 # 56 = CURLE_RECV_ERROR
index 7c9be16b6e877d0f76d513db9add0fa9fe5daecc..558da7da1eb1fb07070c6adb6c5942dc25cd18b8 100644 (file)
@@ -56,12 +56,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/heads%TESTNUMBER">
 HTTP/1.1 200 funky chunky!\r
index f59555642e0974d6e5360013ad7d529a6b710463..ffabe95ccfb8082bb0c631e41a5cd97cdef9b770 100644 (file)
@@ -26,165 +26,165 @@ ftp://%HOSTIP:%FTPPORT/part1/part2/part3/part4/part5/part6/part7/part8/part9/par
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD part1\r
-CWD part2\r
-CWD part3\r
-CWD part4\r
-CWD part5\r
-CWD part6\r
-CWD part7\r
-CWD part8\r
-CWD part9\r
-CWD part10\r
-CWD part11\r
-CWD part12\r
-CWD part13\r
-CWD part14\r
-CWD part15\r
-CWD part16\r
-CWD part17\r
-CWD part18\r
-CWD part19\r
-CWD part20\r
-CWD part21\r
-CWD part22\r
-CWD part23\r
-CWD part24\r
-CWD part25\r
-CWD part26\r
-CWD part27\r
-CWD part28\r
-CWD part29\r
-CWD part30\r
-CWD part31\r
-CWD part32\r
-CWD part33\r
-CWD part34\r
-CWD part35\r
-CWD part36\r
-CWD part37\r
-CWD part38\r
-CWD part39\r
-CWD part40\r
-CWD part41\r
-CWD part42\r
-CWD part43\r
-CWD part44\r
-CWD part45\r
-CWD part46\r
-CWD part47\r
-CWD part48\r
-CWD part49\r
-CWD part50\r
-CWD part51\r
-CWD part52\r
-CWD part53\r
-CWD part54\r
-CWD part55\r
-CWD part56\r
-CWD part57\r
-CWD part58\r
-CWD part59\r
-CWD part60\r
-CWD part61\r
-CWD part62\r
-CWD part63\r
-CWD part64\r
-CWD part65\r
-CWD part66\r
-CWD part67\r
-CWD part68\r
-CWD part69\r
-CWD part70\r
-CWD part71\r
-CWD part72\r
-CWD part73\r
-CWD part74\r
-CWD part75\r
-CWD part76\r
-CWD part77\r
-CWD part78\r
-CWD part79\r
-CWD part80\r
-CWD part81\r
-CWD part82\r
-CWD part83\r
-CWD part84\r
-CWD part85\r
-CWD part86\r
-CWD part87\r
-CWD part88\r
-CWD part89\r
-CWD part90\r
-CWD part91\r
-CWD part92\r
-CWD part93\r
-CWD part94\r
-CWD part95\r
-CWD part96\r
-CWD part97\r
-CWD part98\r
-CWD part99\r
-CWD part100\r
-CWD part101\r
-CWD part102\r
-CWD part103\r
-CWD part104\r
-CWD part105\r
-CWD part106\r
-CWD part107\r
-CWD part108\r
-CWD part109\r
-CWD part110\r
-CWD part111\r
-CWD part112\r
-CWD part113\r
-CWD part114\r
-CWD part115\r
-CWD part116\r
-CWD part117\r
-CWD part118\r
-CWD part119\r
-CWD part120\r
-CWD part121\r
-CWD part122\r
-CWD part123\r
-CWD part124\r
-CWD part125\r
-CWD part126\r
-CWD part127\r
-CWD part128\r
-CWD part129\r
-CWD part130\r
-CWD part131\r
-CWD part132\r
-CWD part133\r
-CWD part134\r
-CWD part135\r
-CWD part136\r
-CWD part137\r
-CWD part138\r
-CWD part139\r
-CWD part140\r
-CWD part141\r
-CWD part142\r
-CWD part143\r
-CWD part144\r
-CWD part145\r
-CWD part146\r
-CWD part147\r
-CWD part148\r
-CWD part149\r
-CWD part150\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD part1
+CWD part2
+CWD part3
+CWD part4
+CWD part5
+CWD part6
+CWD part7
+CWD part8
+CWD part9
+CWD part10
+CWD part11
+CWD part12
+CWD part13
+CWD part14
+CWD part15
+CWD part16
+CWD part17
+CWD part18
+CWD part19
+CWD part20
+CWD part21
+CWD part22
+CWD part23
+CWD part24
+CWD part25
+CWD part26
+CWD part27
+CWD part28
+CWD part29
+CWD part30
+CWD part31
+CWD part32
+CWD part33
+CWD part34
+CWD part35
+CWD part36
+CWD part37
+CWD part38
+CWD part39
+CWD part40
+CWD part41
+CWD part42
+CWD part43
+CWD part44
+CWD part45
+CWD part46
+CWD part47
+CWD part48
+CWD part49
+CWD part50
+CWD part51
+CWD part52
+CWD part53
+CWD part54
+CWD part55
+CWD part56
+CWD part57
+CWD part58
+CWD part59
+CWD part60
+CWD part61
+CWD part62
+CWD part63
+CWD part64
+CWD part65
+CWD part66
+CWD part67
+CWD part68
+CWD part69
+CWD part70
+CWD part71
+CWD part72
+CWD part73
+CWD part74
+CWD part75
+CWD part76
+CWD part77
+CWD part78
+CWD part79
+CWD part80
+CWD part81
+CWD part82
+CWD part83
+CWD part84
+CWD part85
+CWD part86
+CWD part87
+CWD part88
+CWD part89
+CWD part90
+CWD part91
+CWD part92
+CWD part93
+CWD part94
+CWD part95
+CWD part96
+CWD part97
+CWD part98
+CWD part99
+CWD part100
+CWD part101
+CWD part102
+CWD part103
+CWD part104
+CWD part105
+CWD part106
+CWD part107
+CWD part108
+CWD part109
+CWD part110
+CWD part111
+CWD part112
+CWD part113
+CWD part114
+CWD part115
+CWD part116
+CWD part117
+CWD part118
+CWD part119
+CWD part120
+CWD part121
+CWD part122
+CWD part123
+CWD part124
+CWD part125
+CWD part126
+CWD part127
+CWD part128
+CWD part129
+CWD part130
+CWD part131
+CWD part132
+CWD part133
+CWD part134
+CWD part135
+CWD part136
+CWD part137
+CWD part138
+CWD part139
+CWD part140
+CWD part141
+CWD part142
+CWD part143
+CWD part144
+CWD part145
+CWD part146
+CWD part147
+CWD part148
+CWD part149
+CWD part150
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 <limits>
 Allocations: 170
index 2cc70390629caaad6656dab2baeba4ff018bd2b5..c3c3f6ffc8f751309e7e5d35103967cf105ddd23 100644 (file)
@@ -48,12 +48,12 @@ ftp
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 <file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
 /********* Sample code generated by the curl command line tool **********
index 9aa95bf273d3c520e7982115f5a0678cc91a6860..3d57e77d2f739a6e899984743afc9723c6fe0db8 100644 (file)
@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O file://%FILE_PWD/%LOGDIR/name%TESTNUM
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/name%TESTNUMBER">
index 16a4cf31fcf839b8753fd0fdc2bea6bb301c7616..a49a04cbdd38b0ce06de771a0550d25c8d1ae4fd 100644 (file)
@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER file://%FILE_
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/outfile%TESTNUMBER">
index 640582549d80ee4f8f7f0f158e1b4adbcc72746d..806906a63392102618f9ccb0ccd38f8b3bb3f581 100644 (file)
@@ -57,13 +57,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 11:00:00 1999 GMT" -o %LOGDIR/ou
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT
+
 </protocol>
 
 <file1 name="%LOGDIR/outfile%TESTNUMBER">
index 63032181b2e15d718fcba45e18219e522e4166cf..681b06f6a60686034f542b7ce2a298279d40269c 100644 (file)
@@ -49,12 +49,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout>
 HTTP/1.1 200 OK
index 737c7514f1262422839c4ff44a3b0d1242ccdf75..407a499dab08e5aa0f774f7e5611304e681412cf 100644 (file)
@@ -49,12 +49,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --output -
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout nonewline="yes">
 HTTP/1.1 200 OK
index 51d7721bce7f51d5332db4ab7cf7ae335411ce2f..5636f04710e71c61510d92f23be642b490a32d31 100644 (file)
@@ -68,14 +68,14 @@ Proxy-Connection: Keep-Alive
 header-type: proxy\r
 \r
 </proxy>
-<protocol>
-GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: test.%TESTNUMBER:%HTTPPORT\r
-Authorization: Basic %b64[iam:my:;self]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-header-type: server\r
-\r
+<protocol crlf="yes">
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: test.%TESTNUMBER:%HTTPPORT
+Authorization: Basic %b64[iam:my:;self]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+header-type: server
+
 </protocol>
 </verify>
 </testcase>
index 3d8dce1a9571409d96d90927e9cc071bd4d77e75..d313bc4b89e887e57116521f19462c91f1173cd7 100644 (file)
@@ -57,12 +57,12 @@ Funny-head: yesyes
 -foo-
 999
 </stdout>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index ed89e70dec7137372a9a0c7af5be07ba84499fc4..205cc1fc6df5d908804a1da8b22d4cab09d5375b 100644 (file)
@@ -28,17 +28,17 @@ FTP URL with type=a
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD /\r
-CWD tmp\r
-CWD moo\r
-EPSV\r
-TYPE A\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD /
+CWD tmp
+CWD moo
+EPSV
+TYPE A
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 11db3ccbfcfa1ab3d116ad6ab7490cfd7b78e5cd..ebf025101ee9621fd052c4c031e7bd0af89ad868 100644 (file)
@@ -40,12 +40,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 # 1 - CURLE_UNSUPPORTED_PROTOCOL
 # Due to invalid HTTP response code
index 3f396a4a2185b5848ea00661041455c0e68d88d3..b8a1b01dd41ce5f026f17661e11be20fd0bf98a9 100644 (file)
@@ -40,12 +40,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <errorcode>
 1
index 4789057a1b4085602372733b6360190eb5fa3242..971e85417843557758061987bbc851bf8ced629d 100644 (file)
@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <errorcode>
 1
index aec6181a1eb31accef56825ea35775bcfbcace26..852e056f70a38ff29d039bf36c8c2294bda695e0 100644 (file)
@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <errorcode>
 1
index b6f775e0f603bb838be4ee60eaec647ac18c913f..92e7dbaa854911c67a8d4874491a0b1178384fe4 100644 (file)
@@ -76,13 +76,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 100
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=100-\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=100-
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 321ea4c022e15dec77f1096c18322fd983f351f4..01726bad2fb90aa2e44b8402dc24e41e3e5da9a2 100644 (file)
@@ -33,12 +33,12 @@ simple HTTP GET over Unix socket
 </client>
 
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: server-interpreted.example.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: server-interpreted.example.com
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index f82384e58df9013c787a8ac5d4cc044d051cecfd..dbb00f5ee0c203d06eb01afe83ab261e2151c58d 100644 (file)
@@ -47,22 +47,22 @@ HTTP requests with multiple connections over Unix socket
 </client>
 
 <verify>
-<protocol>
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: one.example.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0002 HTTP/1.1\r
-Host: two.example.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0003 HTTP/1.1\r
-Host: one.example.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: one.example.com
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: two.example.com
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0003 HTTP/1.1
+Host: one.example.com
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout>
 HTTP/1.1 200 OK
index ad8fa080e11f0ec3b0284505558ba8ae061932df..9d118390875659d437594b6c95805308793c2461 100644 (file)
@@ -66,18 +66,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER", response="4376eb639bf8e7343a6e7b56e1b89c4f", algorithm=MD5\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER", response="4376eb639bf8e7343a6e7b56e1b89c4f", algorithm=MD5
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index cbf19550d0bc55080f553603a937c47f87dbd55d..d099d91824136a11ba3b68916872292bbf3e51ec 100644 (file)
@@ -46,12 +46,12 @@ Content-Type: text/plain
 testdata
 http
 </stdout>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 9a9196e4b6d85e74447e3ffe3464155c95539a3f..17776a452b45343fd68fdce252b2d52b7063a341 100644 (file)
@@ -45,12 +45,12 @@ Content-Type: text/plain
 testdata
 1.1
 </stdout>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index be2ca5c8c5a0414a5b89029fa901617db259b8fb..644cddda8be1ff59fe0493a71f593f13dbef8569 100644 (file)
@@ -36,14 +36,14 @@ ftp://%HOSTIP:%FTPPORT/ -P - -l
 ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
 ^EPRT \|1\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|\d{1,5}\|
 </strip>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-PORT 127,0,0,1,243,212\r
-TYPE A\r
-NLST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+PORT 127,0,0,1,243,212
+TYPE A
+NLST
+QUIT
 </protocol>
 </verify>
 </testcase>
index c42480ae87689fc00354374f8d5151efb14fbd63..125627043d52ee4da6122c46d3214da30ef947fe 100644 (file)
@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O --remote-time --output-dir %LOGDIR
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/%TESTNUMBER">
 12345
index 2f4c8d068728c60d4f0d127678d0758bd42b11d6..bbe80e12978d943d3f355abc02c76849177fd3c5 100644 (file)
@@ -32,16 +32,16 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --remote-time
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-MDTM %TESTNUMBER\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+MDTM %TESTNUMBER
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 # Verify the mtime of the file. The mtime is specifically chosen to be an even
 # number so that it can be represented exactly on a FAT file system.
index f7ff09f952c02feec70d615f442ef0951083ccc9..dfc761ee84c42fc5cfc56dc814c858431c1b73ee 100644 (file)
@@ -57,17 +57,17 @@ http://%hex[%c3%a5%c3%a4%c3%b6]hex%.se:%HTTPPORT/%TESTNUMBER --resolve xn--4cab6
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: xn--4cab6c.se:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: xn--4cab6c.se:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: xn--4cab6c.se:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: xn--4cab6c.se:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <stdout>
index 0b9de0192c8540d9ac0b349f7623deedc1ca4f6a..a65c705811b62690a1b9b9e10af7f0f8da97c8b5 100644 (file)
@@ -27,12 +27,12 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -r 36893488147419103232-
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+QUIT
 </protocol>
 </verify>
 </testcase>
index 53f3f631d7bf7c433d2f94a61db8e727a8e6e621..388c854f4b14b19a25f06c190b3cf30e2e884abc 100644 (file)
@@ -38,14 +38,14 @@ ftp://%HOSTIP:%FTPPORT/ -P - -l
 ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
 ^EPRT \|1\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|\d{1,5}\|
 </strip>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-PORT 127,0,0,1,243,212\r
-TYPE A\r
-NLST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+PORT 127,0,0,1,243,212
+TYPE A
+NLST
+QUIT
 </protocol>
 </verify>
 </testcase>
index 23b76ff78a0700adb3082b46c6d896452a556912..5fa09e1c27cfc8693de496e390e618b9fc88662c 100644 (file)
@@ -50,14 +50,14 @@ proxy
 <strippart>
 s/^PROXY TCP4 %CLIENTIP %HOSTIP (\d*) %HTTPPORT/proxy-line/
 </strippart>
-<protocol>
-proxy-line\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Testno: %TESTNUMBER\r
-\r
+<protocol crlf="yes">
+proxy-line
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Testno: %TESTNUMBER
+
 </protocol>
 </verify>
 </testcase>
index d846b41ebc61580c4c9005e134b91c6f92745240..6f1b0260d5c7ea0e1eac5c4411f5503e0799fe98 100644 (file)
@@ -55,13 +55,13 @@ proxy
 <strippart>
 s/PROXY TCP6 ::1 ::1 (\d+) (\d+)/PROXY TCP6 ::1 ::1 $2/
 </strippart>
-<protocol>
-PROXY TCP6 ::1 ::1 %HTTP6PORT\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOST6IP:%HTTP6PORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+PROXY TCP6 ::1 ::1 %HTTP6PORT
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOST6IP:%HTTP6PORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 235b8404ab10fdbab0c0ebcab25cd4950c583d45..c25133a964c6d56c3197f6934aef35b1dff03451 100644 (file)
@@ -49,12 +49,12 @@ line1line3
 <stderr nonewline="yes">
 line2
 </stderr>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 785ceae16f3e462e63f266b30ee4668de4af0d85..45ff971b0a1fd26dd67e8d6c9e668f0b04b9de84 100644 (file)
@@ -43,12 +43,12 @@ HTTP with wildcard --resolve
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: example.com:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: example.com:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 803fbfc4d70b6bef414dc1bfbae3db3bdfcc4084..af72284da9454933c824da2a8eb2e5748b61e399 100644 (file)
@@ -34,22 +34,22 @@ ftp://%HOSTIP:%FTPPORT/first/dir/here/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/%TESTNU
 ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
 ^EPRT \|1\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|\d{1,5}\|
 </strip>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD first\r
-CWD dir\r
-CWD here\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-CWD /\r
-EPSV\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD first
+CWD dir
+CWD here
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+CWD /
+EPSV
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index b521d2f31f0151526b7d18815fba0920b8e3550e..bef59be3c004cb8eaab3d72567c9623530c234d3 100644 (file)
@@ -45,14 +45,14 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /we/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 24\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 24
+Content-Type: application/x-www-form-urlencoded
+
 %hex[ab%81cd%00e\"?%0D%0A%09%01fghi%1Ajklm%FD]hex%
 </protocol>
 <stripfile>
index 315974ad413bc3d4ea64f5bc5701e2805f99412e..dda651ff4623fea4f8037dd4816bbf3054ba5238 100644 (file)
@@ -34,12 +34,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 568670a71a136f4910fc998ded13132cf859c286..cf77bcbb4e13a7f9a55e0ded70ddb3d0531c555b 100644 (file)
@@ -49,12 +49,12 @@ HTTP GET via SOCKS5 proxy via Unix sockets
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 9836434d4a9f4f972339f47ddda302ae01b0dedc..a39e1e64a6fd07d0077f974babff1c37cf500405 100644 (file)
@@ -50,12 +50,12 @@ http://this.is.a.host.name:%HTTPPORT/%TESTNUMBER --proxy socks5h://localhost%SOC
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: this.is.a.host.name:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: this.is.a.host.name:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <socks>
 atyp 3 => this.is.a.host.name
index 769043d489047287165b5b66abeb2a8c94d24d21..9b17219f5eb0b79cb0dbaec58bcfa5b3b49ffca2 100644 (file)
@@ -36,20 +36,20 @@ ftp://%HOSTIP:%FTPPORT/first/dir/here/%TESTNUMBER --ftp-create-dirs
 ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
 ^EPRT \|1\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|\d{1,5}\|
 </strip>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD first\r
-MKD first\r
-CWD first\r
-CWD dir\r
-CWD here\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD first
+MKD first
+CWD first
+CWD dir
+CWD here
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 5c3d74343441cff915f10dbcde3b1e069d2d5d5c..54adeb6138de7fabeb336568df6ab63201f2f563 100644 (file)
@@ -51,12 +51,12 @@ https://this.is.a.host.name:%HTTPSPORT/%TESTNUMBER --insecure --proxy socks5h://
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: this.is.a.host.name:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: this.is.a.host.name:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <socks>
 atyp 3 => this.is.a.host.name
index 4c0190cea0219705c7c64bb1e13701957edb3432..1e21534c29b30cf98a388a7dc45abb188da4557e 100644 (file)
@@ -39,12 +39,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index f88ef74ee279ff82f7803128ef6d2fc0d3791dd7..2b483cb0ae365d11c0bb6ad59a0785c61c90ce07 100644 (file)
@@ -71,13 +71,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C - -f
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=100-\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=100-
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 3677b673808e416eac0bb10fa07a23388885e0c2..68dc2b758ce1a0ae7371da68e1924ddbf1b5b060 100644 (file)
@@ -41,17 +41,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 # weird_server_reply
 <errorcode>
index 051d31a9deac2b9d2ba1db29520e55d638ef36df..7ff578336fea57c619966652c451080cb4910653 100644 (file)
@@ -36,14 +36,14 @@ ftp://%HOSTIP:%FTPPORT/attempt/to/get/this/%TESTNUMBER --ftp-create-dirs
 <errorcode>
 9
 </errorcode>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD attempt\r
-MKD attempt\r
-CWD attempt\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD attempt
+MKD attempt
+CWD attempt
+QUIT
 </protocol>
 </verify>
 </testcase>
index 0f51f12b6445b74b0535dda54063442b9ec58815..6eea7504837c9fcf37210e9d3c93cb38894a599d 100644 (file)
@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 # weird_server_reply
index 87aada2873e007eab4236490a710250b3e3bea7e..8f63141b872728a3235be89239192ad3b7d553af 100644 (file)
@@ -42,13 +42,13 @@ http://moo/ --libcurl %LOGDIR/test%TESTNUMBER.c --tls-max 1.3 --proxy-tlsv1 -x h
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://moo/ HTTP/1.1\r
-Host: moo\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://moo/ HTTP/1.1
+Host: moo
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 <stripfile>
 s/(USERAGENT, \")[^\"]+/${1}stripped/
index 2a322f6a86638dcebf5aeff59e490aade61c46e3..30353e29095781b212a4b83af5740344f88578bf 100644 (file)
@@ -60,12 +60,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/heads%TESTNUMBER">
 HTTP/1.1 200 funky chunky!\r
index 60ff2104b2717b6fef7064c962fe1f4405e6b301..88827a2cc8c312928593beb7308668d19c5ca500 100644 (file)
@@ -62,12 +62,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/heads%TESTNUMBER">
 HTTP/1.1 200 funky chunky!\r
index 52de029a081488d10083a80899a189a808dbb25b..7cdce889dd2cc5c890b88c44f7ded3c4ab03bf5f 100644 (file)
@@ -42,12 +42,12 @@ HTTP HEAD with response body to ignore
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-HEAD /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+HEAD /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index d89362f4658d77d0a0ebf2c3bd886270dbb87555..d36705bbf1ec480bdee9c7ae02cc751d002a767a 100644 (file)
@@ -41,11 +41,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index a3eac5dbad26867429c6d1184eef94958e8fe7d6..3a0c8e83560b7627df2548b0f40be637d366fc44 100644 (file)
@@ -39,12 +39,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O --output-dir %LOGDIR
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/name%TESTNUMBER">
 12345
index 404922b296c46499d432839ce9326bce675cb461..dfb16cfd850e9f0d2a995c69669aa95117a918b4 100644 (file)
@@ -32,19 +32,19 @@ send away this contents
 ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
 ^EPRT \|1\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|\d{1,5}\|
 </strip>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD dir1\r
-EPSV\r
-TYPE I\r
-STOR %TESTNUMBER\r
-CWD /\r
-CWD dir2\r
-EPSV\r
-STOR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD dir1
+EPSV
+TYPE I
+STOR %TESTNUMBER
+CWD /
+CWD dir2
+EPSV
+STOR %TESTNUMBER
+QUIT
 </protocol>
 <file name="%LOGDIR/upload%TESTNUMBER">
 send away this contents
index 2e7e1f32ae8bf9edea33702e80cc7b524d579e3f..b2ef8f50d5f6ae5e7eb05ed7f72c8783e6048d22 100644 (file)
@@ -40,12 +40,12 @@ http://%HOSTIP:%HTTPPORT/junk%TESTNUMBER -J -O --show-headers --output-dir %LOGD
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /junk%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /junk%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/junk%TESTNUMBER">
 HTTP/1.1 200 OK
index f1d1fba5eba2e4fda0e69f7f910c2a3d84471736..91797378117cb11790d6297d3c252929f776bdd2 100644 (file)
@@ -57,12 +57,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/heads%TESTNUMBER">
 HTTP/1.1 200 funky chunky!\r
index 5546831c0919c0e972068fcc4906ccf9fb7ae529..67b8dc33226d4c191a7fe317453d7fb0a514ed45 100644 (file)
@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 
index 2c0f33f8dfbdb06309546ec6ad2ee1edb92e034a..de725b7b4e1ab67b0b036cbcb66e55ceddf4dc24 100644 (file)
@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <errorcode>
 61
index dda32606f347ae175e65b061a757427eab049208..d669dedaa9dad4959a94d663418674d743f310e1 100644 (file)
@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <errorcode>
 61
index 94b19a251439a3407fedf2f41616be76dd6bdb72..6e8caef8d6025e96e8689ac3d3806af147901335 100644 (file)
@@ -44,17 +44,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 3 -o /dev/null
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 </verify>
index 9d79e1a38c5fc228ab0c0c2e7e1da5dedd57c842..cb432f7c53e716a7ad66633ebb0fd490df48289e 100644 (file)
@@ -59,17 +59,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LO
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 
index ba24d2e0b2c1697989181a3af37697a55fbeca9b..ec065e38fa5dd1d5948fe2b311c4b905256d3374 100644 (file)
@@ -44,12 +44,12 @@ Content-Length: 26
 Repeated nonsense-headers
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER 200 26
 </stdout>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index fb906bf4bcf35bd192119c096752647a976bbc5c..a06c6421dad38ff7a229e35e32f7a00d5917189d 100644 (file)
@@ -74,19 +74,19 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm --fail
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 195c17998cd3bfa611c285510bd00eb4e53ed5fb..3382b87a852aab4e142819ea060049fb5d51b199 100644 (file)
@@ -42,15 +42,15 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/
 <errorcode>
 0
 </errorcode>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD %TESTNUMBER\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD %TESTNUMBER
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 
 </verify>
index e2639f404af0c796eacbe036988fe6ceaa18eace..c4c378c59e57439758eaa7f9ef275be8d5be2ff4 100644 (file)
@@ -45,11 +45,11 @@ http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: google.com:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: google.com:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index c387b8d3c549233b952826dc3a3daed38d5df1ba..fe5783e311208fa5a65b46b727373662eb90a553 100644 (file)
@@ -45,11 +45,11 @@ http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: google.com:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: google.com:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 916a40ba8c777ebea8adf5f1fc00023a8c6ce0e1..3a9de6804e4b1e6f74f0a4fb377fe97a4631a752 100644 (file)
@@ -45,11 +45,11 @@ http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: google.com:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: google.com:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 61e634641a094b6698353b681f74f41ea8f33f8e..500abdf1279f8ece5a1f5841005d61751af448d4 100644 (file)
@@ -45,11 +45,11 @@ http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: google.com:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: google.com:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index af581ae6bf553f0ba0ab587ce078f873e461e3bd..b08d1aeadf1c68889f1fd1e77c31d5aae44fa262 100644 (file)
@@ -9,36 +9,36 @@ verbose logs
 
 # Server-side
 <reply>
-<data1>
-HTTP/1.1 200 OK\r
-Date: Tue, 09 Nov 2010 14:49:00 GMT\r
-Server: test-server/fake\r
-Content-Length: 47\r
-\r
+<data1 crlf="yes">
+HTTP/1.1 200 OK
+Date: Tue, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 47
+
 file contents should appear once for each file
 </data1>
-<data2>
-HTTP/1.1 200 OK\r
-Date: Tue, 09 Nov 2010 14:49:00 GMT\r
-Server: test-server/fake\r
-Content-Length: 47\r
-\r
+<data2 crlf="yes">
+HTTP/1.1 200 OK
+Date: Tue, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 47
+
 file contents should appear once for each file
 </data2>
-<data3>
-HTTP/1.1 200 OK\r
-Date: Tue, 09 Nov 2010 14:49:00 GMT\r
-Server: test-server/fake\r
-Content-Length: 47\r
-\r
+<data3 crlf="yes">
+HTTP/1.1 200 OK
+Date: Tue, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 47
+
 file contents should appear once for each file
 </data3>
-<data4>
-HTTP/1.1 200 OK\r
-Date: Tue, 09 Nov 2010 14:49:00 GMT\r
-Server: test-server/fake\r
-Content-Length: 47\r
-\r
+<data4 crlf="yes">
+HTTP/1.1 200 OK
+Date: Tue, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 47
+
 file contents should appear once for each file
 </data4>
 </reply>
@@ -64,23 +64,23 @@ HTTP GET connection cache limit (CURLMOPT_MAXCONNECTS)
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /path/%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /path/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /path/%TESTNUMBER0003 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /path/%TESTNUMBER0004 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /path/%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /path/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /path/%TESTNUMBER0003 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /path/%TESTNUMBER0004 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 <strip>
 ^Host:.*
index e1eb12bc3682fad448fc4a3c36663cbc46a74315..afc87120566beb8f23b25ba739da6bbaae6e1a39 100644 (file)
@@ -39,11 +39,11 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<%TESTNUMBER-realuser@example.com>\r
-RCPT TO:<%TESTNUMBER-recipient@example.com>\r
-DATA\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<%TESTNUMBER-realuser@example.com>
+RCPT TO:<%TESTNUMBER-recipient@example.com>
+DATA
 </protocol>
 <upload>
 </upload>
index 98035f8b47623737c308415559a4089ed0396d6f..f50672cf19c52f31c5f247d0e6548f825bc3ae9c 100644 (file)
@@ -34,12 +34,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 4a80b7a1d2f6312d8de121c0e0539e1ac65c9d3f..447f6d00d856e56815a2bee6e972e04e5f99ffab 100644 (file)
@@ -61,23 +61,23 @@ HTTP GET connection cache limit (CURLOPT_MAXCONNECTS)
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /path/%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /path/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /path/%TESTNUMBER0003 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /path/%TESTNUMBER0004 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /path/%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /path/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /path/%TESTNUMBER0003 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /path/%TESTNUMBER0004 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 <strip>
 ^Host:.*
index a0e321432b44123c79ad17cf192aa017d7df2da4..ff21e11aba3683abd0fc2c27a7d0bb11995bceb0 100644 (file)
@@ -60,15 +60,15 @@ GLOBAL CACHE test over two easy performs
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /path/%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /path/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /path/%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /path/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 <strip>
 ^Host:.*
index 90c32229f75e8876ffaf5b3b11a84b0fbce98fb3..6957761af9fb01a14e0929ba3d09cc86a17ed79a 100644 (file)
@@ -37,8 +37,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-</protocol>
 # 42 == CURLE_ABORTED_BY_CALLBACK
 <errorcode>
 42
index b34406e0727b61e1dcda09204bf42a5a563570f0..571ee6daa6d409267bd717d48c4cacc3969b8514 100644 (file)
@@ -39,26 +39,26 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 <verify>
 # Content-Length header is not present
 # Transfer-Encoding header is added automatically
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Transfer-Encoding: chunked\r
-Content-Type: application/x-www-form-urlencoded\r
-Expect: 100-continue\r
-\r
-1\r
-d\r
-1\r
-u\r
-1\r
-m\r
-1\r
-m\r
-1\r
-y\r
-0\r
-\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Transfer-Encoding: chunked
+Content-Type: application/x-www-form-urlencoded
+Expect: 100-continue
+
+1
+d
+1
+u
+1
+m
+1
+m
+1
+y
+0
+
 </protocol>
 </verify>
 </testcase>
index 18d1fcaf2f094944b36a94f2f7c533f132b2a82a..d2c477593c96452b81b260e8a2fd3d7524097faa 100644 (file)
@@ -62,13 +62,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 <strippart>
 s/^(this is what we post to the silly web server)(\r)?\n//
 </strippart>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Length: 45\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 45
+Content-Type: application/x-www-form-urlencoded
+
 </protocol>
 <errorcode>
 0
index ea5304d1b6ad621fada38f4a474e0751d75519ef..09a7efb0147ef604d16078dfa426baa316d10fc4 100644 (file)
@@ -46,8 +46,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 <strippart>
 
 </strippart>
-<protocol>
-</protocol>
 <stdout>
 res 0
 status 302
index f57f68544a43809eedf4a52edb52a3582657b2fb..d284bd96609f766464527259eda03e2cafd28f3f 100644 (file)
@@ -46,8 +46,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 <strippart>
 
 </strippart>
-<protocol>
-</protocol>
 <stdout>
 res 0
 status 302
index 31c2360192b817cbe4527988f270bd0bcf510e1e..aa5cf971decce6c8da44458b8355e8d1f4fa7661 100644 (file)
@@ -35,12 +35,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <errorcode>
 22
index c360cabc75f3e69ffd7a08f3918b5869e99568cc..eb398f414a460740911fb7eb9826561b48f772dc 100644 (file)
@@ -39,25 +39,25 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-\r
-..\r
-..\r
-\r
-..\r
-\r
-body\r
-.\r
+<upload crlf="yes">
+From: different
+To: another
+
+
+..
+..
+
+..
+
+body
+.
 </upload>
 </verify>
 </testcase>
index a38cce6fa91d32d3253727a6e581124090be9362..44c06ca5b54980b0282d4b76eb2174498ab9cd13 100644 (file)
@@ -91,35 +91,35 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -u testuser:testpass --digest http://%H
 <strip>
 ^Authorization.*cnonce
 </strip>
-<protocol>
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER0001", response="f4f83139396995bac665f24a1f1055c7"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER0002", response="f84511b014fdd0ba6494f42871079c32"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="999999", uri="/%TESTNUMBER0002", cnonce="MTA4MzIr", nc="00000001", qop="auth", response="25291c357671604a16c0242f56721c07", algorithm=MD5\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER0001", response="f4f83139396995bac665f24a1f1055c7"
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER0002", response="f84511b014fdd0ba6494f42871079c32"
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="999999", uri="/%TESTNUMBER0002", cnonce="MTA4MzIr", nc="00000001", qop="auth", response="25291c357671604a16c0242f56721c07", algorithm=MD5
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout>
 HTTP/1.1 401 Authorization Required swsclose\r
index f80056ab06d4e27b7c0d8fd47e7eff3efe53b79f..865aeda1f8cf3c6fdb848bb4ea4dc81592b8b880 100644 (file)
@@ -25,13 +25,13 @@ CURLOPT_POSTFIELDS with binary data set after multi_add_handle
 
 # it should be detected and an error should be reported
 <verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Length: 8\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 8
+Content-Type: application/x-www-form-urlencoded
+
 %hex[%2eabc%00xyz]hex%
 </protocol>
 </verify>
index 582f05a5bc1301f21d61f32fbc39e01ca8db42ec..fddfe5675de5d403ed8731f09139a3fb522def5d 100644 (file)
@@ -36,11 +36,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 <errorcode>
 0
index a957bebbc7bf030999020cb54a2b2bd41ec3bc1e..e0d85669efa54ae00ae3dfdd329f8a4f39bb3529 100644 (file)
@@ -43,31 +43,31 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 <errorcode>
 41
 </errorcode>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Length: 3\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Length: 3\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Length: 3\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-aaaPOST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Length: 3\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 3
+Content-Type: application/x-www-form-urlencoded
+
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 3
+Content-Type: application/x-www-form-urlencoded
+
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 3
+Content-Type: application/x-www-form-urlencoded
+
+aaaPOST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 3
+Content-Type: application/x-www-form-urlencoded
+
 aaa
 </protocol>
 </verify>
index 0f98ad604349185a08e7613d326a9fe3ad5bae6a..d35b5cb1c5d7d8e11f1943752b2769694ce02662 100644 (file)
@@ -38,11 +38,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 <errorcode>
 0
index 477f3fac28957e1f8aa19f20ea1609f592214756..dac9b2c85c46e083aa4df5467c46190b26a9a000 100644 (file)
@@ -37,11 +37,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 <errorcode>
 0
index ea7ce3966a581cbf4aaf57e1ecbe745bc0899f02..111e07766f1d37e6de37d55ee87bcacd62554f6b 100644 (file)
@@ -37,11 +37,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 <errorcode>
 0
index dc1aa7011e0c6cd8d399ec21c2947fda77c6ec90..c3d918b4dac0686a116af1e1c69486747354e08e 100644 (file)
@@ -57,11 +57,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 9b29f43534e35a80653c9769fbee0abfd7ac5ea7..9b7a479d5b63c9d0eea4e4de5ae348e93636ea37 100644 (file)
@@ -64,11 +64,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index e9061a8f2bea0c445a333b1fee94d56b5d869d35..cdde885ce7f5054b99aea6688108ab85b387e11f 100644 (file)
@@ -39,23 +39,23 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/stderr%TESTNUMBER" mode="text">
 == Info: Connection #0 to host %HOSTIP:%HTTPPORT left intact
index 3aefe57ef11ae39d682be5b5ac8adcea2ca1198a..798b273e321e6f59cc0451bf800d4e784b1df691 100644 (file)
@@ -52,15 +52,15 @@ CURLOPT_CURLU, URL with space and CURLINFO_EFFECTIVE_URL
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%20/with/%20space/%20/file HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%20/with/%20space/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%20/with/%20space/%20/file HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%20/with/%20space/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 <stdout>
 res 0
index b83b7ee95fa1a82e1b22e60eba9524fcc5acaa97..facd309475008969d84a88379e21c3541694c78d 100644 (file)
@@ -47,14 +47,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-TE: gzip\r
-Connection: TE\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+TE: gzip
+Connection: TE
+
 </protocol>
 <errorcode>
 61
index 067b3568edecdd9809c72b627b5bdb82dcb87b75..7e1625aa4b9e25a6db2dbbf4d170d6974a51776d 100644 (file)
@@ -42,15 +42,15 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/ -P %CLIENTIP --ftp-pasv
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD test-%TESTNUMBER\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD test-%TESTNUMBER
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index 8af8d6641e3980ceb7298853166f17077cbae408..78999e88336506a1f0dcfbf33fb06b725a2640ac 100644 (file)
@@ -47,23 +47,23 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </client>
 
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index fd35ca1f61c62cbad12d03769bd778c0ea0db3e5..6e89c9c1e8250e3e37bcc1c5994fdaec6d91386e 100644 (file)
@@ -46,7 +46,5 @@ lib%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-</protocol>
 </verify>
 </testcase>
index 0c01ab3e6960336a83d62cee4fffc14bd129a279..10863307374de1b000286ec9c7d84e82d6e85963 100644 (file)
@@ -51,7 +51,5 @@ imap://non-existing-host.haxx.se:%IMAPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-</protocol>
 </verify>
 </testcase>
index e3c7e55c6921c5ba1d144ecb98cabf39fe3439b5..b224f7c0edd02352bf389e5c431dddc23493a6d5 100644 (file)
@@ -37,8 +37,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-</protocol>
 # 42 == CURLE_ABORTED_BY_CALLBACK
 <errorcode>
 42
index 80254da2d444c1d368303a195886ecd99becc541..49ca0d90ade7349a70d2c60dfc0ca363a492688e 100644 (file)
@@ -46,11 +46,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 <stdout>
 -foo-
index 1341d12130ce1c357f0135df6da70b34b72ad25e..aea133c628cf084d8c350a8634bf12250cfba63f 100644 (file)
@@ -76,17 +76,17 @@ Cookies set over HTTP can't override secure ones
 </command>
 </client>
 <verify>
-<protocol>
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: www.example.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0002 HTTP/1.1\r
-Host: www.example.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: www.example.com
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: www.example.com
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/jar%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
index 88e442f7b20ad7a8a5dca977045db24cbaac891f..cfcc430985d07eea0960d7234ea3957823254abd 100644 (file)
@@ -48,23 +48,23 @@ Expire secure cookies over HTTPS
 </command>
 </client>
 <verify>
-<protocol>
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: www.example.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0002 HTTP/1.1\r
-Host: www.example.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: foo=123\r
-\r
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: www.example.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: www.example.com
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: www.example.com
+User-Agent: curl/%VERSION
+Accept: */*
+Cookie: foo=123
+
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: www.example.com
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 </verify>
index 6bf3ad905b4ecee204f6f9a878f498027c0736b6..ab089213f33ed66cf76d0c8f985b5313da2d2883 100644 (file)
@@ -36,12 +36,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -L -H "Host: www.example.com"
 <errorcode>
 1
 </errorcode>
-<protocol>
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: www.example.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: www.example.com
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 </verify>
index be047dcebb5722299e3730bc3625621b35b80287..b348352ebb13192eaec650902e9888f9f463e7a9 100644 (file)
@@ -46,13 +46,13 @@ downloaded already
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-If-None-Match: "123456"\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+If-None-Match: "123456"
+
 </protocol>
 
 # verify that the target file is untouched
index 68b1fe21102f6464e4b938b55b35e82129fbb42e..486d3eb9fbcce46a86e4cd64c41043906b7f20c4 100644 (file)
@@ -48,23 +48,23 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </client>
 
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 899d9b59f19fe0c9d11e1ff8217047edfcaf75e5..896077517aa2003d4d5a47880c702df7ea68baf3 100644 (file)
@@ -71,18 +71,18 @@ http://%HOSTIP/%TESTNUMBER %HTTPPORT
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: lib%TESTNUMBER\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="9cbbd857a37e45f2bcad5c7d088191df"\r
-User-Agent: lib%TESTNUMBER\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: lib%TESTNUMBER
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="9cbbd857a37e45f2bcad5c7d088191df"
+User-Agent: lib%TESTNUMBER
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 159a813919ee272ab247d740200ddc32379d1098..b5d16e0622884605bac921910367d1e6b45c65c1 100644 (file)
@@ -40,19 +40,19 @@ lib%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-PASV\r
-TYPE A\r
-RETR %TESTNUMBER\r
-PASV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+PASV
+TYPE A
+RETR %TESTNUMBER
+PASV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 <stdout>
index 5ab45ec05b391a9104879d025f5ffa9a976b0492..a29112175ab1d53b3f327a93f3508c470c6eb78b 100644 (file)
@@ -34,12 +34,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 713ab5ea778c591b7b6d907e835d50d62ef97460..57dc6b077e99a5c600ccb33d9023a3ff98f58dc6 100644 (file)
@@ -40,19 +40,19 @@ lib1569
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-PASV\r
-TYPE A\r
-NLST\r
-PASV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+PASV
+TYPE A
+NLST
+PASV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 <stdout>
index e75423a73c1c53c564d6101c3fc679efa7dab123..440711b39e01348aba53b9438ae1893ab12be436 100644 (file)
@@ -78,7 +78,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline="yes" crlf="yes">
+<protocol crlf="yes" nonewline="yes">
 IGLOO /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
index 4c2329506ec3fd3deff018463abbcdfa545ddad0..968f76a9b889eb28fda9cc8d7c9dba7394145201 100644 (file)
@@ -78,7 +78,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline="yes" crlf="yes">
+<protocol crlf="yes" nonewline="yes">
 IGLOO /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
index 1d1e4b7ed3928df7bb6cbb59245edfb3cf63e2c3..5e44ca5ad488641207f3fbabe4b6aa13950eca9a 100644 (file)
@@ -78,7 +78,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline="yes" crlf="yes">
+<protocol crlf="yes" nonewline="yes">
 IGLOO /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
index 3b243bc632e290157ac7a1ff3333fbc029487f20..459218fecce1d0fa27b43868784e6be25285bf4a 100644 (file)
@@ -78,7 +78,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline="yes" crlf="yes">
+<protocol crlf="yes" nonewline="yes">
 CURL /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
index d5ff6a725d3a2f44b91684131631b973d7833742..e26d1c44eef3e68907cd0ddaa7a68ad59d6f2aa1 100644 (file)
@@ -78,7 +78,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER %TESTNUMBER
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline="yes" crlf="yes">
+<protocol crlf="yes" nonewline="yes">
 CURL /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
index ba43782506aa4564ea60f28474daaf36d3b64e3e..ede98d89cfe462bf46d033e166fc3e2c66e9c0a8 100644 (file)
@@ -78,7 +78,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline="yes" crlf="yes">
+<protocol crlf="yes" nonewline="yes">
 CURL /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
index db3a49b7f57b633f70d181ec29b4127d1d0c749c..89def179cccc77ac3b1ebfc533099a27d51eb114 100644 (file)
@@ -37,19 +37,19 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F name=daniel
 ^Content-Type: multipart/form-data.*
 ^-----------------------.*
 </strip>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 157\r
-Content-Type: multipart/form-data; boundary=----------------------------4f12fcdaa3bc\r
-\r
-------------------------------4f12fcdaa3bc\r
-Content-Disposition: form-data; name="name"\r
-\r
-daniel\r
-------------------------------4f12fcdaa3bc--\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 157
+Content-Type: multipart/form-data; boundary=----------------------------4f12fcdaa3bc
+
+------------------------------4f12fcdaa3bc
+Content-Disposition: form-data; name="name"
+
+daniel
+------------------------------4f12fcdaa3bc--
 </protocol>
 <errorcode>
 52
index 629cf1ab451dfb74c16078e263aaf39636bb624e..70b0f512f7e752c7c8a7ef7663ea096c5bd2d57f 100644 (file)
@@ -78,7 +78,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER 1578
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline="yes" crlf="yes">
+<protocol crlf="yes" nonewline="yes">
 CURL /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
index 98c78b613a353c439a6395039e13a6e8d1d5a940..c2f800c18f6d72ff8092832ee2d72cd14ed69877 100644 (file)
@@ -78,7 +78,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline="yes" crlf="yes">
+<protocol crlf="yes" nonewline="yes">
 IGLOO /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
index 146863fd6994f2e3b23d3ee51f7e61efe413fd9e..e446c7508f0270b0fdb581c17a82056e73964d32 100644 (file)
@@ -42,11 +42,11 @@ https://%HOSTIP:%HTTPSPORT/
 </client>
 
 <verify>
-<protocol>
-GET / HTTP/1.1\r
-Host: %HOSTIP:%HTTPSPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET / HTTP/1.1
+Host: %HOSTIP:%HTTPSPORT
+Accept: */*
+
 </protocol>
 
 </verify>
index cc183855a71ffb3a1b2365454358fbd71df722e1..b81faa17ac14c061470f122aec99b75a70da689a 100644 (file)
@@ -60,13 +60,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm -0
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.0\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.0
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 738696db1c7df9569726238e57660977809f6967..f5971e8f294808a5a9925ba5b2e77bf516b5a369 100644 (file)
@@ -40,21 +40,21 @@ more than one byte
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-PUT /bzz/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Transfer-Encoding: chunked\r
-Trailer: my-super-awesome-trailer, my-other-awesome-trailer\r
-Expect: 100-continue\r
-\r
-e\r
-Hello Cloud!\r
-\r
-0\r
-my-super-awesome-trailer: trail1\r
-my-other-awesome-trailer: trail2\r
-\r
+<protocol crlf="yes">
+PUT /bzz/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Transfer-Encoding: chunked
+Trailer: my-super-awesome-trailer, my-other-awesome-trailer
+Expect: 100-continue
+
+e
+Hello Cloud!
+
+0
+my-super-awesome-trailer: trail1
+my-other-awesome-trailer: trail2
+
 </protocol>
 </verify>
 </testcase>
index 60d9f0b87d68ff7da4620dcd5e6caf54ef5c8b79..daf70afa4e0ce03624f8fa3062bfefa42e7ec44a 100644 (file)
@@ -36,11 +36,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 
 <verify>
 # Note here the lack of If-Modified-Since
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index a93f89d374a29a4aab116f8a24134a89594d6815..24128d257f56277a478f16511ef14a13f0d37dc8 100644 (file)
@@ -36,11 +36,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </client>
 
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 <stdout>
 Retry-After 22
index 4dade7c199a32016eebd6ff5fb798357f6ebf486..6b11a8d7b828358e2ffb4b998aebb0b4086bf6f7 100644 (file)
@@ -35,11 +35,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </client>
 
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 <stdout>
 Retry-After 0
index 2f4084a28bf1156c28211e1e7dbaed9c5dc31fe7..376fb5ebb8fbd0fca3c2b7917154179f71e229d3 100644 (file)
@@ -36,11 +36,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </client>
 
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 # Retry-After time is limited to 6 hours (21600 seconds)
 <stdout>
index eb0ade1040fe296be998271a1b0ac469806f3b3d..a85c1246922be8e49e117f8064c103500a811847 100644 (file)
@@ -40,20 +40,20 @@ more than one byte
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-POST /bzz/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Trailer: my-super-awesome-trailer, my-other-awesome-trailer\r
-Transfer-Encoding: chunked\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-11\r
-xxx=yyy&aaa=bbbbb\r
-0\r
-my-super-awesome-trailer: trail1\r
-my-other-awesome-trailer: trail2\r
-\r
+<protocol crlf="yes">
+POST /bzz/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Trailer: my-super-awesome-trailer, my-other-awesome-trailer
+Transfer-Encoding: chunked
+Content-Type: application/x-www-form-urlencoded
+
+11
+xxx=yyy&aaa=bbbbb
+0
+my-super-awesome-trailer: trail1
+my-other-awesome-trailer: trail2
+
 </protocol>
 </verify>
 </testcase>
index be3fc8853caea388d8043b6d7083c3a06d03a14e..5184c202ea01dcf7026ccaddd98ddcf0fb174172 100644 (file)
@@ -40,14 +40,14 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1\r
-Host: we.want.that.site.com\r
-Proxy-Authorization: Basic %b64[fake@user:loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
+Host: we.want.that.site.com
+Proxy-Authorization: Basic %b64[fake@user:loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index e74a40b66af12acfa47490ef357a3b813e5df19c..957dbd7fa294497c78e5a718a129c4920deaf2ca 100644 (file)
@@ -57,17 +57,17 @@ Connection: close
 surprise2
 </stdout>
 
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /wantmore/%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /wantmore/%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index d8d7793761546e64b31fc12cc8cd7a0bf706797a..201fe52bfaaf6afa97d407a2786836d6f642f1fe 100644 (file)
@@ -34,14 +34,14 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 <verify>
 # This doesn't send QUIT because of known bug:
 # "7.8 Premature transfer end but healthy control channel"
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 </protocol>
 # CURLE_PARTIAL_FILE = 18
 <errorcode>
index 040fae3301f31912a8ccf85b6dd1a178a7068ebf..fce1cb370a60fa7a3389491817043d5435333ca4 100644 (file)
@@ -40,14 +40,14 @@ proxy
 </client>
 
 <verify>
-<protocol>
-OPTIONS * HTTP/1.1\r
-Host: www.example.org\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-Testno: %TESTNUMBER\r
-\r
+<protocol crlf="yes">
+OPTIONS * HTTP/1.1
+Host: www.example.org
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+Testno: %TESTNUMBER
+
 </protocol>
 </verify>
 </testcase>
index 0fe967bd27a70f7e6d8a94298454e441eb9534c4..623dd84a44621e37c3acb21568750cc6aa589730 100644 (file)
@@ -61,15 +61,15 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection: this" -H "Con
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-TE: gzip\r
-Connection: this, TE\r
-Connection: that\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+TE: gzip
+Connection: this, TE
+Connection: that
+
 </protocol>
 </verify>
 </testcase>
index ec0cd2545a32e0a6cf74908db4ce5999b940ae7a..8de635b04496bf9a58f6c4cc079e8b354d97f9b7 100644 (file)
@@ -44,14 +44,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-us
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 <errorcode>
 22
index e838700fe79055458d0cc756636e208fb0c0e6a0..161952caadb9e02d282972db61b0b668067112fd 100644 (file)
@@ -73,15 +73,15 @@ User-Agent: curl
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 9d877f8f8798bac8cb01cdb1a0f66c23d024195a..81be0800638e193b31b12f85ddc54b458a69edba 100644 (file)
@@ -88,18 +88,18 @@ User-Agent: curl
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-EPSV\r
-SIZE %TESTNUMBER0002\r
-RETR %TESTNUMBER0002\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+EPSV
+SIZE %TESTNUMBER0002
+RETR %TESTNUMBER0002
+QUIT
 </protocol>
 </verify>
 </testcase>
index 0752575942c1c2929b30aff87b5ee6d2189e98ad..8934fab29d9f5788a0d7bcf3103055f4fef03e5d 100644 (file)
@@ -69,31 +69,31 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -d moo --retry 1 -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 3\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-mooGET /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 3\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-mooGET /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 3
+Content-Type: application/x-www-form-urlencoded
+
+mooGET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 3
+Content-Type: application/x-www-form-urlencoded
+
+mooGET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index ee7a50871aa703dbfa8679adb92a1dfc69060e84..50dfec7fcca08021fca6302d1d721c3fddfeaabf 100644 (file)
@@ -55,17 +55,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 1 --fail
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 751d46232c8b6212b429469379d6ec400078198a..a3a1c82e47914c23cc9bc702bf5e4ed9ecafc5d1 100644 (file)
@@ -44,17 +44,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 1 --fail-with-body
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout>
 moo
index 83f7a107a126d4da9b32d9f1883f505036fe40f2..b68876dbde2da2a7397c20488bcff873f764c2d6 100644 (file)
@@ -54,13 +54,13 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -r 0-10,12-15
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=0-10,12-15\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=0-10,12-15
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 4996a3564f5b9e0e725851826eee51b5c1d41f4d..9c686b685d362121e929a8561492f76179ce097d 100644 (file)
@@ -46,19 +46,19 @@ http://www.%hex[%c3%a5%c3%a4%c3%b6]hex%.se/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://www.xn--4cab6c.se/page/%TESTNUMBER HTTP/1.1\r
-Host: www.xn--4cab6c.se\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://www.xn--groe-xna.de/page/%TESTNUMBER HTTP/1.1\r
-Host: www.xn--groe-xna.de\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://www.xn--4cab6c.se/page/%TESTNUMBER 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/%TESTNUMBER HTTP/1.1
+Host: www.xn--groe-xna.de
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 7221e3c3236ecde83a07809a04d775bc0f1c5f0e..cf5358bc214c4ae9ec81fa6c3a7b88f283974448 100644 (file)
@@ -58,22 +58,22 @@ http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://%
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
-Host: data.from.server.requiring.digest.hohoho.com\r
-Proxy-Authorization: Basic %b64[foo:bar]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
-Host: data.from.server.requiring.digest.hohoho.com\r
-Proxy-Authorization: Basic %b64[foo:bar]b64%\r
-Authorization: Digest username="digest", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="304c55b19dbcb9c7e7a3354abd11ba1b"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
+Host: data.from.server.requiring.digest.hohoho.com
+Proxy-Authorization: Basic %b64[foo:bar]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
+Host: data.from.server.requiring.digest.hohoho.com
+Proxy-Authorization: Basic %b64[foo:bar]b64%
+Authorization: Digest username="digest", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="304c55b19dbcb9c7e7a3354abd11ba1b"
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 34d79f766fce93d9fdd031baf6627dcd8878efba..ba46bda1bdc8fe8f6de271d8227d03c35a523bb7 100644 (file)
@@ -47,12 +47,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%header{etag} %header{nope} %header{DAT
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout mode="text">
 "21025-dc7-39462498"  Tue, 09 Nov 2010 14:49:00 GMT
index db4473ce98a747fa60bdf97ece5c56b6dc1bc3bb..4a6ea11b5ef31375a6f008e1c7d47ac4a5645d06 100644 (file)
@@ -72,28 +72,28 @@ http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://%
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
-Host: data.from.server.requiring.digest.hohoho.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
-Host: data.from.server.requiring.digest.hohoho.com\r
-Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="fb8608e00ad9239a3dedb14bc8575976"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
-Host: data.from.server.requiring.digest.hohoho.com\r
-Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="fb8608e00ad9239a3dedb14bc8575976"\r
-Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/%TESTNUMBER", response="bfecb43898f3db12543650d45493313b"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
+Host: data.from.server.requiring.digest.hohoho.com
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
+Host: data.from.server.requiring.digest.hohoho.com
+Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="fb8608e00ad9239a3dedb14bc8575976"
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
+Host: data.from.server.requiring.digest.hohoho.com
+Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="fb8608e00ad9239a3dedb14bc8575976"
+Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/%TESTNUMBER", response="bfecb43898f3db12543650d45493313b"
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 8a2bb108a91f45370a1fe5da8f4b55a73d234fe4..0b296a496eae2704eb1f6b946070e3c372168f40 100644 (file)
@@ -93,28 +93,28 @@ http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://%
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
-Host: data.from.server.requiring.digest.hohoho.com\r
-Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
-Host: data.from.server.requiring.digest.hohoho.com\r
-Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
-Host: data.from.server.requiring.digest.hohoho.com\r
-Authorization: Digest username="digest", realm="r e a l m", nonce="abcdef", uri="/%TESTNUMBER", response="89b737a4b6eefde285c093c92e9bd6ea"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
+Host: data.from.server.requiring.digest.hohoho.com
+Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
+Host: data.from.server.requiring.digest.hohoho.com
+Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
+Host: data.from.server.requiring.digest.hohoho.com
+Authorization: Digest username="digest", realm="r e a l m", nonce="abcdef", uri="/%TESTNUMBER", response="89b737a4b6eefde285c093c92e9bd6ea"
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 67d2a9fcc7507dfba400c4e20428af781284f22a..97a37d85cfd522e168b48cc56a9462df0ba43056 100644 (file)
@@ -43,12 +43,12 @@ request MOOO
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-MOOO /that.site.com/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: agent007 license to drill  \r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+MOOO /that.site.com/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: agent007 license to drill  
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index f8c7357e681d325cd2a96d30a38473d6fb3c477a..7bfb06fcb81fe9a06ac6a96ebc15f8ab2e4fc09c 100644 (file)
@@ -34,15 +34,15 @@ http://a.galaxy.far.far.away/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --prox
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-POST http://a.galaxy.far.far.away/%TESTNUMBER HTTP/1.1\r
-Host: a.galaxy.far.far.away\r
-Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-Content-Length: 0\r
-\r
+<protocol crlf="yes">
+POST http://a.galaxy.far.far.away/%TESTNUMBER HTTP/1.1
+Host: a.galaxy.far.far.away
+Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+Content-Length: 0
+
 </protocol>
 # 52 is CURLE_GOT_NOTHING
 <errorcode>
index be5644db5a6887818e22b487822d8eb1fa10e21f..7ebc98790ed7ea2613bde704018a06d521e00645 100644 (file)
@@ -59,17 +59,17 @@ http://%HOSTIP:%HTTP2PORT/%TESTNUMBER --http2 http://%HOSTIP:%HTTP2PORT/%TESTNUM
 ^X-Forwarded-Proto:.*
 ^Via:.*
 </strip>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTP2PORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTP2PORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTP2PORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTP2PORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout>
 HTTP/1.1 101 Switching Protocols\r
index 469026d79d00e287d94758ec019598d43168343d..4af318b7eaee69837d5da0bc8a32dfc2ac9d88a5 100644 (file)
@@ -50,14 +50,14 @@ http://%HOSTIP:%HTTP2PORT/%TESTNUMBER --http2 -d "datatosend"
 ^X-Forwarded-Proto:.*
 ^Via:.*
 </strip>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTP2PORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 10\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTP2PORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 10
+Content-Type: application/x-www-form-urlencoded
+
 datatosend
 </protocol>
 <stdout>
index ce4a1c04d49b8d4d6779dc7d242925233f120aa2..6b7496c1b56a45b4d8918d938c7615227049968c 100644 (file)
@@ -49,12 +49,12 @@ http://%HOSTIP:%HTTP2PORT/%TESTNUMBER --http2 --head
 ^X-Forwarded-Proto:.*
 ^Via:.*
 </strip>
-<protocol>
-HEAD /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTP2PORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+HEAD /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTP2PORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout>
 HTTP/1.1 101 Switching Protocols\r
index 324551a068d72bd418c0af742343a64d681595ff..8fd7ee57b59794b9271214af6b13f1bb3e8fd4d8 100644 (file)
@@ -47,15 +47,15 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http2
 ^X-Forwarded-Proto:.*
 ^Via:.*
 </strip>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Upgrade: h2c\r
-HTTP2-Settings: AAMAAABkAAQAAQAAAAIAAAAA\r
-Connection: Upgrade, HTTP2-Settings\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Upgrade: h2c
+HTTP2-Settings: AAMAAABkAAQAAQAAAAIAAAAA
+Connection: Upgrade, HTTP2-Settings
+
 </protocol>
 
 # CURLE_WEIRD_SERVER_REPLY (8)
index a03ec8a6883faefb54911280bcba6e5a1e056386..d913d1191e510943b2ebb886120bd3c768227182 100644 (file)
@@ -41,13 +41,13 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://z.x.com/%TESTNUMBER HTTP/1.1\r
-Host: z.x.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://z.x.com/%TESTNUMBER HTTP/1.1
+Host: z.x.com
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 <file name="%LOGDIR/jar%TESTNUMBER" mode="text">
 # Netscape HTTP Cookie File
index 077dd74be9ea5af025330765f2babc0d78cbf9ae..72016e3557a41811b1239a426b13441a8b344b37 100644 (file)
@@ -40,12 +40,12 @@ RCPT TO:<recipient@example.com>
 DATA
 QUIT
 </protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-%repeat[5000 x test in body... ]%\r
-.\r
+<upload crlf="yes">
+From: different
+To: another
+
+%repeat[5000 x test in body... ]%
+.
 </upload>
 </verify>
 </testcase>
index 3a9a9ed6648aa97fb0a6584a6928ed64a981959f..5bdfbebcf83b63a25365d24038a7b99ff90ec1c3 100644 (file)
@@ -45,13 +45,13 @@ cookies
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: nodomain=value; partmatch=present; tool=curl; name=fool\r
-\r
+<protocol crlf="yes">
+GET /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Cookie: nodomain=value; partmatch=present; tool=curl; name=fool
+
 </protocol>
 </verify>
 </testcase>
index 399164425d34273e8e94665c5e86144ca36b3ce6..f07db6ac2263062f236c56c6f1aef3684100cb7d 100644 (file)
@@ -35,14 +35,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth -d "junkelij
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 11\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 11
+Content-Type: application/x-www-form-urlencoded
+
 junkelijunk
 </protocol>
 </verify>
index 2af0a9b843b27e5a9680e80e07f8753e194c68ef..1b5bb7fa9b25679f39374467efa2519987ba8531 100644 (file)
@@ -63,21 +63,21 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk"
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 0\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 11\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 0
+Content-Type: application/x-www-form-urlencoded
+
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 11
+Content-Type: application/x-www-form-urlencoded
+
 junkelijunk
 </protocol>
 </verify>
index f86fa7f677e7aa9156a4eb011956fb5264e2f46d..3d34b38b8824524be6a78020379726778e08b696 100644 (file)
@@ -64,22 +64,22 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --ntlm -d "junkelijunk"
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 0\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 11\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 0
+Content-Type: application/x-www-form-urlencoded
+
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 11
+Content-Type: application/x-www-form-urlencoded
+
 junkelijunk
 </protocol>
 </verify>
index 2034876d908784d56e0d74357e7192cabf938621..27bbfd83d4bccc2ed70702dfc338c4903be601f3 100644 (file)
@@ -39,14 +39,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk"
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 0\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 0
+Content-Type: application/x-www-form-urlencoded
+
 </protocol>
 </verify>
 </testcase>
index afff507273b22c46a86c39726ea49845aa4ffdcc..60f93bf92fcc31e053737c67da51a7273ae57be5 100644 (file)
@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 # weird_server_reply
 <errorcode>
index e3869b7fbf166d06fe4159ff2a17cbe743ec3a15..7a91b34fc678dfc46405e1f04603cd2e602abb1f 100644 (file)
@@ -46,14 +46,14 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://supertrooper.fake/c/%TESTNUMBER HTTP/1.1\r
-Host: supertrooper.fake\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-Cookie: moo2=indeed\r
-\r
+<protocol crlf="yes">
+GET http://supertrooper.fake/c/%TESTNUMBER HTTP/1.1
+Host: supertrooper.fake
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+Cookie: moo2=indeed
+
 </protocol>
 </verify>
 </testcase>
index 222437e8e1790d1db9b4080746abdfd57a041e37..56a40806db7a02d2bfb025a2c402a5be28427d98 100644 (file)
@@ -42,15 +42,15 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http2
 </client>
 
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Upgrade: %H2CVER\r
-HTTP2-Settings: AAMAAABkAAQAAQAAAAIAAAAA\r
-Connection: Upgrade, HTTP2-Settings\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Upgrade: %H2CVER
+HTTP2-Settings: AAMAAABkAAQAAQAAAAIAAAAA
+Connection: Upgrade, HTTP2-Settings
+
 </protocol>
 </verify>
 </testcase>
index a65a2d5d4560956efb8f27ab03cf6f018a55aa51..d5499b3cb9b51c637bf1de31e3f6a1a5a9eb50c5 100644 (file)
@@ -49,15 +49,15 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http2
 </client>
 
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Connection: Upgrade, HTTP2-Settings\r
-Upgrade: %H2CVER\r
-HTTP2-Settings: AAMAAABkAARAAAAAAAIAAAAA\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Connection: Upgrade, HTTP2-Settings
+Upgrade: %H2CVER
+HTTP2-Settings: AAMAAABkAARAAAAAAAIAAAAA
+
 </protocol>
 # CURLE_HTTP2: Send failure: Broken pipe
 <errorcode>
index cb1e4f0c200e71c84839e6d54cddc1a85768198c..90a0885455459bb3d183c5d232cfc8a681cc0e90 100644 (file)
@@ -29,15 +29,15 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index ba0df8c2feae3a2633c6c357f7127c1ad6d542ec..f13ff2af434916c7ce5c1b4ef04764012524c1d3 100644 (file)
@@ -37,19 +37,19 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://deathstar.another.galaxy/%TESTNUMBER HTTP/1.1\r
-Host: deathstar.another.galaxy\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://a.galaxy.far.far.away/%TESTNUMBER HTTP/1.1\r
-Host: a.galaxy.far.far.away\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://deathstar.another.galaxy/%TESTNUMBER HTTP/1.1
+Host: deathstar.another.galaxy
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://a.galaxy.far.far.away/%TESTNUMBER HTTP/1.1
+Host: a.galaxy.far.far.away
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 
 </verify>
index 95c9e288b731aa6882eb36d9cd5fb5653d2acfc9..19d81cb03a7a26cd3dde1f8a521c00ebb71a2ca1 100644 (file)
@@ -57,19 +57,19 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://deathstar.another.galaxy/%TESTNUMBER HTTP/1.1\r
-Host: another.visitor.stay.a.while.stay.foreeeeeever\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://yet.another.host/%TESTNUMBER HTTP/1.1\r
-Host: yet.another.host\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://deathstar.another.galaxy/%TESTNUMBER HTTP/1.1
+Host: another.visitor.stay.a.while.stay.foreeeeeever
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://yet.another.host/%TESTNUMBER HTTP/1.1
+Host: yet.another.host
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 
 </verify>
index 81093d2b0648d6f05615a75420bdf6443d73f2b8..66bba00bf70da988811366bf1f54a91235178216 100644 (file)
@@ -57,19 +57,19 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://deathstar.another.galaxy/%TESTNUMBER HTTP/1.1\r
-Host: another.visitor.stay.a.while.stay.foreeeeeever\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://deathstar.another.galaxy/go/west/%TESTNUMBER HTTP/1.1\r
-Host: another.visitor.stay.a.while.stay.foreeeeeever\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://deathstar.another.galaxy/%TESTNUMBER HTTP/1.1
+Host: another.visitor.stay.a.while.stay.foreeeeeever
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://deathstar.another.galaxy/go/west/%TESTNUMBER HTTP/1.1
+Host: another.visitor.stay.a.while.stay.foreeeeeever
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 
 </verify>
index 006de790477628c8b7a67fd4c15bc8ae39a7ddd2..ea9d4d1145e5cd99c0c214fbfacb5511b1e0ffc0 100644 (file)
@@ -41,25 +41,25 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "name=daniel;type=moo/foo-.4" -F
 <strip>
 ^(Content-Type: multipart/form-data;|------------).*
 </strip>
-<protocol>
-POST /we/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 341\r
-Content-Type: multipart/form-data; boundary=----------------------------212d9006ceb5\r
-\r
-------------------------------212d9006ceb5\r
-Content-Disposition: form-data; name="name"\r
-Content-Type: moo/foo-.4\r
-\r
-daniel\r
-------------------------------212d9006ceb5\r
-Content-Disposition: form-data; name="html"\r
-Content-Type: text/html;charset=verymoo\r
-\r
-<body>hello</body>\r
-------------------------------212d9006ceb5--\r
+<protocol crlf="yes">
+POST /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 341
+Content-Type: multipart/form-data; boundary=----------------------------212d9006ceb5
+
+------------------------------212d9006ceb5
+Content-Disposition: form-data; name="name"
+Content-Type: moo/foo-.4
+
+daniel
+------------------------------212d9006ceb5
+Content-Disposition: form-data; name="html"
+Content-Type: text/html;charset=verymoo
+
+<body>hello</body>
+------------------------------212d9006ceb5--
 </protocol>
 </verify>
 </testcase>
index aff3a9d1ade83b6bbbeea216ecb34e567f70d1fd..823bcdc471832bed81508c7c162dafcf8fd4a4dc 100644 (file)
@@ -60,17 +60,17 @@ http://%HOSTIP:%HTTPPORT?oh=what-weird=test/%TESTNUMBER -L
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /?oh=what-weird=test/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /root/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /?oh=what-weird=test/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /root/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 00d29990f8eb83913b704af0205d04f25e496c8b..43fa70e726f77b6fc8b3eb22168fff36a884e7d7 100644 (file)
@@ -57,19 +57,19 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 50 -L
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=50-\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=50-\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=50-
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=50-
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index f4ff1fa366adb344fc5313f199dfe9e8d525fd3a..6ca4b66e1733157fbeafdd2ab7a680dd1c880f99 100644 (file)
@@ -51,19 +51,19 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 50 -L
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=50-\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=50-\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=50-
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=50-
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 # 33 is CURLE_RANGE_ERROR
 <errorcode>
index 033152f38083847944add6a165b65c41064ffce2..2bd225ed9caaba7bf208de46a627820ac1b5c618 100644 (file)
@@ -37,11 +37,11 @@ ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER -m 10
 <errorcode>
 28
 </errorcode>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
 </protocol>
 </verify>
 </testcase>
index 8f005365f6d84cfabecf5c1f5882f8844b1c6987..4d359e4200b3d52e3abab6a2f227701ba4a93718 100644 (file)
@@ -68,12 +68,12 @@ User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
-<protocol>
-GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: test.%TESTNUMBER:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: test.%TESTNUMBER:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index a17425e42d701192482d03722ba3519311675943..f335a0113bb2edc0789b7f97f51c5e46a1582e02 100644 (file)
@@ -42,11 +42,11 @@ cookies
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/cookies%TESTNUMBER" mode="text">
 # Netscape HTTP Cookie File
index 6769d0cdb0eee596ee025fe842bf974ad883314e..5a6eb7132662ea3a70c13b92bb1d95b5023ede0f 100644 (file)
@@ -39,11 +39,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 31a4cbc2d04a78c349e3e4dc2b098fc8fb2427b1..d92427ccedf9dc81a585bbd54fa1114ba79f3882 100644 (file)
@@ -37,11 +37,11 @@ lib%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 <stdout>
 Effective URL: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
index fe0b5d626ae92aaaa34d485fa91f15a021afe2b1..a49c49db2245b9d784bb812ad6cea199b790ee2b 100644 (file)
@@ -57,15 +57,15 @@ lib%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 <stripfile>
 # strip out the (dynamic) expire date from the file so that the rest
index 2d868cc0bb60427495d9751384feea2abe748248..bcce977df63c9f7d415d00ab87b5470d7413739b 100644 (file)
@@ -43,17 +43,17 @@ HTTP GET --retry-all-errors to overcome partial transfer
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/outfile%TESTNUMBER">
index 0293693631296db72e6ead0e740d3be3d30f2c3d..b1cbb266a212da8ffb89626f13a8e9fb29300cfd 100644 (file)
@@ -27,15 +27,15 @@ FTP URL with ?-letters in username and password
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER use?r\r
-PASS pass?word\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER use?r
+PASS pass?word
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 2653690200fcc7b24190574a8b3e2b1f5aa516e5..8485119e65440158bfdaa31bc6139ffce7aef631 100644 (file)
@@ -49,17 +49,17 @@ lib%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[user%0aname:pass%0aword]b64%\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[user%0aname:pass%0aword]b64%\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user%0aname:pass%0aword]b64%
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user%0aname:pass%0aword]b64%
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index b5f4bb17c260797c76e0cf47316a5ac4b69daf22..ad2f851db85dad5d1950feda5c81ce99e4ea84dc 100644 (file)
@@ -35,17 +35,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Bearer c4e448d652a961fda0ab64f882c8c161d5985f805d45d80c9ddca1\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Bearer c4e448d652a961fda0ab64f882c8c161d5985f805d45d80c9ddca1\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Bearer c4e448d652a961fda0ab64f882c8c161d5985f805d45d80c9ddca1
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Bearer c4e448d652a961fda0ab64f882c8c161d5985f805d45d80c9ddca1
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 12ed68db641ab1f54193022eeafc1d6bc5a53425..76912d227a34ed8ac0a2c9225085ad3095790cc0 100644 (file)
@@ -36,12 +36,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n"
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <stdout>
index 9e4dac0448f06e3515d1ec00f4eff41f0e5bdaa8..398127d5224abf498e0007f849ba7123c16d1066 100644 (file)
@@ -48,17 +48,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n" -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <stdout>
index ef4013caa45fdd4325e105c85fe90154c9a58855..15bbb9af733eb24e792edb8db942b020d2472339 100644 (file)
@@ -59,12 +59,12 @@ http://xxx:yyy@127.0.0.1:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%H
 ^Content-Type:.*
 ^Accept:.*
 </strip>
-<protocol>
-GET /%TESTNUMBER/testapi/test HTTP/1.1\r
-Host: 127.0.0.1:9000\r
-Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/0/127/xxx4_request, SignedHeaders=content-type;host;x-xxx-date, Signature=3d8e00a02e437211a596143dcd590fcc805b731365c68f7f48951ea6eda39c4f\r
-X-Xxx-Date: 19700101T000000Z\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER/testapi/test HTTP/1.1
+Host: 127.0.0.1:9000
+Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/0/127/xxx4_request, SignedHeaders=content-type;host;x-xxx-date, Signature=3d8e00a02e437211a596143dcd590fcc805b731365c68f7f48951ea6eda39c4f
+X-Xxx-Date: 19700101T000000Z
+
 </protocol>
 </verify>
 </testcase>
index 86553a46338ba32cf7f145afaec1e2627e582db2..7aa3575e9f699a704c6944ee87b613059fd4b91d 100644 (file)
@@ -59,12 +59,12 @@ http://127.0.0.1:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%HTTPPORT
 ^Content-Type:.*
 ^Accept:.*
 </strip>
-<protocol>
-GET /%TESTNUMBER/testapi/test HTTP/1.1\r
-Host: 127.0.0.1:9000\r
-Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/0/127/xxx4_request, SignedHeaders=content-type;host;x-yyy-date, Signature=cf8dc9a4af903a1a9bb1385d8e2366d780afb501e266436598438395e502d58c\r
-X-Yyy-Date: 19700101T000000Z\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER/testapi/test HTTP/1.1
+Host: 127.0.0.1:9000
+Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/0/127/xxx4_request, SignedHeaders=content-type;host;x-yyy-date, Signature=cf8dc9a4af903a1a9bb1385d8e2366d780afb501e266436598438395e502d58c
+X-Yyy-Date: 19700101T000000Z
+
 </protocol>
 </verify>
 </testcase>
index 26701aee8d4bb01dea966e410bd8e1fced431ae4..26c9425376a476c67c8f9fc0ea15f034695570f3 100644 (file)
@@ -59,12 +59,12 @@ http://127.0.0.1:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%HTTPPORT
 ^Content-Type:.*
 ^Accept:.*
 </strip>
-<protocol>
-GET /%TESTNUMBER/testapi/test HTTP/1.1\r
-Host: 127.0.0.1:9000\r
-Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/rrr/127/xxx4_request, SignedHeaders=content-type;host;x-yyy-date, Signature=a0b11b97b54689428d4188b788ed32865d607822d85d3e91cf06141f479dac0b\r
-X-Yyy-Date: 19700101T000000Z\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER/testapi/test HTTP/1.1
+Host: 127.0.0.1:9000
+Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/rrr/127/xxx4_request, SignedHeaders=content-type;host;x-yyy-date, Signature=a0b11b97b54689428d4188b788ed32865d607822d85d3e91cf06141f479dac0b
+X-Yyy-Date: 19700101T000000Z
+
 </protocol>
 </verify>
 </testcase>
index 0d100c55e1dcaa6dda5942c31ed8f8af0120fb48..2628b9230559ea3abff7888b2a6356ef6ecfb4fd 100644 (file)
@@ -59,12 +59,12 @@ http://127.0.0.1:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%HTTPPORT
 ^Content-Type:.*
 ^Accept:.*
 </strip>
-<protocol>
-GET /%TESTNUMBER/testapi/test HTTP/1.1\r
-Host: 127.0.0.1:9000\r
-Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/rrr/sss/xxx4_request, SignedHeaders=content-type;host;x-yyy-date, Signature=026b713d76b0789bd224c5e41322f74eed088f8a22fd15183ca68376c575c5b0\r
-X-Yyy-Date: 19700101T000000Z\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER/testapi/test HTTP/1.1
+Host: 127.0.0.1:9000
+Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/rrr/sss/xxx4_request, SignedHeaders=content-type;host;x-yyy-date, Signature=026b713d76b0789bd224c5e41322f74eed088f8a22fd15183ca68376c575c5b0
+X-Yyy-Date: 19700101T000000Z
+
 </protocol>
 </verify>
 </testcase>
index b1bd518a9fe9b7b5c916333b1f38314c26150697..816b9c18d766629cbb991625d3ee3954ea47080f 100644 (file)
@@ -60,13 +60,13 @@ http://127.0.0.1:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%HTTPPORT
 ^Content-Type:.*
 ^Accept:.*
 </strip>
-<protocol nonewline="yes">
-POST /%TESTNUMBER/testapi/test HTTP/1.1\r
-Host: 127.0.0.1:9000\r
-Authorization: PROVIDER14-HMAC-SHA256 Credential=keyId/19700101/region/service/provider14_request, SignedHeaders=content-type;host;x-provider2-date, Signature=4928ccf97a9e71fe27f91db5a3b3c943b6080d25e6f4df8593d4c38e7d1e849b\r
-X-Provider2-Date: 19700101T000000Z\r
-Content-Length: 8\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER/testapi/test HTTP/1.1
+Host: 127.0.0.1:9000
+Authorization: PROVIDER14-HMAC-SHA256 Credential=keyId/19700101/region/service/provider14_request, SignedHeaders=content-type;host;x-provider2-date, Signature=4928ccf97a9e71fe27f91db5a3b3c943b6080d25e6f4df8593d4c38e7d1e849b
+X-Provider2-Date: 19700101T000000Z
+Content-Length: 8
+
 postData
 </protocol>
 </verify>
index be0c206d675f1d86799ba1d8ca482ddbfc28a3e4..5662bc5597ce4f21711955743d6b96e20551242e 100644 (file)
@@ -30,9 +30,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 <errorcode>
 67
 </errorcode>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
 </protocol>
 </verify>
 </testcase>
index 67de2a1e8d97186186e3253708f500c5d2b3c243..2266529bbe360199535443c6c54f0ec7ccd1f7a0 100644 (file)
@@ -59,16 +59,16 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
 ^Content-Type:.*
 ^Accept:.*
 </strip>
-<protocol>
-GET /aws_sigv4/testapi/test HTTP/1.1\r
-Host: exam.ple.com:9000\r
-Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/ple/exam/xxx4_request, SignedHeaders=content-type;host;tesmixcase;test2;test3;test_space;x-xxx-date, Signature=dd39202e9fb7b836ebf2abb83b114cae11ff3b6a169f0c64b290a774a873db9d\r
-X-Xxx-Date: 19700101T000000Z\r
-test3: 1234\r
-test2:\r
-test_space: t  s  m       end    \r
-tesMixCase: MixCase\r
-\r
+<protocol crlf="yes">
+GET /aws_sigv4/testapi/test HTTP/1.1
+Host: exam.ple.com:9000
+Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/ple/exam/xxx4_request, SignedHeaders=content-type;host;tesmixcase;test2;test3;test_space;x-xxx-date, Signature=dd39202e9fb7b836ebf2abb83b114cae11ff3b6a169f0c64b290a774a873db9d
+X-Xxx-Date: 19700101T000000Z
+test3: 1234
+test2:
+test_space: t  s  m       end    
+tesMixCase: MixCase
+
 </protocol>
 </verify>
 </testcase>
index 84b2a81e0285761416d5026d867fe27a4cfcce41..a53e57c44d482333c7b378050c04a6f737801bdf 100644 (file)
@@ -59,13 +59,13 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
 ^Content-Type:.*
 ^Accept:.*
 </strip>
-<protocol>
-GET /aws_sigv4/testapi/test HTTP/1.1\r
-Host: exam.ple.com:9000\r
-Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/ple/exam/xxx4_request, SignedHeaders=content-type;host;x-xxx-content-sha256;x-xxx-date, Signature=dfe78c8846a9b7d65d1eb4c1d6ea7bc886650d03f3568088cb8d5b4c3778287f\r
-X-Xxx-Date: 19700101T000000Z\r
-X-Xxx-Content-Sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855\r
-\r
+<protocol crlf="yes">
+GET /aws_sigv4/testapi/test HTTP/1.1
+Host: exam.ple.com:9000
+Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/ple/exam/xxx4_request, SignedHeaders=content-type;host;x-xxx-content-sha256;x-xxx-date, Signature=dfe78c8846a9b7d65d1eb4c1d6ea7bc886650d03f3568088cb8d5b4c3778287f
+X-Xxx-Date: 19700101T000000Z
+X-Xxx-Content-Sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+
 </protocol>
 </verify>
 </testcase>
index 2f538cc8e2fa0a1a215a1c2849e40f4ba08e045c..b30d9acdd36647f1abae686281ae22fd7b900214 100644 (file)
@@ -59,13 +59,13 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
 ^Content-Type:.*
 ^Accept:.*
 </strip>
-<protocol>
-GET /aws_sigv4/testapi/test HTTP/1.1\r
-Host: exam.ple.com:9000\r
-Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/ple/exam/xxx4_request, SignedHeaders=content-type;host;x-xxx-content-sha256;x-xxx-date, Signature=25b4cac711ea8f65010c485d3778885f5f3870d0b8ff0b3ab58a8d7eeab991ff\r
-X-Xxx-Date: 19700101T000000Z\r
-X-Xxx-Content-Sha256: arbitrary\r
-\r
+<protocol crlf="yes">
+GET /aws_sigv4/testapi/test HTTP/1.1
+Host: exam.ple.com:9000
+Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/ple/exam/xxx4_request, SignedHeaders=content-type;host;x-xxx-content-sha256;x-xxx-date, Signature=25b4cac711ea8f65010c485d3778885f5f3870d0b8ff0b3ab58a8d7eeab991ff
+X-Xxx-Date: 19700101T000000Z
+X-Xxx-Content-Sha256: arbitrary
+
 </protocol>
 </verify>
 </testcase>
index 27be746d37ef0bf474974e74e2118e54381daa7c..239a11eccb2f03fbb81203fa10fd3238eac9c3ec 100644 (file)
@@ -59,13 +59,13 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
 ^Content-Type:.*
 ^Accept:.*
 </strip>
-<protocol>
-GET /aws_sigv4/testapi/test HTTP/1.1\r
-Host: exam.ple.com:9000\r
-Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/ple/exam/xxx4_request, SignedHeaders=content-type;host;x-xxx-content-sha256;x-xxx-date, Signature=25b4cac711ea8f65010c485d3778885f5f3870d0b8ff0b3ab58a8d7eeab991ff\r
-X-Xxx-Date: 19700101T000000Z\r
-X-Xxx-Content-Sha256:  arbitrary \r
-\r
+<protocol crlf="yes">
+GET /aws_sigv4/testapi/test HTTP/1.1
+Host: exam.ple.com:9000
+Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/ple/exam/xxx4_request, SignedHeaders=content-type;host;x-xxx-content-sha256;x-xxx-date, Signature=25b4cac711ea8f65010c485d3778885f5f3870d0b8ff0b3ab58a8d7eeab991ff
+X-Xxx-Date: 19700101T000000Z
+X-Xxx-Content-Sha256:  arbitrary 
+
 </protocol>
 </verify>
 </testcase>
index c6c15cadf48548730124567891375a629cb026d7..46ef85a678cf763690a221beed1bdf75fece9778 100644 (file)
@@ -59,13 +59,13 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
 ^Content-Type:.*
 ^Accept:.*
 </strip>
-<protocol>
-GET /aws_sigv4/testapi/test HTTP/1.1\r
-Host: exam.ple.com:9000\r
-Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/ple/exam/xxx4_request, SignedHeaders=content-type;host;x-xxx-content-sha256;x-xxx-date, Signature=7b343a4aa55d73ffc05005d84480bc705a3367373ed8cae1a1c0fbd2b3aa0483\r
-X-Xxx-Date: 19700101T000000Z\r
-X-Xxx-Content-Sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855\r
-\r
+<protocol crlf="yes">
+GET /aws_sigv4/testapi/test HTTP/1.1
+Host: exam.ple.com:9000
+Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/ple/exam/xxx4_request, SignedHeaders=content-type;host;x-xxx-content-sha256;x-xxx-date, Signature=7b343a4aa55d73ffc05005d84480bc705a3367373ed8cae1a1c0fbd2b3aa0483
+X-Xxx-Date: 19700101T000000Z
+X-Xxx-Content-Sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+
 </protocol>
 </verify>
 </testcase>
index c72cbebf49ec6dd66617c686da1ffc5502e92f82..60083affe3e8c14f2057fe92d0b3e21443019836 100644 (file)
@@ -32,11 +32,11 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --retry 1 -w '%{num_retries}\n'
 <errorcode>
 67
 </errorcode>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-USER anonymous\r
-PASS ftp@example.com\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+USER anonymous
+PASS ftp@example.com
 </protocol>
 <stdout>
 1
index cd148faf7108fbe1dc09e2df5b8191e5c2fed162..b005bbf932be3952723bb8deba58b87ee4155fc4 100644 (file)
@@ -58,12 +58,12 @@ http://xxx:yyy@127.0.0.1:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%H
 ^Content-Type:.*
 ^Accept:.*
 </strip>
-<protocol>
-GET /%TESTNUMBER/testapi/test HTTP/1.1\r
-Host: 127.0.0.1:9000\r
-Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/0/127/xxx4_request, SignedHeaders=content-type;host;x-xxx-date, Signature=35da102c1df68f2ef85ade08ecc212fa663a66e3a973146f6578a5c5426e9669\r
-X-Xxx-Date: 19700101T000000Z\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER/testapi/test HTTP/1.1
+Host: 127.0.0.1:9000
+Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/0/127/xxx4_request, SignedHeaders=content-type;host;x-xxx-date, Signature=35da102c1df68f2ef85ade08ecc212fa663a66e3a973146f6578a5c5426e9669
+X-Xxx-Date: 19700101T000000Z
+
 </protocol>
 </verify>
 </testcase>
index d940b0dc38e9ec6b8b28fca86c561501f8babb49..31f132f8fde1cc1795ed10f1c9a0642b6f539c22 100644 (file)
@@ -44,17 +44,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 1000
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <stdout>
index 106a0e31627462a6c29d1afd4524fb339c56616d..b3d3a36a0e302b7a772f6e7e30b63c8d667fa8c5 100644 (file)
@@ -59,14 +59,14 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
 ^Content-Type:.*
 ^Accept:.*
 </strip>
-<protocol>
-PUT /aws_sigv4/testapi/test HTTP/1.1\r
-Host: exam.ple.com:9000\r
-Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=a028756f42a859122e9609c1f90cae4b272d6b03bf60d9fd354138176dfa2260\r
-X-Amz-Date: 19700101T000000Z\r
-x-amz-content-sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855\r
-Content-Length: 0\r
-\r
+<protocol crlf="yes">
+PUT /aws_sigv4/testapi/test HTTP/1.1
+Host: exam.ple.com:9000
+Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=a028756f42a859122e9609c1f90cae4b272d6b03bf60d9fd354138176dfa2260
+X-Amz-Date: 19700101T000000Z
+x-amz-content-sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+Content-Length: 0
+
 </protocol>
 </verify>
 </testcase>
index d6f550793323e2270c1f33dbe436b6f33375e175..57cb834e95242782d40419a3d5de5632631d2029 100644 (file)
@@ -52,17 +52,17 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
 ^Content-Type:.*
 ^Accept:.*
 </strip>
-<protocol>
-PUT /aws_sigv4/testapi/test HTTP/1.1\r
-Host: exam.ple.com:9000\r
-Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=4a6e9b4af0542ffb83744c6852f8e1bfec14f2a67e6f6f037b39f172f79d62af\r
-X-Amz-Date: 19700101T000000Z\r
-x-amz-content-sha256: UNSIGNED-PAYLOAD\r
-Transfer-Encoding: chunked\r
-Expect: 100-continue\r
-\r
-0\r
-\r
+<protocol crlf="yes">
+PUT /aws_sigv4/testapi/test HTTP/1.1
+Host: exam.ple.com:9000
+Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=4a6e9b4af0542ffb83744c6852f8e1bfec14f2a67e6f6f037b39f172f79d62af
+X-Amz-Date: 19700101T000000Z
+x-amz-content-sha256: UNSIGNED-PAYLOAD
+Transfer-Encoding: chunked
+Expect: 100-continue
+
+0
+
 </protocol>
 </verify>
 </testcase>
index 5a07d544d4fc15a80be09d3c1df7424561238869..7b4168d119a380fefb43a1182609b54ad77049c2 100644 (file)
@@ -62,19 +62,19 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
 ^Content-Type:.*
 ^Accept:.*
 </strip>
-<protocol>
-POST /aws_sigv4/testapi/test HTTP/1.1\r
-Host: exam.ple.com:9000\r
-Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=eaee0f1c5984ad5d81c8bc7805f28c7b83b35322de654b2ace18cb8cf6d5a9cb\r
-X-Amz-Date: 19700101T000000Z\r
-x-amz-content-sha256: UNSIGNED-PAYLOAD\r
-Content-Length: 154\r
-\r
---------------------------qrstuvwxyz0123456789AB\r
-Content-Disposition: attachment; name="foo"\r
-\r
-bar\r
---------------------------qrstuvwxyz0123456789AB--\r
+<protocol crlf="yes">
+POST /aws_sigv4/testapi/test HTTP/1.1
+Host: exam.ple.com:9000
+Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=eaee0f1c5984ad5d81c8bc7805f28c7b83b35322de654b2ace18cb8cf6d5a9cb
+X-Amz-Date: 19700101T000000Z
+x-amz-content-sha256: UNSIGNED-PAYLOAD
+Content-Length: 154
+
+--------------------------qrstuvwxyz0123456789AB
+Content-Disposition: attachment; name="foo"
+
+bar
+--------------------------qrstuvwxyz0123456789AB--
 </protocol>
 </verify>
 </testcase>
index b184ca4b5afa388e2a717d77aa355b70b5fd178a..f91606e362beb0128ce3a579a24177e96105978e 100644 (file)
@@ -59,13 +59,13 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
 ^Content-Type:.*
 ^Accept:.*
 </strip>
-<protocol>
-GET /aws_sigv4/testapi/test HTTP/1.1\r
-Host: exam.ple.com:9000\r
-Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=host;x-amz-content-sha256;x-amz-date, Signature=e6270423932feafe9b00ca5d60c9ed566be649f9ca9676144288273945153021\r
-X-Amz-Date: 19700101T000000Z\r
-x-amz-content-sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855\r
-\r
+<protocol crlf="yes">
+GET /aws_sigv4/testapi/test HTTP/1.1
+Host: exam.ple.com:9000
+Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=host;x-amz-content-sha256;x-amz-date, Signature=e6270423932feafe9b00ca5d60c9ed566be649f9ca9676144288273945153021
+X-Amz-Date: 19700101T000000Z
+x-amz-content-sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+
 </protocol>
 </verify>
 </testcase>
index 1e980c5a82ccd7e082d3328d8bd8dbbcb3e2d496..92fd563da868be05117f1ca958c03505f55b4ca6 100644 (file)
@@ -52,17 +52,17 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
 ^Content-Type:.*
 ^Accept:.*
 </strip>
-<protocol>
-PUT /aws_sigv4/testapi/test HTTP/1.1\r
-Host: exam.ple.com:9000\r
-Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=a028756f42a859122e9609c1f90cae4b272d6b03bf60d9fd354138176dfa2260\r
-X-Amz-Date: 19700101T000000Z\r
-Transfer-Encoding: chunked\r
-X-Amz-Content-Sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855\r
-Expect: 100-continue\r
-\r
-0\r
-\r
+<protocol crlf="yes">
+PUT /aws_sigv4/testapi/test HTTP/1.1
+Host: exam.ple.com:9000
+Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=a028756f42a859122e9609c1f90cae4b272d6b03bf60d9fd354138176dfa2260
+X-Amz-Date: 19700101T000000Z
+Transfer-Encoding: chunked
+X-Amz-Content-Sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+Expect: 100-continue
+
+0
+
 </protocol>
 </verify>
 </testcase>
index c105c46662be61ab4eb3215723bfdf4d564896e3..f2c1ead98614030d6bca9fac7b53abde1a2884d5 100644 (file)
@@ -44,19 +44,19 @@ effective URL: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 effective URL: http://%HOSTIP:%HTTPPORT/%TESTNUMBER?foo
 effective URL: http://%HOSTIP:%HTTPPORT/%TESTNUMBER?foo&bar
 </stdout>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER?foo HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER?foo&bar HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%TESTNUMBER?foo HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%TESTNUMBER?foo&bar HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 95b1f99e1cef15c4a0e91a0e5c5c4b61ff118061..e1e81aee51f6325f62e7f9114407ced024f6e6fe 100644 (file)
@@ -53,17 +53,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 1000
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 </verify>
index 1289fd2d9b334bd4747cabca15ffc5f30fb85e00..4965d3ce935ab72feba5157e2c6451b833a8117b 100644 (file)
@@ -42,17 +42,17 @@ HTTP with -d, -G and {}
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 86ec605dba5b810d40da6c58da5b669f68799b4a..79d2cf9b7c2aaa2b5dc32cabc0f057d3d8356ce6 100644 (file)
@@ -36,13 +36,13 @@ HTTP GET with user and password
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[fake:user]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[fake:user]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 91e256298a402ffb85b108850ffc0528a1359cbe..51e90782a91eda7527d051baa0c780494b3181bd 100644 (file)
@@ -43,13 +43,13 @@ machine example.com
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET / HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[:5up3r53cr37]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET / HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[:5up3r53cr37]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 9c3cc94c0a82b89e00b3ed2f58672d68c8deb65c..3626499be107cf8ca5606a964f178a48f59b4a72 100644 (file)
@@ -119,32 +119,32 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER basic basic
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER0100 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[testuser:wrongpass]b64%\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0200 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[testuser:testpass]b64%\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0300 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[testuser:wrongpass]b64%\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0400 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[testuser:wrongpass]b64%\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0500 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[testuser:testpass]b64%\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER0100 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[testuser:wrongpass]b64%
+Accept: */*
+
+GET /%TESTNUMBER0200 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[testuser:testpass]b64%
+Accept: */*
+
+GET /%TESTNUMBER0300 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[testuser:wrongpass]b64%
+Accept: */*
+
+GET /%TESTNUMBER0400 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[testuser:wrongpass]b64%
+Accept: */*
+
+GET /%TESTNUMBER0500 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[testuser:testpass]b64%
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index e79285bc7bbfd689bdae48945dfac55e793ace29..b2d6f729ae28db737873b15119034f2a683100d4 100644 (file)
@@ -134,32 +134,32 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER basic digest
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER0100 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[testuser:wrongpass]b64%\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0200 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0200", response="ed646c565f79e2dd9fa37cb5a621213c"\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0300 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[testuser:wrongpass]b64%\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0400 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER0400", response="9741ced8caacc6124770187b36f007c5"\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0500 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="3", uri="/%TESTNUMBER0500", response="5bc77ec8c2d443b27a1b55f1fd8fbb13"\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER0100 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[testuser:wrongpass]b64%
+Accept: */*
+
+GET /%TESTNUMBER0200 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0200", response="ed646c565f79e2dd9fa37cb5a621213c"
+Accept: */*
+
+GET /%TESTNUMBER0300 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[testuser:wrongpass]b64%
+Accept: */*
+
+GET /%TESTNUMBER0400 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER0400", response="9741ced8caacc6124770187b36f007c5"
+Accept: */*
+
+GET /%TESTNUMBER0500 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="3", uri="/%TESTNUMBER0500", response="5bc77ec8c2d443b27a1b55f1fd8fbb13"
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 7982b68d22e60e2162b70a564157a619e648c03c..9f6dd4176da906b40542676b12dcc3d7d2783c7e 100644 (file)
@@ -216,47 +216,47 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER basic ntlm
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER0100 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[testuser:wrongpass]b64%\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0200 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0200 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0300 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[testuser:wrongpass]b64%\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0400 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0400 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0500 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0500 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER0100 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[testuser:wrongpass]b64%
+Accept: */*
+
+GET /%TESTNUMBER0200 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Accept: */*
+
+GET /%TESTNUMBER0200 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=
+Accept: */*
+
+GET /%TESTNUMBER0300 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[testuser:wrongpass]b64%
+Accept: */*
+
+GET /%TESTNUMBER0400 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Accept: */*
+
+GET /%TESTNUMBER0400 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
+Accept: */*
+
+GET /%TESTNUMBER0500 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Accept: */*
+
+GET /%TESTNUMBER0500 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index ee434319d49f98c01bd2e6e5ecd117af6f15eb53..e3b5e946cce6ace2a6d6c44367205980ec1d3705 100644 (file)
@@ -170,40 +170,40 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER digest basic
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER0100 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0100 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0100", response="5f992a2e761ab926256419f7c685f85b"\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0200 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[testuser:testpass]b64%\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0300 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0300 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="3", uri="/%TESTNUMBER0300", response="132242e602882251929be93228c830ae"\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0400 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[testuser:wrongpass]b64%\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0500 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[testuser:testpass]b64%\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER0100 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%TESTNUMBER0100 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0100", response="5f992a2e761ab926256419f7c685f85b"
+Accept: */*
+
+GET /%TESTNUMBER0200 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[testuser:testpass]b64%
+Accept: */*
+
+GET /%TESTNUMBER0300 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%TESTNUMBER0300 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="3", uri="/%TESTNUMBER0300", response="132242e602882251929be93228c830ae"
+Accept: */*
+
+GET /%TESTNUMBER0400 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[testuser:wrongpass]b64%
+Accept: */*
+
+GET /%TESTNUMBER0500 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[testuser:testpass]b64%
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 259e439504dfe5cbb03cec308e711b6f17389a93..b4ca0e327ddc1e3109dd951248d891206fec4b24 100644 (file)
@@ -193,45 +193,45 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER digest digest
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER0100 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0100 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0100", response="f7fd60eefaff5225971bf9b3d80d6ba6"\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0200 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER0200", response="785ca3ef511999f7e9c178195f5b388c"\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0300 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0300 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="4", uri="/%TESTNUMBER0300", response="4c735d2360fd6848e7cb32a11ae3612b"\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0400 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="f5906785511fb60a2af8b1cd53008ead"\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0400 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="f5906785511fb60a2af8b1cd53008ead"\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0500 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="7", uri="/%TESTNUMBER0500", response="8ef4d935fd964a46c3965c0863b52cf1"\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER0100 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%TESTNUMBER0100 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0100", response="f7fd60eefaff5225971bf9b3d80d6ba6"
+Accept: */*
+
+GET /%TESTNUMBER0200 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER0200", response="785ca3ef511999f7e9c178195f5b388c"
+Accept: */*
+
+GET /%TESTNUMBER0300 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%TESTNUMBER0300 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="4", uri="/%TESTNUMBER0300", response="4c735d2360fd6848e7cb32a11ae3612b"
+Accept: */*
+
+GET /%TESTNUMBER0400 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="f5906785511fb60a2af8b1cd53008ead"
+Accept: */*
+
+GET /%TESTNUMBER0400 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="f5906785511fb60a2af8b1cd53008ead"
+Accept: */*
+
+GET /%TESTNUMBER0500 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="7", uri="/%TESTNUMBER0500", response="8ef4d935fd964a46c3965c0863b52cf1"
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 461d7ba6a814e23087f810a0b6a41d2706d52db7..ef87640ac80bed10f134d3aae11127518b96589f 100644 (file)
@@ -253,55 +253,55 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER digest ntlm
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER0100 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0100 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0100", response="53c80666f5e3a4a55f92a66aaf0078bb"\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0200 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0200 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0300 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0300 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="4", uri="/%TESTNUMBER0300", response="1aa5d90da9803ca12d04b24e0f19476e"\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0400 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0400 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0500 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0500 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER0100 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%TESTNUMBER0100 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0100", response="53c80666f5e3a4a55f92a66aaf0078bb"
+Accept: */*
+
+GET /%TESTNUMBER0200 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Accept: */*
+
+GET /%TESTNUMBER0200 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=
+Accept: */*
+
+GET /%TESTNUMBER0300 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%TESTNUMBER0300 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="4", uri="/%TESTNUMBER0300", response="1aa5d90da9803ca12d04b24e0f19476e"
+Accept: */*
+
+GET /%TESTNUMBER0400 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Accept: */*
+
+GET /%TESTNUMBER0400 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
+Accept: */*
+
+GET /%TESTNUMBER0500 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Accept: */*
+
+GET /%TESTNUMBER0500 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 7adadaa57e391d2bacf0cf0d4e4f9fd86f29d5a5..9b43d0f87f7a379f3db382de74ebe8c29c81476d 100644 (file)
@@ -189,42 +189,42 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER ntlm basic
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER0100 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0100 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0200 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[testuser:testpass]b64%\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0300 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0300 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0400 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[testuser:wrongpass]b64%\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0500 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[testuser:testpass]b64%\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER0100 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Accept: */*
+
+GET /%TESTNUMBER0100 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
+Accept: */*
+
+GET /%TESTNUMBER0200 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[testuser:testpass]b64%
+Accept: */*
+
+GET /%TESTNUMBER0300 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Accept: */*
+
+GET /%TESTNUMBER0300 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
+Accept: */*
+
+GET /%TESTNUMBER0400 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[testuser:wrongpass]b64%
+Accept: */*
+
+GET /%TESTNUMBER0500 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[testuser:testpass]b64%
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 4961e668d6de949a2e98e7be4ac038b1d18f1bfc..2baee67311935ff6cdfcf6797e88541c048784bd 100644 (file)
@@ -242,47 +242,47 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER ntlm digest
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER0100 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0100 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0200 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER0200", response="2f2d784ba53a0a307758a90e98d25c27"\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0300 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0300 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0400 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="d6262e9147db08c62ff2f53b515861e8"\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0400 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="d6262e9147db08c62ff2f53b515861e8"\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0500 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="7", uri="/%TESTNUMBER0500", response="198757e61163a779cf24ed4c49c1ad7d"\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER0100 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Accept: */*
+
+GET /%TESTNUMBER0100 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
+Accept: */*
+
+GET /%TESTNUMBER0200 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER0200", response="2f2d784ba53a0a307758a90e98d25c27"
+Accept: */*
+
+GET /%TESTNUMBER0300 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Accept: */*
+
+GET /%TESTNUMBER0300 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
+Accept: */*
+
+GET /%TESTNUMBER0400 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="d6262e9147db08c62ff2f53b515861e8"
+Accept: */*
+
+GET /%TESTNUMBER0400 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="d6262e9147db08c62ff2f53b515861e8"
+Accept: */*
+
+GET /%TESTNUMBER0500 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="7", uri="/%TESTNUMBER0500", response="198757e61163a779cf24ed4c49c1ad7d"
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index b464b0b7a2f89fb52c7da37b7f4f7af625d2cf42..1d3b168e5f43fa503c1bb23eb88c3f7f841199a0 100644 (file)
@@ -255,57 +255,57 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER ntlm ntlm
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER0100 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0100 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0200 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0200 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0300 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0300 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0400 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0400 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0500 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0500 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER0100 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Accept: */*
+
+GET /%TESTNUMBER0100 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
+Accept: */*
+
+GET /%TESTNUMBER0200 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Accept: */*
+
+GET /%TESTNUMBER0200 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=
+Accept: */*
+
+GET /%TESTNUMBER0300 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Accept: */*
+
+GET /%TESTNUMBER0300 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
+Accept: */*
+
+GET /%TESTNUMBER0400 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Accept: */*
+
+GET /%TESTNUMBER0400 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
+Accept: */*
+
+GET /%TESTNUMBER0500 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Accept: */*
+
+GET /%TESTNUMBER0500 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 06aa1ebfacb8245133cc9a6d883f0928d2a3527f..403ca153638c4d63e0194e32edc635cf76f265b6 100644 (file)
@@ -88,27 +88,27 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER0100 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[testuser:testpass]b64%\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0100 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[testuser:testpass]b64%\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0200 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0200 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER0100 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[testuser:testpass]b64%
+Accept: */*
+
+GET /%TESTNUMBER0100 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[testuser:testpass]b64%
+Accept: */*
+
+GET /%TESTNUMBER0200 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Accept: */*
+
+GET /%TESTNUMBER0200 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 2973eb89879c136594762a02bccfcc37a33b1f4c..447e8c5330529be2bda27eef6125f7e7941a28b1 100644 (file)
@@ -47,12 +47,12 @@ CURL_SSL_BACKEND=schannel
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: localhost:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: localhost:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index adb4f1767134179a8c454fb3e7f72858f05dbdfa..a2ecffdb412b668e1df6a2c1fe1c667f89979b5d 100644 (file)
@@ -43,12 +43,12 @@ simple HTTPS GET with DER public key pinning
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: localhost:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: localhost:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 9f229cfd3ea8782c2cff4b6c2ceee6758e991cd5..138f573004f63eb4f1234cae817b7b733559b312 100644 (file)
@@ -43,12 +43,12 @@ simple HTTPS GET with PEM public key pinning
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: localhost:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: localhost:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 7cab984ce5ab4ee7632b5f48f362f397dae779a4..c7e7acb63ff95c4f279d24fac3e104eead9961cb 100644 (file)
@@ -48,14 +48,14 @@ machine %HOSTIP login user2 password passwd2
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER userdef\r
-PASS passwddef\r
-PWD\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER userdef
+PASS passwddef
+PWD
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index 6537d193e3c4151ab46ff4446028aaf9c5de744e..ab7987cb2be12c2a40f89c6d42ee25279f7bec38 100644 (file)
@@ -47,18 +47,18 @@ HTTP Basic authorization, then without authorization
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER0100 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[testuser:testpass]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0200 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER0100 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[testuser:testpass]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0200 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout>
 Finally, this is the real page!
index 71112c27f8b26e2573b01becbc5c48b28f02fc88..75da98ba9efe0a1c41923bfbf9cec979050bf3d0 100644 (file)
@@ -43,12 +43,12 @@ simple HTTPS GET with base64-sha256 public key pinning
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: localhost:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: localhost:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 555515aa4a31af9d7b9628559f0ada919b384b11..4eb6ce69999e3bf03108099bef573be3db71b96f 100644 (file)
@@ -57,17 +57,17 @@ http://%hex[%c3%a5%c3%a4%c3%b6]hex%.se:%HTTPPORT/%TESTNUMBER --resolve xn--4cab6
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: xn--4cab6c.se:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: xn--4cab6c.se:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: xn--4cab6c.se:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: xn--4cab6c.se:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <stdout>
index 9c671b178536585fa5eac65ff17e77699fd8ea49..ac934a6f76711e26a0f78581a3f66df20ce8b633 100644 (file)
@@ -58,19 +58,19 @@ http://%hex[%c3%a5%c3%a4%c3%b6]hex%.se/%TESTNUMBER -x %HOSTIP:%HTTPPORT -w "%{nu
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://xn--4cab6c.se/%TESTNUMBER HTTP/1.1\r
-Host: xn--4cab6c.se\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://xn--4cab6c.se/%TESTNUMBER0001 HTTP/1.1\r
-Host: xn--4cab6c.se\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://xn--4cab6c.se/%TESTNUMBER HTTP/1.1
+Host: xn--4cab6c.se
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://xn--4cab6c.se/%TESTNUMBER0001 HTTP/1.1
+Host: xn--4cab6c.se
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 
 <stdout>
index 98be38bee670701e5a58f38c0d4b8f8a2c688c9b..31513551accb7c8d79ae0b944d185cafa4966108 100644 (file)
@@ -38,27 +38,27 @@ http://www1.example.com:8081/%TESTNUMBER --connect-to ::%HOSTIP:%HTTPPORT --next
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: www1.example.com:8081\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: www2.example.com:8082\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: www3.example.com:8083\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: www4.example.com:8084\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: www1.example.com:8081
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: www2.example.com:8082
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: www3.example.com:8083
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: www4.example.com:8084
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 </verify>
index ed4713f9a5fccf7d410d6e9a73eb08b22e62499e..202ea39106b6f76a2433d92a21a1aa9dc84c2f6a 100644 (file)
@@ -68,12 +68,12 @@ User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: www.example.com.%TESTNUMBER\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: www.example.com.%TESTNUMBER
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 </verify>
index ce76cc93c059d6b4bfa167ff6303bb173d100f09..b11d3c452b3c3b3666db50f35ad86a2720d42d64 100644 (file)
@@ -38,22 +38,22 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n" --next --connect-to
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <stdout>
index 18fc7c5ebfd9d4082ef31e77ea7dbe4ec153a640..60b45402b2d63349ae747abe00f5d856bd1ea979 100644 (file)
@@ -39,17 +39,17 @@ http://www.example.com:%HTTPPORT/%TESTNUMBER --resolve www.example.com:%HTTPPORT
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: www.example.com:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: www.example.com:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: www.example.com:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: www.example.com:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <stdout>
index a416d528689c43ddfe15378c46673beacebe6178..ac35ed37e54d96f175e6737140006a3b2e55141c 100644 (file)
@@ -38,17 +38,17 @@ http://10.0.0.1:8081/%TESTNUMBER --connect-to 10.0.0.1:8081:%HOSTIP:%HTTPPORT --
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: 10.0.0.1:8081\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: [fc00::1]:8082\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: 10.0.0.1:8081
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: [fc00::1]:8082
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 </verify>
index 8217444e5364e7c0b45e0c0ee4da62ca41b38aa4..59ec523bb76b374de796152ad9ed1d7ce8b151ed 100644 (file)
@@ -38,27 +38,27 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --connect-to foo::bar: --connect-to :123::4
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: www.example.com:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:8083\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: www.example.com:8084\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: www.example.com:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:8083
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: www.example.com:8084
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 </verify>
index 4710970ffd98e4555c052fdb8e67c22b6a3b5e87..dca5630263df79ea2c55e5250b533e2e70ff596e 100644 (file)
@@ -69,12 +69,12 @@ User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: www.example.com.%TESTNUMBER\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: www.example.com.%TESTNUMBER
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 </verify>
index 3833663c10f2c2c82f1771fc0badb20e157e9e1e..9d0db1d747bcdb060a24465a8d5af0a2c511e9fa 100644 (file)
@@ -51,13 +51,13 @@ CURL_STUB_GSS_CREDS="KRB5_Alice"
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Negotiate %b64["KRB5_Alice":HTTP@127.0.0.1:1:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Negotiate %b64["KRB5_Alice":HTTP@127.0.0.1:1:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 7e45ae1214c59a2a436425e85296f4f0e92437ed..e9b61333431242d81ffba93ceebf15a086c35dfc 100644 (file)
@@ -67,19 +67,19 @@ CURL_STUB_GSS_CREDS="NTLM_Alice"
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Negotiate %b64["NTLM_Alice":HTTP@127.0.0.1:2:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Negotiate %b64["NTLM_Alice":HTTP@127.0.0.1:3:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Negotiate %b64["NTLM_Alice":HTTP@127.0.0.1:2:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Negotiate %b64["NTLM_Alice":HTTP@127.0.0.1:3:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 605d827be7c7f1ab6711b9ebb120920a24ae6e1b..26a2869712c363ee64ab919d1310aff54144c077 100644 (file)
@@ -66,18 +66,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="9dc55255f1a2537b838311674b621d45346b862a81631bb20e4ce356ef25062d", algorithm=SHA-256\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="9dc55255f1a2537b838311674b621d45346b862a81631bb20e4ce356ef25062d", algorithm=SHA-256
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 039354382daa21ef536f483eb52c29d4b7197d31..3f8eedc7b4716cc819a30886affd3de8cae5b1b3 100644 (file)
@@ -66,18 +66,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="9d3256ee6526ec40dd48743bb48e51ee9baba587c78f15c3a86166242150af98", algorithm=SHA-512-256\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="9d3256ee6526ec40dd48743bb48e51ee9baba587c78f15c3a86166242150af98", algorithm=SHA-512-256
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 07e12f3c778af9383a073a7b22c1d8eb21357f3e..cc4c4c2fb07e0ea80ea16ee4f43cc16346d2e37d 100644 (file)
@@ -66,18 +66,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="75af8a3500f771e58a52093a25e7905d6e428a511285c12ea1420c73078dfd61", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="6c470aec384ab1d4e12d3ce1f5b08303d8cad177e52ebe50ec1a3e141adb0cdc", algorithm=SHA-256, userhash=true\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="75af8a3500f771e58a52093a25e7905d6e428a511285c12ea1420c73078dfd61", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="6c470aec384ab1d4e12d3ce1f5b08303d8cad177e52ebe50ec1a3e141adb0cdc", algorithm=SHA-256, userhash=true
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index d3142704647e05542b5ff594c3b90998b3fb3cf5..54102887e32495d5e11adaaf585062c4d9a5675f 100644 (file)
@@ -66,18 +66,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="a9c3ec1036068b336cbabefe9dfcad52ee8b89bc7c91ddbb5bb415c6acdf38a5", algorithm=SHA-256\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="a9c3ec1036068b336cbabefe9dfcad52ee8b89bc7c91ddbb5bb415c6acdf38a5", algorithm=SHA-256
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 5365cac3fd71650cd79647f15cec4476e6a7b529..c15341049a6f4d411d6a4666e9583c425f5e11e2 100644 (file)
@@ -66,18 +66,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="0373a49d7d352ff54884faaf762fc6c89281b4112ad8fcbbe1d1ee52dcf7a802", algorithm=SHA-512-256\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="0373a49d7d352ff54884faaf762fc6c89281b4112ad8fcbbe1d1ee52dcf7a802", algorithm=SHA-512-256
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 8f5f7aa8a4e9fcb3c79774ae97ef4eee7688f173..3a43fbb2bed8fd44a323c5c442c28d2f31807a57 100644 (file)
@@ -66,18 +66,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="75af8a3500f771e58a52093a25e7905d6e428a511285c12ea1420c73078dfd61", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="374a35326cc09e7d1ec3165aee9de01cae46daac33d8999aa1f483fa7882b86c", algorithm=SHA-256, userhash=true\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="75af8a3500f771e58a52093a25e7905d6e428a511285c12ea1420c73078dfd61", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="374a35326cc09e7d1ec3165aee9de01cae46daac33d8999aa1f483fa7882b86c", algorithm=SHA-256, userhash=true
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 20120e1873cf361106c4e7dd04c585c1723b0219..12f2ff18e63db8e88282c5308b1e49d3ab4927b6 100644 (file)
@@ -67,22 +67,22 @@ HTTP POST --digest with SHA256 and user-specified Content-Length header
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 0\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="67b97af219c92fa7e8685e5bebb8e74892f6c6792e911c52bd2dfbf0b49272eb", algorithm=SHA-256\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 11\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 0
+Content-Type: application/x-www-form-urlencoded
+
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="67b97af219c92fa7e8685e5bebb8e74892f6c6792e911c52bd2dfbf0b49272eb", algorithm=SHA-256
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 11
+Content-Type: application/x-www-form-urlencoded
+
 junkelijunk
 </protocol>
 </verify>
index 867330e135f8c63f0573000398e26e35575e356f..a19faf2f878cda5692dcbb2f5d3e581a7556cc6e 100644 (file)
@@ -67,22 +67,22 @@ HTTP POST Digest with SHA-512-256, userhash and set Content-Length
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 0\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="0ba2f7ec8045446588eea82bb0c3812aedb05f4eac8883ea65040a52e9c5629e", algorithm=SHA-512-256\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 11\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 0
+Content-Type: application/x-www-form-urlencoded
+
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="0ba2f7ec8045446588eea82bb0c3812aedb05f4eac8883ea65040a52e9c5629e", algorithm=SHA-512-256
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 11
+Content-Type: application/x-www-form-urlencoded
+
 junkelijunk
 </protocol>
 </verify>
index 650726d17c5c33ae3cb80881e041872d6d6947de..06e444f17a44953478ec19e75372b78318b515da 100644 (file)
@@ -67,22 +67,22 @@ HTTP POST Digest with SHA-256, userhash and set Content-Length header
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 0\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="fddc3bc7b753b73ab0848fd83cb20cbbca971258eb8d20c941dd5e0b010d66be", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="9a29f1dab407e62daa7121185f9f12db6177415e03f35d9a881550095a83378d", algorithm=SHA-256, userhash=true\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 11\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 0
+Content-Type: application/x-www-form-urlencoded
+
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="fddc3bc7b753b73ab0848fd83cb20cbbca971258eb8d20c941dd5e0b010d66be", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="9a29f1dab407e62daa7121185f9f12db6177415e03f35d9a881550095a83378d", algorithm=SHA-256, userhash=true
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 11
+Content-Type: application/x-www-form-urlencoded
+
 junkelijunk
 </protocol>
 </verify>
index 4c0e0c72ea1fa077d0238243a0c9caf83c4c53ba..193926f08b310d6ef6b662568bac83f7e967e1e6 100644 (file)
@@ -48,12 +48,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 # curl: (18) transfer closed with outstanding read data remaining
index c2c0cdee9acf09ea315d694c3a8ac5419fdb1c7c..0769d1af0f7a11c580e6617a5793edf1ca860740 100644 (file)
@@ -46,12 +46,12 @@ CURL_SSL_BACKEND=schannel
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: localhost:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: localhost:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 8eea2655368f78df94fca6381aaefa6b6b094759..6000c7db6e21594cdf9ce526d2194aa105ce78d4 100644 (file)
@@ -47,27 +47,27 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F 'name=a;filename=a.pdf' --next http://%H
 <strip>
 ^(Content-Type: multipart/form-data;|------------).*
 </strip>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 201\r
-\r
-Content-Disposition: form-data; name="name"; filename="a.pdf"\r
-Content-Type: application/pdf\r
-\r
-a\r
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 196\r
-\r
-Content-Disposition: form-data; name="name"; filename="b.jpg"\r
-Content-Type: image/jpeg\r
-\r
-b\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 201
+
+Content-Disposition: form-data; name="name"; filename="a.pdf"
+Content-Type: application/pdf
+
+a
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 196
+
+Content-Disposition: form-data; name="name"; filename="b.jpg"
+Content-Type: image/jpeg
+
+b
 </protocol>
 </verify>
 </testcase>
index 1ef3480b5c2524b966ca2a87b36925d6dca95c84..9e3d26d4da8dcc3f3bd507b87e427c5364e1e827 100644 (file)
@@ -43,13 +43,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --oauth2-bearer mF_9.B5f-4.1JqM
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Bearer mF_9.B5f-4.1JqM\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Bearer mF_9.B5f-4.1JqM
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 6ef44c2c7294ff5dd0259cb4a6088fa3863da5ee..cb5e911da99021e20034754bc14a94c3b6d896a5 100644 (file)
@@ -58,18 +58,18 @@ HTTP with digest auth and URI contains query
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER?query HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER?query HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER?query", response="5758bd3bbde7f33236e6ccd278eb59af"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER?query HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER?query HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER?query", response="5758bd3bbde7f33236e6ccd278eb59af"
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index ec1277e5efc9fe9a13b628e473c11220c5d1728a..de1f1cf5c22d8e1727f77ab07c7c5ff8eb2264f8 100644 (file)
@@ -38,14 +38,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --negotiate --data name=value
 <errorcode>
 0
 </errorcode>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 10\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 10
+Content-Type: application/x-www-form-urlencoded
+
 name=value
 </protocol>
 </verify>
index 117a712c3f8bc3082646bbcaa902925b06909c6e..0e2cf01a248bd7bcaa46c46f5149c0ea96a6e93e 100644 (file)
@@ -47,12 +47,12 @@ CURL_SSL_BACKEND=schannel
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: localhost:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: localhost:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 7aad416215636ba606004272aa499b6a3c1678ab..421b4758866015a8b2825941dddcc9d4b53566fa 100644 (file)
@@ -42,20 +42,20 @@ http://user:pass@%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER#anchor --location --r
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/our/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[user:pass]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[user:pass]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Referer: http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER\r
-\r
+<protocol crlf="yes">
+GET /we/want/our/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user:pass]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user:pass]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Referer: http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER
+
 </protocol>
 <stdout>
 HTTP/1.1 301 This is a weirdo text message swsclose\r
index f347bbc61b685e9b6552ddc17ebe60e692e02ae3..bffab46fa2c4aa3b6a84f19c1c21f0e36c700c4e 100644 (file)
@@ -47,12 +47,12 @@ CURL_SSL_BACKEND=schannel
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: localhost:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: localhost:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 71839ee37c6af9963f0f1c4f6df2d3da1c738381..b318e674c9fdd0b3a71272d7d414488255c7c0f4 100644 (file)
@@ -42,12 +42,12 @@ HTTPS GET with client authentication (mtls)
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: localhost:%HTTPS-MTLSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: localhost:%HTTPS-MTLSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index aee93abf6e424a45d1c5aba771e07419b77e3ff9..5a64225d912987e050365350956be46daee2c8fd 100644 (file)
@@ -42,12 +42,12 @@ HTTPS GET with client authentication (mtls) and --insecure
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: localhost:%HTTPS-MTLSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: localhost:%HTTPS-MTLSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 887d04fbeef74c5184314a0abf8e5e198a2a6a3d..3a9c1218a8b062fe397af2b4243a96fc1f3466da 100644 (file)
@@ -92,24 +92,24 @@ http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --prox
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
-Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
-Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Proxy-Connection: Keep-Alive\r
-\r
-CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
-Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
-Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-User-Agent: curl/%VERSION\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET /path/%TESTNUMBER0002 HTTP/1.1\r
-Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
+GET /path/%TESTNUMBER0002 HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 1ee313d76ac947e5c68dc7a10dd9407dfa15613c..954ec03648e4b47502f34d8e41ca48ded1458fa4 100644 (file)
@@ -33,20 +33,20 @@ data blobb
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD a\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-EPSV\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD a
+CWD path
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+EPSV
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index efe54a6bc70069a3bf2e8fc0bcc1776fbe7bfe30..a5e809c6eff3ab13d6df9848960b31db74968908 100644 (file)
@@ -69,49 +69,49 @@ http://foo.example.com:%HTTPPORT/%TESTNUMBER --doh-url http://%HOSTIP:%HTTPPORT/
 <strippart>
 s/com\x00\x00(\x1c|\x01)/com-00-00!/g;
 </strippart>
-<protocol>
+<protocol crlf="yes">
 %if HTTPSRR
-POST /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Type: application/dns-message\r
-Content-Length: 33\r
-\r
-%hex[%00%00%01%00%00%01%00%00%00%00%00%00%03foo%07example%03com-00-00!%00%01]hex%POST /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Type: application/dns-message\r
-Content-Length: 33\r
-\r
-%hex[%00%00%01%00%00%01%00%00%00%00%00%00%03foo%07example%03com-00-00!%00%01]hex%POST /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Type: application/dns-message\r
-Content-Length: 47\r
-\r
-%hex[%00%00%01%00%00%01%00%00%00%00%00%00%06_%HTTPPORT%06_https%03foo%07example%03com%00%00A%00%01]hex%GET /%TESTNUMBER HTTP/1.1\r
-Host: foo.example.com:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+POST /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Type: application/dns-message
+Content-Length: 33
+
+%hex[%00%00%01%00%00%01%00%00%00%00%00%00%03foo%07example%03com-00-00!%00%01]hex%POST /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Type: application/dns-message
+Content-Length: 33
+
+%hex[%00%00%01%00%00%01%00%00%00%00%00%00%03foo%07example%03com-00-00!%00%01]hex%POST /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Type: application/dns-message
+Content-Length: 47
+
+%hex[%00%00%01%00%00%01%00%00%00%00%00%00%06_%HTTPPORT%06_https%03foo%07example%03com%00%00A%00%01]hex%GET /%TESTNUMBER HTTP/1.1
+Host: foo.example.com:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 %else
-POST /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Type: application/dns-message\r
-Content-Length: 33\r
-\r
-%hex[%00%00%01%00%00%01%00%00%00%00%00%00%03foo%07example%03com-00-00!%00%01]hex%POST /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Type: application/dns-message\r
-Content-Length: 33\r
-\r
-%hex[%00%00%01%00%00%01%00%00%00%00%00%00%03foo%07example%03com-00-00!%00%01]hex%GET /%TESTNUMBER HTTP/1.1\r
-Host: foo.example.com:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+POST /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Type: application/dns-message
+Content-Length: 33
+
+%hex[%00%00%01%00%00%01%00%00%00%00%00%00%03foo%07example%03com-00-00!%00%01]hex%POST /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Type: application/dns-message
+Content-Length: 33
+
+%hex[%00%00%01%00%00%01%00%00%00%00%00%00%03foo%07example%03com-00-00!%00%01]hex%GET /%TESTNUMBER HTTP/1.1
+Host: foo.example.com:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 %endif
 </protocol>
 </verify>
index 6830727ab6fb35790286457b90f9372a81739410..3e6a8f9ada728f3a66ab6b550c7a7f7d7fad8bc5 100644 (file)
@@ -34,21 +34,21 @@ data blobb
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD a\r
-CWD path\r
-EPSV\r
-PASV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-PASV\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD a
+CWD path
+EPSV
+PASV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+PASV
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 877d9276ce80f3596de81203080d10a38b7afdf4..7780b231c1753beb730a38176df597cda3b7a5c3 100644 (file)
@@ -92,26 +92,26 @@ http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --prox
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.0\r
-Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
-Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Proxy-Connection: Keep-Alive\r
-\r
-CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.0\r
-Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
-Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-User-Agent: curl/%VERSION\r
-Proxy-Connection: Keep-Alive\r
-\r
-POST /path/%TESTNUMBER0002 HTTP/1.1\r
-Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 6\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.0
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.0
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
+POST /path/%TESTNUMBER0002 HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 6
+Content-Type: application/x-www-form-urlencoded
+
 postit
 </protocol>
 </verify>
index 846b46458e58cf612f8c6d8af7c4062e720aa3e5..76c328ac98cb3d49c157395ff68affa6515cb2f1 100644 (file)
@@ -40,12 +40,12 @@ MSYS2_ARG_CONV_EXCL=http://
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /{}\/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /{}\/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 </verify>
index 058639f272cbb31000fcdc04b73c32be8aa8be9e..f06bca11fa06cabc58a8f8aef2a70f964d378913 100644 (file)
@@ -38,19 +38,19 @@ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNU
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD a\r
-CWD path\r
-CWD %TESTNUMBER\r
-EPSV\r
-TYPE A\r
-LIST\r
-EPSV\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD a
+CWD path
+CWD %TESTNUMBER
+EPSV
+TYPE A
+LIST
+EPSV
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index 1be87c0d1ea409f3313d9895ac5905bb8a8ceab5..5fbc6153ef18069d8f16dfffa4e27b699b1a6f6e 100644 (file)
@@ -27,19 +27,19 @@ upload this file twice
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD a\r
-CWD path\r
-CWD %TESTNUMBER\r
-EPSV\r
-TYPE I\r
-STOR upload.%TESTNUMBER\r
-EPSV\r
-STOR ..anotherup.%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD a
+CWD path
+CWD %TESTNUMBER
+EPSV
+TYPE I
+STOR upload.%TESTNUMBER
+EPSV
+STOR ..anotherup.%TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index cb6c6738b6e2fe6edbc9337ddd64fa526495aea2..07bbeac46fdc7b0b714cb43862fdaa1f45f79fdb 100644 (file)
@@ -41,12 +41,12 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
-Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
 </protocol>
 # CURLE_RECV_ERROR
 <errorcode>
index 900778279343bcc223fdbf4a32835206e09ff9d7..2141182295d7b5c5d5aa0cea5a305756eaba298f 100644 (file)
@@ -31,12 +31,12 @@ get HTTP with URL > 10000 bytes
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%repeat[11000 x a]%/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%repeat[11000 x a]%/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index b87ad7ee22140bb0209c949c1f4fe07d1207ee02..48cd0af3bebbd1afd7b2e099a313ede141db18f5 100644 (file)
@@ -61,13 +61,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 <strippart>
 s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
 </strippart>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Accept-Encoding: xxx\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Accept-Encoding: xxx
+
 </protocol>
 </verify>
 </testcase>
index c5d8fa456b38c2703af7ffaa6560769fd704af6c..d51d730f75524b3c0c22b4d25342a5f8a08692bc 100644 (file)
@@ -61,13 +61,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 <strippart>
 s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
 </strippart>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Accept-Encoding: xxx\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Accept-Encoding: xxx
+
 </protocol>
 <errorcode>
 61
index 1a1fe89492ac6602347ff262165fb685fc8b86af..f01c017f83c40e9b5a3e2daec7166ed655418721 100644 (file)
@@ -172,13 +172,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 <strippart>
 s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
 </strippart>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Accept-Encoding: xxx\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Accept-Encoding: xxx
+
 </protocol>
 </verify>
 </testcase>
index ba62b2ca753373f38ad1f695ae3b3f944d59fbf9..bcdc415d18b02b8192d7e7c9d546211168206bcb 100644 (file)
@@ -60,13 +60,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 <strippart>
 s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
 </strippart>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Accept-Encoding: xxx\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Accept-Encoding: xxx
+
 </protocol>
 <errorcode>
 61
index 99400cd1d821c90294e04d828a5f512689bc05f9..cf8673111318afd1a30896a82be78c57404bd002 100644 (file)
@@ -58,13 +58,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 <strippart>
 s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
 </strippart>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Accept-Encoding: xxx\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Accept-Encoding: xxx
+
 </protocol>
 </verify>
 </testcase>
index f7b445185d7d51a9427f6d0fa8337fcc74735798..e0a6af9f76c62ff988dfedce607e7ad3e1fe788e 100644 (file)
@@ -37,21 +37,21 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FA
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-NOOP 1\r
-FAIL\r
-EPSV\r
-PASV\r
-TYPE I\r
-NOOP 2\r
-FAIL HARD\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-NOOP 3\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+NOOP 1
+FAIL
+EPSV
+PASV
+TYPE I
+NOOP 2
+FAIL HARD
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+NOOP 3
+QUIT
 </protocol>
 </verify>
 </testcase>
index 8e7d73ff0c98d41450ad22d82fd9bf8afa9cc697..e9acda8ddb3d1618da32cebe8157f4531cd45b4e 100644 (file)
@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-account "one count"
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-ACCT one count\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+ACCT one count
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 71da135fc0e955166b2ae9a489466a862a7ce1b6..9b79392a9681fafe64e3d3703359e3c7d9f6e305 100644 (file)
@@ -29,10 +29,10 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-account "one count"
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-ACCT one count\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+ACCT one count
 </protocol>
 <errorcode>
 11
index 47663ad294c64d1860b5a5ed21354d9c06e224a3..3dc478fc99d6d2c33469f635aff803a015802cd9 100644 (file)
@@ -172,13 +172,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 <strippart>
 s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
 </strippart>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Accept-Encoding: xxx\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Accept-Encoding: xxx
+
 </protocol>
 </verify>
 </testcase>
index 8b2877468609f5d12e1485f8f3c96cd0cf42b083..33460cdd4b68bef79cfc2591178706bd2dca3f52 100644 (file)
@@ -47,16 +47,16 @@ WebSockets upgrade only
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol nocheck="yes">
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Upgrade: websocket\r
-Sec-WebSocket-Version: 13\r
-Sec-WebSocket-Key: NDMyMTUzMjE2MzIxNzMyMQ==\r
-Connection: Upgrade\r
-\r
+<protocol crlf="yes" nocheck="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Upgrade: websocket
+Sec-WebSocket-Version: 13
+Sec-WebSocket-Key: NDMyMTUzMjE2MzIxNzMyMQ==
+Connection: Upgrade
+
 </protocol>
 <errorcode>
 52
index 1b968c7672850e76b815d333377d55eaca43c8f3..1762a2c57f1b3a1a175d65115767c5f60517861f 100644 (file)
@@ -52,16 +52,16 @@ ws://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol nocheck="yes" nonewline="yes">
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: webbie-sox/3\r
-Accept: */*\r
-Upgrade: websocket\r
-Sec-WebSocket-Version: 13\r
-Sec-WebSocket-Key: NDMyMTUzMjE2MzIxNzMyMQ==\r
-Connection: Upgrade\r
-\r
+<protocol crlf="yes" nonewline="yes" nocheck="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: webbie-sox/3
+Accept: */*
+Upgrade: websocket
+Sec-WebSocket-Version: 13
+Sec-WebSocket-Key: NDMyMTUzMjE2MzIxNzMyMQ==
+Connection: Upgrade
+
 %hex[%8a%00]hex%
 </protocol>
 </verify>
index 8e2d34877f5f6cf8716bcd2562431629c437d77e..117b5a7ebfede80e0a66d6dd4b5816670508a56c 100644 (file)
@@ -53,16 +53,16 @@ ws://%HOSTIP:%HTTPPORT/%TESTNUMBER
 # PONG with no data and the 32 bit mask
 #
 <verify>
-<protocol nocheck="yes" nonewline="yes">
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: webbie-sox/3\r
-Accept: */*\r
-Upgrade: websocket\r
-Sec-WebSocket-Version: 13\r
-Sec-WebSocket-Key: NDMyMTUzMjE2MzIxNzMyMQ==\r
-Connection: Upgrade\r
-\r
+<protocol crlf="yes" nonewline="yes" nocheck="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: webbie-sox/3
+Accept: */*
+Upgrade: websocket
+Sec-WebSocket-Version: 13
+Sec-WebSocket-Key: NDMyMTUzMjE2MzIxNzMyMQ==
+Connection: Upgrade
+
 %hex[%8a%808321]hex%
 </protocol>
 <stdout mode="text">
index 8ad45cbecaf46ef3ad86c75a49c147d30bd0b4cf..cfb1f0d6cd3828fa4c640f038850da55c1b1856c 100644 (file)
@@ -43,16 +43,16 @@ ws://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </client>
 
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: webbie-sox/3\r
-Accept: */*\r
-Upgrade: websocket\r
-Sec-WebSocket-Version: 13\r
-Sec-WebSocket-Key: NDMyMTUzMjE2MzIxNzMyMQ==\r
-Connection: Upgrade\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: webbie-sox/3
+Accept: */*
+Upgrade: websocket
+Sec-WebSocket-Version: 13
+Sec-WebSocket-Key: NDMyMTUzMjE2MzIxNzMyMQ==
+Connection: Upgrade
+
 </protocol>
 # 22 == CURLE_HTTP_RETURNED_ERROR
 <errorcode>
index 8ed75d96a9cfada33797aeeb8780ecf6f85afbca..47c81b2a96e7668d17ec4bb4077e6c2445bca0d3 100644 (file)
@@ -52,7 +52,7 @@ ws://%HOSTIP:%HTTPPORT/%TESTNUMBER
 # PONG with no data and the 32 bit mask
 #
 <verify>
-<protocol nocheck="yes" crlf="yes">
+<protocol crlf="yes" nocheck="yes">
 GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: websocket/%TESTNUMBER
index 620f7b5ecc1200a42892cd3e2d7b495a9e88fbde..0f7bd541dfac838f8adeb5ecd70633d0b9fc2074 100644 (file)
@@ -54,15 +54,15 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 3881d353db6c63a78dfadda5435df2ef6e5da173..c4e35ad8cc2a63a1da1ef22a6985dd6795fa001d 100644 (file)
@@ -44,11 +44,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 <stdout mode="text">
 Returned 23, should be 23.
index 4ba78ee91e179c932f8bfa776d32f311512ef8e6..3763822d0e8f2efe4301215b399e34cad1085eac 100644 (file)
@@ -54,13 +54,13 @@ password $y$j9T$WUVjiVvDbRAWafDLs6cab1$01NX.oaZKf5lw8MR2Nk9Yaxv4CqbE0IaDF.GpGxPu
 </client>
 
 <verify>
-<protocol>
-GET http://github.com/ HTTP/1.1\r
-Host: github.com\r
-Authorization: Basic %b64[daniel:$y$j9T$WUVjiVvDbRAWafDLs6cab1$01NX.oaZKf5lw8MR2Nk9Yaxv4CqbE0IaDF.GpGxPul1]b64%\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://github.com/ HTTP/1.1
+Host: github.com
+Authorization: Basic %b64[daniel:$y$j9T$WUVjiVvDbRAWafDLs6cab1$01NX.oaZKf5lw8MR2Nk9Yaxv4CqbE0IaDF.GpGxPul1]b64%
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 7f39d7a2fea8a3ee6bfc7ff97cba26d3964220f6..25cab8372bbe2d413cf44ee237a11a81423702ad 100644 (file)
@@ -172,13 +172,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 <strippart>
 s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
 </strippart>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Accept-Encoding: xxx\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Accept-Encoding: xxx
+
 </protocol>
 </verify>
 </testcase>
index fa83d750d1449901cd2333ffe8fa6f6dcdf214d9..3b55200e20087a854c2d5402dc757e914283011b 100644 (file)
@@ -75,22 +75,22 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: first.host.it.is\r
-Proxy-Authorization: Basic %b64[testing:this]b64%\r
-Authorization: Basic %b64[iam:myself]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1\r
-Host: goto.second.host.now\r
-Proxy-Authorization: Basic %b64[testing:this]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: first.host.it.is
+Proxy-Authorization: Basic %b64[testing:this]b64%
+Authorization: Basic %b64[iam:myself]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1
+Host: goto.second.host.now
+Proxy-Authorization: Basic %b64[testing:this]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 2902da1528d2e37c604153b62a9dee0346acdc51..b3b06cc6be011a7b35d95d30230ee5367f4dcfc0 100644 (file)
@@ -77,23 +77,23 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: first.host.it.is\r
-Proxy-Authorization: Basic %b64[testing:this]b64%\r
-Authorization: Basic %b64[iam:myself]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1\r
-Host: goto.second.host.now\r
-Proxy-Authorization: Basic %b64[testing:this]b64%\r
-Authorization: Basic %b64[iam:myself]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: first.host.it.is
+Proxy-Authorization: Basic %b64[testing:this]b64%
+Authorization: Basic %b64[iam:myself]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1
+Host: goto.second.host.now
+Proxy-Authorization: Basic %b64[testing:this]b64%
+Authorization: Basic %b64[iam:myself]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 7081a776c8f5c74759ef71bb593023faad1651c6..651dd55cd1306316c6d5c7377c8fb2f568002782 100644 (file)
@@ -33,15 +33,15 @@ worx?
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-STOR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+STOR %TESTNUMBER
+QUIT
 </protocol>
 <upload>
 this is the *****crap******** that we're gonna upload
index a66fa046d93e7527c105897082c51d4c32496e43..735b5bf583b7c2ed36ead618d1d070a23e9f65d1 100644 (file)
@@ -34,15 +34,15 @@ Test data
 # Verify data after the test has been "shot"
 <verify>
 
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-STOR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+STOR %TESTNUMBER
+QUIT
 </protocol>
 
 #  (25) Failed FTP upload: 550
index 010f4f4322f05acb907e0f8eae3bae6f94a7dc62..fe407993fa307f065bdf620586f31b759579e480 100644 (file)
@@ -34,11 +34,11 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --disable-epsv
 <errorcode>
 14
 </errorcode>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-PASV\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+PASV
 </protocol>
 </verify>
 </testcase>
index 6e2af83d7e45aa50cf6d0e3a47eba2c7b7d57f63..bd01546ea6183e3a72018b9fc604e3172abe8518 100644 (file)
@@ -31,12 +31,12 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 <errorcode>
 13
 </errorcode>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+QUIT
 </protocol>
 </verify>
 </testcase>
index 230fcc31ad65e9bb9f3e98530231c5570057ff5a..6bd571b7e2b33d900eaf3a7121ea3fb194a39662 100644 (file)
@@ -67,25 +67,25 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-us
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-Content-Length: 0\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-Content-Length: 6\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+Content-Length: 0
+Content-Type: application/x-www-form-urlencoded
+
+POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+Content-Length: 6
+Content-Type: application/x-www-form-urlencoded
+
 postit
 </protocol>
 </verify>
index 888c635733149df305c67054b35a41e2c954db68..ae343baa59495dee77f1342144b4705d1dab8342 100644 (file)
@@ -31,12 +31,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail --silent --show-error
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <errorcode>
 22
index 75bd4bb3de69f7bf599312ea7302eac58216f26f..d4d3551b8256264387fb57891a8e16d1db48b29b 100644 (file)
@@ -45,12 +45,12 @@ HTTP-IPv6 GET
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOST6IP:%HTTP6PORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOST6IP:%HTTP6PORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 8f686e850333c6335e4cbd3376a4f1fbfe223b1d..979a8b235687a41ca0dc835130e687eac92b1cff 100644 (file)
@@ -55,16 +55,16 @@ server: nghttpx
 via: 1.1 nghttpx\r
 \r
 </stdout>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTP2TLSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 3\r
-Content-Type: application/x-www-form-urlencoded\r
-X-Forwarded-Proto: https\r
-Via: 2 nghttpx\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTP2TLSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 3
+Content-Type: application/x-www-form-urlencoded
+X-Forwarded-Proto: https
+Via: 2 nghttpx
+
 moo
 </protocol>
 </verify>
index 881a32120fe587d0dfde9afbcd950b52dd5e3364..3a5901e8f3aa9d6147d56791c95c1f9e31435151 100644 (file)
@@ -11,35 +11,35 @@ verbose logs
 # Server-side
 <reply>
 <data1 crlf="yes">
-HTTP/1.1 200 OK\r
-Date: Tue, 09 Nov 2010 14:49:00 GMT\r
-Server: server.example.com\r
-Content-Length: 47\r
-\r
+HTTP/1.1 200 OK
+Date: Tue, 09 Nov 2010 14:49:00 GMT
+Server: server.example.com
+Content-Length: 47
+
 file contents should appear once for each file
 </data1>
-<data2>
-HTTP/1.1 200 OK\r
-Date: Tue, 09 Nov 2010 14:49:00 GMT\r
-Server: server.example.com\r
-Content-Length: 47\r
-\r
+<data2 crlf="yes">
+HTTP/1.1 200 OK
+Date: Tue, 09 Nov 2010 14:49:00 GMT
+Server: server.example.com
+Content-Length: 47
+
 file contents should appear once for each file
 </data2>
-<data3>
-HTTP/1.1 200 OK\r
-Date: Tue, 09 Nov 2010 14:49:00 GMT\r
-Server: server.example.com\r
-Content-Length: 47\r
-\r
+<data3 crlf="yes">
+HTTP/1.1 200 OK
+Date: Tue, 09 Nov 2010 14:49:00 GMT
+Server: server.example.com
+Content-Length: 47
+
 file contents should appear once for each file
 </data3>
-<data4>
-HTTP/1.1 200 OK\r
-Date: Tue, 09 Nov 2010 14:49:00 GMT\r
-Server: server.example.com\r
-Content-Length: 47\r
-\r
+<data4 crlf="yes">
+HTTP/1.1 200 OK
+Date: Tue, 09 Nov 2010 14:49:00 GMT
+Server: server.example.com
+Content-Length: 47
+
 file contents should appear once for each file
 </data4>
 </reply>
index 8489156e7315eeb238ce33b832410653378f4648..ee25b1de53e4a34a0907beb3d815d896c1e1c8b4 100644 (file)
@@ -44,7 +44,5 @@ http://%HOSTIP:%HTTP2PORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-</protocol>
 </verify>
 </testcase>
index f8cf6e9a43a26f1f6e72ffeddecd550690b54699..66161f6569c06896fbc2577f624d2abdf7c0175d 100644 (file)
@@ -43,12 +43,12 @@ HTTP-IPv6 GET (using ip6-localhost)
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: ip6-localhost:%HTTP6PORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: ip6-localhost:%HTTP6PORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 2e9f89165a985bca6851ddadb6cbcc375b7e5712..62be5173cce1df1c68f4d842e738f8702975bd32 100644 (file)
@@ -40,13 +40,13 @@ HTTP-IPv6 GET with username+password in URL
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOST6IP:%HTTP6PORT\r
-Authorization: Basic %b64[foobar:barfoo]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOST6IP:%HTTP6PORT
+Authorization: Basic %b64[foobar:barfoo]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 3952571b6ed1da73a07febec45d5d8f47b9a44e9..273bd05492d2aa9bff2b41ec6bbf1581e9a2096a 100644 (file)
@@ -88,33 +88,33 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-us
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-Content-Length: 6\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-postitPOST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-Content-Length: 0\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-Content-Length: 6\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+Content-Length: 6
+Content-Type: application/x-www-form-urlencoded
+
+postitPOST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+Content-Length: 0
+Content-Type: application/x-www-form-urlencoded
+
+POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+Content-Length: 6
+Content-Type: application/x-www-form-urlencoded
+
 postit
 </protocol>
 </verify>
index 782be2be403fce95c13694dadaf6aab965d51a03..a54ce3f6a5255e848fcbca49cea03ac2259ad7d3 100644 (file)
@@ -41,14 +41,14 @@ FTP dir listing with nocwd and URL encoded path
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE A\r
-LIST fir#t/third/%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE A
+LIST fir#t/third/%TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index da263692153caf0a2dce591cdb5cfe33793608b1..da95cc5a6ba12fa7b513448db5f9449b6323d35e 100644 (file)
@@ -64,22 +64,22 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk"
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 0\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="379a439b1737ba257c1d2f103914b18b"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 11\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 0
+Content-Type: application/x-www-form-urlencoded
+
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="379a439b1737ba257c1d2f103914b18b"
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 11
+Content-Type: application/x-www-form-urlencoded
+
 junkelijunk
 </protocol>
 </verify>
index 3ab338213c47366bfc919ef40c7fdf083b7c0d7a..9f2ab7435315ca3f7ea23276d034c8db23833a5a 100644 (file)
@@ -74,22 +74,22 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk"
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 0\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="761e6fc9a760c39d587092e8d840e740"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 11\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 0
+Content-Type: application/x-www-form-urlencoded
+
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="761e6fc9a760c39d587092e8d840e740"
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 11
+Content-Type: application/x-www-form-urlencoded
+
 junkelijunk
 </protocol>
 </verify>
index 8b154f419b78c4a89c9c376aee1e3344df1afb09..43401696c483a4b1cdcbb63baa5db87c78416fe1 100644 (file)
@@ -35,12 +35,12 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt -z "apr 1 2005
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-MDTM %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+MDTM %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index b497dd7af2821336b1b401f2dbb7af88c55e0c3a..f7d15cd630a5c895752707e5bf028bc837c9a717 100644 (file)
@@ -44,15 +44,15 @@ that FTP
 works
   so does it?
 </upload>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-MDTM %TESTNUMBER\r
-EPSV\r
-TYPE I\r
-STOR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+MDTM %TESTNUMBER
+EPSV
+TYPE I
+STOR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 82b0a1406c8e21a0092b4348ef8aae5d612921f7..6f671080c10bd632afaf5f9e6e75c1aeff80dda2 100644 (file)
@@ -40,13 +40,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
+
 </protocol>
 </verify>
 </testcase>
index b00ef84ece696620e58cb0d39a2b67eec71c8dc0..f641da93bbae8a75855f1db92f69c76d409c9a3c 100644 (file)
@@ -73,37 +73,37 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L --max-redirs 5
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /want/data/reply/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /want/data/reply/data/reply/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /want/data/reply/data/reply/data/reply/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /want/data/reply/data/reply/data/reply/data/reply/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /want/data/reply/data/reply/data/reply/data/reply/data/reply/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /want/data/reply/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /want/data/reply/data/reply/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /want/data/reply/data/reply/data/reply/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /want/data/reply/data/reply/data/reply/data/reply/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /want/data/reply/data/reply/data/reply/data/reply/data/reply/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <errorcode>
index 4f01ea79a38a002de0a637d354ce9f2e2caae2d5..550aca257a2e6038f69cacc065cba494fcd8dd20 100644 (file)
@@ -46,14 +46,14 @@ ftp://%HOSTIP:%FTPPORT/
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index d05395754d551786000520cfd2f28d82bd34472a..6de5b755c1a7d9aa7c0bf648a6cf0f8c487a28c0 100644 (file)
@@ -54,15 +54,15 @@ funny-head: yesyes
 via: 1.1 nghttpx\r
 \r
 </stdout>
-<protocol nonewline="yes">
-POST https://%HOSTIP:%HTTP3PORT/2501 HTTP/1.1\r
-Host: %HOSTIP:%HTTP3PORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 3\r
-Content-Type: application/x-www-form-urlencoded\r
-Via: 3 nghttpx\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST https://%HOSTIP:%HTTP3PORT/2501 HTTP/1.1
+Host: %HOSTIP:%HTTP3PORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 3
+Content-Type: application/x-www-form-urlencoded
+Via: 3 nghttpx
+
 moo
 </protocol>
 </verify>
index 8625ee7b74b2958a2fcc06f6d2ff9e6a5896014a..b878e2c9ece6419ef37e20f7306e91ba98c0b2a8 100644 (file)
@@ -11,35 +11,35 @@ verbose logs
 # Server-side
 <reply>
 <data1 crlf="yes">
-HTTP/1.1 200 OK\r
-Date: Tue, 09 Nov 2010 14:49:00 GMT\r
-Server: server.example.com\r
-Content-Length: 47\r
-\r
+HTTP/1.1 200 OK
+Date: Tue, 09 Nov 2010 14:49:00 GMT
+Server: server.example.com
+Content-Length: 47
+
 file contents should appear once for each file
 </data1>
-<data2>
-HTTP/1.1 200 OK\r
-Date: Tue, 09 Nov 2010 14:49:00 GMT\r
-Server: server.example.com\r
-Content-Length: 47\r
-\r
+<data2 crlf="yes">
+HTTP/1.1 200 OK
+Date: Tue, 09 Nov 2010 14:49:00 GMT
+Server: server.example.com
+Content-Length: 47
+
 file contents should appear once for each file
 </data2>
-<data3>
-HTTP/1.1 200 OK\r
-Date: Tue, 09 Nov 2010 14:49:00 GMT\r
-Server: server.example.com\r
-Content-Length: 47\r
-\r
+<data3 crlf="yes">
+HTTP/1.1 200 OK
+Date: Tue, 09 Nov 2010 14:49:00 GMT
+Server: server.example.com
+Content-Length: 47
+
 file contents should appear once for each file
 </data3>
-<data4>
-HTTP/1.1 200 OK\r
-Date: Tue, 09 Nov 2010 14:49:00 GMT\r
-Server: server.example.com\r
-Content-Length: 47\r
-\r
+<data4 crlf="yes">
+HTTP/1.1 200 OK
+Date: Tue, 09 Nov 2010 14:49:00 GMT
+Server: server.example.com
+Content-Length: 47
+
 file contents should appear once for each file
 </data4>
 </reply>
index 9ed8c9488009b8aa9174033ac440584a4ed44b39..a743b2824fc33cceb3147a896fc8e066d11c5d1d 100644 (file)
@@ -46,14 +46,14 @@ ftp://%HOSTIP:%FTPPORT/ -P %CLIENTIP
 ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
 ^EPRT \|1\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|\d{1,5}\|
 </strip>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-PORT 127,0,0,1,243,212\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+PORT 127,0,0,1,243,212
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index 1480ee1ec1dc672b6ecbd42dd45c1be1ac242126..77fb9246bb1ec2bff83102e92e71a59f763e3b92 100644 (file)
@@ -45,14 +45,14 @@ FTP IPv6 dir list PASV
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index 90b58a0b30675c826562905adfaed97c2ef31905..63254842456826fd58601eb810a6b263030b2907 100644 (file)
@@ -46,14 +46,14 @@ FTP IPv6 dir list PASV and --disable-epsv
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index aa60459548e10987cb78a3239334d10dbccc83d4..e8ac36b5aa1ee97de23e6d4afacfdbb3a6d1e936 100644 (file)
@@ -45,15 +45,15 @@ proxy
 <errorcode>
 33
 </errorcode>
-<protocol>
-GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Proxy-Authorization: Basic %b64[daniel:stenberg]b64%\r
-Range: bytes=78-\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Proxy-Authorization: Basic %b64[daniel:stenberg]b64%
+Range: bytes=78-
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 
 # the download target file must remain untouched
index 4a245b0120fe54c69c123edb298ef06ce6c06720..4ffb7a6f320537725e4c5a2caa30e2415288c104 100644 (file)
@@ -85,27 +85,27 @@ machine anotherone.com login user2 password passwd2
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://supersite.com/want/%TESTNUMBER HTTP/1.1\r
-Host: supersite.com\r
-Authorization: Basic %b64[user1:passwd1]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://anotherone.com/%TESTNUMBER0002 HTTP/1.1\r
-Host: anotherone.com\r
-Authorization: Basic %b64[user2:passwd2]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://athird.com/%TESTNUMBER0003 HTTP/1.1\r
-Host: athird.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://supersite.com/want/%TESTNUMBER HTTP/1.1
+Host: supersite.com
+Authorization: Basic %b64[user1:passwd1]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://anotherone.com/%TESTNUMBER0002 HTTP/1.1
+Host: anotherone.com
+Authorization: Basic %b64[user2:passwd2]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://athird.com/%TESTNUMBER0003 HTTP/1.1
+Host: athird.com
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 9e334bc5b50acd97c6248e5ea3dbe1178b5ee266..438109516d6777f5f9dd2c43c4a8f27c1fe4f046 100644 (file)
@@ -31,12 +31,12 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -o - -o -
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index b72d6cd1663da0a277a241e7b4916052a5dbe4fa..41a8a7a6341ca59a1d47045389f64ffc827803f9 100644 (file)
@@ -42,12 +42,12 @@ HTTP GET URL without slash but with question mark
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /?%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /?%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index d5f940372e8dcb6fbf388f9fb9e7fd285eaf8533..59cc16fec25064b6d9556089edce10d0025b7740 100644 (file)
@@ -34,15 +34,15 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index fae51caeae9d36da2a30dc24467e1e717395a1bf..6b5ad6204ee84c91542361860e019b307385355d 100644 (file)
@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <errorcode>
 8
index 64870252971302072c6a3b571662ca5bf12958fa..e1fbe036caa8764ee89eea562cd41e81b20b31f0 100644 (file)
@@ -41,13 +41,13 @@ HTTP-IPv6 GET with proxy specified using IPv6-numerical address
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://veryveryremotesite.com/%TESTNUMBER HTTP/1.1\r
-Host: veryveryremotesite.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://veryveryremotesite.com/%TESTNUMBER HTTP/1.1
+Host: veryveryremotesite.com
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 8eae539bdc03bd2e33714f1193db8e55bb904278..cb1ad053b3101246b7241296967006c29e4bd942 100644 (file)
@@ -37,14 +37,14 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1\r
-Host: we.want.that.site.com\r
-Proxy-Authorization: Basic %b64[fake:user]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
+Host: we.want.that.site.com
+Proxy-Authorization: Basic %b64[fake:user]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 6b407b24dd351e267e66d6df7c7d50265464b800..75d943f0f7ac9a46e992a0bdbb13e2e538df80f4 100644 (file)
@@ -95,26 +95,26 @@ http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --prox
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
-Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
-Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Proxy-Connection: Keep-Alive\r
-\r
-CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
-Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
-Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-User-Agent: curl/%VERSION\r
-Proxy-Connection: Keep-Alive\r
-\r
-POST /path/%TESTNUMBER0002 HTTP/1.1\r
-Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 6\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
+POST /path/%TESTNUMBER0002 HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 6
+Content-Type: application/x-www-form-urlencoded
+
 postit
 </protocol>
 </verify>
index 8604c609b89efa829d23c89cfba1264a563eb6de..aa974b628be6d92b95a8064f60bfab5e5011f277 100644 (file)
@@ -60,12 +60,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/heads%TESTNUMBER">
 HTTP/1.1 200 funky chunky!\r
index f24c7f6a917888819e524aac8b7f1c35f7b0b733..60f8878cbf7f4a7d51227318340d36d9c839d3ab 100644 (file)
@@ -73,27 +73,27 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm -d "data" -H "H
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Header1: yes\r
-Header2: no\r
-Content-Length: 0\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Header1: yes\r
-Header2: no\r
-Content-Length: 4\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Accept: */*
+Header1: yes
+Header2: no
+Content-Length: 0
+Content-Type: application/x-www-form-urlencoded
+
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+User-Agent: curl/%VERSION
+Accept: */*
+Header1: yes
+Header2: no
+Content-Length: 4
+Content-Type: application/x-www-form-urlencoded
+
 data
 </protocol>
 </verify>
index e9e7843d44b1fc33e1d5a70fd7b30da1eca1d574..1533ef7eebf080689b181c19524183d402d2bf4e 100644 (file)
@@ -40,12 +40,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --ignore-content-length
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 75c73acc2bfd9c55e8e889349a98b1f86338b75a..f9ec0cf051c0ebda640071addbcb5beae4715b10 100644 (file)
@@ -36,24 +36,24 @@ cookies
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: thewinneris=nowayyouwin\r
-\r
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: thewinneris=nowayyouwin\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Cookie: thewinneris=nowayyouwin
+
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Cookie: thewinneris=nowayyouwin
+
 </protocol>
 </verify>
 </testcase>
index efa183f1559be0c85593c52c58aa62e16b4c9490..6f1db343a769006488ef22429f06c2b41d957f5e 100644 (file)
@@ -36,15 +36,15 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-skip-pasv-ip --disable-epsv
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-PASV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+PASV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index eb7ab1cc6a27df4ba92ee83cdf4d621e26ce8acc..e3629c1843e401c192be4ca89fe8983bf41a968e 100644 (file)
@@ -66,18 +66,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="576ae57b1db0039f8c0de43ef58e49e3"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="576ae57b1db0039f8c0de43ef58e49e3"
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index bb72006148400a0e0653109ed0b879e3682cf49e..685bd0854adb1ca766970a8ef651093365350bd3 100644 (file)
@@ -34,12 +34,12 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L --max-redirs 0
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <errorcode>
index 6814f9ed7b25c674c5efe88596a103033076b7f5..f71a2de427ec6813b9d86fe2b2a71be3e207537b 100644 (file)
@@ -59,17 +59,17 @@ HTTP Location: following with multiple question marks in URLs
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want?uri=http://anything/%TESTNUMBER?secondq/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /data/%TESTNUMBER0002.txt?coolsite=http://anotherurl/?a_second/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want?uri=http://anything/%TESTNUMBER?secondq/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /data/%TESTNUMBER0002.txt?coolsite=http://anotherurl/?a_second/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 69a17fea5ef155f7374761bcc8ca9e8af04e259a..0f8cdaa3e05b4993ba2c067e6ba318f0a3309da3 100644 (file)
@@ -40,19 +40,19 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -F name=daniel -H "Content-Type: text/
 s/^--------------------------[A-Za-z0-9]*/--------------------------/
 s/boundary=------------------------[A-Za-z0-9]*/boundary=------------------------/
 </strippart>
-<protocol>
-POST /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 158\r
-Content-Type: text/info; boundary=------------------------\r
-\r
---------------------------\r
-Content-Disposition: attachment; name="name"\r
-\r
-daniel\r
-----------------------------\r
+<protocol crlf="yes">
+POST /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 158
+Content-Type: text/info; boundary=------------------------
+
+--------------------------
+Content-Disposition: attachment; name="name"
+
+daniel
+----------------------------
 </protocol>
 </verify>
 </testcase>
index eebd2e4623fb622ce38212ed294161bd49bed0d0..102815aae08d1e7b0dc62a7c7cae248abf157bab 100644 (file)
@@ -37,14 +37,14 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1\r
-Host: we.want.that.site.com\r
-Proxy-Authorization: Basic %b64[fake:]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
+Host: we.want.that.site.com
+Proxy-Authorization: Basic %b64[fake:]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 627be88f916944966a91bd55ca541b922e0f1817..579e13f8097c4352ce76156ddd9b89f495584c24 100644 (file)
@@ -38,14 +38,14 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1\r
-Host: we.want.that.site.com\r
-Proxy-Authorization: Basic %b64[fake:]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
+Host: we.want.that.site.com
+Proxy-Authorization: Basic %b64[fake:]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 667d8f97f61ac78134eecec9277c4c139d2d73f8..979868cea3bd6211be24e6483c9b7e47cded335b 100644 (file)
@@ -58,17 +58,17 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /online/1,1795,Welcome,00.html/%TESTNUMBER0002.txt?logout=TRUE HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /online/1,1795,Welcome,00.html/%TESTNUMBER0002.txt?logout=TRUE HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 1aee4b517f1159f15c77de1547dc6423579eb51a..9959188dad8e44488f618d2eec477510fe0bf848 100644 (file)
@@ -46,16 +46,16 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ --ftp-alternative-to-user "USER replacement"
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-USER replacement\r
-PASS ftp@example.com\r
-PWD\r
-CWD %TESTNUMBER\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+USER replacement
+PASS ftp@example.com
+PWD
+CWD %TESTNUMBER
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index 68d3b428cbcdbdbe12bf99b50bd6b2f03519fb08..e5b1321be2d26bacff8053e430352283f89fd750 100644 (file)
@@ -32,12 +32,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 85d557ec96d9e64f4957317b67f37e54b2e2c75f..1bc6654ba3d121fa884866159ba3f58f6da22631 100644 (file)
@@ -37,12 +37,12 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
-Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT\r
-Proxy-Connection: Keep-Alive\r
-User-Agent: looser/2007\r
-\r
+<protocol crlf="yes">
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+Proxy-Connection: Keep-Alive
+User-Agent: looser/2007
+
 </protocol>
 # CURLE_RECV_ERROR
 <errorcode>
index 689ac43ee1c45a2671495a634950311110a70a2b..b99b02f04cfb543cc81ad9579db4b8dc0ac8f6b3 100644 (file)
@@ -39,12 +39,12 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -m 2
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <errorcode>
 28
index e7048a5384d5e5552109090919fc727c31f4b74c..99f7299c8b9f9ad6c42086c8738cf9da27f94fd3 100644 (file)
@@ -30,14 +30,14 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --max-filesize 30
 <errorcode>
 63
 </errorcode>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 05cc2b444a0687f7e7885c8821175977f534bc7f..33ddb32ba3f424013847fe61b2156bd32ee27c25 100644 (file)
@@ -33,15 +33,15 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --max-filesize 100
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 0ae74a9bc0450dc2c1b597260197a9f351be444a..02159882e4042c6599904c8721a0700b0d03f82b 100644 (file)
@@ -43,12 +43,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 1000
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 04f98999103e825bcc25ae885e90a53926c0b36e..3b2fc4d9ee376f7b7b1611ec77a7ed98d52a1ade 100644 (file)
@@ -47,12 +47,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 2
 <errorcode>
 63
 </errorcode>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 67108aedb91f365bdda622494aab08efc24e38c4..55d08f053f3387cc222ae8a63167f46b5b8fb128 100644 (file)
@@ -47,16 +47,16 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ --ftp-account "data for acct"
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-ACCT data for acct\r
-PWD\r
-CWD %TESTNUMBER\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+ACCT data for acct
+PWD
+CWD %TESTNUMBER
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index ebb1a3697604512e2b6c8af5588f9088a1f8c839..ff5f89169d667c805f5fa9939c9632f95b821b5c 100644 (file)
@@ -37,9 +37,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/
 <errorcode>
 67
 </errorcode>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
 </protocol>
 </verify>
 </testcase>
index c88ec99bf7cf6ae7ad532f49731e16d115c957f9..8f38eab457ef30d0098fc4b34b734d9c2df8b6b8 100644 (file)
@@ -31,18 +31,18 @@ FTP CWD with --ftp-method multicwd
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD first\r
-CWD second\r
-CWD third\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD first
+CWD second
+CWD third
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 99c10d3e135bce97db8b1011a667fa4310ab6954..e361425398a4de7cbab112864965f318f244b5e7 100644 (file)
@@ -31,16 +31,16 @@ FTP CWD with --ftp-method singlecwd
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD first/second/third\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD first/second/third
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 5188c85477d1b11fa8e69499f9f2f693883aa4ba..5af79e7ff9528105d3a50b55e8d4465e45a2ae91 100644 (file)
@@ -31,15 +31,15 @@ FTP CWD with --ftp-method nocwd
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE first/second/third/%TESTNUMBER\r
-RETR first/second/third/%TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE first/second/third/%TESTNUMBER
+RETR first/second/third/%TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 932e065b8b510293aaa20b7b8248a523cec15285..6de5234d2bd391adeced40f33a081f059bc65dca 100644 (file)
@@ -39,14 +39,14 @@ FTP over HTTP proxy with user:pass not in url
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET ftp://michal:aybabtu@host.com/we/want/%TESTNUMBER HTTP/1.1\r
-Host: host.com:21\r
-Authorization: Basic %b64[michal:aybabtu]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET ftp://michal:aybabtu@host.com/we/want/%TESTNUMBER HTTP/1.1
+Host: host.com:21
+Authorization: Basic %b64[michal:aybabtu]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index a7cb4f8839edc64448682d55a4c29e42426c1d71..fbf60558c0a4a9eb704a534ffd803716d75183e2 100644 (file)
@@ -43,15 +43,15 @@ HTTP POST with auth and contents but with content-length set to 0
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[fake:-user]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 37\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[fake:-user]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 37
+Content-Type: application/x-www-form-urlencoded
+
 fooo=mooo&pooo=clue&doo=%20%20%20++++
 </protocol>
 </verify>
index 6d6a7f645274acecb04c9b9a4cab6a40000c9f16..5facba61b398f41a5d18dfebaf3e36c556a2493b 100644 (file)
@@ -27,12 +27,12 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <errorcode>
 52
index 3dbf0f01d9c9122d7dcbdbc89a4d83f703ba90a4..53c945033715a181c0ee8fe5bf3641da133d2d77 100644 (file)
@@ -40,12 +40,12 @@ simple HTTPS GET
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index e46012d2788eee12746d2ca4007721b4da0a15ca..9fd21ec507b9ef718690783cebefb19d8fc97ecb 100644 (file)
@@ -42,12 +42,12 @@ HTTPS localhost, first subaltname matches, CN does not match
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: localhost:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: localhost:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index ce53eb9aa0a451d44aa436bb250e1144fe4deaab..e4732d1cba68d3aef50bc3950ebf34cfe30066ed 100644 (file)
@@ -42,12 +42,12 @@ HTTPS localhost, last subject alt name matches, CN does not match
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: localhost:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: localhost:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 206bb7d4d9f4b0874e3fd79605ffe5510da490db..21d799b183f31da199f0e1a5b68d709e1882e862 100644 (file)
@@ -33,23 +33,23 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<invalid.one>\r
-RCPT TO:<recipient.two@example.com>\r
-RCPT TO:<recipient.three@example.com>\r
-RCPT TO:<recipient.four@example.com>\r
-RCPT TO:<recipient.five@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<invalid.one>
+RCPT TO:<recipient.two@example.com>
+RCPT TO:<recipient.three@example.com>
+RCPT TO:<recipient.four@example.com>
+RCPT TO:<recipient.five@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-body\r
-.\r
+<upload crlf="yes">
+From: different
+To: another
+
+body
+.
 </upload>
 </verify>
 </testcase>
index dea4bd6517264bb3d5cebd219b69acc98f2d5298..a0b4d67202ca367c8c9a21782a6e8684e0a6b46f 100644 (file)
@@ -33,23 +33,23 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt recipien
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient.one@example.com>\r
-RCPT TO:<recipient.two@example.com>\r
-RCPT TO:<recipient.three@example.com>\r
-RCPT TO:<recipient.four@example.com>\r
-RCPT TO:<invalid.five>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient.one@example.com>
+RCPT TO:<recipient.two@example.com>
+RCPT TO:<recipient.three@example.com>
+RCPT TO:<recipient.four@example.com>
+RCPT TO:<invalid.five>
+DATA
+QUIT
 </protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-body\r
-.\r
+<upload crlf="yes">
+From: different
+To: another
+
+body
+.
 </upload>
 </verify>
 </testcase>
index a995ddee542e23ce6e68c08ab1ae4774aa92a39b..30f67cbc74d8b9188106aa2e597fe73b65822fb9 100644 (file)
@@ -33,23 +33,23 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt recipien
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient.one@example.com>\r
-RCPT TO:<recipient.two@example.com>\r
-RCPT TO:<invalid.three>\r
-RCPT TO:<recipient.four@example.com>\r
-RCPT TO:<recipient.five@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient.one@example.com>
+RCPT TO:<recipient.two@example.com>
+RCPT TO:<invalid.three>
+RCPT TO:<recipient.four@example.com>
+RCPT TO:<recipient.five@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-body\r
-.\r
+<upload crlf="yes">
+From: different
+To: another
+
+body
+.
 </upload>
 </verify>
 </testcase>
index 8fd3330622812a5bd296430b71cfcce87495cc8c..cfe63acdfbea4614c74b177cf8c5c2bb218c0c70 100644 (file)
@@ -33,23 +33,23 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<invalid.one>\r
-RCPT TO:<recipient.two@example.com>\r
-RCPT TO:<invalid.three>\r
-RCPT TO:<invalid.four>\r
-RCPT TO:<invalid.five>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<invalid.one>
+RCPT TO:<recipient.two@example.com>
+RCPT TO:<invalid.three>
+RCPT TO:<invalid.four>
+RCPT TO:<invalid.five>
+DATA
+QUIT
 </protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-body\r
-.\r
+<upload crlf="yes">
+From: different
+To: another
+
+body
+.
 </upload>
 </verify>
 </testcase>
index 5ebf0bdf1643a061566a7623d10c6231df17d801..0d0449d9134d3e6aa2a49af04d7a3c2d1b3a6bd3 100644 (file)
@@ -37,15 +37,15 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.
 <errorcode>
 55
 </errorcode>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<invalid.one>\r
-RCPT TO:<invalid.two>\r
-RCPT TO:<invalid.three>\r
-RCPT TO:<invalid.four>\r
-RCPT TO:<invalid.five>\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<invalid.one>
+RCPT TO:<invalid.two>
+RCPT TO:<invalid.three>
+RCPT TO:<invalid.four>
+RCPT TO:<invalid.five>
+QUIT
 </protocol>
 </verify>
 </testcase>
index 9a4aede6f85b4eae043bc3ed0e0b4584f28cbb5b..2cbc4f9a6f7174d7b2e089598f60e0439bf26eb0 100644 (file)
@@ -37,11 +37,11 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.
 <errorcode>
 55
 </errorcode>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<invalid.one>\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<invalid.one>
+QUIT
 </protocol>
 </verify>
 </testcase>
index 51afb047e8c65ac827900074a4e715c25ee25a74..7701a2c33c5627dea6e85c6e9dfaf7d3ce6c2e6a 100644 (file)
@@ -43,12 +43,12 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/%LOGDIR
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /this/is/the/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /this/is/the/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/%TESTNUMBER">
 -foo-
index 213e8ae682bc7bc2c9a2e18c37b14ff3316d7ec1..96e9d8035f72db2a06a29216dbb8da352ad8659e 100644 (file)
@@ -43,12 +43,12 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/not-there
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /this/is/the/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /this/is/the/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <errorcode>
 23
index af394784ecd498fc0edf66bfef8df8b1ffdfcaf0..76a5a61ade6ddb0d2c07f530ed3bd9b661a7d15d 100644 (file)
@@ -40,13 +40,13 @@ HTTPS GET with user and password
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPSPORT\r
-Authorization: Basic %b64[fake:user]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPSPORT
+Authorization: Basic %b64[fake:user]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <data>
 [insert full protocol verifiction dump here]
index f5b2f1d8c651455ceeab016ae0d7c57d98f5a2c1..6933b584ab1ec0bb7305601999d1844552b8dbb3 100644 (file)
@@ -43,12 +43,12 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/%LOGDIR/tm
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /this/is/the/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /this/is/the/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/tmp/%TESTNUMBER">
 -foo-
index a9c95058743192434c403e868a01910bf31dffd8..5b98c0c4e21ed457a4208806118ab65f62e9b152 100644 (file)
@@ -47,12 +47,12 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -OJR --output-dir %PWD/%LOGDIR
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /this/is/the/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /this/is/the/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/MMM%TESTNUMBERMMM">
 -foo-
index 183667e6823cf994db927c4d09ee7c1f70830817..305e435eb56bfb670454951cff541de01ff88764 100644 (file)
@@ -46,17 +46,17 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/%LOGDIR ht
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /this/is/the/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /another/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /this/is/the/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /another/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/%TESTNUMBER">
 -foo-
index eb5c705716b098171ccac8048ee3dbc5ddb09470..7a6686495d2d2e530921757034be114bb5cca574 100644 (file)
@@ -45,12 +45,12 @@ Content-Type: text/plain
 testdata
 4
 </stdout>
-<protocol>
-GET /1439 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /1439 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 41e0640bc239fd10f7c7fba53c650b1cfd21fe25..b2697aa3e0cd80c24853fd239de24dd661b490c1 100644 (file)
@@ -57,17 +57,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_headers}\n" -L -o%DEV_NULL
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <stdout mode="text">
index b4210bf4820cc4d62b56abf5df6537be022c2d07..c5ee22f7d72271a23df9a05a2a14b6c35e71fbca 100644 (file)
@@ -46,12 +46,12 @@ CURL_SSL_BACKEND=schannel
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: localhost:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: localhost:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 7e4b5bb6f4d8710a6d57f6e5f2ba17039e32863b..76bd4481a55ffb5313f7c276201947187f2ad424 100644 (file)
@@ -46,12 +46,12 @@ CURL_SSL_BACKEND=schannel
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: localhost:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: localhost:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 05a811f4e801df533c4ca0505665880e2f925fa8..aaa3e547046cb5c9d5253e83c72c1cd57c2c548f 100644 (file)
@@ -40,16 +40,16 @@ data blobb
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-MDTM %TESTNUMBER\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+MDTM %TESTNUMBER
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index bc69e862af08580b35296a23269fed0463efbc0b..7929f52c0758739f9b2da0a0dbac171b65dcffd1 100644 (file)
@@ -60,13 +60,13 @@ Proxy-Connection: Keep-Alive
 \r
 </proxy>
 
-<protocol>
-proxy-line\r
-GET /page HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+proxy-line
+GET /page HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 </verify>
index f2aad9dfb74e79f2f44d4404862f9b3522b133dd..c5c6613cb2e4f4773d68c3c6d756cb87b8ea6300 100644 (file)
@@ -43,12 +43,12 @@ HTTPS with 8 secs timeout
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <errorcode>
 28
index 58edc376dda83463a81755baca512160c37ba9cf..b8da69e5fde2ecb58de74217b1f1715bcc799cd4 100644 (file)
@@ -43,12 +43,12 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER --dump-header %PWD/%LOGDIR/tmp/
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /this/is/the/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /this/is/the/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/tmp/out.txt" crlf="yes">
 HTTP/1.1 200 OK
index 985ff4ff6440a3e5d1243990855a80f35a940734..067e43c02ae31761a56c3cf640107261bab7d8ad 100644 (file)
@@ -86,27 +86,27 @@ HTTP redirect loop 3x swsbounce test
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 19fefa23183fb76e5b2f4f30d3038dfc1886c60f..98fe7c5fd0c937f45c9aea691dfb1db00a3b1b62 100644 (file)
@@ -87,36 +87,36 @@ HTTP retry failed download with keep data and auto-resume
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=5-\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=11-\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=11-\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=11-\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=5-
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=11-
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=11-
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=11-
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 <file1 name="%LOGDIR/outfile%TESTNUMBER" nonewline="yes">
index e0b5f907520019303925ab327a822ecdd2a4fcfc..6fac104547f707f3ac11c189e0c02ad5d1dd60a2 100644 (file)
@@ -52,12 +52,12 @@ HTTPS GET, receive no headers only data!
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 650daaea1c175426798728d345efaf89486770be..3d796bfc01c4579d1dfa17d9a71b2a61141d7350 100644 (file)
@@ -43,12 +43,12 @@ simple HTTPS GET with openssl engine
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 29058d4c966524f7b9623aab09d079ac37261e19..33e36fce00a5885b6e31184fa1c69e8ee13d30e6 100644 (file)
@@ -65,17 +65,17 @@ HTTP Location: redirect to HTTPS URL
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1\r
-Host: %HOSTIP:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
+Host: %HOSTIP:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 8de7adc7836aaf17f6b3014cc1699a9e8e78eee3..b8b09b8d0fe036a777fcbe01f434aaf1d63147c3 100644 (file)
@@ -99,12 +99,12 @@ local-http
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/%TESTNUMBER HTTP/1.1\r
-Host: test31.curl:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/%TESTNUMBER HTTP/1.1
+Host: test31.curl:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/jar%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
index f2415a329fb87077e58971f7d5ce08d53a608a09..f58b673782d2fb1e73e6b98aaa9ca280a8272c62 100644 (file)
@@ -42,12 +42,12 @@ simple HTTPS GET
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: localhost:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: localhost:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 32ce6d3bedfb3232ca66c07a2c1585c7e0259e4e..cd8dd0a3a1fbe54d1ed2cc5e1383bd3990ef3edd 100644 (file)
@@ -69,16 +69,16 @@ rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-DESCRIBE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0\r
-CSeq: 1\r
-Accept: application/sdp\r
-\r
-DESCRIBE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0\r
-CSeq: 2\r
-Accept: application/sdp\r
-Authorization: Basic %b64[user:pass]b64%d29yZA==\r
-\r
+<protocol crlf="yes">
+DESCRIBE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0
+CSeq: 1
+Accept: application/sdp
+
+DESCRIBE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0
+CSeq: 2
+Accept: application/sdp
+Authorization: Basic %b64[user:pass]b64%d29yZA==
+
 </protocol>
 </verify>
 
index d5fd882db06533a1e1d5e8e7dc934834d6c6a752..7d4dae7f64f2172a07a752adc97a5512af18c043 100644 (file)
@@ -72,16 +72,16 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[user:pass]b64%d29yZA==\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user:pass]b64%d29yZA==
+Accept: */*
+
 </protocol>
 </verify>
 
index 9142c46460b47cbdcdf0e53d1af6464acc2ac038..779642fbb0bf241872993291e66d20213c121e11 100644 (file)
@@ -38,11 +38,11 @@ https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPSPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPSPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 287ccb886e95fa29996794d67cf09b91f9168421..5970391cc53895c018a39fb374cad6333115c36c 100644 (file)
@@ -174,13 +174,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 <strippart>
 s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
 </strippart>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Accept-Encoding: xxx\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Accept-Encoding: xxx
+
 </protocol>
 </verify>
 </testcase>
index 9be36dc0f21e287c80a7d597f09200fd8c0ca7cd..4b1c443c3f65c25a25156ff405239d065d26a3bc 100644 (file)
@@ -60,13 +60,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 <strippart>
 s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
 </strippart>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Accept-Encoding: xxx\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Accept-Encoding: xxx
+
 </protocol>
 <errorcode>
 61
index 3036c836b1e0affd1bdb425ea98952ed78f61d9f..12b9fd378d2da3b132545574f080266c9cef9da8 100644 (file)
@@ -60,13 +60,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 <strippart>
 s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
 </strippart>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Accept-Encoding: xxx\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Accept-Encoding: xxx
+
 </protocol>
 </verify>
 </testcase>
index e510c98b45ca6fdeda38c796c0ee67417b306c80..435b99d970bedf07695f9931c04398f12f2ab450 100644 (file)
@@ -75,22 +75,22 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: first.host.it.is\r
-Proxy-Authorization: Basic %b64[testing:this]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-Authorization: s3cr3t\r
-\r
-GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1\r
-Host: goto.second.host.now\r
-Proxy-Authorization: Basic %b64[testing:this]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: first.host.it.is
+Proxy-Authorization: Basic %b64[testing:this]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+Authorization: s3cr3t
+
+GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1
+Host: goto.second.host.now
+Proxy-Authorization: Basic %b64[testing:this]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 9f712782be0d50d7044b9ded3c6882ca93e6400c..cdbde8a105bdc60ed895d47d5743a7638d1e9959 100644 (file)
@@ -75,23 +75,23 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: first.host.it.is\r
-Proxy-Authorization: Basic %b64[testing:this]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-Authorization: s3cr3t\r
-\r
-GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1\r
-Host: goto.second.host.now\r
-Proxy-Authorization: Basic %b64[testing:this]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-Authorization: s3cr3t\r
-\r
+<protocol crlf="yes">
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: first.host.it.is
+Proxy-Authorization: Basic %b64[testing:this]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+Authorization: s3cr3t
+
+GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1
+Host: goto.second.host.now
+Proxy-Authorization: Basic %b64[testing:this]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+Authorization: s3cr3t
+
 </protocol>
 </verify>
 </testcase>
index d6ad42e9b1c104c93dbe6eea6bc89df5164c0b3a..12da8ecbedf996935e373f9deb1644f54af06fd2 100644 (file)
@@ -48,12 +48,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --raw
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index edf74bc58557e3b1d6b95dc15e96efed4997e35f..60290b835f1b72ddf16236841191743e4037880a 100644 (file)
@@ -56,8 +56,6 @@ simple TLS-SRP HTTPS GET, check user in response
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-</protocol>
 <file name="%LOGDIR/curl%TESTNUMBER.out">
 HTTP/1.0 200 OK\r
 Content-type: text/html\r
index 730da8d9327573fe9d3fcf5fa12275471e198c56..ddbf9bc24b3781de1963acb3d0e9cb8067684990 100644 (file)
@@ -50,14 +50,14 @@ proxy
 <strippart>
 s/^PROXY TCP4 192.168.1.1 %HOSTIP (\d*) %HTTPPORT/proxy-line/
 </strippart>
-<protocol>
-proxy-line\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Testno: %TESTNUMBER\r
-\r
+<protocol crlf="yes">
+proxy-line
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Testno: %TESTNUMBER
+
 </protocol>
 </verify>
 </testcase>
index 48a74e132cf32dbc5df22a9bded1e65bf482e48f..d4ea6a33c317fb3785da7b283251b6e005978bc4 100644 (file)
@@ -55,13 +55,13 @@ proxy
 <strippart>
 s/^PROXY TCP6 2001:db8:: ::1 (\d*) %HTTP6PORT/proxy-line/
 </strippart>
-<protocol>
-proxy-line\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOST6IP:%HTTP6PORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+proxy-line
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOST6IP:%HTTP6PORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 8cc9c2f5b5fbae49cd2ad1b548314e6b272b275d..25450cb00ab8a77077d98f39760c4d07e05aa1f8 100644 (file)
@@ -37,13 +37,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER --et
 
 # Verify that the file still exists with the correct etag value.
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-If-None-Match: "21025-dc7-39462498"\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+If-None-Match: "21025-dc7-39462498"
+
 </protocol>
 <file name="%LOGDIR/etag%TESTNUMBER">
 "21025-dc7-39462498"
index d47494a86686c17a92ddf0478838efdad718a3d5..1acc2c729d8132d24bcfd30cc9c5fd0528c595de 100644 (file)
@@ -37,12 +37,12 @@ IMAP custom FETCH with larger literal response (~7KB)
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 456 BODY[TEXT]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 SELECT %TESTNUMBER
+A004 FETCH 456 BODY[TEXT]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 70c12e9d36cbcfd30117d5a6e8f53186ec4dc55b..8eab081f520105325f9302bceda1dff093eb2f83 100644 (file)
@@ -38,19 +38,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt "<recipient@example.com> NOTIFY
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com> RET=HDRS\r
-RCPT TO:<recipient@example.com> NOTIFY=SUCCESS,FAILURE\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com> RET=HDRS
+RCPT TO:<recipient@example.com> NOTIFY=SUCCESS,FAILURE
+DATA
+QUIT
 </protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-body\r
-.\r
+<upload crlf="yes">
+From: different
+To: another
+
+body
+.
 </upload>
 </verify>
 </testcase>
index 4f5826252043c3490fc8360cd5e1fd021d49d801..c18f6dfe20636651b79b6c1199865c8ef59170a3 100644 (file)
@@ -49,12 +49,12 @@ HTTPS with attempted redirect to denied HTTP
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 # 1 - Protocol http not supported or disabled in libcurl
 <errorcode>
index 920a9c1af6863cb6d9df5c26f21c43409fab949e..656fbf8b722f1efa7c68da9a2904d9bc7c3e34e5 100644 (file)
@@ -53,12 +53,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --raw
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 6e86c3722b54f67c1394ad1e52146ccb25f584e1..91849746c4f1fa7fcfcc89656b1985065d08d20a 100644 (file)
@@ -52,18 +52,18 @@ cookies
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /we/want/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: foobar=name\r
-\r
+<protocol crlf="yes">
+GET /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /we/want/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Cookie: foobar=name
+
 </protocol>
 <file name="%LOGDIR/cookies%TESTNUMBER" mode="text">
 # Netscape HTTP Cookie File
index cb891b044fa00247d1270f26af77d00c3024396b..2cde3b22fb7bd578101d81a704cf393da69374da 100644 (file)
@@ -44,12 +44,12 @@ http://%HOSTIP:%HTTPPORT/hello/%TESTNUMBER --compressed
 <strip>
 ^Accept-Encoding:.*
 </strip>
-<protocol>
-GET /hello/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /hello/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 93135c5ec10593b81da81245729106327278cfa7..4d3b721e223367c138de973773e03f2d1eb4abf2 100644 (file)
@@ -59,19 +59,19 @@ cookies
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/%TESTNUMBER HTTP/1.1\r
-Host: host.foo.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: tester=yes; test=no\r
-\r
-GET /we/want/%TESTNUMBER0002 HTTP/1.1\r
-Host: host.foo.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: tester=yes\r
-\r
+<protocol crlf="yes">
+GET /we/want/%TESTNUMBER HTTP/1.1
+Host: host.foo.com
+User-Agent: curl/%VERSION
+Accept: */*
+Cookie: tester=yes; test=no
+
+GET /we/want/%TESTNUMBER0002 HTTP/1.1
+Host: host.foo.com
+User-Agent: curl/%VERSION
+Accept: */*
+Cookie: tester=yes
+
 </protocol>
 </verify>
 </testcase>
index 4344e2d4b27a39ce4ce6fdbf050d3d9082e4a5b5..0e6d21defb13d5783373b11373de758fb718f7fc 100644 (file)
@@ -74,20 +74,20 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: first.host.it.is\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-Cookie: test=yes\r
-\r
-GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1\r
-Host: goto.second.host.now\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER 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/%TESTNUMBER0002 HTTP/1.1
+Host: goto.second.host.now
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 8ab268203f88a51d3541f82857875e6474981fe3..6d656ac73414ceba014f868a118569bdbc14353c 100644 (file)
@@ -50,20 +50,20 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://moo/we/want/%TESTNUMBER HTTP/1.1\r
-Host: moo\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://moo/we/want/%TESTNUMBER0002 HTTP/1.1\r
-Host: moo\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-Cookie: moo=yes\r
-\r
+<protocol crlf="yes">
+GET http://moo/we/want/%TESTNUMBER HTTP/1.1
+Host: moo
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://moo/we/want/%TESTNUMBER0002 HTTP/1.1
+Host: moo
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+Cookie: moo=yes
+
 </protocol>
 </verify>
 </testcase>
index 159335093b8d7dc859b3543f87656971c765d028..b6194e09be86a7302ac460a98a1859781e8d16e5 100644 (file)
@@ -31,12 +31,12 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 327296df32bedfaca977c5c35e69947f7a5deb2a..c4057953d28865322fd25e55cd616a4ffab72f26 100644 (file)
@@ -74,28 +74,28 @@ http://digest:a-lot@data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --p
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
-Host: data.from.server.requiring.digest.hohoho.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
-Host: data.from.server.requiring.digest.hohoho.com\r
-Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="f61609cd8f5bb205ef4e169b2c5626cb"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
-Host: data.from.server.requiring.digest.hohoho.com\r
-Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="f61609cd8f5bb205ef4e169b2c5626cb"\r
-Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/%TESTNUMBER", response="ea0f4cb7a119a1a6f6c6c6c2e4190860"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
+Host: data.from.server.requiring.digest.hohoho.com
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
+Host: data.from.server.requiring.digest.hohoho.com
+Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="f61609cd8f5bb205ef4e169b2c5626cb"
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
+Host: data.from.server.requiring.digest.hohoho.com
+Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="f61609cd8f5bb205ef4e169b2c5626cb"
+Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/%TESTNUMBER", response="ea0f4cb7a119a1a6f6c6c6c2e4190860"
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index f50b42adb3320f83e4c4c9798c39f5bb0551da75..ddf4266b46b62e591d8a58e3e5917a5ee30b4e68 100644 (file)
@@ -41,18 +41,18 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --range 3-6
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-PASV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-REST 3\r
-RETR %TESTNUMBER\r
-ABOR\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+PASV
+TYPE I
+SIZE %TESTNUMBER
+REST 3
+RETR %TESTNUMBER
+ABOR
+QUIT
 </protocol>
 </verify>
 </testcase>
index d44a712fbbb7b57a320d878fa96a328477c43c29..a54f964e10fef1d3313fe1f9ae35b3fd2383c2f4 100644 (file)
@@ -41,18 +41,18 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --range 3-6
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-PASV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-REST 3\r
-RETR %TESTNUMBER\r
-ABOR\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+PASV
+TYPE I
+SIZE %TESTNUMBER
+REST 3
+RETR %TESTNUMBER
+ABOR
+QUIT
 </protocol>
 </verify>
 </testcase>
index 8c43402757c6a3f6a0601434a6b1de85225085c7..29205e0431d9782dfdb7fc33f47aa388816cfe8b 100644 (file)
@@ -46,12 +46,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save %LOGDIR/etag%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/etag%TESTNUMBER">
 W/"asdf"
index 5d81a5a8f7846b34f7a545ca6d94d1b84fe8f91b..bda5a23fc5683aec126707d9fdbe7fc19dff8c2d 100644 (file)
@@ -52,12 +52,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 
index c003e42afa916e7cf720c591c39e2cd689b268c7..d971a07c099e9e206ddb4a68597a719844ee7231 100644 (file)
@@ -28,10 +28,10 @@ FTP using %00 in path with singlecwd
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
 </protocol>
 <errorcode>
 3
index b6e429a222c28e14f7428d61ae64ff2ea7142fd9..3a5f82ea24e304d50eabeee02067542fef4034ce 100644 (file)
@@ -46,13 +46,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-If-None-Match: ""\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+If-None-Match: ""
+
 </protocol>
 </verify>
 
index 79f60256350c37144264ea18d20e1ce09f710cb4..14d343998db09ab919564ccc9ae96f6513061075 100644 (file)
@@ -44,13 +44,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-If-None-Match: "21025-dc7-39462498"\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+If-None-Match: "21025-dc7-39462498"
+
 </protocol>
 </verify>
 </testcase>
index dd13708ce895135812a3cb85e9a8e545bb6f68b7..c23c3080538e660a32f5a036d9e268013b51b21d 100644 (file)
@@ -44,13 +44,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER --et
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-If-None-Match: "21025-dc7-39462498"\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+If-None-Match: "21025-dc7-39462498"
+
 </protocol>
 <file name="%LOGDIR/out%TESTNUMBER">
 "21025-dc7-11111"
index 197c00489bdbf08c330cd59a80407b85503998d9..06e70c8597a8f50b3bad6e25991c0d493310ef3e 100644 (file)
@@ -41,13 +41,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER --et
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-If-None-Match: ""\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+If-None-Match: ""
+
 </protocol>
 <file name="%LOGDIR/etag%TESTNUMBER">
 "21025-dc7-11111"
index c6da676a83d8ff66098be6c4d1d995e3dc3dff96..5fbd2dfd9f567a850d71ec9c05a39a4e75ab4aab 100644 (file)
@@ -44,13 +44,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER --et
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-If-None-Match: "21025-dc7-39462498"\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+If-None-Match: "21025-dc7-39462498"
+
 </protocol>
 <file name="%LOGDIR/etag%TESTNUMBER">
 "21025-dc7-11111"
index a94da860b0e2bf45cec14c5e8ba5c217f7386615..0f67cfb339453c631fa76647971a7d36e714a0ce 100644 (file)
@@ -44,15 +44,15 @@ HTTP GET over proxy with credentials using blank passwords
 
 #
 <verify>
-<protocol>
-GET http://remote.example/%TESTNUMBER HTTP/1.1\r
-Host: remote.example\r
-Proxy-Authorization: Basic %b64[puser:]b64%\r
-Authorization: Basic %b64[suser:]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://remote.example/%TESTNUMBER HTTP/1.1
+Host: remote.example
+Proxy-Authorization: Basic %b64[puser:]b64%
+Authorization: Basic %b64[suser:]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 606335c0d060c9ec9045ed78ae9a4a68cf939b67..dae91d3ca27478cca189f9ef06f8410ec853daf2 100644 (file)
@@ -46,12 +46,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save %LOGDIR/etag%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/etag%TESTNUMBER">
 </file>
index 55e9d608ddc8f0e3d8f520453b11728191a15297..108e089444dfffa8643dde67d39cef27f1b5b04b 100644 (file)
@@ -44,14 +44,14 @@ that FTP
 works
   so does it?
 </upload>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-STOR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+STOR %TESTNUMBER
+QUIT
 </protocol>
 # 70 - CURLE_REMOTE_DISK_FULL
 <errorcode>
index c1106f2ac3caac8ffd2bac15e85eaa35cc733e65..6dc32dbbf55072993b0274b240cab3975d8d1aea 100644 (file)
@@ -31,12 +31,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail-with-body
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <errorcode>
 22
index 3eb8b80aa6bd405fb377dd68a59abef8279cb165..9bc9237836f22671304e56029ab9cb610a6bce4a 100644 (file)
@@ -41,15 +41,15 @@ ftp://%HOSTIP:%FTPPORT// --ftp-method multicwd
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD /\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD /
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index ffa93e3e2987817f4752341dd3738c75714341d2..4ac29ecee6e96c21465ba4ad2aa03f689ec8172a 100644 (file)
@@ -41,14 +41,14 @@ ftp://%HOSTIP:%FTPPORT// --ftp-method nocwd
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE A\r
-LIST /\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE A
+LIST /
+QUIT
 </protocol>
 </verify>
 </testcase>
index 0cc4d69fd1e45dffc1edc893d7b5ce7b2635a1a6..2311bfa457f89d6d8d90c29cc9d8891cd6b0a1fb 100644 (file)
@@ -41,15 +41,15 @@ ftp://%HOSTIP:%FTPPORT// --ftp-method singlecwd
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD /\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD /
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index a94828bd6b987a9f033e2d5d3ab9ebe3c5b6183a..4b4889926363153667c4fd54d096f013973577f0 100644 (file)
@@ -41,14 +41,14 @@ ftp://%HOSTIP:%FTPPORT/ --ftp-method singlecwd
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index dc6d732d8ba281ff39e66c5837bbfd81692c793c..641cd01f8b5adbd226e02d567990945aa6e473fc 100644 (file)
@@ -37,14 +37,14 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 67f7777ff504236a4c19d63bad6d5ae791456381..ffb7cbc3c1d068a420912c287b0df4bcdf118b50 100644 (file)
@@ -44,12 +44,12 @@ h1 example.com 80 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 8d7cd45b17daf6ae0b5376e80b16be0d8ad097c6..d723b3953db37c4076bc2e7f0f2a95b2904954e9 100644 (file)
@@ -50,12 +50,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc "%LOGDIR/altsvc-%TESTNUMBER"
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stripfile>
 # strip out the (dynamic) expire date from the file so that the rest
index 1f055726bce82c8b3ab7315921be87b2868fc525..efe23719a80832c67d08f131d28dad41fa11beea 100644 (file)
@@ -52,12 +52,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 <errorcode>
 56
 </errorcode>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 
index 4fbf3d5ea24efbebe34d08f0f57ad8501e7f89fe..c9642fbbfa81e5187958ab034f4ad0ac8055fb77 100644 (file)
@@ -31,17 +31,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <errorcode>
 22
index e8ce9731ed83b8f041955c88efcf6e0eda3fb801..2259211adcced98693df2f360bab7a99b8349030 100644 (file)
@@ -37,15 +37,15 @@ that FTP
 works
   so does it?
 </upload>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-STOR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+STOR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index d2d9661f708876f0f4518b6b9be8e3c4862ab4a6..489d2cf6f1884ccce1386c719b208b05d364525a 100644 (file)
@@ -74,14 +74,14 @@ User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
-<protocol nonewline="yes">
-POST /we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: test.%TESTNUMBER:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 27\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: test.%TESTNUMBER:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 27
+Content-Type: application/x-www-form-urlencoded
+
 datatopost=ohthatsfunyesyes
 </protocol>
 </verify>
index 40f0540bcc136533bf2880355ed49ee91bc7d01a..847023011d6c252a203899197fc15c9794fc42f0 100644 (file)
@@ -54,12 +54,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index d2193ff14a5cc5eef1e9132ea9dffcf1f37088dc..8fcdbc4d91de4c93a4482c5c3f923e12afd74841 100644 (file)
@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 2 --retry-max-time 10
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 </verify>
index bd3bc0a88783d29ff0615bcd20bf749477b734c7..fd3252f31e188df97a460f7926cf8bd7de4bd07c 100644 (file)
@@ -36,13 +36,13 @@ http://:example@%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[:example]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[:example]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 69b63e94f6c6a3c49743a2cb880635116043920a..d49d1ccf302691badabfb6520de522de8da63bd8 100644 (file)
@@ -37,13 +37,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -r 4
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=4-\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=4-
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 17a6b4480adf2670c326931541b40db950028731..9810d0a5b9d290ae73abfedc9d147aab636ebdec 100644 (file)
@@ -36,12 +36,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save %LOGDIR/nowhere/etag%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index d5e79824c6e20d1c42fe639923b7c0f3c3ee343b..ee2ac76e2805a77113bb1d4b2f3a2f99101144ed 100644 (file)
@@ -33,12 +33,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 <errorcode>
 52
 </errorcode>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 
index b58237f359605d29564689fd137df5981a8a900f..d31454f07b094272c91ec41d1cf3b7b00dd2042e 100644 (file)
@@ -42,12 +42,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/dump -o %LOGDIR/dump2 --no-progr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stderr mode="text">
 Warning: Got more output options than URLs
index e1cf356ddd7a89d6ad05c812e237a8e855942fe6..fcc07822ed68859a7702bfb8822f647606cebac8 100644 (file)
@@ -35,12 +35,12 @@ proxy
 </client>
 
 <verify>
-<protocol>
-GET /binary-zero-in-data-section/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /binary-zero-in-data-section/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <errorcode>
 0
index 5a51fe968f13ccfc481ccfed115fd2570b0c863e..99bfaf3ac95fa0e2fb50f6f82c8dd398e042d703 100644 (file)
@@ -64,12 +64,12 @@ http://%HOSTIP:%HTTPPORT/chunked-transfer-encoding/%TESTNUMBER
 </client>
 
 <verify>
-<protocol>
-GET /chunked-transfer-encoding/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /chunked-transfer-encoding/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <errorcode>
 0
index d85bb7855f6a95ee6caaed5b98fa58ff8a96fdbb..daec117af9e7e6c93ad90a65fabbc703f3a19df6 100644 (file)
@@ -35,12 +35,12 @@ http://%HOSTIP:%HTTPPORT/gif/%TESTNUMBER
 </client>
 
 <verify>
-<protocol>
-GET /gif/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /gif/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <errorcode>
 0
index 6913788a3b2d4576db60e0226b6ccb2003c7afa7..d2affc1de5331a36d47d0cb02679c753499ee897 100644 (file)
@@ -45,12 +45,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/save-%TESTNUMBER --remove-on-err
 <errorcode>
 18
 </errorcode>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 # the file should be empty now
index 0d727ccf26b52c98d92899e814d7efd1edbaaad4..d465e90901c384675e96e70a5b2ff220dcf1b516 100644 (file)
@@ -48,12 +48,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/save --remove-on-error --no-clob
 <errorcode>
 18
 </errorcode>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 # this file should be untouched
index abd2d3e362ae49f90122a1fb49670f52db712fe1..3346f6cf6f1d1a9bf213ad3e4eb85c83d982baa0 100644 (file)
@@ -41,13 +41,13 @@ download on.
 <errorcode>
 33
 </errorcode>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=78-\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=78-
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 # the download target file must remain untouched
index f9ccafdabc2826f5390e320cebf309c4711380b1..6fe29288b641955ace64fd805f146dc240242da8 100644 (file)
@@ -48,14 +48,14 @@ machine %HOSTIP login mary password yram
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER mary\r
-PASS yram\r
-PWD\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER mary
+PASS yram
+PWD
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index 41b9eb779c74194d9de2fa489694e57b6f594afd..9ec9b5a89ba956507d47f03e4d997575c55fccdd 100644 (file)
@@ -52,14 +52,14 @@ machine %HOSTIP login mary password yram
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER mary\r
-PASS drfrank\r
-PWD\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER mary
+PASS drfrank
+PWD
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index 2094460db3ab725b99a78a7759d2d842b7f2f701..2f4191ad8dbcdcc283c1d21ded1e0857ae78fa69 100644 (file)
@@ -42,14 +42,14 @@ HTTP with --json
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Content-Type: application/json\r
-Accept: application/json\r
-Content-Length: 21\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Content-Type: application/json
+Accept: application/json
+Content-Length: 21
+
 { "drink": "coffee" }
 </protocol>
 </verify>
index c28a9f08f6fd293295a14b304e44387dff1a62d8..fbcebc7ab4b346e20b8cc1a8a422d2388bae7346 100644 (file)
@@ -42,14 +42,14 @@ HTTP with --json x 2
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Content-Type: drinks/hot\r
-Accept: application/json\r
-Content-Length: 41\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Content-Type: drinks/hot
+Accept: application/json
+Content-Length: 41
+
 { "drink": "coffee", "crunch": "cookie" }
 </protocol>
 </verify>
index c49d75b2aa620dc97a18c6f2d42cad3bbbcf1d3a..c267ef62ae136c84b114902302119f98bd753d4d 100644 (file)
@@ -56,19 +56,19 @@ HTTP with --json + --next
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Content-Type: application/json\r
-Accept: application/json\r
-Content-Length: 21\r
-\r
-{ "drink": "coffee" }GET /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Content-Type: application/json
+Accept: application/json
+Content-Length: 21
+
+{ "drink": "coffee" }GET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index a6d2ab03fcab15d0773ac903f28b8640a0cc171c..b07096263ecee87b28ab0901daa5b24984682221 100644 (file)
@@ -38,14 +38,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -sS --tr-encoding
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-TE: gzip\r
-Connection: TE\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+TE: gzip
+Connection: TE
+
 </protocol>
 
 # CURLE_BAD_CONTENT_ENCODING is 61
index a38d70eef636ae7c7541f291e8cf4a50b4c549fd..069515ac80928e22e9c1086dbc4c07fe89431056 100644 (file)
@@ -46,12 +46,12 @@ local-http
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: curlmachine.localhost:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: curlmachine.localhost:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 279c562de3173e43c7856b0da164ded6f529662e..55d540550232dcae4d1c324cf232b2e2acf8b58f 100644 (file)
@@ -56,17 +56,17 @@ http://%HOSTIP:%HTTPPORT/../../%TESTNUMBER --path-as-is -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /../../%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /../../%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index a9f756d9482837f65ef9174aa77b72091745238e..be0a52640067a68fb8516ae76e04c80ce8b54a98 100644 (file)
@@ -45,18 +45,18 @@ local-http
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: localhost:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: localhost:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: foobar=name\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: localhost:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: localhost:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Cookie: foobar=name
+
 </protocol>
 </verify>
 </testcase>
index a9cad707920591570b061d7c42942537f0d5db03..11f273a6c7f4a69bad6c52041f7f5afaee0ce6fa 100644 (file)
@@ -47,12 +47,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 2000000
 <errorcode>
 63
 </errorcode>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 3533447f578da45883510371290bcd976e187c02..5f797d9794d23e7fa6b428e9a50a834e35240b6f 100644 (file)
@@ -46,12 +46,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 <errorcode>
 8
 </errorcode>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 8dbd4e964d458dc142103d46bf0269f5f74ee897..e3626eb82bde67a2cc227db06073ef1d0dd9b930 100644 (file)
@@ -42,12 +42,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index f5606dde77a13eca2e9edc7c80cb1614f6d655cd..4e57778cf18e721ee8cf1d0210b3a961faaa5b1a 100644 (file)
@@ -171,13 +171,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 <strippart>
 s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
 </strippart>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Accept-Encoding: xxx\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Accept-Encoding: xxx
+
 </protocol>
 </verify>
 </testcase>
index f05fe21970b7bf8ec9245a14c4e37ccfc108d458..40f1495fc5a4e82040073b193dbfe26000474d5e 100644 (file)
@@ -61,13 +61,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 <strippart>
 s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
 </strippart>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Accept-Encoding: xxx\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Accept-Encoding: xxx
+
 </protocol>
 </verify>
 </testcase>
index eab125272cacd25b92df684259ca68a9cac3cf5b..6b52e0e558c05fece45b88a9c9705277c132c714 100644 (file)
@@ -46,12 +46,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <errorcode>
 8
index 58e1650b0739c88e0780434bd712712c3d277c68..06012cca862ba51c939b5931f0535873f33cdfc6 100644 (file)
@@ -37,25 +37,25 @@ Replaced internal and added custom HTTP headers
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-extra-header: here\r
-Accept: replaced\r
-X-Custom-Header:\r
-X-Test: foo; \r
-X-Test2: foo;\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-extra-header: here\r
-Accept: replaced\r
-X-Custom-Header:\r
-X-Test: foo; \r
-X-Test2: foo;\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+extra-header: here
+Accept: replaced
+X-Custom-Header:
+X-Test: foo; 
+X-Test2: foo;
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+extra-header: here
+Accept: replaced
+X-Custom-Header:
+X-Test: foo; 
+X-Test2: foo;
+
 </protocol>
 </verify>
 </testcase>
index 16e9426c865dfb24c0ae218a7dab8346e6d9aae7..5d8d8c1e45b07784b855bf7938b6e95779aec1c8 100644 (file)
@@ -56,17 +56,17 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/are/all/twits/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /we/are/all/moo.html/?name=d+a+niel&testcase=/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /we/are/all/moo.html/?name=d+a+niel&testcase=/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 47fdd49e3ea71ed57ff3ab2dd2caec6fc84c8d84..32f85f856ef79413aa26fd74d30e30a20e403e48 100644 (file)
@@ -45,16 +45,16 @@ FTPS dir list PASV unencrypted data
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PBSZ 0\r
-PROT C\r
-PWD\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PBSZ 0
+PROT C
+PWD
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index 0f9e0d528fa521566ce96169fb9e91374d8eb78f..49382c9363dad5f645aac6179b007a6f5d33b49d 100644 (file)
@@ -40,12 +40,12 @@ HTTPS GET with ECH GREASE
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 8ff16a5c0dded0510ca436be35a2f0b5083918b3..27752cd8d92b5e2501bd2b4b9ce314ba42ec37d3 100644 (file)
@@ -42,16 +42,16 @@ that FTPS
 works
   so does it?
 </upload>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PBSZ 0\r
-PROT C\r
-PWD\r
-EPSV\r
-TYPE I\r
-STOR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PBSZ 0
+PROT C
+PWD
+EPSV
+TYPE I
+STOR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index a62267dd1523bbc4543bdda26cd78455c2c2dece..a038efd3c88a772cf9b7faefa21eed10167a4ced 100644 (file)
@@ -28,9 +28,9 @@ FTP SSL required on non-SSL server
 <errorcode>
 64
 </errorcode>
-<protocol>
-AUTH SSL\r
-AUTH TLS\r
+<protocol crlf="yes">
+AUTH SSL
+AUTH TLS
 </protocol>
 </verify>
 </testcase>
index f451bf8f4335c24b81a789aa2a214926a7ff4afa..20609c2d13603ee7a83fbbfc2343642866c521d4 100644 (file)
@@ -47,17 +47,17 @@ FTPS with CCC not supported by server
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PBSZ 0\r
-PROT C\r
-CCC\r
-PWD\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PBSZ 0
+PROT C
+CCC
+PWD
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index 9cd5047d85e77efec74ea72c600922b958c735f2..0e1b70ebfc4ad527cbacbc30076d750b8b0b8656 100644 (file)
@@ -50,16 +50,16 @@ FTPS dir list, PORT with specified IP
 ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
 ^EPRT \|1\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|\d{1,5}\|
 </strip>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PBSZ 0\r
-PROT C\r
-PWD\r
-PORT 127,0,0,1,243,212\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PBSZ 0
+PROT C
+PWD
+PORT 127,0,0,1,243,212
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index 33a07cd126940bf7a77331a8bcfb2ba3509cb11d..edbd188c6e9cc50f278cbad869e354ded1c2efd2 100644 (file)
@@ -39,22 +39,22 @@ data blobb
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PBSZ 0\r
-PROT C\r
-PWD\r
-CWD a\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-EPSV\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PBSZ 0
+PROT C
+PWD
+CWD a
+CWD path
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+EPSV
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 13c9c51179c28d99b9799cdcd655de8f5137033e..e60c771617bf782a312ee6ec79492acaad77250f 100644 (file)
@@ -40,19 +40,19 @@ Moooooooooooo
 ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
 ^EPRT \|1\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|\d{1,5}\|
 </strip>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PBSZ 0\r
-PROT C\r
-PWD\r
-CWD CWD\r
-CWD STOR\r
-CWD RETR\r
-PORT 127,0,0,1,5,109\r
-TYPE I\r
-STOR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PBSZ 0
+PROT C
+PWD
+CWD CWD
+CWD STOR
+CWD RETR
+PORT 127,0,0,1,5,109
+TYPE I
+STOR %TESTNUMBER
+QUIT
 </protocol>
 <upload>
 Moooooooooooo
index f7a014248c824453470864fb873e40f516153aa4..872261b28f692002fc5773c314504e46667c308b 100644 (file)
@@ -42,16 +42,16 @@ that FTP
 works
   so does it?
 </upload>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PBSZ 0\r
-PROT C\r
-PWD\r
-EPSV\r
-TYPE I\r
-STOR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PBSZ 0
+PROT C
+PWD
+EPSV
+TYPE I
+STOR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index f947fcdc1d4f9fec77c5303bb072adb154eacff2..85885a4d895d85fbe26dda2b6e08ab224efcf034 100644 (file)
@@ -43,13 +43,13 @@ Long: %repeat[3500 x header content]%
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Long: %repeat[3500 x header content]%\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Long: %repeat[3500 x header content]%
+
 </protocol>
 </verify>
 </testcase>
index 4c90c98ec1e0c2cd4b42ad7f7520752be8715643..3a6c1836031f76b57fa9a43b9151272fc14dde71 100644 (file)
@@ -52,13 +52,13 @@ h1 whohoo 12345 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: whohoo.:12345\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Alt-Used: %HOSTIP:%HTTPPORT\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: whohoo.:12345
+User-Agent: curl/%VERSION
+Accept: */*
+Alt-Used: %HOSTIP:%HTTPPORT
+
 </protocol>
 </verify>
 </testcase>
index 913a444d9ff24c7f341f66f241bcffe035c77966..392dbc16f027295e2a70e34224789045643a7965 100644 (file)
@@ -52,13 +52,13 @@ h1 whohoo. 12345 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: whohoo:12345\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Alt-Used: %HOSTIP:%HTTPPORT\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: whohoo:12345
+User-Agent: curl/%VERSION
+Accept: */*
+Alt-Used: %HOSTIP:%HTTPPORT
+
 </protocol>
 </verify>
 </testcase>
index 8a697ae125c6f45032291083c8820a11d458108a..7e84a8c939a29c6d607e1ef8368b2c2aa4cf104d 100644 (file)
@@ -62,23 +62,23 @@ https://attack.invalid:%HTTPSPORT/a/b/%TESTNUMBER --insecure -c %LOGDIR/cookie%T
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /a/b/%TESTNUMBER HTTP/1.1\r
-Host: attack.invalid:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /a/b/%TESTNUMBER0002 HTTP/1.1\r
-Host: attack.invalid:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /a/b/%TESTNUMBER0003 HTTP/1.1\r
-Host: attack.invalid:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: SESSIONID=originaltoken; second=originaltoken\r
-\r
+<protocol crlf="yes">
+GET /a/b/%TESTNUMBER HTTP/1.1
+Host: attack.invalid:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /a/b/%TESTNUMBER0002 HTTP/1.1
+Host: attack.invalid:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /a/b/%TESTNUMBER0003 HTTP/1.1
+Host: attack.invalid:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Cookie: SESSIONID=originaltoken; second=originaltoken
+
 </protocol>
 </verify>
 </testcase>
index f0cecd267f5f2f4d4ce3de2796f726e51c2abc54..0692dc54c9da3fc9de0ad3df3b520d890b61fd52 100644 (file)
@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 # built-in curl returns weird_server_reply
index b6b10b3df2c00dddc211d5680a89bd2047b22d73..50397a20523654c453fa7604f99fa1704583127c 100644 (file)
@@ -38,14 +38,14 @@ FTP growing file support
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 5ac1755542db46829eead03add3ab556fcb45061..c8f5997b6739c541c71f6c2cb10375ecefe84dcc 100644 (file)
@@ -38,12 +38,12 @@ https
 </command>
 </client>
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPSPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stripfile>
 s/^(.*):(.*)[\r\n]*//
index 85a4c88c65a2ad004ae209694fc70cd8ebe446f0..36263e2987d645ce90108face5d4ceee6cd86a7a 100644 (file)
@@ -56,17 +56,17 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/are/all/twits/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /we/are/all/m%20o%20o.html/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /we/are/all/m%20o%20o.html/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 1c36f1c60c678b1993b6ebe3aae48840371829ba..57e22eba0fe224b51bc214c7d47e3f96e6fde3cc 100644 (file)
@@ -63,19 +63,19 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://%HOSTIP:%HTTPPORT/want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://%HOSTIP:%HTTPPORT/want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 377c2d48b9d2dad072f80976a642d1cd7b2039d0..fb68dcf3f79fd61a13a9b2c866c9dd950387e985 100644 (file)
@@ -70,31 +70,31 @@ Three -K uses with --next and --data in each
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-a: a\r
-Content-Length: 1\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-aPOST /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-b: b\r
-Content-Length: 1\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-bPOST /%TESTNUMBER0003 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-c: c\r
-Content-Length: 1\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+a: a
+Content-Length: 1
+Content-Type: application/x-www-form-urlencoded
+
+aPOST /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+b: b
+Content-Length: 1
+Content-Type: application/x-www-form-urlencoded
+
+bPOST /%TESTNUMBER0003 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+c: c
+Content-Length: 1
+Content-Type: application/x-www-form-urlencoded
+
 c
 </protocol>
 </verify>
index 9622d64e1d265580451ad9dbb6f45fe81e9ae91a..54bf7ae6ecbda1bd09e026a209c248222f3157b7 100644 (file)
@@ -64,31 +64,31 @@ Two -K uses with --next and then one on cmdline
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-a: a\r
-Content-Length: 1\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-aPOST /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-b: b\r
-Content-Length: 1\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-bPOST /%TESTNUMBER0003 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-c: c\r
-Content-Length: 1\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+a: a
+Content-Length: 1
+Content-Type: application/x-www-form-urlencoded
+
+aPOST /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+b: b
+Content-Length: 1
+Content-Type: application/x-www-form-urlencoded
+
+bPOST /%TESTNUMBER0003 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+c: c
+Content-Length: 1
+Content-Type: application/x-www-form-urlencoded
+
 c
 </protocol>
 </verify>
index 02a46111d324dff5092dd5b0312f99b501e45d62..5b0066f7d384fb4d9f6e8b6d0ae0d26364aa8009 100644 (file)
@@ -69,31 +69,31 @@ Use -K with --next and --config from within
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-a: a\r
-Content-Length: 1\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-aPOST /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-b: b\r
-Content-Length: 1\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-bPOST /%TESTNUMBER0003 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-c: c\r
-Content-Length: 1\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+a: a
+Content-Length: 1
+Content-Type: application/x-www-form-urlencoded
+
+aPOST /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+b: b
+Content-Length: 1
+Content-Type: application/x-www-form-urlencoded
+
+bPOST /%TESTNUMBER0003 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+c: c
+Content-Length: 1
+Content-Type: application/x-www-form-urlencoded
+
 c
 </protocol>
 </verify>
index d063c431614022cbe55573d81b6dacbf84cbb570..4d91fdce6b2f476de8dff8cc0bb5c6e3176e565e 100644 (file)
@@ -44,15 +44,15 @@ Verify XDG_CONFIG_HOME use to find curlrc
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-a: a\r
-Content-Length: 11\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+a: a
+Content-Length: 11
+Content-Type: application/x-www-form-urlencoded
+
 curlrc read
 </protocol>
 </verify>
index 63d8ce7c6e2883b049321998bf71bd01d4cf863a..274380dfa6834a9f7b25b6fbe56d4c139b5e57f2 100644 (file)
@@ -35,12 +35,12 @@ http
 
 #
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 4d13ebb81ea4650d91c5eac42516dc83465123ef..d5cdfbbbd7d5521a5e541dc4c828fe9b990d3a49 100644 (file)
@@ -33,17 +33,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w 'lo
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 # replace the number with a fixed string since the port number is not
index dfd39f2b3946773fe40a6e3dbea889e6f88666ad..4371c84d48ad44156be52ea91a543a9f841e2a39 100644 (file)
@@ -44,15 +44,15 @@ Find .curlrc in .config/curlrc via CURL_HOME
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-a: a\r
-Content-Length: 11\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+a: a
+Content-Length: 11
+Content-Type: application/x-www-form-urlencoded
+
 curlrc read
 </protocol>
 </verify>
index 1322fb05946b1660a3d120700e92ec26f00d5a51..7611be8257ef80dbf7dd549c6a67594de94a609c 100644 (file)
@@ -48,12 +48,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc "%LOGDIR/altsvc-%TESTNUMBER"
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stripfile>
 # strip out the (dynamic) expire date from the file so that the rest
index 7da9a8bd3cc876c35aa1f114189f7bdb24874ecb..238e3b3f4db9b20416d371be9e26af882ff20cc3 100644 (file)
@@ -52,12 +52,12 @@ test-duphandle
 
 <verify>
 # we let it CONNECT to the server to confirm HSTS but deny from there
-<protocol>
-CONNECT this.hsts.example.:443 HTTP/1.1\r
-Host: this.hsts.example.:443\r
-User-Agent: curl/%VERSION\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+CONNECT this.hsts.example.:443 HTTP/1.1
+Host: this.hsts.example.:443
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
 </protocol>
 <stdout>
 HTTP/1.1 403 not OK at all\r
index 02aca4d0e0f6690f2040f474bde1171989a4a756..2cdd9f318c0bd2e841f4abae8aea1b593f37c4f7 100644 (file)
@@ -51,12 +51,12 @@ test-duphandle
 
 <verify>
 # we let it CONNECT to the server to confirm HSTS but deny from there
-<protocol>
-CONNECT this.hsts.example:443 HTTP/1.1\r
-Host: this.hsts.example:443\r
-User-Agent: curl/%VERSION\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+CONNECT this.hsts.example:443 HTTP/1.1
+Host: this.hsts.example:443
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
 </protocol>
 <stdout>
 HTTP/1.1 403 not OK at all\r
index fb881d3b67f902e75f7d2220bb566b0785d8de89..1f29ad3bc62a1c994d3cb89962ede35c95acac33 100644 (file)
@@ -201,13 +201,13 @@ cookies
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /a/b/%TESTNUMBER HTTP/1.1\r
-Host: attack.invalid:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: name150=could-be-large-150; name149=could-be-large-149; name148=could-be-large-148; name147=could-be-large-147; name146=could-be-large-146; name145=could-be-large-145; name144=could-be-large-144; name143=could-be-large-143; name142=could-be-large-142; name141=could-be-large-141; name140=could-be-large-140; name139=could-be-large-139; name138=could-be-large-138; name137=could-be-large-137; name136=could-be-large-136; name135=could-be-large-135; name134=could-be-large-134; name133=could-be-large-133; name132=could-be-large-132; name131=could-be-large-131; name130=could-be-large-130; name129=could-be-large-129; name128=could-be-large-128; name127=could-be-large-127; name126=could-be-large-126; name125=could-be-large-125; name124=could-be-large-124; name123=could-be-large-123; name122=could-be-large-122; name121=could-be-large-121; name120=could-be-large-120; name119=could-be-large-119; name118=could-be-large-118; name117=could-be-large-117; name116=could-be-large-116; name115=could-be-large-115; name114=could-be-large-114; name113=could-be-large-113; name112=could-be-large-112; name111=could-be-large-111; name110=could-be-large-110; name109=could-be-large-109; name108=could-be-large-108; name107=could-be-large-107; name106=could-be-large-106; name105=could-be-large-105; name104=could-be-large-104; name103=could-be-large-103; name102=could-be-large-102; name101=could-be-large-101; name100=could-be-large-100; name99=could-be-large-99; name98=could-be-large-98; name97=could-be-large-97; name96=could-be-large-96; name95=could-be-large-95; name94=could-be-large-94; name93=could-be-large-93; name92=could-be-large-92; name91=could-be-large-91; name90=could-be-large-90; name89=could-be-large-89; name88=could-be-large-88; name87=could-be-large-87; name86=could-be-large-86; name85=could-be-large-85; name84=could-be-large-84; name83=could-be-large-83; name82=could-be-large-82; name81=could-be-large-81; name80=could-be-large-80; name79=could-be-large-79; name78=could-be-large-78; name77=could-be-large-77; name76=could-be-large-76; name75=could-be-large-75; name74=could-be-large-74; name73=could-be-large-73; name72=could-be-large-72; name71=could-be-large-71; name70=could-be-large-70; name69=could-be-large-69; name68=could-be-large-68; name67=could-be-large-67; name66=could-be-large-66; name65=could-be-large-65; name64=could-be-large-64; name63=could-be-large-63; name62=could-be-large-62; name61=could-be-large-61; name60=could-be-large-60; name59=could-be-large-59; name58=could-be-large-58; name57=could-be-large-57; name56=could-be-large-56; name55=could-be-large-55; name54=could-be-large-54; name53=could-be-large-53; name52=could-be-large-52; name51=could-be-large-51; name50=could-be-large-50; name49=could-be-large-49; name48=could-be-large-48; name47=could-be-large-47; name46=could-be-large-46; name45=could-be-large-45; name44=could-be-large-44; name43=could-be-large-43; name42=could-be-large-42; name41=could-be-large-41; name40=could-be-large-40; name39=could-be-large-39; name38=could-be-large-38; name37=could-be-large-37; name36=could-be-large-36; name35=could-be-large-35; name34=could-be-large-34; name33=could-be-large-33; name32=could-be-large-32; name31=could-be-large-31; name30=could-be-large-30; name29=could-be-large-29; name28=could-be-large-28; name27=could-be-large-27; name26=could-be-large-26; name25=could-be-large-25; name24=could-be-large-24; name23=could-be-large-23; name22=could-be-large-22; name21=could-be-large-21; name20=could-be-large-20; name19=could-be-large-19; name18=could-be-large-18; name17=could-be-large-17; name16=could-be-large-16; name15=could-be-large-15; name14=could-be-large-14; name13=could-be-large-13; name12=could-be-large-12; name11=could-be-large-11; name10=could-be-large-10; name9=could-be-large-9; name8=could-be-large-8; name7=could-be-large-7; name6=could-be-large-6; name5=could-be-large-5; name4=could-be-large-4; name3=could-be-large-3; name2=could-be-large-2; name1=could-be-large-1\r
-\r
+<protocol crlf="yes">
+GET /a/b/%TESTNUMBER HTTP/1.1
+Host: attack.invalid:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Cookie: name150=could-be-large-150; name149=could-be-large-149; name148=could-be-large-148; name147=could-be-large-147; name146=could-be-large-146; name145=could-be-large-145; name144=could-be-large-144; name143=could-be-large-143; name142=could-be-large-142; name141=could-be-large-141; name140=could-be-large-140; name139=could-be-large-139; name138=could-be-large-138; name137=could-be-large-137; name136=could-be-large-136; name135=could-be-large-135; name134=could-be-large-134; name133=could-be-large-133; name132=could-be-large-132; name131=could-be-large-131; name130=could-be-large-130; name129=could-be-large-129; name128=could-be-large-128; name127=could-be-large-127; name126=could-be-large-126; name125=could-be-large-125; name124=could-be-large-124; name123=could-be-large-123; name122=could-be-large-122; name121=could-be-large-121; name120=could-be-large-120; name119=could-be-large-119; name118=could-be-large-118; name117=could-be-large-117; name116=could-be-large-116; name115=could-be-large-115; name114=could-be-large-114; name113=could-be-large-113; name112=could-be-large-112; name111=could-be-large-111; name110=could-be-large-110; name109=could-be-large-109; name108=could-be-large-108; name107=could-be-large-107; name106=could-be-large-106; name105=could-be-large-105; name104=could-be-large-104; name103=could-be-large-103; name102=could-be-large-102; name101=could-be-large-101; name100=could-be-large-100; name99=could-be-large-99; name98=could-be-large-98; name97=could-be-large-97; name96=could-be-large-96; name95=could-be-large-95; name94=could-be-large-94; name93=could-be-large-93; name92=could-be-large-92; name91=could-be-large-91; name90=could-be-large-90; name89=could-be-large-89; name88=could-be-large-88; name87=could-be-large-87; name86=could-be-large-86; name85=could-be-large-85; name84=could-be-large-84; name83=could-be-large-83; name82=could-be-large-82; name81=could-be-large-81; name80=could-be-large-80; name79=could-be-large-79; name78=could-be-large-78; name77=could-be-large-77; name76=could-be-large-76; name75=could-be-large-75; name74=could-be-large-74; name73=could-be-large-73; name72=could-be-large-72; name71=could-be-large-71; name70=could-be-large-70; name69=could-be-large-69; name68=could-be-large-68; name67=could-be-large-67; name66=could-be-large-66; name65=could-be-large-65; name64=could-be-large-64; name63=could-be-large-63; name62=could-be-large-62; name61=could-be-large-61; name60=could-be-large-60; name59=could-be-large-59; name58=could-be-large-58; name57=could-be-large-57; name56=could-be-large-56; name55=could-be-large-55; name54=could-be-large-54; name53=could-be-large-53; name52=could-be-large-52; name51=could-be-large-51; name50=could-be-large-50; name49=could-be-large-49; name48=could-be-large-48; name47=could-be-large-47; name46=could-be-large-46; name45=could-be-large-45; name44=could-be-large-44; name43=could-be-large-43; name42=could-be-large-42; name41=could-be-large-41; name40=could-be-large-40; name39=could-be-large-39; name38=could-be-large-38; name37=could-be-large-37; name36=could-be-large-36; name35=could-be-large-35; name34=could-be-large-34; name33=could-be-large-33; name32=could-be-large-32; name31=could-be-large-31; name30=could-be-large-30; name29=could-be-large-29; name28=could-be-large-28; name27=could-be-large-27; name26=could-be-large-26; name25=could-be-large-25; name24=could-be-large-24; name23=could-be-large-23; name22=could-be-large-22; name21=could-be-large-21; name20=could-be-large-20; name19=could-be-large-19; name18=could-be-large-18; name17=could-be-large-17; name16=could-be-large-16; name15=could-be-large-15; name14=could-be-large-14; name13=could-be-large-13; name12=could-be-large-12; name11=could-be-large-11; name10=could-be-large-10; name9=could-be-large-9; name8=could-be-large-8; name7=could-be-large-7; name6=could-be-large-6; name5=could-be-large-5; name4=could-be-large-4; name3=could-be-large-3; name2=could-be-large-2; name1=could-be-large-1
+
 </protocol>
 <limits>
 Allocations: 1100
index cbc8685ac2b0162828de4b9f86eb6a1be0975c01..ae9218325aa99cefbe3db6a5b23cc9aa63b4892f 100644 (file)
@@ -70,13 +70,13 @@ cookies
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /a/b/%TESTNUMBER HTTP/1.1\r
-Host: attack.invalid:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: huge-20=%repeat[500 x a]%-20; huge-19=%repeat[500 x a]%-19; huge-18=%repeat[500 x a]%-18; huge-17=%repeat[500 x a]%-17; huge-16=%repeat[500 x a]%-16; huge-15=%repeat[500 x a]%-15; huge-14=%repeat[500 x a]%-14; huge-13=%repeat[500 x a]%-13; huge-12=%repeat[500 x a]%-12; huge-11=%repeat[500 x a]%-11; huge-10=%repeat[500 x a]%-10; huge-9=%repeat[500 x a]%-9; huge-8=%repeat[500 x a]%-8; huge-7=%repeat[500 x a]%-7; huge-6=%repeat[500 x a]%-6\r
-\r
+<protocol crlf="yes">
+GET /a/b/%TESTNUMBER HTTP/1.1
+Host: attack.invalid:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Cookie: huge-20=%repeat[500 x a]%-20; huge-19=%repeat[500 x a]%-19; huge-18=%repeat[500 x a]%-18; huge-17=%repeat[500 x a]%-17; huge-16=%repeat[500 x a]%-16; huge-15=%repeat[500 x a]%-15; huge-14=%repeat[500 x a]%-14; huge-13=%repeat[500 x a]%-13; huge-12=%repeat[500 x a]%-12; huge-11=%repeat[500 x a]%-11; huge-10=%repeat[500 x a]%-10; huge-9=%repeat[500 x a]%-9; huge-8=%repeat[500 x a]%-8; huge-7=%repeat[500 x a]%-7; huge-6=%repeat[500 x a]%-6
+
 </protocol>
 </verify>
 </testcase>
index 8df990280a6c079f4497a07a37afa9b914ede784..a9759c73b043738cfb946c782fa67f459310c05e 100644 (file)
@@ -126,12 +126,12 @@ cookies
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /a/b/%TESTNUMBER HTTP/1.1\r
-Host: attack.invalid:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /a/b/%TESTNUMBER HTTP/1.1
+Host: attack.invalid:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/cookie%TESTNUMBER" mode="text">
 # Netscape HTTP Cookie File
index e7c3b65926c96a940b260060a62944267868e3ea..254c3afe97165ccdd5baa2325300b650d94e3907 100644 (file)
@@ -59,17 +59,17 @@ simple HTTP Location: without protocol in initial URL
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /want/data.cgi?moo=http://&/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /want/data.cgi?moo=http://&/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index aa391d7fd00908aac3e433f0ae878e277073220c..79175fcd4c6b58157b9b672f471b55fcff28cecc 100644 (file)
@@ -53,12 +53,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 143
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 # curl: (63) Exceeded the maximum allowed file size (143)
 <errorcode>
index cb4bc518dcc77ff9976ce398415b219be87cf0fd..30d88b973d905d8264be09ff62776f4da3cdffe4 100644 (file)
@@ -74,13 +74,13 @@ cookies
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: domain..tld:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: empty=; mooo2=indeed2; mooo=indeed\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: domain..tld:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Cookie: empty=; mooo2=indeed2; mooo=indeed
+
 </protocol>
 <file name="%LOGDIR/jar%TESTNUMBER" mode="text">
 # Netscape HTTP Cookie File
index 42086999b4deeba7fba948364ba9d86ad82b2cef..addde5c391464863ab1a62f76e624948e74295b6 100644 (file)
@@ -35,12 +35,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -0
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.0\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.0
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 
index 4a08fed278d7f8d8799d02c821a1491873f1c692..02e273ca3b232d4a4aef1e6ffd5726dbfefa8768 100644 (file)
@@ -54,17 +54,17 @@ Reject HTTP/1.1 to HTTP/2 switch on the same connection
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 # curl: (1) Version mismatch (from HTTP/1 to HTTP/2)
 <errorcode>
index 874813c4e6917268d47aa92061e61d62876ac941..8a1a10a6cdfad82e4536d2aa25c2e6330480d1a0 100644 (file)
@@ -47,12 +47,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save %LOGDIR/etag%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/etag%TESTNUMBER">
 W/"asdf"
index 32ad8071f540f0846fccd7919a32e9cac1bb4f99..852dbcb44812c5f6572604cdc418248cbd834baa 100644 (file)
@@ -33,14 +33,14 @@ FTP PASV upload ASCII file
 <upload crlf="yes" nonewline="yes">
 %repeat[1750 x a line of text used for verifying this !%0a]%
 </upload>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE A\r
-STOR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE A
+STOR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 792488fd174c80c83253a790d5bc0bb341f83ff2..b53104b11626df9389fd5abc23a55ff43d13cb18 100644 (file)
@@ -29,14 +29,14 @@ FTP PASV upload ASCII file already using CRLF
 <upload crlf="yes" nonewline="yes">
 %repeat[1750 x a line of text used for verifying this !%0a]%
 </upload>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE A\r
-STOR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE A
+STOR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 12843918efcea1110366d4bacd46157fb7f4abd9..ab0eac0c81f0c83f7f6b74feea983c7a61a6b2f2 100644 (file)
@@ -51,17 +51,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 5 -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 6558363f508c085f14ce4b33b4fcd2f268c63ff2..510eb1969699fb5a1160e4ff8d1dac023dbac34f 100644 (file)
@@ -60,14 +60,14 @@ login debbie
 </client>
 
 <verify>
-<protocol>
-GET http://github.com/ HTTP/1.1\r
-Host: github.com\r
-Authorization: Basic %b64[debbie:second%0D]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://github.com/ HTTP/1.1
+Host: github.com
+Authorization: Basic %b64[debbie:second%0D]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index d7ce4652fae272dd73c5ee851d86d7c32f6ac7df..0dfa730ad46378d54f87fc106658e0e6762729d7 100644 (file)
@@ -87,21 +87,21 @@ default
 </client>
 
 <verify>
-<protocol>
-GET http://a.com/ HTTP/1.1\r
-Host: a.com\r
-Authorization: Basic %b64[alice:alicespassword]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://b.com/%TESTNUMBER0002 HTTP/1.1\r
-Host: b.com\r
-Authorization: Basic %b64[bob:]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://a.com/ HTTP/1.1
+Host: a.com
+Authorization: Basic %b64[alice:alicespassword]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://b.com/%TESTNUMBER0002 HTTP/1.1
+Host: b.com
+Authorization: Basic %b64[bob:]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 5d86f467d0d174d7b5a50744ed6dbd5cfe7eac68..57fd10977805c5d5a0a705da503a7e57ae0bb138 100644 (file)
@@ -12,10 +12,10 @@ cookies
 <reply>
 <data crlf="yes">
 HTTP/1.1 200 OK
-Set-Cookie: name=value; expires=Fri Feb 13 11:56:27 GMT 2132\r
-Set-Cookie: name2=value; expires=Fri Feb 13 11:56:27 ; 2132\r
-Set-Cookie: name3=value; expires=Fri Feb 13 11:56:27 ...................................................GMT 2132\r
-Set-Cookie: name4=value; expires=Fri Feb 13 11:56:27 ....................................................GMT 2132\r
+Set-Cookie: name=value; expires=Fri Feb 13 11:56:27 GMT 2132
+Set-Cookie: name2=value; expires=Fri Feb 13 11:56:27 ; 2132
+Set-Cookie: name3=value; expires=Fri Feb 13 11:56:27 ...................................................GMT 2132
+Set-Cookie: name4=value; expires=Fri Feb 13 11:56:27 ....................................................GMT 2132
 Accept-Ranges: bytes
 Content-Length: 6
 Connection: close
index 53efae597a1bcf3445832c1d80b5a634e7d7a5a9..0bcd045eb48a033dc8b2d8a7ba63ca65598c08c5 100644 (file)
@@ -86,20 +86,20 @@ default
 </client>
 
 <verify>
-<protocol>
-GET http://a.com/ HTTP/1.1\r
-Host: a.com\r
-Authorization: Basic %b64[alice:alicespassword]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://b.com/%TESTNUMBER0002 HTTP/1.1\r
-Host: b.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://a.com/ HTTP/1.1
+Host: a.com
+Authorization: Basic %b64[alice:alicespassword]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://b.com/%TESTNUMBER0002 HTTP/1.1
+Host: b.com
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 996cf018bde1f0080faa96e49e110e1dd712b6ce..ff2f41b3c1bdf25c382942d93514e7b0ddb77011 100644 (file)
@@ -56,17 +56,17 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/are/all/twits/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /we/are/all/moo.html/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /we/are/all/moo.html/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index d157f0355fa9c508e96f408b9a8648421b96a844..67083721d6b282ea84f4ece05bfd78d507873377 100644 (file)
@@ -50,12 +50,12 @@ test-duphandle
 
 <verify>
 # we let it CONNECT to the server to confirm HSTS but deny from there
-<protocol>
-CONNECT this.hsts.example:443 HTTP/1.1\r
-Host: this.hsts.example:443\r
-User-Agent: curl/%VERSION\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+CONNECT this.hsts.example:443 HTTP/1.1
+Host: this.hsts.example:443
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
 </protocol>
 <stdout>
 HTTP/1.1 403 not OK at all\r
index 648318729d113c3f03a27a8a7d932595d5a3b2c5..ed4717a4d5efd4f76a64d9e7464eccde1731d78a 100644 (file)
@@ -46,15 +46,15 @@ machine %HOSTIP login user1 password passwd1
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER user1\r
-PASS passwd1\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER user1
+PASS passwd1
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index d7313bac3c8ab7c54dcba42aa865999b347c49a0..60b24b97ee256e8b5ee7d3db35a84415078e246c 100644 (file)
@@ -44,13 +44,13 @@ http://foo%40bar:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --netrc-optional
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[foo@bar:secret]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[foo@bar:secret]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 8d4078fb77c7307f45548a0dfd6bfbf3e278c3de..25d887b496d682ecd4b9d29860c45dae0bea9697 100644 (file)
@@ -39,13 +39,13 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index ce4fd16601941c6ef0aea922a8874d05c29a7537..6b8f86a6c76fe472374c2189756374debfbce5a4 100644 (file)
@@ -56,17 +56,17 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/are/all/twits/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /we/are/moo.html/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /we/are/moo.html/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 7904110c7e0a7264c9539b96f1945c00b729e894..d09cc4fdbd05f831c4f2ae58e5b4160746f9ac86 100644 (file)
@@ -48,11 +48,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
 <file name="%LOGDIR/ip%TESTNUMBER">
 IP %HOSTIP
 </file>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 <limits>
 Allocations: 82
index 53a9d47927c0e5b3aa18995532a8f4941a01e813..d7ecebce187cdebc33c6dd0e29ec4b40407f518b 100644 (file)
@@ -52,16 +52,16 @@ upload
 
 works?
 </upload>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-STOR %TESTNUMBER\r
-RNFR %TESTNUMBER\r
-RNTO %TESTNUMBER-forreal\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+STOR %TESTNUMBER
+RNFR %TESTNUMBER
+RNTO %TESTNUMBER-forreal
+QUIT
 </protocol>
 </verify>
 </testcase>
index 277da000fbaf4814b0cc297c1e47abec2c25537e..d66df67444425b48680c6dfcc3994915c87ce8ac 100644 (file)
@@ -56,17 +56,17 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/are/all/twits/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index ed16920dd7564e1b93d1e8f9d0bc5fb6fc317879..7864293100ede05a751cbca894b23dc727f182e5 100644 (file)
@@ -42,24 +42,24 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Transfer-Encoding: chunked\r
-Content-Type: application/x-www-form-urlencoded\r
-Expect: 100-continue\r
-\r
-3\r
-one\r
-3\r
-two\r
-5\r
-three\r
-1d\r
-and a final longer crap: four\r
-0\r
-\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Transfer-Encoding: chunked
+Content-Type: application/x-www-form-urlencoded
+Expect: 100-continue
+
+3
+one
+3
+two
+5
+three
+1d
+and a final longer crap: four
+0
+
 </protocol>
 </verify>
 </testcase>
index adcabe8bda6c6e0a725138761d7b3ad96df67dcb..a07c9e43f8f988f1b9a70223784f22607f251fa6 100644 (file)
@@ -39,14 +39,14 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 <errorcode>
 78
 </errorcode>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-MDTM %TESTNUMBER\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+MDTM %TESTNUMBER
+TYPE I
+SIZE %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 8935a12c77ec588955d3b90c8ade56878f299f80..79e198af18c1294ab9120d00ed2869bbe55e2449 100644 (file)
@@ -40,11 +40,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index fcf1a07ca35a36c112ac17ea541e8fe38a088a22..2f3a01eb5d783e7748a114b68dd2593e9d7ef4e2 100644 (file)
@@ -44,11 +44,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-HEAD /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+HEAD /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 9bf6131edd4e5f03b807841cbf3ff9da5770d0ef..1009900cc95bb676a6e11ed82ee5f310aa2ebb23 100644 (file)
@@ -39,13 +39,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Length: 0\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 0
+Content-Type: application/x-www-form-urlencoded
+
 </protocol>
 </verify>
 </testcase>
index e8b522c32dc939159b8a1b92ff5a370647a8bc2b..fcadb706bc7be2e68e2c01dbae4f87bb1f4578c4 100644 (file)
@@ -44,12 +44,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Length: 0\r
-\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 0
+
 </protocol>
 </verify>
 </testcase>
index 2fa7bfb5ca51e0e4e257401abdf6b4153d4f8905..0e730664cde45d6b2410bdd046946eb8f4fbcd2f 100644 (file)
@@ -54,11 +54,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 <valgrind>
 disable
index 53f2f19487fa37fe978f409449c88b6ddd96848e..2e38372b48d6129380a79dd0e56898eeb0cde0a3 100644 (file)
@@ -62,17 +62,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[monster:underbed]b64%\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[anothermonster:inwardrobe]b64%\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[monster:underbed]b64%
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[anothermonster:inwardrobe]b64%
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index e636ed959c9b6f8c59d179356faa57ff73ac481d..b86796636272c220ba9b8b8ebf2caf00523572e6 100644 (file)
@@ -56,17 +56,17 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/are/all/twits/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /we/are/all/twits/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /we/are/all/twits/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 6a27bb3f8e4984c44c63d7df3041be685ace0774..6709cef01f7f4f664a6ac4e22f211ad214a2052b 100644 (file)
@@ -38,16 +38,16 @@ ftp://%HOSTIP:%FTPPORT/520
 # Verify data after the test has been "shot"
 <verify>
 
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-MDTM 520\r
-EPSV\r
-TYPE I\r
-SIZE 520\r
-RETR 520\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+MDTM 520
+EPSV
+TYPE I
+SIZE 520
+RETR 520
+QUIT
 </protocol>
 </verify>
 </testcase>
index 90473b33a0b78c781370f82a32de3d1d178b6a9c..c35c08967e0bf37a15b1c064300da22a77403679 100644 (file)
@@ -44,15 +44,15 @@ ftp://%HOSTIP/%TESTNUMBER/ %FTPPORT
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER xxx\r
-PASS yyy\r
-PWD\r
-CWD %TESTNUMBER\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER xxx
+PASS yyy
+PWD
+CWD %TESTNUMBER
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index cc849f47a66d7b7f93b3e6ef244642cf07f8ae15..1c4b179686959e5d5c2b06fa32ddfeab3d43b683 100644 (file)
@@ -43,12 +43,12 @@ http://%HOSTIP/%TESTNUMBER %HTTPPORT
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[xxx:yyy]b64%\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[xxx:yyy]b64%
+Accept: */*
+
 </protocol>
 <stdout>
 hello
index f414bf81d924f864b44648a2743711314d281bb3..fc4b5272e1969493bf559dc33dbbe03cc46b9e10 100644 (file)
@@ -49,13 +49,13 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://www.example.com:19999/%TESTNUMBER HTTP/1.1\r
-Host: www.example.com:19999\r
-Authorization: Basic %b64[xxx:yyy]b64%\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://www.example.com:19999/%TESTNUMBER HTTP/1.1
+Host: www.example.com:19999
+Authorization: Basic %b64[xxx:yyy]b64%
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 <stdout>
 hello
index 3b383003fb53bb255d5fe158fcadcd0884bcbc49..ca365c4722420c67a0e768239f09e86533054baf 100644 (file)
@@ -32,10 +32,10 @@ ftp://%HOSTIP:%FTPPORT/path/to/
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
 </protocol>
 
 # 3 is CURLE_URL_MALFORMAT
index 2b96a7fd96731c3d63de186fde0b79fc1eb42ecc..f22f437e615596d7047b72099a1ddf5237eaff75 100644 (file)
@@ -41,15 +41,15 @@ Moooooooooooo
 ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
 ^EPRT \|1\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|\d{1,5}\|
 </strip>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-PORT 127,0,0,1,5,109\r
-TYPE I\r
-STOR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+PORT 127,0,0,1,5,109
+TYPE I
+STOR %TESTNUMBER
+QUIT
 </protocol>
 <upload>
 Moooooooooooo
index 85b24d5db924330aa6dee157752e5a62d0722954..e8b7c45a541e171b0ca37f90285dbcacac0413a3 100644 (file)
@@ -39,25 +39,25 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-EPSV\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-EPSV\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-EPSV\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+EPSV
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+EPSV
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+EPSV
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 3cfe7998cc16cbb78f4b4f24e927d2a6af3f044d..de764a5449e8df7e21310d905947236262132ec3 100644 (file)
@@ -39,25 +39,25 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-EPSV\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-EPSV\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-EPSV\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+EPSV
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+EPSV
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+EPSV
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 7cb9e8b1149f27417636b7ffbf0f04adbc9470a2..0889b69980a9caf36c71749247769717454e4b23 100644 (file)
@@ -43,23 +43,23 @@ http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /path/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /path/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /path/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /path/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /path/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /path/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /path/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /path/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 1c21c15efe0d4e4a749e642506fd8918828d2225..1626af9ba04327b7e847d49a11f3e7432431d256 100644 (file)
@@ -41,15 +41,15 @@ Moooooooooooo
 ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
 ^EPRT \|1\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|\d{1,5}\|
 </strip>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-PORT 127,0,0,1,5,109\r
-TYPE I\r
-STOR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+PORT 127,0,0,1,5,109
+TYPE I
+STOR %TESTNUMBER
+QUIT
 </protocol>
 <upload>
 Moooooooooooo
index 0bbc5d63734e8e6f6e5c252d97df788d1cfecec1..5a018ab492571eaf9f60d28bbe8763d60e21801f 100644 (file)
@@ -43,13 +43,13 @@ cookies
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: mooo=indeed\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Cookie: mooo=indeed
+
 </protocol>
 </verify>
 </testcase>
index 42e27a0d838e3e617de85bf14f1c6f294d4d5c40..32ffbcab5a5f477de124a3f9eecbdb14f44598d5 100644 (file)
@@ -43,7 +43,5 @@ http://%HOSTIP:%HTTPPORT/file%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-</protocol>
 </verify>
 </testcase>
index 59501d5ead4e716bd80b1e34810a316f6139ab37..e018d7d60cd9a20d2d8cc1bfaed44a0d9e1b67a0 100644 (file)
@@ -44,15 +44,15 @@ don't upload this
 ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
 ^EPRT \|1\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|\d{1,5}\|
 </strip>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-PORT 127,0,0,1,5,109\r
-TYPE I\r
-STOR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+PORT 127,0,0,1,5,109
+TYPE I
+STOR %TESTNUMBER
+QUIT
 </protocol>
 
 </verify>
index ac97e89b9cab4deb89043c5cb033fb9039acd55e..b65d6ead62155f1d112c4fd7a1fa6fe356d0cfe4 100644 (file)
@@ -39,25 +39,25 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-EPSV\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-EPSV\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-EPSV\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+EPSV
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+EPSV
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+EPSV
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 1dbceb6dd3b535f6f46b5f9f25fc48a3172b62dc..86554ba72635d9a7a6951fb3e55f111134fe66e7 100644 (file)
@@ -37,19 +37,19 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-EPSV\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+EPSV
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 0e0f35abdd15e05a9388eec61396c0855267ad75..aa02dfbb3f0ef60ce17f221c620523bbc682bb5c 100644 (file)
@@ -38,16 +38,16 @@ ftp://non-existing-host.haxx.se/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TE
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index aa52197767e1d3e89fbe43efb79238451ccf10ec..50dfcffd499b97bf9590b4d50ecc714bb8ab840b 100644 (file)
@@ -55,15 +55,15 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index c227a72cb15a1c89019f00b7a72620d7b6e64651..0fa0ef7cd89b0af5365fae40513fb8973a650b48 100644 (file)
@@ -54,11 +54,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 <limits>
 Maximum allocated: 3200000
index e411db88f5cfdedb7c1df655f5a11138ea7e8644..8f7b04f8e438db31b5e73a0b444c19dd295a4f7c 100644 (file)
@@ -37,9 +37,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 <errorcode>
 41
 </errorcode>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
 </protocol>
 </verify>
 </testcase>
index 7985a52347e08309a4279ed579e1bc23d695325f..b98fb4b908cda6f11822ed0611efcbe3a09accc3 100644 (file)
@@ -43,21 +43,21 @@ ftp://%HOSTIP:%FTPPORT/path/to/the/file/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path/to/the/file\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-SYST\r
-CWD /\r
-EPSV\r
-SIZE path/to/the/file/%TESTNUMBER0001\r
-RETR path/to/the/file/%TESTNUMBER0001\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path/to/the/file
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+SYST
+CWD /
+EPSV
+SIZE path/to/the/file/%TESTNUMBER0001
+RETR path/to/the/file/%TESTNUMBER0001
+QUIT
 </protocol>
 </verify>
 </testcase>
index 8a463118ccd6c242f370dd0227296975eb2906fb..478e52a32cb6348c3e3c902a7219cf0e3d9fa018 100644 (file)
@@ -32,12 +32,12 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 787faa3d98c56bcd2a1254beeef1fe58e69eb0bd..f10ce2dadd93bb69748e41938024f4aa5915f434 100644 (file)
@@ -43,16 +43,16 @@ works?
 <verify>
 <upload>
 </upload>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-STOR %TESTNUMBER\r
-EPSV\r
-STOR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+STOR %TESTNUMBER
+EPSV
+STOR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index b39b1b30d1a57bd5894e6e4cf6a2c32a855f3c20..0974f0292c97ad45ddc3e30274bc8d9172e5bde7 100644 (file)
@@ -44,14 +44,14 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 # There's no MTDM in the protocol here since this code doesn't ask for the
 # time/date of the file
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-REST 0\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+TYPE I
+SIZE %TESTNUMBER
+REST 0
+QUIT
 </protocol>
 </verify>
 </testcase>
index f8f01641a0aa61cbb947573dcb22735855c2bcf6..5fb7c0c096eee6b21c8251a67e624d0bdb5ace3e 100644 (file)
@@ -44,19 +44,19 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-EPSV\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+EPSV
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 <stdout>
 data
index 95b2def5cf9e656a1fcd97eac70ad6ec5fde0d1f..070bfcdfd3917874b5c50bd051ad0390a7c8e528 100644 (file)
@@ -49,12 +49,12 @@ ftp://www.example.com/moo/%TESTNUMBER http://%HOSTIP:%HTTPPORT
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET ftp://www.example.com/moo/%TESTNUMBER;type=i HTTP/1.1\r
-Host: www.example.com:21\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET ftp://www.example.com/moo/%TESTNUMBER;type=i HTTP/1.1
+Host: www.example.com:21
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 <stdout>
 hello
index ea014f4aaea4fa5c38a1a0ae475ef0dfb7c21dcb..dd8a9d4f6bd2d4006cd0e080138987cda9f3b46f 100644 (file)
@@ -48,17 +48,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L
 </client>
 
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index a4ee2b49b22f81ee3d2fa4348aa965065dddfc1d..e0d0b1b16f0ba77e00d5a73a33755ae41d8dd9b0 100644 (file)
@@ -49,12 +49,12 @@ ftp://www.example.com/moo/%TESTNUMBER http://%HOSTIP:%HTTPPORT ascii
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET ftp://www.example.com/moo/%TESTNUMBER;type=a HTTP/1.1\r
-Host: www.example.com:21\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET ftp://www.example.com/moo/%TESTNUMBER;type=a HTTP/1.1
+Host: www.example.com:21
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 <stdout>
 hello
index e531f012ea4b7e4d62d23253a619f78b428ec5e9..d8abd149884a2f50ed1a55741c8ae903f61914cd 100644 (file)
@@ -38,10 +38,10 @@ http://%HOSTIP:%HTTPPORT
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: ninja\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: ninja
+
 </protocol>
 </verify>
 </testcase>
index 32590f27c70541e0deaa6f8c277a4318f46342ff..5ced385bb0cf877d4754a6e8667390c22373e382 100644 (file)
@@ -44,18 +44,18 @@ header "Transfer-Encoding: chunked"
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-POST /that.site.com/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: %repeat[99999 x a]%\r
-Accept: */*\r
-Transfer-Encoding: chunked\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-c\r
-we post this\r
-0\r
-\r
+<protocol crlf="yes">
+POST /that.site.com/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: %repeat[99999 x a]%
+Accept: */*
+Transfer-Encoding: chunked
+Content-Type: application/x-www-form-urlencoded
+
+c
+we post this
+0
+
 </protocol>
 </verify>
 </testcase>
index 30641a16685803ba68cd50da640d244627c18521..cdcf674f8f45fa2951ba0ef809a992b1637e03de 100644 (file)
@@ -43,11 +43,11 @@ https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPSPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPSPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 09e381745c422248ac2c1dbb6bfb25cf9c5611ee..5bd07e49d1f67603a8f398d7d89e9c9238e9ce37 100644 (file)
@@ -50,12 +50,12 @@ FTP RETR with CURLOPT_PROXY_TRANSFER_MODE, ASCII transfer and type=i
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET ftp://www.example.com/moo/%TESTNUMBER;type=i HTTP/1.1\r
-Host: www.example.com:21\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET ftp://www.example.com/moo/%TESTNUMBER;type=i HTTP/1.1
+Host: www.example.com:21
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 <stdout>
 hello
index d1793891d077cab23cb6c9af9528ade973f9a63f..d7871f18ec2867cfa64481a322817f6af6514fc1 100644 (file)
@@ -39,14 +39,14 @@ FTP a type=A URL and CURLOPT_PORT set
 # There's no MTDM in the protocol here since this code doesn't ask for the
 # time/date of the file
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE A\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE A
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index b7c61db768b9325fefe0140d8e79fcafea366483..c109e9f80f79d02e0c64c9fd85a2e09fc68b82a9 100644 (file)
@@ -48,12 +48,12 @@ ftp_proxy=http://%HOSTIP:%HTTPPORT/
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET ftp://%HOSTIP:%FTPPORT/%TESTNUMBER;type=A HTTP/1.1\r
-Host: %HOSTIP:%FTPPORT\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET ftp://%HOSTIP:%FTPPORT/%TESTNUMBER;type=A HTTP/1.1
+Host: %HOSTIP:%FTPPORT
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 96a6f9b1a6b7bcae19244277f376a1e0da949a9e..6dad35318b31866eda286cb83e2c383b2a3a611a 100644 (file)
@@ -45,16 +45,16 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 <stdout>
 data
index b8e418ec7b9e8dc8e4e8e0d3e613edb207430102..736946c86ae80a6f5f110bdcc7193ab300dba4e0 100644 (file)
@@ -78,33 +78,33 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Transfer-Encoding: chunked\r
-Content-Type: application/x-www-form-urlencoded\r
-\r
-0\r
-\r
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="foo", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="877424f750af047634dbd94f9933217b"\r
-Accept: */*\r
-Transfer-Encoding: chunked\r
-Content-Type: application/x-www-form-urlencoded\r
-Expect: 100-continue\r
-\r
-3\r
-one\r
-3\r
-two\r
-5\r
-three\r
-1d\r
-and a final longer crap: four\r
-0\r
-\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Transfer-Encoding: chunked
+Content-Type: application/x-www-form-urlencoded
+
+0
+
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="foo", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="877424f750af047634dbd94f9933217b"
+Accept: */*
+Transfer-Encoding: chunked
+Content-Type: application/x-www-form-urlencoded
+Expect: 100-continue
+
+3
+one
+3
+two
+5
+three
+1d
+and a final longer crap: four
+0
+
 </protocol>
 </verify>
 </testcase>
index 1ff92f4e21b87a9583a9cf40875773481244b687..ccfedd826cc3e0ebe6efda51a05098db26d55eb3 100644 (file)
@@ -47,11 +47,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
 <file name="%LOGDIR/ip%TESTNUMBER">
 CL 0
 </file>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index f6cdec42a1f646f125d66c69008ffad03a80718e..940ac7d0013415d91bde153ee4896e2aea3bdcd0 100644 (file)
@@ -37,12 +37,12 @@ rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
 </client>
 
 <verify>
-<protocol>
-OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0\r
-CSeq: 1\r
-User-Agent: test%TESTNUMBER\r
-Test-Number: %TESTNUMBER\r
-\r
+<protocol crlf="yes">
+OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0
+CSeq: 1
+User-Agent: test%TESTNUMBER
+Test-Number: %TESTNUMBER
+
 </protocol>
 </verify>
 
index b70e9083cadebff4c506fb00dce4afbcdf60fb7d..103672bd0125ce2af96617ce5bd0b694490f825f 100644 (file)
@@ -74,31 +74,31 @@ rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER %LOGDIR/idfile%TESTNUMBER.txt
 <strip>
 ^If-Modified-Since:.*
 </strip>
-<protocol>
-SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0001 RTSP/1.0\r
-CSeq: 1\r
-Transport: Fake/NotReal/JustATest;foo=baz\r
-\r
-TEARDOWN rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0002 RTSP/1.0\r
-CSeq: 2\r
-Session: 00.+1-am-aSe55ion_id\$yes-i-am\$\r
-\r
-SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0003 RTSP/1.0\r
-CSeq: 3\r
-Transport: Fake/NotReal/JustATest;foo=baz\r
-\r
-TEARDOWN rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0004 RTSP/1.0\r
-CSeq: 4\r
-Session: \$extraspaces\r
-\r
-SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0005 RTSP/1.0\r
-CSeq: 5\r
-Transport: Fake/NotReal/JustATest;foo=baz\r
-\r
-TEARDOWN rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0006 RTSP/1.0\r
-CSeq: 6\r
-Session: A\r
-\r
+<protocol crlf="yes">
+SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0001 RTSP/1.0
+CSeq: 1
+Transport: Fake/NotReal/JustATest;foo=baz
+
+TEARDOWN rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0002 RTSP/1.0
+CSeq: 2
+Session: 00.+1-am-aSe55ion_id\$yes-i-am\$
+
+SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0003 RTSP/1.0
+CSeq: 3
+Transport: Fake/NotReal/JustATest;foo=baz
+
+TEARDOWN rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0004 RTSP/1.0
+CSeq: 4
+Session: \$extraspaces
+
+SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0005 RTSP/1.0
+CSeq: 5
+Transport: Fake/NotReal/JustATest;foo=baz
+
+TEARDOWN rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0006 RTSP/1.0
+CSeq: 6
+Session: A
+
 </protocol>
 <file name="%LOGDIR/idfile%TESTNUMBER.txt">
 Got Session ID: [00.+1-am-aSe55ion_id\$yes-i-am\$]
index f177f08eb46c3f3935632547e9e83ad12e8bd49b..d3360096b93db579a3fa3487a096e96f43ac17cb 100644 (file)
@@ -35,12 +35,12 @@ HTTP content-type with spaces in
 <stdout mode="text">
 text/html; charset=ISO-8859-4
 </stdout>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index c1a03485590b508edfc17217b0d27e5d0dfb36fa..318beee096210c9169c170f33ce29a18a7ebd942 100644 (file)
@@ -58,18 +58,18 @@ rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
 <strip>
 ^If-Modified-Since:.*
 </strip>
-<protocol>
-OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0001 RTSP/1.0\r
-CSeq: 1\r
-\r
-SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0002 RTSP/1.0\r
-CSeq: 999\r
-Transport: RAW/RAW/UDP;unicast;client_port=3056-3057\r
-\r
-PLAY rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0003 RTSP/1.0\r
-CSeq: 1000\r
-Session: asdf\r
-\r
+<protocol crlf="yes">
+OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0001 RTSP/1.0
+CSeq: 1
+
+SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0002 RTSP/1.0
+CSeq: 999
+Transport: RAW/RAW/UDP;unicast;client_port=3056-3057
+
+PLAY rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0003 RTSP/1.0
+CSeq: 1000
+Session: asdf
+
 </protocol>
 </verify>
 
index 67e806dcdf6691eb12406a8b63fb027b45341c4f..82669b36f78ebaf7a36bcd726812eaa3c698fc26 100644 (file)
@@ -45,11 +45,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 1b185e98a926fbb20d5b2a4783e0a7102cdf179a..861b3072e312615a5e41e9d5f2757890808c5fe7 100644 (file)
@@ -37,45 +37,45 @@ ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/*.txt
 0
 </errorcode>
 # THERE SHOULD NOT BE "SIZE"! and one "USER/PASS"
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD fully_simulated\r
-CWD UNIX\r
-EPSV\r
-TYPE A\r
-LIST\r
-EPSV\r
-TYPE I\r
-RETR chmod1\r
-EPSV\r
-RETR chmod2\r
-EPSV\r
-RETR chmod3\r
-EPSV\r
-RETR empty_file.dat\r
-EPSV\r
-RETR file.txt\r
-EPSV\r
-RETR someothertext.txt\r
-EPSV\r
-TYPE A\r
-LIST\r
-EPSV\r
-TYPE I\r
-RETR chmod1\r
-EPSV\r
-RETR chmod2\r
-EPSV\r
-RETR chmod3\r
-EPSV\r
-RETR empty_file.dat\r
-EPSV\r
-RETR file.txt\r
-EPSV\r
-RETR someothertext.txt\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD fully_simulated
+CWD UNIX
+EPSV
+TYPE A
+LIST
+EPSV
+TYPE I
+RETR chmod1
+EPSV
+RETR chmod2
+EPSV
+RETR chmod3
+EPSV
+RETR empty_file.dat
+EPSV
+RETR file.txt
+EPSV
+RETR someothertext.txt
+EPSV
+TYPE A
+LIST
+EPSV
+TYPE I
+RETR chmod1
+EPSV
+RETR chmod2
+EPSV
+RETR chmod3
+EPSV
+RETR empty_file.dat
+EPSV
+RETR file.txt
+EPSV
+RETR someothertext.txt
+QUIT
 </protocol>
 <stdout>
 This file should have permissions 444
index b1725a9b2a73ba7a4ffcd8024a5cd672bc253d85..c093c96c4f86571a2110208a0b70eb781750c695 100644 (file)
@@ -35,67 +35,67 @@ ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/*
 <errorcode>
 0
 </errorcode>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD fully_simulated\r
-CWD UNIX\r
-EPSV\r
-TYPE A\r
-LIST\r
-EPSV\r
-TYPE I\r
-RETR chmod1\r
-EPSV\r
-RETR chmod2\r
-EPSV\r
-RETR chmod3\r
-EPSV\r
-RETR empty_file.dat\r
-EPSV\r
-RETR file.txt\r
-EPSV\r
-RETR someothertext.txt\r
-EPSV\r
-TYPE A\r
-LIST\r
-EPSV\r
-TYPE I\r
-RETR chmod1\r
-EPSV\r
-RETR chmod2\r
-EPSV\r
-RETR chmod3\r
-EPSV\r
-RETR empty_file.dat\r
-EPSV\r
-RETR file.txt\r
-EPSV\r
-RETR someothertext.txt\r
-QUIT\r
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD fully_simulated\r
-CWD UNIX\r
-EPSV\r
-TYPE A\r
-LIST\r
-EPSV\r
-TYPE I\r
-RETR chmod1\r
-EPSV\r
-RETR chmod2\r
-EPSV\r
-RETR chmod3\r
-EPSV\r
-RETR empty_file.dat\r
-EPSV\r
-RETR file.txt\r
-EPSV\r
-RETR someothertext.txt\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD fully_simulated
+CWD UNIX
+EPSV
+TYPE A
+LIST
+EPSV
+TYPE I
+RETR chmod1
+EPSV
+RETR chmod2
+EPSV
+RETR chmod3
+EPSV
+RETR empty_file.dat
+EPSV
+RETR file.txt
+EPSV
+RETR someothertext.txt
+EPSV
+TYPE A
+LIST
+EPSV
+TYPE I
+RETR chmod1
+EPSV
+RETR chmod2
+EPSV
+RETR chmod3
+EPSV
+RETR empty_file.dat
+EPSV
+RETR file.txt
+EPSV
+RETR someothertext.txt
+QUIT
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD fully_simulated
+CWD UNIX
+EPSV
+TYPE A
+LIST
+EPSV
+TYPE I
+RETR chmod1
+EPSV
+RETR chmod2
+EPSV
+RETR chmod3
+EPSV
+RETR empty_file.dat
+EPSV
+RETR file.txt
+EPSV
+RETR someothertext.txt
+QUIT
 </protocol>
 <stdout>
 This file should have permissions 444
index c7f4bcfcd778ac4e42178e953ae6dc09a77d6ca5..ad6b73b33d6f8521ccbb6b4799124a6f330f2c25 100644 (file)
@@ -53,11 +53,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 <errorcode>
 8
index e784e72ea548e4eead062595e47bd1657ac2a124..81844771fbdb638112e09c616d29a6a7840b870e 100644 (file)
@@ -45,11 +45,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 81c9b840377138832d71bd7be3d40903a838470a..56c72c72469f3ed17e99d8d83399ba2a52f6729b 100644 (file)
@@ -62,23 +62,23 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 s/^--------------------------[A-Za-z0-9]*/--------------------------/
 s/boundary=------------------------[A-Za-z0-9]*/boundary=------------------------/
 </strippart>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Length: 156\r
-Content-Type: multipart/form-data; boundary=------------------------\r
-\r
---------------------------\r
-Content-Disposition: form-data; name="fake"\r
-\r
-party\r
-----------------------------\r
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Length: 0\r
-\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 156
+Content-Type: multipart/form-data; boundary=------------------------
+
+--------------------------
+Content-Disposition: form-data; name="fake"
+
+party
+----------------------------
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 0
+
 </protocol>
 </verify>
 </testcase>
index e5138cdb175585afa7bf63ffc3d0bd2b1efa5352..a9d4f61d161c4dd7527ec4498541ed10fde781cc 100644 (file)
@@ -56,11 +56,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index d441ff5ecfce0f8e1e1f8de1dad0fdae04ce648b..85971a0800364b5120550ea46f8eb4611cd862d0 100644 (file)
@@ -45,15 +45,15 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index c798c0eed926fda91006a106bc5eda23389a4eb6..0846661aa768bb636b2e62443322ba96be530d10 100644 (file)
@@ -44,12 +44,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Length: 0\r
-\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 0
+
 </protocol>
 </verify>
 </testcase>
index b86b02d3d03596b3b3b2cc9c273d7de4a685e162..6ccb1ce37f32480e7880fc4cd3cff8323e5bfc72 100644 (file)
@@ -34,12 +34,12 @@ HTTP URL with slash but with "parameter"
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /?mooo/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /?mooo/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 00ef1b1901c1bacb6fb953201ca94e31417ee979..09c2c065a277bb70439887f906490423a10f5bd1 100644 (file)
@@ -90,24 +90,24 @@ http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT
 # Verify data after the test has been "shot"
 <verify>
 
-<protocol>
-GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
-Host: test.remote.example.com\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
-Host: test.remote.example.com\r
-Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1\r
-Host: test.remote.example.com\r
-Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAAAgACAHAAAAALAAsAcgAAAAAAAAAAAAAAhoIBAAQt1KW5CgG4YdWWcfXyfXBz1ZMCzYp37xYjBiAizmw58O6eQS7yR66eqYGWeSwl9W1lV09SS1NUQVRJT04=\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
+Host: test.remote.example.com
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
+Host: test.remote.example.com
+Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
+Host: test.remote.example.com
+Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAAAgACAHAAAAALAAsAcgAAAAAAAAAAAAAAhoIBAAQt1KW5CgG4YdWWcfXyfXBz1ZMCzYp37xYjBiAizmw58O6eQS7yR66eqYGWeSwl9W1lV09SS1NUQVRJT04=
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 65f23f7ead510b0be3bf5a51e31bdb24a893da20..969879ad359cb534e24053b268d33b1b9f62936a 100644 (file)
@@ -43,15 +43,15 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 5402d29b1ff96bce6e882ff4a18bf75cbe0298f6..6888e409738dd443ffa98d38cdd5f9c3f523de3e 100644 (file)
@@ -27,10 +27,10 @@ ftp://%HOSTIP:%FTPPORT
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
 </protocol>
 </verify>
 </testcase>
index 7a6601b9afc6fead2c7235a833448e8b9f311170..74ed46bac4dedd8dddaf5e2b46fe6cd464fd7a7c 100644 (file)
@@ -66,18 +66,18 @@ cookies
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: the-moo agent next generation\r
-Accept: */*\r
-Referer: http://example.com/the-moo\r
-Cookie: name=moo\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: the-moo agent next generation
+Accept: */*
+Referer: http://example.com/the-moo
+Cookie: name=moo
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 9c5db36d990d80f6d27df09b9f9d246151b76a80..225c92833c1e6b0ffe3c1632222e0337887d63cf 100644 (file)
@@ -38,13 +38,13 @@ cookies
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: name=contents;name2=content2;name3=content3\r
-\r
+<protocol crlf="yes">
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Cookie: name=contents;name2=content2;name3=content3
+
 </protocol>
 </verify>
 </testcase>
index 2cb5963ff465dc39247db552aacb40ef3b889f43..22d22c88a8b8d6b0c70ba0fb1f082f5fb6c2e3c8 100644 (file)
@@ -59,12 +59,12 @@ cookies
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/%TESTNUMBER HTTP/1.1\r
-Host: www.host.foo.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/%TESTNUMBER HTTP/1.1
+Host: www.host.foo.com
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/jar%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
index 97cef4afacce5172160f6c8132561cc939eb6c26..ec47b60f072a03ebecb662435bc414974c2aa5c0 100644 (file)
@@ -49,19 +49,19 @@ cookies
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/%TESTNUMBER HTTP/1.1\r
-Host: www.host.foo.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: test2=yes; test=yes\r
-\r
-GET /we/want/%TESTNUMBER?hoge=fuga HTTP/1.1\r
-Host: www.host.foo.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: test2=yes; test=yes\r
-\r
+<protocol crlf="yes">
+GET /we/want/%TESTNUMBER HTTP/1.1
+Host: www.host.foo.com
+User-Agent: curl/%VERSION
+Accept: */*
+Cookie: test2=yes; test=yes
+
+GET /we/want/%TESTNUMBER?hoge=fuga HTTP/1.1
+Host: www.host.foo.com
+User-Agent: curl/%VERSION
+Accept: */*
+Cookie: test2=yes; test=yes
+
 </protocol>
 </verify>
 </testcase>
index aab25791f24aa40a81b84aaee3ddd6d853ecaea4..a8d3ed33722a042cc4df8cd70378bf2c32dd8681 100644 (file)
@@ -34,8 +34,6 @@ Dummy test file for remove test
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-</protocol>
 <postcheck>
 %PERL %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/test%TESTNUMBER.txt
 </postcheck>
index 81d6ffc7e6724c49c70dd6d6dc907196d9c55441..6056edaedcf3b2df4cfb8d56afab36dbc10e270b 100644 (file)
@@ -41,14 +41,14 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1\r
-Host: we.want.that.site.com\r
-Proxy-Authorization: Basic %b64[fake:user]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
+Host: we.want.that.site.com
+Proxy-Authorization: Basic %b64[fake:user]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index d56b2514c9e8254d3ff66678ebe98eb6b9cd26e5..34f49b69ffcfa515466df5a610a633928ba9393c 100644 (file)
@@ -66,18 +66,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="c55f7f30d83d774a3d2dcacf725abaca"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="c55f7f30d83d774a3d2dcacf725abaca"
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index b055763a398bab26ed5722782bd8369d968ac083..017b98d6e9090516cdb1975a09b3f6b76cef4d8c 100644 (file)
@@ -65,17 +65,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --xattr -L -o %LOGDIR/out%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout mode="text">
 user.creator => curl
index fe86e32775b560b8170f8ce912d2bc64a554eaf4..67ef66498d2f7064b10d2deff2c36c664b49ad18 100644 (file)
@@ -54,12 +54,12 @@ X-fileheader2: This is #a
 s/^--------------------------[A-Za-z0-9]*/------------------------------/
 s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
 </strippart>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
 <upload>
 Content-Type: multipart/mixed; boundary=----------------------------\r
index 8cac4577e1ee3f263c4c632af0aaf828cefb02b2..0e3d242cd746deb725b5d5cc20b6c48617002765 100644 (file)
@@ -42,11 +42,11 @@ It may contain any type of data.
 s/^--------------------------[A-Za-z0-9]*/------------------------------/
 s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
 </strippart>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 APPEND %TESTNUMBER (\Seen) {940}\r
-A004 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 APPEND %TESTNUMBER (\Seen) {940}
+A004 LOGOUT
 </protocol>
 <upload>
 Content-Type: multipart/mixed; boundary=----------------------------\r
index 992a3dbc5ed95c7262820bbfa7a0aba6e1211d29..f472f9f876d35218599a38c0a1b3e289ca6b7694 100644 (file)
@@ -46,33 +46,33 @@ It may contain any type of data and will be encoded in base64 for transfer.
 s/^--------------------------[A-Za-z0-9]*/------------------------------/
 s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
 </strippart>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-Content-Type: multipart/mixed; boundary=----------------------------\r
-Mime-Version: 1.0\r
-From: different\r
-To: another\r
-\r
-------------------------------\r
-Content-Transfer-Encoding: quoted-printable\r
-Content-disposition: "inline"\r
-\r
-This is the email inline text with a very long line containing the special =\r
-character =3D and that should be split by encoder.\r
-------------------------------\r
-Content-Disposition: attachment; filename="test%TESTNUMBER.txt"\r
-Content-Transfer-Encoding: base64\r
-\r
-VGhpcyBpcyBhbiBhdHRhY2hlZCBmaWxlLgoKSXQgbWF5IGNvbnRhaW4gYW55IHR5cGUgb2YgZGF0\r
-YSBhbmQgd2lsbCBiZSBlbmNvZGVkIGluIGJhc2U2NCBmb3IgdHJhbnNmZXIuCg==\r
---------------------------------\r
-.\r
+<upload crlf="yes">
+Content-Type: multipart/mixed; boundary=----------------------------
+Mime-Version: 1.0
+From: different
+To: another
+
+------------------------------
+Content-Transfer-Encoding: quoted-printable
+Content-disposition: "inline"
+
+This is the email inline text with a very long line containing the special =
+character =3D and that should be split by encoder.
+------------------------------
+Content-Disposition: attachment; filename="test%TESTNUMBER.txt"
+Content-Transfer-Encoding: base64
+
+VGhpcyBpcyBhbiBhdHRhY2hlZCBmaWxlLgoKSXQgbWF5IGNvbnRhaW4gYW55IHR5cGUgb2YgZGF0
+YSBhbmQgd2lsbCBiZSBlbmNvZGVkIGluIGJhc2U2NCBmb3IgdHJhbnNmZXIuCg==
+--------------------------------
+.
 </upload>
 </verify>
 </testcase>
index 371f00bfdc5cff93876f7d0614e301e77ffd62ab..ea3c9c344728a86bfad4bdec97eb2365fdd821fd 100644 (file)
@@ -42,11 +42,11 @@ It contains at least an 8-bit byte value.
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
 </protocol>
 <errorcode>
 26
index 8f82c92b4bde0087b502a624ee98760e349405b4..300b9ad5cbaf5e78cb9beda040d6dd1158c31e43 100644 (file)
@@ -66,18 +66,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="66d68d3251f1839576ba7c766cf9205b"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="66d68d3251f1839576ba7c766cf9205b"
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index acd2c5f194a131e6c8a771fab730b87d6d946977..4c0107ae643a01b3107c323d9849cd8e084b6b3c 100644 (file)
@@ -10,14 +10,14 @@ FORM
 #
 # Server-side
 <reply>
-<data nocheck="yes">
-HTTP/1.1 301 OK\r
-Date: Tue, 09 Nov 2010 14:49:00 GMT\r
-Server: test-server/fake swsclose\r
-Connection: close\r
-Content-Type: text/html\r
+<data crlf="yes" nocheck="yes">
+HTTP/1.1 301 OK
+Date: Tue, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake swsclose
+Connection: close
+Content-Type: text/html
 Location: /%TESTNUMBER0002
-\r
+
 hello
 </data>
 <data2 crlf="yes">
index cf19bfc34a27062f47111566e0dd4e5467377946..a3691f88e9e4b214b70345a6bf44f145ee0afdf1 100644 (file)
@@ -58,18 +58,18 @@ s/boundary=------------------------[A-Za-z0-9]*/boundary=-----------------------
 # Note that the stripping above removes 12 bytes from every occurrence of the
 # boundary string and since 5 of them are in the body contents, we see
 # (5*12) == 60 bytes less
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Length: 17151\r
-Content-Type: multipart/form-data; boundary=----------------------------\r
-\r
-------------------------------\r
-Content-Disposition: form-data; name="hello"\r
-\r
-%repeat[1000 x A]%%repeat[1000 x B]%%repeat[1000 x C]%%repeat[1000 x D]%%repeat[1000 x E]%%repeat[1000 x F]%%repeat[1000 x G]%%repeat[1000 x H]%%repeat[1000 x I]%%repeat[1000 x J]%%repeat[1000 x K]%%repeat[1000 x L]%%repeat[1000 x M]%%repeat[1000 x N]%%repeat[1000 x O]%%repeat[1000 x P]%%repeat[999 x Q]%\r
---------------------------------\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 17151
+Content-Type: multipart/form-data; boundary=----------------------------
+
+------------------------------
+Content-Disposition: form-data; name="hello"
+
+%repeat[1000 x A]%%repeat[1000 x B]%%repeat[1000 x C]%%repeat[1000 x D]%%repeat[1000 x E]%%repeat[1000 x F]%%repeat[1000 x G]%%repeat[1000 x H]%%repeat[1000 x I]%%repeat[1000 x J]%%repeat[1000 x K]%%repeat[1000 x L]%%repeat[1000 x M]%%repeat[1000 x N]%%repeat[1000 x O]%%repeat[1000 x P]%%repeat[999 x Q]%
+--------------------------------
 </protocol>
 </verify>
 </testcase>
index 31ec7b821daa6caef5462f6adfdd2852d5358d64..25e5a6d9e3bbc9b4e5a21a6c1bf4b9abbc3ddaa6 100644 (file)
@@ -39,323 +39,323 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 s/^--------------------------[A-Za-z0-9]*/------------------------------/
 s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
 </strippart>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<somebody@example.com>\r
-RCPT TO:<someone@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<somebody@example.com>
+RCPT TO:<someone@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-Content-Type: multipart/mixed; boundary=----------------------------\r
-Mime-Version: 1.0\r
-\r
-------------------------------\r
-Content-Disposition: attachment; filename="myfile.jpg"\r
-Content-Type: image/jpeg\r
-Content-Transfer-Encoding: base64\r
-\r
-QUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZG\r
-RkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExM\r
-TExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFS\r
-UlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dX\r
-V1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0ND\r
-Q0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJ\r
-SUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5O\r
-Tk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRU\r
-VFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpa\r
-WlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVF\r
-RkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tL\r
-S0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFR\r
-UVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZX\r
-V1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJC\r
-QkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhI\r
-SEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5O\r
-Tk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NT\r
-U1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZ\r
-WVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVF\r
-RUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpK\r
-S0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQ\r
-UFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZW\r
-VlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFC\r
-QkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dH\r
-R0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1N\r
-TU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNT\r
-U1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhY\r
-WFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDRERERERE\r
-REREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpK\r
-SkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09P\r
-UFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVV\r
-VVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFB\r
-QUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZH\r
-R0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExM\r
-TExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJS\r
-UlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hY\r
-WFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0ND\r
-Q0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJ\r
-SUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09P\r
-T09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRU\r
-VVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpa\r
-WlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZG\r
-RkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tM\r
-TExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFR\r
-UVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dX\r
-V1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkND\r
-Q0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhI\r
-SElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5O\r
-Tk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRU\r
-VFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZ\r
-WlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVF\r
-RUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tL\r
-S0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBR\r
-UVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZW\r
-VlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJC\r
-QkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hI\r
-SEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1N\r
-TU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NT\r
-U1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZ\r
-WVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERE\r
-RUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpK\r
-SkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQ\r
-UFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVW\r
-VlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFB\r
-QUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dH\r
-R0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1N\r
-TU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJS\r
-UlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhY\r
-WFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDRERE\r
-REREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJ\r
-SkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09P\r
-T09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVV\r
-VVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpB\r
-QUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZG\r
-RkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExM\r
-TExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJS\r
-UlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dX\r
-V1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0ND\r
-Q0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJ\r
-SUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5O\r
-T09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRU\r
-VFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpa\r
-WlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVG\r
-RkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tL\r
-S0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFR\r
-UVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldX\r
-V1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJC\r
-QkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhI\r
-SEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5O\r
-Tk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NT\r
-VFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZ\r
-WVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVF\r
-RUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpL\r
-S0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQ\r
-UFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZW\r
-VlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJC\r
-QkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dH\r
-R0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1N\r
-TU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NT\r
-U1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhY\r
-WVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERE\r
-RERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpK\r
-SkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09Q\r
-UFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVV\r
-VVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFB\r
-QUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdH\r
-R0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExM\r
-TE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJS\r
-UlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhY\r
-WFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0ND\r
-REREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJ\r
-SUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09P\r
-T09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRV\r
-VVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpa\r
-WlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZG\r
-RkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xM\r
-TExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFR\r
-UVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dX\r
-V1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0ND\r
-Q0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhI\r
-SUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5O\r
-Tk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRU\r
-VFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVla\r
-WlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVF\r
-RUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tL\r
-S0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFR\r
-UVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZW\r
-VldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJC\r
-QkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhI\r
-SEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1N\r
-Tk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NT\r
-U1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZ\r
-WVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERF\r
-RUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpK\r
-SkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQ\r
-UFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZW\r
-VlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFB\r
-QUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dH\r
-R0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1N\r
-TU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJS\r
-U1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhY\r
-WFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERE\r
-RERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlK\r
-SkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09P\r
-T09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVV\r
-VVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFB\r
-QUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZG\r
-RkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExM\r
-TExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJS\r
-UlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dX\r
-WFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0ND\r
-Q0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJ\r
-SUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5P\r
-T09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRU\r
-VFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpa\r
-WlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZG\r
-RkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tL\r
-S0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFR\r
-UVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dX\r
-V1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJC\r
-Q0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhI\r
-SEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5O\r
-Tk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NU\r
-VFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZ\r
-WVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVF\r
-RUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktL\r
-S0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQ\r
-UFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZW\r
-VlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJC\r
-QkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dH\r
-SEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1N\r
-TU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NT\r
-U1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZ\r
-WVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERE\r
-RERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpK\r
-SkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQ\r
-UFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVV\r
-VVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFB\r
-QUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dH\r
-R0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExM\r
-TU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJS\r
-UlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhY\r
-WFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NE\r
-RERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJ\r
-SUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09P\r
-T09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVV\r
-VVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpa\r
-WkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZG\r
-RkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExM\r
-TExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFR\r
-UlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dX\r
-V1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0ND\r
-Q0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJ\r
-SUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5O\r
-Tk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRU\r
-VFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpa\r
-WlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVF\r
-RUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tL\r
-S0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFR\r
-UVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZW\r
-V1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJC\r
-QkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhI\r
-SEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1O\r
-Tk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NT\r
-U1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZ\r
-WVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVF\r
-RUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpK\r
-SktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQ\r
-UFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZW\r
-VlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFB\r
-QkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dH\r
-R0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1N\r
-TU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJT\r
-U1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhY\r
-WFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERE\r
-RERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpK\r
-SkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09P\r
-T1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVV\r
-VVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFB\r
-QUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZG\r
-R0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExM\r
-TExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJS\r
-UlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dY\r
-WFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0ND\r
-Q0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJ\r
-SUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9P\r
-T09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRU\r
-VFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpa\r
-WlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZG\r
-RkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tL\r
-TExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFR\r
-UVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dX\r
-V1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJD\r
-Q0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhI\r
-SEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5O\r
-Tk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RU\r
-VFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZ\r
-WVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVF\r
-RUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tL\r
-S0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQ\r
-UVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZW\r
-VlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJC\r
-QkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dI\r
-SEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1N\r
-TU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NT\r
-U1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZ\r
-WVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDRERERERERERE\r
-REVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpK\r
-SkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQ\r
-UFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVV\r
-VlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFB\r
-QUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dH\r
-R0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExN\r
-TU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJS\r
-UlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhY\r
-WFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RE\r
-RERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJ\r
-SUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09P\r
-T09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVV\r
-VVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpa\r
-QUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZG\r
-RkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExM\r
-TExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFS\r
-UlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dX\r
-V1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0ND\r
-Q0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJ\r
-SUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5O\r
-Tk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRU\r
-VFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpa\r
-WlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVF\r
-RkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tL\r
-S0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFR\r
-UVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZX\r
-V1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJC\r
-QkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhI\r
-SEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5O\r
-Tk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NT\r
-U1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZ\r
-WVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVF\r
-RUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpK\r
-S0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQ\r
-UFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZW\r
-VlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFC\r
-QkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dH\r
-R0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1N\r
-TU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNT\r
-U1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhY\r
-WFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDRERERERE\r
-REREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpK\r
-SkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09P\r
-UFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVV\r
-VVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFB\r
-QUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZH\r
-R0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExM\r
-TExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJS\r
-UlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hY\r
-WFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0ND\r
-Q0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJ\r
-SUlJSUpKSkpKSkpKSko=\r
---------------------------------\r
-.\r
+<upload crlf="yes">
+Content-Type: multipart/mixed; boundary=----------------------------
+Mime-Version: 1.0
+
+------------------------------
+Content-Disposition: attachment; filename="myfile.jpg"
+Content-Type: image/jpeg
+Content-Transfer-Encoding: base64
+
+QUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZG
+RkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExM
+TExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFS
+UlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dX
+V1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0ND
+Q0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJ
+SUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5O
+Tk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRU
+VFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpa
+WlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVF
+RkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tL
+S0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFR
+UVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZX
+V1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJC
+QkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhI
+SEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5O
+Tk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NT
+U1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZ
+WVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVF
+RUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpK
+S0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQ
+UFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZW
+VlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFC
+QkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dH
+R0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1N
+TU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNT
+U1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhY
+WFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDRERERERE
+REREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpK
+SkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09P
+UFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVV
+VVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFB
+QUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZH
+R0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExM
+TExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJS
+UlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hY
+WFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0ND
+Q0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJ
+SUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09P
+T09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRU
+VVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpa
+WlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZG
+RkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tM
+TExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFR
+UVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dX
+V1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkND
+Q0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhI
+SElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5O
+Tk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRU
+VFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZ
+WlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVF
+RUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tL
+S0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBR
+UVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZW
+VlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJC
+QkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hI
+SEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1N
+TU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NT
+U1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZ
+WVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERE
+RUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpK
+SkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQ
+UFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVW
+VlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFB
+QUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dH
+R0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1N
+TU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJS
+UlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhY
+WFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDRERE
+REREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJ
+SkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09P
+T09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVV
+VVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpB
+QUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZG
+RkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExM
+TExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJS
+UlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dX
+V1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0ND
+Q0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJ
+SUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5O
+T09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRU
+VFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpa
+WlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVG
+RkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tL
+S0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFR
+UVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldX
+V1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJC
+QkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhI
+SEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5O
+Tk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NT
+VFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZ
+WVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVF
+RUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpL
+S0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQ
+UFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZW
+VlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJC
+QkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dH
+R0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1N
+TU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NT
+U1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhY
+WVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERE
+RERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpK
+SkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09Q
+UFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVV
+VVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFB
+QUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdH
+R0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExM
+TE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJS
+UlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhY
+WFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0ND
+REREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJ
+SUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09P
+T09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRV
+VVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpa
+WlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZG
+RkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xM
+TExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFR
+UVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dX
+V1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0ND
+Q0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhI
+SUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5O
+Tk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRU
+VFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVla
+WlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVF
+RUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tL
+S0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFR
+UVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZW
+VldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJC
+QkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhI
+SEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1N
+Tk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NT
+U1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZ
+WVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERF
+RUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpK
+SkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQ
+UFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZW
+VlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFB
+QUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dH
+R0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1N
+TU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJS
+U1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhY
+WFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERE
+RERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlK
+SkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09P
+T09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVV
+VVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFB
+QUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZG
+RkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExM
+TExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJS
+UlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dX
+WFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0ND
+Q0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJ
+SUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5P
+T09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRU
+VFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpa
+WlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZG
+RkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tL
+S0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFR
+UVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dX
+V1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJC
+Q0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhI
+SEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5O
+Tk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NU
+VFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZ
+WVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVF
+RUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktL
+S0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQ
+UFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZW
+VlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJC
+QkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dH
+SEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1N
+TU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NT
+U1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZ
+WVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERE
+RERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpK
+SkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQ
+UFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVV
+VVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFB
+QUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dH
+R0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExM
+TU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJS
+UlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhY
+WFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NE
+RERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJ
+SUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09P
+T09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVV
+VVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpa
+WkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZG
+RkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExM
+TExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFR
+UlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dX
+V1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0ND
+Q0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJ
+SUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5O
+Tk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRU
+VFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpa
+WlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVF
+RUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tL
+S0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFR
+UVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZW
+V1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJC
+QkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhI
+SEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1O
+Tk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NT
+U1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZ
+WVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVF
+RUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpK
+SktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQ
+UFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZW
+VlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFB
+QkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dH
+R0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1N
+TU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJT
+U1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhY
+WFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERE
+RERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpK
+SkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09P
+T1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVV
+VVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFB
+QUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZG
+R0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExM
+TExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJS
+UlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dY
+WFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0ND
+Q0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJ
+SUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9P
+T09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRU
+VFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpa
+WlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZG
+RkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tL
+TExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFR
+UVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dX
+V1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJD
+Q0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhI
+SEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5O
+Tk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RU
+VFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZ
+WVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVF
+RUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tL
+S0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQ
+UVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZW
+VlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJC
+QkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dI
+SEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1N
+TU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NT
+U1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZ
+WVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDRERERERERERE
+REVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpK
+SkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQ
+UFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVV
+VlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFB
+QUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dH
+R0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExN
+TU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJS
+UlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhY
+WFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RE
+RERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJ
+SUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09P
+T09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVV
+VVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpa
+QUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZG
+RkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExM
+TExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFS
+UlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dX
+V1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0ND
+Q0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJ
+SUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5O
+Tk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRU
+VFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpa
+WlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVF
+RkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tL
+S0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFR
+UVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZX
+V1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJC
+QkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhI
+SEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5O
+Tk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NT
+U1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZ
+WVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVF
+RUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpK
+S0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQ
+UFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZW
+VlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFC
+QkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dH
+R0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1N
+TU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNT
+U1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhY
+WFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDRERERERE
+REREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpK
+SkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09P
+UFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVV
+VVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFB
+QUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZH
+R0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExM
+TExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJS
+UlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hY
+WFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0ND
+Q0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJ
+SUlJSUpKSkpKSkpKSko=
+--------------------------------
+.
 </upload>
 </verify>
 </testcase>
index 33885f17faaab01d655d94a07f7e05fd38ba6ebd..350f84bc3a098b57eb4cb22b380ad95a198c8a41 100644 (file)
@@ -68,29 +68,29 @@ s/boundary=------------------------[A-Za-z0-9]*/boundary=-----------------------
 # Note that the stripping above removes 12 bytes from every occurrence of the
 # boundary string and since 5 of them are in the body contents, we see
 # (5*12) == 60 bytes less
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Length: 162\r
-Content-Type: multipart/form-data; boundary=----------------------------\r
-\r
-------------------------------\r
-Content-Disposition: form-data; name="name"\r
-\r
-short value\r
---------------------------------\r
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Length: 179\r
-Content-Type: multipart/form-data; boundary=----------------------------\r
-\r
-------------------------------\r
-Content-Disposition: form-data; name="name"\r
-\r
-long value for length change\r
---------------------------------\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 162
+Content-Type: multipart/form-data; boundary=----------------------------
+
+------------------------------
+Content-Disposition: form-data; name="name"
+
+short value
+--------------------------------
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 179
+Content-Type: multipart/form-data; boundary=----------------------------
+
+------------------------------
+Content-Disposition: form-data; name="name"
+
+long value for length change
+--------------------------------
 </protocol>
 </verify>
 </testcase>
index 32ca29db49788dd072a0f9ac48aa6c9cd7b15b2e..e7889236f7394f68c96117d08c7e464f8184e1de 100644 (file)
@@ -38,11 +38,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </client>
 
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 
index 5cad5eadcd5c34be76592178c42c01aab690a5c6..10adb147623faed7243c7bb0d2b7a912ccad38ac 100644 (file)
@@ -42,12 +42,12 @@ proxy
 </client>
 
 <verify>
-<protocol>
-GET http://www.example.com/ HTTP/1.1\r
-Host: www.example.com\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://www.example.com/ HTTP/1.1
+Host: www.example.com
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 
index d4e20c0fe460cbf1cec27de13ea900d20da7dcc0..0a255fe8443330d07ccdaf305966484fc3ba61ac 100644 (file)
@@ -29,12 +29,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 8fdf879d9ad23ad9d76393db4075b6a1e725f74e..db3db9bed88e0d82d6498f305a9ad6b3b6302df2 100644 (file)
@@ -27,8 +27,8 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
+<protocol crlf="yes">
+A001 CAPABILITY
 </protocol>
 </verify>
 </testcase>
index 5965bd8aeacb7fc9e0f67d795131c0f748c0d076..2714e6fda362d46e81dd7052d43ad010c7e458cf 100644 (file)
@@ -33,41 +33,41 @@ ftp://%HOSTIP:%FTPPORT/
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD /folderA\r
-EPSV\r
-TYPE I\r
-RETR %TESTNUMBER\r
-CWD /folderB\r
-EPSV\r
-RETR %TESTNUMBER\r
-QUIT\r
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-RETR /folderA/%TESTNUMBER\r
-CWD /folderB\r
-EPSV\r
-RETR %TESTNUMBER\r
-EPSV\r
-RETR /folderA/%TESTNUMBER\r
-QUIT\r
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-SYST\r
-QUIT\r
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-SYST\r
-SYST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD /folderA
+EPSV
+TYPE I
+RETR %TESTNUMBER
+CWD /folderB
+EPSV
+RETR %TESTNUMBER
+QUIT
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+RETR /folderA/%TESTNUMBER
+CWD /folderB
+EPSV
+RETR %TESTNUMBER
+EPSV
+RETR /folderA/%TESTNUMBER
+QUIT
+USER anonymous
+PASS ftp@example.com
+PWD
+SYST
+QUIT
+USER anonymous
+PASS ftp@example.com
+PWD
+SYST
+SYST
+QUIT
 </protocol>
 </verify>
 </testcase>
index a1d501fd2d2cd10e4e28384446f84c85534a387d..29bbb589141d44b0b01c724cf2a52962d979aa77 100644 (file)
@@ -60,19 +60,19 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://example.com/please/gimme/%TESTNUMBER HTTP/1.1\r
-Host: example.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://example.net/tes%20t%20case=/%TESTNUMBER0002 HTTP/1.1\r
-Host: example.net\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://example.com/please/gimme/%TESTNUMBER HTTP/1.1
+Host: example.com
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://example.net/tes%20t%20case=/%TESTNUMBER0002 HTTP/1.1
+Host: example.net
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 313910aa6bc2f530a07f31c61ccbc150d09c465b..a6e9ef56e3fab649b6b9a28687470600e7bb5341 100644 (file)
@@ -64,19 +64,19 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://example.com/gimme/%TESTNUMBER?foobar HTTP/1.1\r
-Host: example.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://example.net/there/tes%20t%20case=/%TESTNUMBER0002?+yes+no HTTP/1.1\r
-Host: example.net\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://example.com/gimme/%TESTNUMBER?foobar HTTP/1.1
+Host: example.com
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://example.net/there/tes%20t%20case=/%TESTNUMBER0002?+yes+no HTTP/1.1
+Host: example.net
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index e7298094d01081c5bbf8a5595dcb2e5d9af012ba..9164adbaed3bbc6cb7b9597471a8f392cb9c837e 100644 (file)
@@ -61,28 +61,28 @@ s/boundary=------------------------[A-Za-z0-9]*/boundary=-----------------------
 # Note that the stripping above removes 12 bytes from every occurrence of the
 # boundary string and since 5 of them are in the body contents, we see
 # (5*12) == 60 bytes less
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Transfer-Encoding: chunked\r
-Content-Type: multipart/form-data; boundary=----------------------------\r
-Expect: 100-continue\r
-\r
-85\r
-------------------------------\r
-Content-Disposition: form-data; name="field"\r
-Content-Transfer-Encoding: base64\r
-\r
-\r
-4\r
-ZHVt\r
-3a\r
-bXk=\r
---------------------------------\r
-\r
-0\r
-\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Transfer-Encoding: chunked
+Content-Type: multipart/form-data; boundary=----------------------------
+Expect: 100-continue
+
+85
+------------------------------
+Content-Disposition: form-data; name="field"
+Content-Transfer-Encoding: base64
+
+
+4
+ZHVt
+3a
+bXk=
+--------------------------------
+
+0
+
 </protocol>
 </verify>
 </testcase>
index 620aa3393d5dd16e5090a0c696f384da8f578495..8bc19f15bfcb7852512792808a5e8912afe6bb44 100644 (file)
@@ -41,23 +41,23 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -H 'Content-type: multipart/form-da
 s/^--------------------------[A-Za-z0-9]*/------------------------------/
 s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
 </strippart>
-<protocol>
-POST /we/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Content-Length: 260\r
-Content-Type: multipart/form-data; charset=utf-8; boundary=----------------------------\r
-\r
-------------------------------\r
-Content-Disposition: form-data; name="name"\r
-\r
-daniel\r
-------------------------------\r
-Content-Disposition: form-data; name="tool"\r
-\r
-curl\r
---------------------------------\r
+<protocol crlf="yes">
+POST /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 260
+Content-Type: multipart/form-data; charset=utf-8; boundary=----------------------------
+
+------------------------------
+Content-Disposition: form-data; name="name"
+
+daniel
+------------------------------
+Content-Disposition: form-data; name="tool"
+
+curl
+--------------------------------
 </protocol>
 </verify>
 </testcase>
index b2790099dd6a7c9a7d524d017875bf052760c5a7..48ba23689040b14eb69ee1bf85a747f4318e6834 100644 (file)
@@ -73,19 +73,19 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 94910b5362b78923d4f2c4104126bda7e4ad5907..bb06fbba8a89ce093669596d80a45cf89695b04b 100644 (file)
@@ -58,18 +58,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 s/^--------------------------[A-Za-z0-9]*/------------------------------/
 s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
 </strippart>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Length: 154\r
-Content-Type: multipart/form-data; boundary=----------------------------\r
-\r
-------------------------------\r
-Content-Disposition: form-data; name="field"\r
-\r
-AB\r
---------------------------------\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 154
+Content-Type: multipart/form-data; boundary=----------------------------
+
+------------------------------
+Content-Disposition: form-data; name="field"
+
+AB
+--------------------------------
 </protocol>
 </verify>
 </testcase>
index 310a902b147b51b7952c498ed5994db3923c9085..4a288c852ee1dadeb8173ec631a0caf23a367792 100644 (file)
@@ -58,18 +58,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 s/^--------------------------[A-Za-z0-9]*/------------------------------/
 s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
 </strippart>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Length: 154\r
-Content-Type: multipart/form-data; boundary=----------------------------\r
-\r
-------------------------------\r
-Content-Disposition: form-data; name="field"\r
-\r
-AB\r
---------------------------------\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 154
+Content-Type: multipart/form-data; boundary=----------------------------
+
+------------------------------
+Content-Disposition: form-data; name="field"
+
+AB
+--------------------------------
 </protocol>
 </verify>
 </testcase>
index e295b2f07b5bbb902b1fc18f819f7b480ab9dd1d..c57e030a335b8fb6477448c60feef67e7d6ebc31 100644 (file)
@@ -58,18 +58,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 s/^--------------------------[A-Za-z0-9]*/------------------------------/
 s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
 </strippart>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Length: 154\r
-Content-Type: multipart/form-data; boundary=----------------------------\r
-\r
-------------------------------\r
-Content-Disposition: form-data; name="field"\r
-\r
-AB\r
---------------------------------\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 154
+Content-Type: multipart/form-data; boundary=----------------------------
+
+------------------------------
+Content-Disposition: form-data; name="field"
+
+AB
+--------------------------------
 </protocol>
 </verify>
 </testcase>
index e4db3cf83a015f83e8bb2d71c3f7a95d9720b19d..c599647bb9ee07d1da4c0c8d348f2e2140d85aca 100644 (file)
@@ -58,18 +58,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 s/^--------------------------[A-Za-z0-9]*/------------------------------/
 s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
 </strippart>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Length: 154\r
-Content-Type: multipart/form-data; boundary=----------------------------\r
-\r
-------------------------------\r
-Content-Disposition: form-data; name="field"\r
-\r
-AB\r
---------------------------------\r
+<protocol crlf="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 154
+Content-Type: multipart/form-data; boundary=----------------------------
+
+------------------------------
+Content-Disposition: form-data; name="field"
+
+AB
+--------------------------------
 </protocol>
 </verify>
 </testcase>
index 2043b3d4ae1122a782f65e93c2db41235d191a82..315fe98b650a2fa539b0ee9d42caf6feb45c90e8 100644 (file)
@@ -39,15 +39,15 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </client>
 
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
 </protocol>
 </verify>
 
index 6688cacc940d8800a8390b45b1da3537e01fc068..5d82c52f9bd836743753d2f0adf3f274bbc7f1de 100644 (file)
@@ -37,19 +37,19 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /user1/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[user1:foo1]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /user2/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[user2:foo2]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /user1/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user1:foo1]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /user2/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user2:foo2]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 031395eb8e295d271b95f5742870ce05bf626054..d2f01d0e3131a4e675c2c531a2ea49a5f7b94a79 100644 (file)
@@ -69,18 +69,18 @@ cookies
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: the-moo agent next generation\r
-Accept: */*\r
-Cookie: proven=yes\r
-\r
-GET /we/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: the-moo agent next generation\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: the-moo agent next generation
+Accept: */*
+Cookie: proven=yes
+
+GET /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: the-moo agent next generation
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 166be89543fedbd031cd0bd0f57329dba728a35e..29f5af5d5c6a739eb2d61d3e7aae041a32a37476 100644 (file)
@@ -35,9 +35,9 @@ imap://%HOSTIP:%IMAPPORT/677
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A1 IDLE\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A1 IDLE
 </protocol>
 </verify>
 </testcase>
index ea91ae6aecd4fb34c066ac690d0ddc0d1963fd47..4f3ed70235e6d8b294e1bdc1b2a0d5ca4e898512 100644 (file)
@@ -48,12 +48,12 @@ https://localhost:%HTTPSPORT/%TESTNUMBER %CERTDIR/certs/test-ca.crt
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: localhost:%HTTPSPORT\r
-User-Agent: CURLOPT_CAINFO_BLOB\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: localhost:%HTTPSPORT
+User-Agent: CURLOPT_CAINFO_BLOB
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index e57401be46d348045746df2f013656c791590f95..2c739eebf3b5a5248cd7b1510238f1cea7637f57 100644 (file)
@@ -44,13 +44,13 @@ machine %HOSTIP login user1 password "with spaces and \"\n\r\t\a"
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET / HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[user1:with%20spaces%20and%20"%0a%0d%09a]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET / HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user1:with%20spaces%20and%20"%0a%0d%09a]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index b6d8f67cb5bfdc8d7c3b17a74bb2014c08953d62..3a1a1593609e4c3dfd92e73250ad6db182e9f2e4 100644 (file)
@@ -72,19 +72,19 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index d98393ddbfaee426df8a0f4f1d74e0a5fc102031..1640b900d3d46de524b2ac922975b4f351de6c82 100644 (file)
@@ -37,12 +37,12 @@ http
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout>
 -foo-
index fc2189918525269ae8eeca61621d0775378c1334..748c39a3b6d489329981fbf6ea306b8ea83edfa8 100644 (file)
@@ -41,13 +41,13 @@ machine %HOSTIP login user2 password passwd2
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET / HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[user1:passwd1]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET / HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user1:passwd1]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 9eb250fbd7c182c53c3c7095975c9defeb951af6..4b4048a42e27cab91db52cdeb8fc1b579aadcc23 100644 (file)
@@ -41,13 +41,13 @@ machine %HOSTIP login user2 password passwd2
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET / HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[user2:passwd2]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET / HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user2:passwd2]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index a63424e2509cb55783961328df6fd9a843884cee..a64844b6bf361d4cc90e5f72ceea1b72b4d28957 100644 (file)
@@ -40,13 +40,13 @@ machine %HOSTIP password 5up3r53cr37
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET / HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[:5up3r53cr37]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET / HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[:5up3r53cr37]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index bdb2124b4b002506527fb5e65ba9bc53d0a16ae0..f93fe644b1a37dad09f49b2fba2e74d0557ee358 100644 (file)
@@ -40,13 +40,13 @@ machine %HOSTIP password 5up3r53cr37
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
+<protocol crlf="yes">
+GET / HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user:5up3r53cr37]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
-GET / HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[user:5up3r53cr37]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
 </verify>
 </testcase>
index 28b8bee7eab75790f121dd0ded6fad9d9933f8b2..516d670be23f0f4ed393b1f02e55eb2b9499d03d 100644 (file)
@@ -47,12 +47,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --xattr -o %LOGDIR/out%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout mode="text">
 user.creator => curl
index 6fbd339fc0075b5d6df2b1fae2e8058325fd0d16..e8e7852b2066a4c79774dfcb1e2118a75ba12d89 100644 (file)
@@ -47,12 +47,12 @@ basic --xattr with -O
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout mode="text">
 user.creator => curl
index 31f81983d1046e548be8c59ad9d7a7b0e27f76be..61e57fce4ab49ed4cd3030d1d285f2d192fc4af1 100644 (file)
@@ -37,12 +37,12 @@ rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
 </client>
 
 <verify>
-<protocol>
-OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0\r
-CSeq: 1\r
-User-Agent: test567\r
-Test-Number: 567\r
-\r
+<protocol crlf="yes">
+OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0
+CSeq: 1
+User-Agent: test567
+Test-Number: 567
+
 </protocol>
 # 85 == CURLE_RTSP_CSEQ_ERROR
 <errorcode>
index 1df70f3d9c96e7ed8da172e79e2275de4c252015..bfd4de8c121b7b155549b504d00c4b3fa2d6f456 100644 (file)
@@ -89,24 +89,24 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index d7bd193ac2c8b57ecfebaa0bdfdfab42d456dea7..dd2b3d3ce1bcd51d9e7578a5bc986262b69a3558 100644 (file)
@@ -47,12 +47,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save %LOGDIR/moo/boo/etag%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/moo/boo/etag%TESTNUMBER">
 W/"asdf"
index 8910af077539bc813397032218ba378c9dde2710..90bd0ede7826d5956c5946d048d4d4492c26a641 100644 (file)
@@ -42,37 +42,37 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER
 s/^--------------------------[A-Za-z0-9]*/------------------------------/
 s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
 </strippart>
-<protocol>
-POST /we/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Length: 196\r
-Content-Type: multipart/form-data; boundary=----------------------------\r
-\r
-------------------------------\r
-Content-Disposition: form-data; name="data"\r
-Content-Type: text/html\r
-\r
-<title>hello</title>\r
---------------------------------\r
-POST /we/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Length: 423\r
-Content-Type: multipart/form-data; boundary=----------------------------\r
-\r
-------------------------------\r
-Content-Disposition: form-data\r
-Content-Type: multipart/mixed; boundary=----------------------------\r
-\r
-------------------------------\r
-Content-Disposition: attachment; name="data"\r
-Content-Type: text/html\r
-\r
-<title>hello</title>\r
---------------------------------\r
-\r
---------------------------------\r
+<protocol crlf="yes">
+POST /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 196
+Content-Type: multipart/form-data; boundary=----------------------------
+
+------------------------------
+Content-Disposition: form-data; name="data"
+Content-Type: text/html
+
+<title>hello</title>
+--------------------------------
+POST /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 423
+Content-Type: multipart/form-data; boundary=----------------------------
+
+------------------------------
+Content-Disposition: form-data
+Content-Type: multipart/mixed; boundary=----------------------------
+
+------------------------------
+Content-Disposition: attachment; name="data"
+Content-Type: text/html
+
+<title>hello</title>
+--------------------------------
+
+--------------------------------
 </protocol>
 </verify>
 </testcase>
index 2b53c4fc9873a44d85c2b16bf8bf6e205dbb6fc9..8862b163f23eb1d19292f175bc0d70c177e28e52 100644 (file)
@@ -54,13 +54,13 @@ Connection: close
 \r
 -foo-
 </stdout>
-<protocol>
-GET /556 HTTP/1.1\r
-Host: ninja\r
-\r
-GET /556 HTTP/1.1\r
-Host: ninja\r
-\r
+<protocol crlf="yes">
+GET /556 HTTP/1.1
+Host: ninja
+
+GET /556 HTTP/1.1
+Host: ninja
+
 </protocol>
 
 <errorcode>
index 10cf42cea9416456d1df84d090f9de439b497db3..3335e3875d6fc994bcb25459819609c82f6f77d6 100644 (file)
@@ -37,19 +37,19 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-account "one count" ftp://%HOSTIP:%FTPP
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-ACCT one count\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-EPSV\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+ACCT one count
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+EPSV
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index e98d5f5b1b591a5ee3a9d92053f1cee98b2f548a..5bd0705c412728e86665cb7f41a14ff8888cb2c6 100644 (file)
@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b none -D %LOGDIR/heads%TESTNUMBER
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/heads%TESTNUMBER.txt">
 HTTP/1.1 200 OK
index 5d44a28e85cf7f7085f2c3957c6d8f4fdb9b1408..a4ea92b2c16810c3a1eceffef1469ab77d9385c5 100644 (file)
@@ -69,18 +69,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/%TESTNUMBER", response="2c9a6f00af0d86497b177b90e90c688a"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/%TESTNUMBER", response="2c9a6f00af0d86497b177b90e90c688a"
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index fb59098354c05acaf150cf4b42d7ab68d008e0d1..9a2160bbbcdc3193718d2407edc86e635e1eda9d 100644 (file)
@@ -47,12 +47,12 @@ HTTP GET via SOCKS4 proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index b7a9091a98d92d9b756e2e2ec8066be4de4fed1c..dcd9d442bfdcf93dbcac2a658ed1d18ce0d54cff 100644 (file)
@@ -47,12 +47,12 @@ HTTP GET via SOCKS5 proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index faafd903850d5d45e4b36a609e8af185e3d49e48..ff57dcefc62c25628d8da3d4d154c786ec271a2b 100644 (file)
@@ -47,14 +47,14 @@ FTP dir list PASV via SOCKS4
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index 2c41dfea70d242402a87ee09f2e1e1842e5a98c1..3e411ce7acc54aa19eafc19db7f85d22393ab085 100644 (file)
@@ -47,14 +47,14 @@ FTP dir list PASV via SOCKS5
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE A\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE A
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index d6797dc65f3a3bf43b669cff86f6619bf43485d8..9fd664ff45a1c9457a057fccfca73e8d05e6a44f 100644 (file)
@@ -50,12 +50,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 2b2b952c18dd4fe777d50d67f9280f49747a7335..72c7aec17c02623c02d7e73d13b45e7b942545d2 100644 (file)
@@ -51,12 +51,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 02033831b68b78d7cc87d2b588b57dac2397aae3..b9defa6f626e8059548f03a43c5d9c558546def5 100644 (file)
@@ -47,12 +47,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy socks5://%HOSTIP:%SOCKSPORT
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 355ca0e51efeafec5026dae17de3c2f7e908e858..9317adb8b89e91f2d813df1b1bd04a3a98fc004a 100644 (file)
@@ -43,15 +43,15 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 7bcc2a1bbb40e7fba92a35eb4ed882e44f2db12d..e78767bc56aaf2af12bbd312e2316dbdc2943641 100644 (file)
@@ -37,15 +37,15 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --proxy socks5://%HOSTIP:%SOCKSPORT
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 44820a78ffc762c79067395cdad7353f0e3cea9a..b7ad8cdf0e9fe1e0e1ff10ec7c073afd1b5ca32c 100644 (file)
@@ -38,15 +38,15 @@ ftp://ftp.example.com/%TESTNUMBER --connect-to ::%HOSTIP:%FTPPORT --proxy socks5
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index a38400bb809805a208b66144611a3902adc9de74..b24af1e4af9abcd833ac2e754430b093f83a3909 100644 (file)
@@ -57,15 +57,15 @@ ftp://ftp.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 6f9670af54d7e9e5638214c13dc281fdbc73d030..0574030330fb24025ac555fcf230eb2edc0193b1 100644 (file)
@@ -59,15 +59,15 @@ ftp://ftp.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 54ab95568028aab764e98f8146826129c8e958b7..58e3045e56516dba9454b9f84717f131b93a7a88 100644 (file)
@@ -55,12 +55,12 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:1\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:1
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index dcbf7d77a15cf54618f82abe9ae3214974fc0cf7..95c81e1680a7574ec733a6adf591b1ace7f26653 100644 (file)
@@ -47,12 +47,12 @@ http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy http://
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1\r
-Host: test.remote.haxx.se.%TESTNUMBER:8990\r
-User-Agent: curl/%VERSION\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
 </protocol>
 <errorcode>
 56
index 454460983de2927de573767e204df8335ae24e47..366ea27ee458a16117c48612afdbfe88e8705e8c 100644 (file)
@@ -49,12 +49,12 @@ http://[2200::33]:%HTTPPORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCKSPORT
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: [2200::33]:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: [2200::33]:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <socks>
 atyp 4 => 22 00 00 00 00 00 00 00 00 00 00 00 00 00 00 33
index 775642f8cd0f0e74f00c25d25812feb4f7c79af0..ba7d137b219349b4fe9e4d5a13387e32c2ba0dd8 100644 (file)
@@ -68,18 +68,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/%TESTNUMBER", response="9fcd1330377365a09bbcb33b2cbb25bd"\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/%TESTNUMBER", response="9fcd1330377365a09bbcb33b2cbb25bd"
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 709656a280632521126b1a235fe6a0c2dc64c25f..b146a2bf54f4b9cab9ce69675f5e18ef442f59ce 100644 (file)
@@ -48,12 +48,12 @@ http://12.34.56.78:%HTTPPORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCKSPORT
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: 12.34.56.78:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: 12.34.56.78:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <socks>
 atyp 1 => 12.34.56.78
index db63a8f6b523321379ca837d372bae67d369ec0f..c70d5607225d97cbd79f089c87b60b92d685e5ed 100644 (file)
@@ -48,12 +48,12 @@ http://this.is.a.host.name:%HTTPPORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCK
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: this.is.a.host.name:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: this.is.a.host.name:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <socks>
 atyp 3 => this.is.a.host.name
index 1edcbdcb90171526fb20d0b8c6cc27a9fde36d02..e131ec6f0d32f745b14642b63ad276eb7c328728 100644 (file)
@@ -38,12 +38,12 @@ cookies
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/%TESTNUMBER HTTP/1.1\r
-Host: host.NOT_DISCLOSED.se\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/%TESTNUMBER HTTP/1.1
+Host: host.NOT_DISCLOSED.se
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/jar%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
index d9316f0e67910549ae86a28a5722632481059da6..31179af990d77bba1e286d889d4b016915bc959d 100644 (file)
@@ -50,17 +50,17 @@ HTTP, urlglob {}-retrieval and -o #[num] usage
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/dumpit%TESTNUMBER0001.dump">
 HTTP/1.0 200 OK
index 5f56a1a500da7454869f65669097c0c54becd97b..70720d7a498eab29855023eaf55feae570b6c13a 100644 (file)
@@ -55,12 +55,12 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET / HTTP/1.1\r
-Host: %repeat[254 x c]%:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET / HTTP/1.1
+Host: %repeat[254 x c]%:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index fbb1cf9516772da20583ecf5cd8fb391075a1c79..704a53a448dd97e33eb38197e89ec60989572381 100644 (file)
@@ -68,12 +68,12 @@ Host: foo.host:%HTTPPORT
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: foo.host:%HTTPPORT\r
-Authorization: Basic %b64[foo:baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar]b64%\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: foo.host:%HTTPPORT
+Authorization: Basic %b64[foo:baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar]b64%
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 3913567205f599c642445c6a63e04d45f9f7bb38..250a80c506fb18c8ec7980e625d0adca17f6dc22 100644 (file)
@@ -30,16 +30,16 @@ CURL_FTP_PWD_STOP=1
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-EPSV\r
-TYPE I\r
-SIZE 753\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE 753
+QUIT
 </protocol>
 </verify>
 </testcase>
index 42234bab225e3161a560a5dd7dc65c6465cdbaf9..2aa1e9db0cd64de3426e531f1ec58149392459ce 100644 (file)
@@ -42,20 +42,20 @@ ftp://%HOSTIP:%FTPPORT/path/ -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FAIL" -Q
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-NOOP 1\r
-FAIL\r
-CWD path\r
-EPSV\r
-TYPE A\r
-NOOP 2\r
-FAIL HARD\r
-LIST\r
-NOOP 3\r
-QUIT\r
+<protocol crlf="yes">
+USER anonymous
+PASS ftp@example.com
+PWD
+NOOP 1
+FAIL
+CWD path
+EPSV
+TYPE A
+NOOP 2
+FAIL HARD
+LIST
+NOOP 3
+QUIT
 </protocol>
 </verify>
 </testcase>
index a205c19772411d2117c347e1ef066a4d8dacfb3d..56038a66d8019f14765dd6d3ea1c43a21138ae4a 100644 (file)
@@ -47,17 +47,17 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/want/%TESTNUM
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /want/%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /want/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <stdout>
 HTTP/1.1 200 OK
index 9cf9b2c3b14b1af74ed5a88d761a0d22301e626d..c4f5566c1e31d974b9723c5a82d87a3b1b963915 100644 (file)
@@ -42,37 +42,37 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER
 s/^--------------------------[A-Za-z0-9]*/------------------------------/
 s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
 </strippart>
-<protocol>
-POST /we/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Length: 200\r
-Content-Type: multipart/form-data; boundary=----------------------------\r
-\r
-------------------------------\r
-Content-Disposition: form-data; name="data"\r
-Content-Type: text/html\r
-\r
-<title>fun-times</title>\r
---------------------------------\r
-POST /we/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Accept: */*\r
-Content-Length: 427\r
-Content-Type: multipart/form-data; boundary=----------------------------\r
-\r
-------------------------------\r
-Content-Disposition: form-data\r
-Content-Type: multipart/mixed; boundary=----------------------------\r
-\r
-------------------------------\r
-Content-Disposition: attachment; name="data"\r
-Content-Type: text/html\r
-\r
-<title>fun-times</title>\r
---------------------------------\r
-\r
---------------------------------\r
+<protocol crlf="yes">
+POST /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 200
+Content-Type: multipart/form-data; boundary=----------------------------
+
+------------------------------
+Content-Disposition: form-data; name="data"
+Content-Type: text/html
+
+<title>fun-times</title>
+--------------------------------
+POST /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 427
+Content-Type: multipart/form-data; boundary=----------------------------
+
+------------------------------
+Content-Disposition: form-data
+Content-Type: multipart/mixed; boundary=----------------------------
+
+------------------------------
+Content-Disposition: attachment; name="data"
+Content-Type: text/html
+
+<title>fun-times</title>
+--------------------------------
+
+--------------------------------
 </protocol>
 </verify>
 </testcase>
index 62ce9e6325376fd6b5889db3a10fb74d5ed91cf5..2d7aedcf7f4961511fc6dd9652df2f19ebf9de15 100644 (file)
@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O --remote-time --output-dir %LOGDIR
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <file name="%LOGDIR/%TESTNUMBER">
 12345
index baa9bfc3607447d8a38352f641e1a54d3c71a81a..bde62adce37df6c4e47a0ab248ceaf6520d9a168 100644 (file)
@@ -42,13 +42,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
+
 </protocol>
 </verify>
 </testcase>
index 7b5c3696dc23899b85612b0d6438a05034997e59..6a03ad8feee432e780374284ecffd674e733d4bd 100644 (file)
@@ -52,13 +52,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser%repeat[1100 x A]%:testpass --nt
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 <errorcode>
 100
index d52fb15548007c4907a551acf9e8bdeed4656e5d..545adca00108e989e4bc4a55b14dcf693d1ef924 100644 (file)
@@ -54,13 +54,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 11:00:00 1999 GMT"
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT
+
 </protocol>
 </verify>
 </testcase>
index e836b3bf5c3cdeb5a7ade482fe4c6248859970e5..8a52c09f988b18d03f4f8c1b5846d05f84f73cc5 100644 (file)
@@ -42,13 +42,13 @@ ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index b6af9677ad3000f6dcfff3574389d7ce0b260b53..479f1b1be2414c61638d23736bda1a52b9aa285a 100644 (file)
@@ -75,7 +75,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --no-progress-meter -X IGLOO -d moo --locat
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline="yes" crlf="yes">
+<protocol crlf="yes" nonewline="yes">
 IGLOO /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
index 2e0c4077b49ca728c3098ff7946f2c6260bb35e2..bfef4bd07df7a7b1771ffa0816b13b3d9ebb9fd3 100644 (file)
@@ -75,7 +75,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -X IGLOO -d moo --follow
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline="yes" crlf="yes">
+<protocol crlf="yes" nonewline="yes">
 IGLOO /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
index b0602c1302f96df318c80b07eb9272864898a9ef..5c28f3ccd70af47b0dd93bd20ff361542b11f511 100644 (file)
@@ -75,7 +75,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -X IGLOO -d moo --follow
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline="yes" crlf="yes">
+<protocol crlf="yes" nonewline="yes">
 IGLOO /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
index e8563a598fe4afb78bf08838c8b7f6afe9cb5c5c..ec6d94ca8a4f3fbb1ab7c9722151ba8b34e06652 100644 (file)
@@ -42,12 +42,12 @@ IMAP with --login-options 'AUTH=+LOGIN'
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 5ed328bbedc8a2fd05f427be90536c0e6fea4c52..ee1263eba4f1e9f8f9e9c7f5deea5739bbb03d32 100644 (file)
@@ -88,13 +88,13 @@ cookies
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /we/want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Cookie: name with space=is weird but; trailingspace=removed; cookie=perhaps; cookie=yes; foobar=name; blexp=yesyes; cookie9=junk--\r
-\r
+<protocol crlf="yes">
+GET /we/want/%TESTNUMBER 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; cookie9=junk--
+
 </protocol>
 </verify>
 </testcase>
index 2ffcd8987f39c32e459b66096be57ee8c4e217e5..c840527bf10865788c390ef9fe45e6c7a0dd0605 100644 (file)
@@ -70,12 +70,12 @@ Proxy-Authorization: Basic %b64[youare:yourself]b64%
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
-<protocol>
-GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: test.%TESTNUMBER:%HTTPPORT\r
-Authorization: Basic %b64[iam:myself]b64%\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: test.%TESTNUMBER:%HTTPPORT
+Authorization: Basic %b64[iam:myself]b64%
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index a2daf240a7000fb48272ceeeac42524e0f5c8d16..11a3f877844f01e51e19da13363610394adea97a 100644 (file)
@@ -38,12 +38,12 @@ IMAP FETCH message
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN "\"user" "sec\"ret{"\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN "\"user" "sec\"ret{"
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 9b68d62a86a7564fc34e0a35928313aedc66f6a6..0fda1c25044e00f8524ca4c35f1657991bc0d75a 100644 (file)
@@ -35,12 +35,12 @@ IMAP FETCH message by MAILINDEX and SECTION
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 123 BODY[1]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 SELECT %TESTNUMBER
+A004 FETCH 123 BODY[1]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 1e2e35bfa01b5837060a4c813e8819dd58dc97f5..8d93c792253bcdbbc272b2e5c3327a82169edcc5 100644 (file)
@@ -36,12 +36,12 @@ IMAP SELECT UIDVALIDITY Success
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 123 BODY[TEXT]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 SELECT %TESTNUMBER
+A004 FETCH 123 BODY[TEXT]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 6fb00eb0a6a73dfabbb38ab6ee5782b16a5f55db..d5bd7b19f971fe5072e47c395e15a04b1e02ab75 100644 (file)
@@ -35,11 +35,11 @@ IMAP SELECT UIDVALIDITY Failure
 <errorcode>
 78
 </errorcode>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 SELECT %TESTNUMBER\r
-A004 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 SELECT %TESTNUMBER
+A004 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 9d6c7e94e9db8aea7ab46a2fbb5af3efef83b089..f755a262aef21732eba825ad2bb48903a1dba3d0 100644 (file)
@@ -35,13 +35,13 @@ IMAP doesn't perform SELECT if reusing the same mailbox
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 123 BODY[1]\r
-A005 FETCH 456 BODY[2.3]\r
-A006 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 SELECT %TESTNUMBER
+A004 FETCH 123 BODY[1]
+A005 FETCH 456 BODY[2.3]
+A006 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 7370e63604b9decef65752f34898d3fa1c0d4b02..8953d586805d6637fdba3278ea9fc9231ffbd3d9 100644 (file)
@@ -41,22 +41,22 @@ Hello Joe, do you think we can meet at 3:30 tomorrow?
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 APPEND %TESTNUMBER (\Seen) {295}\r
-A004 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 APPEND %TESTNUMBER (\Seen) {295}
+A004 LOGOUT
 </protocol>
-<upload>
-Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)\r
-From: Fred Foobar <foobar@example.COM>\r
-Subject: afternoon meeting\r
-To: joe@example.com\r
-Message-Id: <B27397-0100000@example.COM>\r
-MIME-Version: 1.0\r
-Content-Type: TEXT/PLAIN; CHARSET=US-ASCII\r
-\r
-Hello Joe, do you think we can meet at 3:30 tomorrow?\r
+<upload crlf="yes">
+Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)
+From: Fred Foobar <foobar@example.COM>
+Subject: afternoon meeting
+To: joe@example.com
+Message-Id: <B27397-0100000@example.COM>
+MIME-Version: 1.0
+Content-Type: TEXT/PLAIN; CHARSET=US-ASCII
+
+Hello Joe, do you think we can meet at 3:30 tomorrow?
 </upload>
 </verify>
 </testcase>
index adfbc11212cf9988e4bb122b9d570b0c9c34202c..6b7e6ff7feccab06212131b0cbaf83ca173e399e 100644 (file)
@@ -34,11 +34,11 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -u user:secret
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 LIST "%TESTNUMBER" *\r
-A004 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 LIST "%TESTNUMBER" *
+A004 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 80a1044da0f4c302c4fdb9d99f7b442211434b44..5da8105914158cea1d531f035f2c967d37316e75 100644 (file)
@@ -35,11 +35,11 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'LSUB "%TESTNUMBER" *'
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 LSUB "%TESTNUMBER" *\r
-A004 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 LSUB "%TESTNUMBER" *
+A004 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 542f87e6d6abdd192a7ba8a2c5344e8fcd246def..6795143d4de4ef8f485b61446186270dffa1e93a 100644 (file)
@@ -39,11 +39,11 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'EXAMINE %TESTNUMBER'
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 EXAMINE %TESTNUMBER\r
-A004 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 EXAMINE %TESTNUMBER
+A004 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 25635d21f04fe35594e2bdcc72e99e26631be03e..af4c8084195f2274ddbe98671a68a0a6ef2caea1 100644 (file)
@@ -33,11 +33,11 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'STATUS %TESTNUMBER (UIDNEXT MESSAGES
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 STATUS %TESTNUMBER (UIDNEXT MESSAGES)\r
-A004 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 STATUS %TESTNUMBER (UIDNEXT MESSAGES)
+A004 LOGOUT
 </protocol>
 </verify>
 </testcase>
index f692f34f46e85042417c9cb251eebc57971c13c0..27f1247a97156f331878d8ad5ef825dcc1071ac6 100644 (file)
@@ -73,21 +73,21 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy-user testuser:testpass -x http://%H
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 37d76f6ba0bc15734d35bdb6051fd433d8e797f9..af9a310f7ab58eaaeae17238951e20dc1714a6b9 100644 (file)
@@ -32,12 +32,12 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER?NEW -u user:secret
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 SELECT %TESTNUMBER\r
-A004 SEARCH NEW\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 SELECT %TESTNUMBER
+A004 SEARCH NEW
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index e2520c3319642e75c398c94ab75df76ccfde566f..5f515022444e28cc8729e82dac971d15bb0fd047 100644 (file)
@@ -30,11 +30,11 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'CREATE %TESTNUMBER'
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 CREATE %TESTNUMBER\r
-A004 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 CREATE %TESTNUMBER
+A004 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 0180e023e8d005453c6c39be8cd8f35ac4e5f6b8..f51b71dad5dce4c9050ca8567f54e65c67dbd7ce 100644 (file)
@@ -30,11 +30,11 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'DELETE %TESTNUMBER'
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 DELETE %TESTNUMBER\r
-A004 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 DELETE %TESTNUMBER
+A004 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 674d308fd7e9ad2642c81d5736ba577fa857c220..741b4968fb48311fdc3da11cf5529ffe6a4ce2da 100644 (file)
@@ -30,11 +30,11 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'RENAME 666 %TESTNUMBER'
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 RENAME 666 %TESTNUMBER\r
-A004 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 RENAME 666 %TESTNUMBER
+A004 LOGOUT
 </protocol>
 </verify>
 </testcase>
index e73b0e894a32a0d92501baee38386db317945852..df10a65592d6cff931912225c1eafc198bb846d8 100644 (file)
@@ -30,12 +30,12 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -u user:secret -X 'CHECK'
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 SELECT %TESTNUMBER\r
-A004 CHECK\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 SELECT %TESTNUMBER
+A004 CHECK
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 04daef90f0f57ae40850c621e9049a48ffdb972d..57af869fa3fe68fe79eb3a109ecec9d13da4476d 100644 (file)
@@ -34,13 +34,13 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -X 'STORE 123 +Flags \Deleted' -u user:secr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 SELECT %TESTNUMBER\r
-A004 STORE 123 +Flags \Deleted\r
-A005 CLOSE\r
-A006 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 SELECT %TESTNUMBER
+A004 STORE 123 +Flags \Deleted
+A005 CLOSE
+A006 LOGOUT
 </protocol>
 </verify>
 </testcase>
index b6054cacfcd62b6c8145f44f14f89db6594d3824..c45cc1172f15eec6fa6b74dfa103f0f686f249a2 100644 (file)
@@ -37,13 +37,13 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -X 'STORE 123 +Flags \Deleted' -u user:secr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 SELECT %TESTNUMBER\r
-A004 STORE 123 +Flags \Deleted\r
-A005 EXPUNGE\r
-A006 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 SELECT %TESTNUMBER
+A004 STORE 123 +Flags \Deleted
+A005 EXPUNGE
+A006 LOGOUT
 </protocol>
 </verify>
 </testcase>
index c608f65b0fd0db6c5d2288cba72cd1cd9b7ab14e..ce5b0adb456dba29e76e17e3dd7d5d50f2e394d5 100644 (file)
@@ -30,11 +30,11 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'COPY 123 %TESTNUMBER'
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 COPY 123 %TESTNUMBER\r
-A004 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 COPY 123 %TESTNUMBER
+A004 LOGOUT
 </protocol>
 </verify>
 </testcase>
index dd917ea3999e4676d5b49e6a6e8285fa39c20fc7..e096b13fd4867c8a3a2c26e08be35dfe51117144 100644 (file)
@@ -36,11 +36,11 @@ imap://%HOSTIP:%IMAPPORT -X NOOP -u user:secret
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 NOOP\r
-A004 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 NOOP
+A004 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 50ff2266912642de592def0032b1408df40c2be4..81f0277c4555e7f7a51d11f321b21e28303e951e 100644 (file)
@@ -44,13 +44,13 @@ IMAP plain authentication
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE PLAIN\r
-AHVzZXIAc2VjcmV0\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE PLAIN
+AHVzZXIAc2VjcmV0
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index c343d0a2de5d28352d9c7afc7ce38caaca363274..6974bc3a1f4bfcef4c39cb9e6fc0bb9793c3d152 100644 (file)
@@ -41,14 +41,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy-user testuser:testpass -x http://%H
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Proxy-Authorization: Basic %b64[testuser:testpass]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Proxy-Authorization: Basic %b64[testuser:testpass]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 80ac25f27dc2b1279cc76977d351bcc5acbbbdb4..e617e241bfdd871c4e09baf3836c2283cf227614 100644 (file)
@@ -44,14 +44,14 @@ IMAP login authentication
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE LOGIN\r
-dXNlcg==\r
-c2VjcmV0\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE LOGIN
+dXNlcg==
+c2VjcmV0
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 4179220800ef30f68278639df6ad2c7440a414b5..2b928fe1d0636f82d200ec35c580134f4817fbba 100644 (file)
@@ -48,13 +48,13 @@ IMAP CRAM-MD5 authentication
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE CRAM-MD5\r
-dXNlciA3MDMxNzI1NTk5ZmRiYjVkNDEyNjg5YWEzMjNlM2UwYg==\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE CRAM-MD5
+dXNlciA3MDMxNzI1NTk5ZmRiYjVkNDEyNjg5YWEzMjNlM2UwYg==
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 61db77dc3c362c98c0f1420caec690fa766a709d..4f4859544d14d498faa64ef595ead98fe356fc2b 100644 (file)
@@ -50,14 +50,14 @@ IMAP NTLM authentication
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE NTLM\r
-TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE NTLM
+TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 91d75fed4a7b35c57a1c3dbec8d279bf2d495136..aef99f0f0baafe0d6c31ee92a738a71fd7c5f98b 100644 (file)
@@ -54,14 +54,14 @@ IMAP DIGEST-MD5 authentication
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE DIGEST-MD5\r
-dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIzNDMzMzIzMTM1MzMzMjMxMzYzMzMyMzEzNzMzMzIzMSIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJpbWFwLzEyNy4wLjAuMSIscmVzcG9uc2U9YmU2MzgyNDkzNjJkN2FhMGUzNTM4NTA3Njc1MWFiNDgscW9wPWF1dGg=\r
-\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE DIGEST-MD5
+dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIzNDMzMzIzMTM1MzMzMjMxMzYzMzMyMzEzNzMzMzIzMSIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJpbWFwLzEyNy4wLjAuMSIscmVzcG9uc2U9YmU2MzgyNDkzNjJkN2FhMGUzNTM4NTA3Njc1MWFiNDgscW9wPWF1dGg=
+
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 0abda22b0a29d7bcca76c18ffb961106338cc6a0..b2d16dc9c8603b0170e51c8aa2f704d3d6da8666 100644 (file)
@@ -44,13 +44,13 @@ IMAP OAuth 2.0 (XOAUTH2) authentication
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE XOAUTH2\r
-dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE XOAUTH2
+dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 64d57f5feb30dc47696f5494c86ba552a28b5c39..9f5336e3775b73818e8abcf3b8d6ebd4cba0908c 100644 (file)
@@ -45,12 +45,12 @@ IMAP plain authentication with initial response
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE PLAIN AHVzZXIAc2VjcmV0\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE PLAIN AHVzZXIAc2VjcmV0
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index b3b0dc335f9af2f4dbb4e7444448fb2b4f2757be..9f49957e7da5dc5f0bb55327b42d6f3f4e484f24 100644 (file)
@@ -45,13 +45,13 @@ IMAP login authentication with initial response
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE LOGIN dXNlcg==\r
-c2VjcmV0\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE LOGIN dXNlcg==
+c2VjcmV0
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 493775381f096af56c095c5b3a5be24e84476443..58a89015bb292be802b833d2c01de52174aac1ef 100644 (file)
@@ -51,13 +51,13 @@ IMAP NTLM authentication with initial response
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index a3548464e88129da23cd9532e5282416ae1fb17a..cda2e33258eb200b116e9c23275bf0e634432c63 100644 (file)
@@ -45,12 +45,12 @@ IMAP OAuth 2.0 (XOAUTH2) authentication with initial response
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE XOAUTH2 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE XOAUTH2 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 1d138ce10a1b1555e9a32876236144ff122c8c51..b6e89a65fb30c9e4ced8377326cfd38b1cdc70e8 100644 (file)
@@ -67,13 +67,13 @@ User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
-<protocol>
-GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: test.%TESTNUMBER:%HTTPPORT\r
-Authorization: Basic %b64[iam:my:;self]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: test.%TESTNUMBER:%HTTPPORT
+Authorization: Basic %b64[iam:my:;self]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 1465406e1b0038da0548ad5793e210bf1a8aa626..8124e1a13c9cac62ffa17b2ab28c4563528a298b 100644 (file)
@@ -48,10 +48,10 @@ IMAP CRAM-MD5 graceful cancellation
 #
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "LOGOUT"
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE CRAM-MD5\r
-*\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE CRAM-MD5
+*
 </protocol>
 </verify>
 </testcase>
index 1ef3d45c418360847ec44bafaeca30d64fbbc72c..c095bcda5db6d3ea2d7131bfc9ea6a5d32c94342 100644 (file)
@@ -49,11 +49,11 @@ IMAP NTLM graceful cancellation
 #
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "LOGOUT"
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE NTLM\r
-TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-*\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE NTLM
+TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+*
 </protocol>
 </verify>
 </testcase>
index 5787bbc797fd8093904b84ed7bd3a50fb7bf6681..f5a0323e3a58774d82e4340dbd293439c08cb121 100644 (file)
@@ -50,10 +50,10 @@ IMAP DIGEST-MD5 graceful cancellation
 #
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "LOGOUT"
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE DIGEST-MD5\r
-*\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE DIGEST-MD5
+*
 </protocol>
 </verify>
 </testcase>
index bda66c514c928882de46bfeb6b9f80e800f8d7dd..f8a204deb266f26b8d19696b4c0a678dcd002043 100644 (file)
@@ -52,15 +52,15 @@ IMAP CRAM-MD5 authentication with SASL downgrade
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE CRAM-MD5\r
-*\r
-A003 AUTHENTICATE PLAIN\r
-AHVzZXIAc2VjcmV0\r
-A004 SELECT %TESTNUMBER\r
-A005 FETCH 1 BODY[]\r
-A006 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE CRAM-MD5
+*
+A003 AUTHENTICATE PLAIN
+AHVzZXIAc2VjcmV0
+A004 SELECT %TESTNUMBER
+A005 FETCH 1 BODY[]
+A006 LOGOUT
 </protocol>
 </verify>
 </testcase>
index ccdf0d1fdba0441a28850e5fe3f46dff5e4d9249..fdfcde88346101a81cecaba2656120b2aedcda84 100644 (file)
@@ -53,16 +53,16 @@ IMAP NTLM authentication with SASL downgrade
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE NTLM\r
-TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-*\r
-A003 AUTHENTICATE PLAIN\r
-AHVzZXIAc2VjcmV0\r
-A004 SELECT %TESTNUMBER\r
-A005 FETCH 1 BODY[]\r
-A006 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE NTLM
+TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+*
+A003 AUTHENTICATE PLAIN
+AHVzZXIAc2VjcmV0
+A004 SELECT %TESTNUMBER
+A005 FETCH 1 BODY[]
+A006 LOGOUT
 </protocol>
 </verify>
 </testcase>
index aa3a446706104f59343cf2fbf36225b304423fc6..b1e0f34225982c918f87478624e58fc57cb250f2 100644 (file)
@@ -54,15 +54,15 @@ IMAP DIGEST-MD5 authentication with SASL downgrade
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE DIGEST-MD5\r
-*\r
-A003 AUTHENTICATE PLAIN\r
-AHVzZXIAc2VjcmV0\r
-A004 SELECT %TESTNUMBER\r
-A005 FETCH 1 BODY[]\r
-A006 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE DIGEST-MD5
+*
+A003 AUTHENTICATE PLAIN
+AHVzZXIAc2VjcmV0
+A004 SELECT %TESTNUMBER
+A005 FETCH 1 BODY[]
+A006 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 821d5392bb8c063481a03256aeb43e11b29c5ff9..cdcb0e9a9b77750d12855f20cb046bd315a8b784 100644 (file)
@@ -43,17 +43,17 @@ IMAP multiple connection authentication
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user.one secret\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
-B001 CAPABILITY\r
-B002 LOGIN user.two secret\r
-B003 SELECT %TESTNUMBER\r
-B004 FETCH 2 BODY[]\r
-B005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user.one secret
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
+B001 CAPABILITY
+B002 LOGIN user.two secret
+B003 SELECT %TESTNUMBER
+B004 FETCH 2 BODY[]
+B005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 74b575a6ed7f9818101b326464852f1dec3c126f..b5735ea09913ede391fdad1b31cc644203759945 100644 (file)
@@ -44,13 +44,13 @@ IMAP external authentication
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE EXTERNAL\r
-dXNlcg==\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE EXTERNAL
+dXNlcg==
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index c6081fb6386f06c2c13a8b94911cf6265778f1f0..bbd282289dcb31e5315ba1e66394903680465152 100644 (file)
@@ -44,13 +44,13 @@ IMAP external authentication without credentials
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE EXTERNAL\r
-=\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE EXTERNAL
+=
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 9f443b42aab4a25bf636a410dc76503af41ac547..8350c414bf872a39d6d1cb5dec30ff4f84ac1049 100644 (file)
@@ -45,12 +45,12 @@ IMAP external authentication with initial response
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE EXTERNAL dXNlcg==\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE EXTERNAL dXNlcg==
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 2cbd8a575d471f25005ba1edc21b14542fcbc064..9dca293375a61a4bc94713f0d0d2fb43bc56074a 100644 (file)
@@ -41,14 +41,14 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[iam:myself]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[iam:myself]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 48fd32a34949685e9ab16974812d749c761a62e4..612e1119eb9698b96622211d0a7d0841c17a3c5b 100644 (file)
@@ -45,12 +45,12 @@ IMAP external authentication with initial response without credentials
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE EXTERNAL =\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE EXTERNAL =
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index debf6cfb848bebb7922f577516b648d601616b8f..eee632f5557408c3127cc9defa81f1e9376082d3 100644 (file)
@@ -45,12 +45,12 @@ IMAP custom request doesn't check continuation data
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 123 BODY[1]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 SELECT %TESTNUMBER
+A004 FETCH 123 BODY[1]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 1cea6e39d35fb4721877b85f90636500af50d23f..e66d5b1aa6ab466ea80b8d9c628c1698bba5d848 100644 (file)
@@ -47,13 +47,13 @@ IMAP OAuth 2.0 (OAUTHBEARER) authentication
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE OAUTHBEARER\r
-%b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE OAUTHBEARER
+%b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 774c4c5e74b4f8b33466cfdf19cf1a9c00aae587..fa8df84c8f670099c2098785f5892563cfc1be3f 100644 (file)
@@ -46,12 +46,12 @@ IMAP OAuth 2.0 (OAUTHBEARER) authentication with initial response
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index fd65d750c6349413963ec7114abad10170a7dde7..caa324638a56c66fe296690985569001326a6152 100644 (file)
@@ -43,10 +43,10 @@ IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation
 #
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "LOGOUT"
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE OAUTHBEARER\r
-%b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE OAUTHBEARER
+%b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
 </protocol>
 </verify>
 </testcase>
index c9cae6d65a2f7487f3ea482113ac35742848faad..f68be7d67c519530196a1e5590aa3fd314067f6c 100644 (file)
@@ -45,10 +45,10 @@ IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response
 #
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "LOGOUT"
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%\r
-%b64[%01]b64%\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+%b64[%01]b64%
 </protocol>
 </verify>
 </testcase>
index 49c391ffe9a778d5fa8ec16ae41c45b93edf2d0b..bbbc92c51a093f689f122e7beb923e63d398d979 100644 (file)
@@ -40,11 +40,11 @@ IMAP PREAUTH response
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 SELECT %TESTNUMBER\r
-A003 FETCH 1 BODY[]\r
-A004 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 SELECT %TESTNUMBER
+A003 FETCH 1 BODY[]
+A004 LOGOUT
 </protocol>
 </verify>
 </testcase>
index 6972f45fb129a352c0e3952007b123719946c1f9..b78cad118926bd35d2d0cd8b511ff6aa355307db 100644 (file)
@@ -38,12 +38,12 @@ IMAP FETCH message
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN "\"user" "sec\"ret{"\r
-A003 SELECT %TESTNUMBER\r
-A004 UID FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN "\"user" "sec\"ret{"
+A003 SELECT %TESTNUMBER
+A004 UID FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index a0d5a29e7de8ab0045ff886057ab6b5ff4891f99..32f589d525881e43fc29e7789aba73e5c8e38457 100644 (file)
@@ -44,13 +44,13 @@ IMAP plain authentication with alternative authorization identity
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE PLAIN\r
-c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE PLAIN
+c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index e092da3904b0982effcc956354077d4bb733d06f..3e771c2ffd794196195396cff6b9c7606ff13139 100644 (file)
@@ -42,10 +42,10 @@ IMAP plain auth with alt authorization identity (Not authorized)
 #
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "LOGOUT"
-<protocol>
-A001 CAPABILITY\r
-A002 AUTHENTICATE PLAIN\r
-dXJzZWwAa3VydAB4aXBqM3BsbXE=\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 AUTHENTICATE PLAIN
+dXJzZWwAa3VydAB4aXBqM3BsbXE=
 </protocol>
 </verify>
 </testcase>
index 2acc87cb0617d391beb1268a3311ea1a2eb1a6c6..ab9c2287db287549671fcf9b8b9a70f8d88c9d1e 100644 (file)
@@ -44,15 +44,15 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Proxy-Authorization: Basic %b64[testing:this]b64%\r
-Authorization: Basic %b64[iam:myself]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Proxy-Authorization: Basic %b64[testing:this]b64%
+Authorization: Basic %b64[iam:myself]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index f0a9f17d65d828f0d984e084f52c1c5a8d4842be..c9cf2ffae6c143d58a14312682ef6eb7a6e9ee5d 100644 (file)
@@ -38,12 +38,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-USER user\r
-PASS secret\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+USER user
+PASS secret
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 3f24c14b34e36eacac4e148b61d231eaaa1235cd..abecf7daa76dd129076c4fc51fa59bdb9a25e2b3 100644 (file)
@@ -33,12 +33,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -l -u user:secret
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-USER user\r
-PASS secret\r
-LIST %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+USER user
+PASS secret
+LIST %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index ed433862bfbe58e03a263f674d6b64b79859dcba..87e47d67aef2f9181a262f925d5da1ee889823b5 100644 (file)
@@ -36,12 +36,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -l -u user:secret
 <errorcode>
 8
 </errorcode>
-<protocol>
-CAPA\r
-USER user\r
-PASS secret\r
-LIST %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+USER user
+PASS secret
+LIST %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 3b57e7d08690aca5a285d6b21e4e2885f5c450c1..29c4580452dd8d52ca1cb06938f7f024ebbfc448 100644 (file)
@@ -42,12 +42,12 @@ pop3://%HOSTIP:%POP3PORT/ -u user:secret
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-USER user\r
-PASS secret\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+USER user
+PASS secret
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index acb32b01f387d73fc8c5c6de33f29f978f588c16..4491153803cc36ac7ed345a91ece26f4174646a2 100644 (file)
@@ -34,12 +34,12 @@ pop3://%HOSTIP:%POP3PORT/ -u user:secret
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-USER user\r
-PASS secret\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+USER user
+PASS secret
+LIST
+QUIT
 </protocol>
 </verify>
 </testcase>
index c7c10be6517b19d907dee6e889dddd15e17df7c8..9e95cad2731837db64349e143c1e8fbe32b1f2ba 100644 (file)
@@ -36,12 +36,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 <errorcode>
 8
 </errorcode>
-<protocol>
-CAPA\r
-USER user\r
-PASS secret\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+USER user
+PASS secret
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index c107612deed061b5b9ee876b44b02655a423fe03..4de4d7270fda34ade85093b59309f152946611ae 100644 (file)
@@ -39,10 +39,10 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:wrong
 #
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
-<protocol>
-CAPA\r
-USER user\r
-PASS wrong\r
+<protocol crlf="yes">
+CAPA
+USER user
+PASS wrong
 </protocol>
 </verify>
 </testcase>
index 5868a2d57ffdaf9d601653c20173137c2e665722..6d1e7daddcde7fe96909701b840d465c2dae442f 100644 (file)
@@ -49,12 +49,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-USER user\r
-PASS secret\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+USER user
+PASS secret
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index f119100ecdaf6943ab3c11745f578f971acf481e..0362bb81fe9a7b5f87e7fed808fd8a1386b7727e 100644 (file)
@@ -30,12 +30,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret -X DELE -I
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-USER user\r
-PASS secret\r
-DELE %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+USER user
+PASS secret
+DELE %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 11ffc068e54274b2db10a3e84cb80a5992a4feef..0603d643ea2cc30c39d2c4c106d1c7f0561736c7 100644 (file)
@@ -30,12 +30,12 @@ pop3://%HOSTIP:%POP3PORT -u user:secret -X STAT -I
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-USER user\r
-PASS secret\r
-STAT\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+USER user
+PASS secret
+STAT
+QUIT
 </protocol>
 </verify>
 </testcase>
index ba9c90d7a8f74b568219ee894d9e5df86fc96f2b..a0e562736f0ec09539f4c6bbe407c03ca0d8a4b5 100644 (file)
@@ -64,22 +64,22 @@ HTTP, urlglob []-retrieval and -o #[num] usage
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER0001 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0002 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER0003 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0003 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 # we check the second file
index 5e1f3f611b2712abd14df48a4d11cb09467243c6..10e931f7f21b6bdf4046d1b097645a34900ea1c4 100644 (file)
@@ -30,12 +30,12 @@ pop3://%HOSTIP:%POP3PORT -u user:secret -X NOOP -I
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-USER user\r
-PASS secret\r
-NOOP\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+USER user
+PASS secret
+NOOP
+QUIT
 </protocol>
 </verify>
 </testcase>
index 65b44c1cc0b8b7d41e8219dab4ad4079b5bf6729..c40d06af14400358b698de6e9c60629b1e35e932 100644 (file)
@@ -41,12 +41,12 @@ pop3://%HOSTIP:%POP3PORT -u user:secret -X UIDL
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-USER user\r
-PASS secret\r
-UIDL\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+USER user
+PASS secret
+UIDL
+QUIT
 </protocol>
 </verify>
 </testcase>
index ab0feaa4838a0cb169a04f7dd7ee065dde303321..73c50ff061d8f823307f87f973d97d0275d3b494 100644 (file)
@@ -39,12 +39,12 @@ pop3://%HOSTIP:%POP3PORT -u user:secret -X 'TOP %TESTNUMBER 0'
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-USER user\r
-PASS secret\r
-TOP %TESTNUMBER 0\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+USER user
+PASS secret
+TOP %TESTNUMBER 0
+QUIT
 </protocol>
 </verify>
 </testcase>
index f7b288baa607e3a8d623175446c1848f8144fd72..a246652fd9cf1bb1fd7342eeefd7ef25accbe27c 100644 (file)
@@ -30,12 +30,12 @@ pop3://%HOSTIP:%POP3PORT -u user:secret -X RSET -I
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-USER user\r
-PASS secret\r
-RSET\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+USER user
+PASS secret
+RSET
+QUIT
 </protocol>
 </verify>
 </testcase>
index 233764f64ec163bc08db92bfe60cea3e011387bb..d2ddb8dee9fcfb684bb24e0d154ba42a8a7c33c4 100644 (file)
@@ -45,11 +45,11 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-APOP user 7501b4cdc224d469940e65e7b5e4d6eb\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+APOP user 7501b4cdc224d469940e65e7b5e4d6eb
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 59bf1c154b5b44f88a364baeaabafc47dde5810d..f88ba45ed4236a53b80b68f6c5549cc14f12f81f 100644 (file)
@@ -46,12 +46,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-AUTH PLAIN\r
-AHVzZXIAc2VjcmV0\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+AUTH PLAIN
+AHVzZXIAc2VjcmV0
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index adab0d8960365bac29a746cd695c8da9a7895388..2ea66bab3898b6d631c38e623e3f63727129def9 100644 (file)
@@ -46,13 +46,13 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-AUTH LOGIN\r
-dXNlcg==\r
-c2VjcmV0\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+AUTH LOGIN
+dXNlcg==
+c2VjcmV0
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 76ad1aa57c22d51c4216b1211166073e4db536b7..4db0704c644338087573532d3b98239d4ddeddf7 100644 (file)
@@ -50,12 +50,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-AUTH CRAM-MD5\r
-dXNlciA3MDMxNzI1NTk5ZmRiYjVkNDEyNjg5YWEzMjNlM2UwYg==\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+AUTH CRAM-MD5
+dXNlciA3MDMxNzI1NTk5ZmRiYjVkNDEyNjg5YWEzMjNlM2UwYg==
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 6807fa56f170ab73b880dc5af1928b311c1488f5..59284154c957479d64c2dcc351d9caca53488fad 100644 (file)
@@ -52,13 +52,13 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u testuser:testpass
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-AUTH NTLM\r
-TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+AUTH NTLM
+TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index b6f91a266a02e6024030e4db953d1906ae5535ea..588be6f3a140aa8d8df116a42aabc128210efee1 100644 (file)
@@ -56,13 +56,13 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-AUTH DIGEST-MD5\r
-dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIzNDMzMzIzMTM1MzMzMjMxMzYzMzMyMzEzNzMzMzIzMSIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJwb3AvMTI3LjAuMC4xIixyZXNwb25zZT0xODMxNTU0OGM3ZjNhMzdlNzE2ZmE4ZTkwZGZhYjliNixxb3A9YXV0aA==\r
-\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+AUTH DIGEST-MD5
+dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIzNDMzMzIzMTM1MzMzMjMxMzYzMzMyMzEzNzMzMzIzMSIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJwb3AvMTI3LjAuMC4xIixyZXNwb25zZT0xODMxNTU0OGM3ZjNhMzdlNzE2ZmE4ZTkwZGZhYjliNixxb3A9YXV0aA==
+
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index b1329da9aa17d2f66084b7a20539c8567116d2be..d0870d390981d613b01d31e80047e767c2c755cc 100644 (file)
@@ -46,12 +46,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-AUTH XOAUTH2\r
-dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+AUTH XOAUTH2
+dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 38335177d4d5b989b5e6b222222a1451754b4ee6..e0afbee00138f7091bb214456015a4a4b0348696 100644 (file)
@@ -46,11 +46,11 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --sasl-ir
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-AUTH PLAIN AHVzZXIAc2VjcmV0\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+AUTH PLAIN AHVzZXIAc2VjcmV0
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index f6c5974262fd82537efa211f41642befdee1cf16..439bbf6b148cf0a19e0ae8199a6e6c6dce060a70 100644 (file)
@@ -46,12 +46,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --sasl-ir
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-AUTH LOGIN dXNlcg==\r
-c2VjcmV0\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+AUTH LOGIN dXNlcg==
+c2VjcmV0
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 0f5f3be9b1381737cd3ac8fc81a06c1248e8511c..e6ac4057d648579584bf7520992cd640c6786bb1 100644 (file)
@@ -52,12 +52,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u testuser:testpass --sasl-ir
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-AUTH NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+AUTH NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 810bc49d170b6d45325396d1bf431f0dd1864c8f..cbb1fbe137b0a09eddd34b6704c348730a14f2d2 100644 (file)
@@ -46,11 +46,11 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --s
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-AUTH XOAUTH2 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+AUTH XOAUTH2 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 3cbed8b5eeb0e49e3076645ae9dbb86ebd9d9f79..85ea5fe3b19b481d900d6d256b617bd255cc8b25 100644 (file)
@@ -49,10 +49,10 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 #
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
-<protocol>
-CAPA\r
-AUTH CRAM-MD5\r
-*\r
+<protocol crlf="yes">
+CAPA
+AUTH CRAM-MD5
+*
 </protocol>
 </verify>
 </testcase>
index e2cb4b37657077b986fcf174e555fe7f0b732770..8f4ac37be1f4bea7681f586d618904ad89818d0e 100644 (file)
@@ -50,11 +50,11 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u testuser:testpass
 #
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
-<protocol>
-CAPA\r
-AUTH NTLM\r
-TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-*\r
+<protocol crlf="yes">
+CAPA
+AUTH NTLM
+TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+*
 </protocol>
 </verify>
 </testcase>
index fe578c816f096be06d1e756f4d413839d6b74f24..a12e96f02ead3290f24d1ea5a6a8d11e4a8e51e5 100644 (file)
@@ -51,10 +51,10 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 #
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
-<protocol>
-CAPA\r
-AUTH DIGEST-MD5\r
-*\r
+<protocol crlf="yes">
+CAPA
+AUTH DIGEST-MD5
+*
 </protocol>
 </verify>
 </testcase>
index cdf25d02a1435bbbaffcfdf763ee69e792a327cf..75aed2ba3d4f0f4eb55ad63a27de1094d41d377b 100644 (file)
@@ -54,14 +54,14 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-AUTH CRAM-MD5\r
-*\r
-AUTH PLAIN\r
-AHVzZXIAc2VjcmV0\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+AUTH CRAM-MD5
+*
+AUTH PLAIN
+AHVzZXIAc2VjcmV0
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 21536d81f50b70d6958962f2a04074747ab2355e..bb92f7f296bc6a000b85b6eb304d04dd33d7658d 100644 (file)
@@ -55,15 +55,15 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-AUTH NTLM\r
-TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-*\r
-AUTH PLAIN\r
-AHVzZXIAc2VjcmV0\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+AUTH NTLM
+TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+*
+AUTH PLAIN
+AHVzZXIAc2VjcmV0
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index a197cb1e603d1037364fbd57662f4f3e105786cd..16caf49a312eb213d876d0338ac2041932358747 100644 (file)
@@ -56,14 +56,14 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-AUTH DIGEST-MD5\r
-*\r
-AUTH PLAIN\r
-AHVzZXIAc2VjcmV0\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+AUTH DIGEST-MD5
+*
+AUTH PLAIN
+AHVzZXIAc2VjcmV0
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index b4fa465340b8bbb6a532740691017eac3b3cf621..bfecd45070764f0595e5a4b303c6fabd2a720b4e 100644 (file)
@@ -42,17 +42,17 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER001 -u user.one:secret -: pop3://%HOSTIP:%PO
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-USER user.one\r
-PASS secret\r
-RETR %TESTNUMBER001\r
-QUIT\r
-CAPA\r
-USER user.two\r
-PASS secret\r
-RETR %TESTNUMBER002\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+USER user.one
+PASS secret
+RETR %TESTNUMBER001
+QUIT
+CAPA
+USER user.two
+PASS secret
+RETR %TESTNUMBER002
+QUIT
 </protocol>
 </verify>
 </testcase>
index 943d2782483166edb778e0a3b82c0774b32c6c29..a82a762dc6f6918a6c324ad3f26b7f72bc94b1ca 100644 (file)
@@ -46,12 +46,12 @@ POP3 external authentication
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-AUTH EXTERNAL\r
-dXNlcg==\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+AUTH EXTERNAL
+dXNlcg==
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 611649c2d292dbc6eb2c835b150775c2b77f9f0b..ebe013fe27f9f69680c9b00d157be98d2111ba34 100644 (file)
@@ -46,12 +46,12 @@ POP3 external authentication without credentials
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-AUTH EXTERNAL\r
-=\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+AUTH EXTERNAL
+=
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 6d2383874f59ea7ea4c34a2322c3707cc838885e..16c6810bcf01195cd9e7015e083b486fd0e468f0 100644 (file)
@@ -46,11 +46,11 @@ POP3 external authentication with initial response
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-AUTH EXTERNAL dXNlcg==\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+AUTH EXTERNAL dXNlcg==
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index e926fe21a1330a2e8391ff66a0ca032168778720..f6de7c1db11eb37a7bf0f4f353845a9371131352 100644 (file)
@@ -46,11 +46,11 @@ POP3 external authentication with initial response without credentials
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-AUTH EXTERNAL =\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+AUTH EXTERNAL =
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index ada1ce1a6b001e4acd509bf3b13a8e0b1fb87e10..bb40d1b9ce526d00b735be2961560c404933c2f0 100644 (file)
@@ -47,12 +47,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-AUTH OAUTHBEARER\r
-%b64[n,a=user,%01host=127.0.0.1%01port=%POP3PORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+AUTH OAUTHBEARER
+%b64[n,a=user,%01host=127.0.0.1%01port=%POP3PORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 289f8137e153a54c66542008b89ebbf62d460937..2d89a3cf3b0b8873ab2546da585aab9063ac0471 100644 (file)
@@ -47,11 +47,11 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --s
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%POP3PORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%POP3PORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 36d0e32d1f5d1982e18a5f6267eea89ba4bd1661..c2982dc17de793d8a25c4047039f34a974402f2f 100644 (file)
@@ -46,11 +46,11 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM
 #
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
-<protocol>
-CAPA\r
-AUTH OAUTHBEARER\r
-%b64[n,a=user,%01host=127.0.0.1%01port=%POP3PORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%\r
-AQ==\r
+<protocol crlf="yes">
+CAPA
+AUTH OAUTHBEARER
+%b64[n,a=user,%01host=127.0.0.1%01port=%POP3PORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+AQ==
 </protocol>
 </verify>
 </testcase>
index fb621ae2b9515948963ba3aeb5aa339c0c001bbe..f1a7a539e22cf85bc41675ca21daf47481671e10 100644 (file)
@@ -106,31 +106,31 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm -L
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /you/%TESTNUMBER0010 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /you/%TESTNUMBER0010 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /you/%TESTNUMBER0010 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /you/%TESTNUMBER0010 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 70ac50459732dbe56219050cebacddd922fb6ff5..9107a32e224d1af98797225d60090f365f1196d5 100644 (file)
@@ -46,10 +46,10 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --s
 #
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
-<protocol>
-CAPA\r
-AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%POP3PORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%\r
-AQ==\r
+<protocol crlf="yes">
+CAPA
+AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%POP3PORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+AQ==
 </protocol>
 </verify>
 </testcase>
index 6d02428005605b92bbe68ea1ee7bc093887bb1bf..b0de3be183a0ce8cbd0e4434c02ac93becb67c2b 100644 (file)
@@ -35,10 +35,10 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-AUTH CRAM-MD5\r
-dXNlciA1YzhkYjAzZjA0Y2VjMGY0M2JjYjA2MDAyMzkxNDE5MA==\r
+<protocol crlf="yes">
+CAPA
+AUTH CRAM-MD5
+dXNlciA1YzhkYjAzZjA0Y2VjMGY0M2JjYjA2MDAyMzkxNDE5MA==
 </protocol>
 # CURLE_LOGIN_DENIED
 <errorcode>
index c77b35da8a7ac7bf9fd3fa2d4dc8bd97d636decf..67f9711568cba47d15ff91316fa211e9dd93da1f 100644 (file)
@@ -46,12 +46,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --sasl-authzid shared-mailbo
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-AUTH PLAIN\r
-c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+AUTH PLAIN
+c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index 021b4d52579de5a859be62123c63e3a1e324a21f..3db486b0d0d85e308c33b8cb432939a7464eab58 100644 (file)
@@ -44,10 +44,10 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u kurt:xipj3plmq --sasl-authzid ursel
 #
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
-<protocol>
-CAPA\r
-AUTH PLAIN\r
-dXJzZWwAa3VydAB4aXBqM3BsbXE=\r
+<protocol crlf="yes">
+CAPA
+AUTH PLAIN
+dXJzZWwAa3VydAB4aXBqM3BsbXE=
 </protocol>
 </verify>
 </testcase>
index dbf17fdc40db7746d2e8f49707488a38183506d1..79f9a9984e9d7326a7ed8c39c68c0377c732b1e9 100644 (file)
@@ -39,12 +39,12 @@ IMAP with --login-options 'AUTH=*'
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN "\"user" "sec\"ret{"\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN "\"user" "sec\"ret{"
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index fe7e1e70a007f99fa72ea434a31f653ecfb9a7f0..8e59d75d1486c90e6aaed5a785b378568c3cccc4 100644 (file)
@@ -38,12 +38,12 @@ IMAP and envelope meta data after body transfer
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN user secret\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 123 BODY[1]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 SELECT %TESTNUMBER
+A004 FETCH 123 BODY[1]
+A005 LOGOUT
 </protocol>
 <file name="%LOGDIR/head-%TESTNUMBER">
         _   _ ____  _     \r
index 4d22862d4a3d02d7d0db8035d440c87f8de1f8d4..78213414e534e0742f62a50bda770e662e326e61 100644 (file)
@@ -74,21 +74,21 @@ HTTP with custom auth and cookies redirected to HTTP on a diff port
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://firsthost.com/ HTTP/1.1\r
-Host: firsthost.com\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-Authorization: Basic %b64[joe:secret]b64%\r
-Cookie: userpwd=am9lOnNlY3JldA==\r
-\r
-GET http://firsthost.com:9999/a/path/%TESTNUMBER0002 HTTP/1.1\r
-Host: firsthost.com:9999\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://firsthost.com/ HTTP/1.1
+Host: firsthost.com
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+Authorization: Basic %b64[joe:secret]b64%
+Cookie: userpwd=am9lOnNlY3JldA==
+
+GET http://firsthost.com:9999/a/path/%TESTNUMBER0002 HTTP/1.1
+Host: firsthost.com:9999
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index b043ce0431b0f9d1591cb131510a1c79ed684847..98c4073766c03cb7f88607ec3733bb70e1686d9f 100644 (file)
@@ -144,41 +144,41 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth -L
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /you/%TESTNUMBER0010 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /you/%TESTNUMBER0010 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /you/%TESTNUMBER0010 HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /you/%TESTNUMBER0010 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /you/%TESTNUMBER0010 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /you/%TESTNUMBER0010 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index f3aae4b6310ff157332ac830218aa86c49739eb8..14644401b3c5e2f32a2a009f4c5c6da2198ff3f5 100644 (file)
@@ -35,12 +35,12 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
 <upload>
 From: different\r
index a97233d871661d28853ea19e33f0e1302d4f6f5e..043f3fad49adc2f3f9d3f70b3ece58f60da54a4d 100644 (file)
@@ -39,25 +39,25 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-\r
-..\r
-..\r
-\r
-..\r
-\r
-body\r
-.\r
+<upload crlf="yes">
+From: different
+To: another
+
+
+..
+..
+
+..
+
+body
+.
 </upload>
 </verify>
 </testcase>
index 961fc7bfbf82e0ade18ec0721e34ccbe656e7159..809a15d03f6bfe9d9ca78cc4331d2f6023351829 100644 (file)
@@ -38,20 +38,20 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-HELO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+HELO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-body\r
-.\r
+<upload crlf="yes">
+From: different
+To: another
+
+body
+.
 </upload>
 </verify>
 </testcase>
index f4d616ec67b07286f152e934e0a3fe74983f2bcb..fb2ff012787a10a4212cdb40441b0e1e5a03c0e2 100644 (file)
@@ -39,18 +39,18 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH PLAIN\r
-AHVzZXIAc2VjcmV0\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH PLAIN
+AHVzZXIAc2VjcmV0
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index b5916ef41974553fb5be565c542762d6934299eb..ee797b1600c51ea18af9a12e8fac8f898cf40d4f 100644 (file)
@@ -39,19 +39,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH LOGIN\r
-dXNlcg==\r
-c2VjcmV0\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH LOGIN
+dXNlcg==
+c2VjcmV0
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index 9f8d417a44cb68e90bf72be37c70147261dcadea..15114e5b5ae88a1de170d2fbd5848a03571a2319 100644 (file)
@@ -43,18 +43,18 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH CRAM-MD5\r
-dXNlciA3MDMxNzI1NTk5ZmRiYjVkNDEyNjg5YWEzMjNlM2UwYg==\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH CRAM-MD5
+dXNlciA3MDMxNzI1NTk5ZmRiYjVkNDEyNjg5YWEzMjNlM2UwYg==
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index 863dce698c7b8ff40e5c2cbdebeb0757020656f6..5e3ea35ceb2906235ac738ba6b14133f1a624cb7 100644 (file)
@@ -45,19 +45,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH NTLM\r
-TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH NTLM
+TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index 9fddbc0de8e305cc49a1829cc37b58aa1db09b4c..3bd4612dd8254fa30cdfc69257704bd70431e39f 100644 (file)
@@ -49,19 +49,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH DIGEST-MD5\r
-dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIzNDMzMzIzMTM1MzMzMjMxMzYzMzMyMzEzNzMzMzIzMSIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJzbXRwLzEyNy4wLjAuMSIscmVzcG9uc2U9YTI3YzQzOTVmMzM4Njc0M2JlMTIyMDdiN2QxMTIxYzUscW9wPWF1dGg=\r
-\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH DIGEST-MD5
+dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIzNDMzMzIzMTM1MzMzMjMxMzYzMzMyMzEzNzMzMzIzMSIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJzbXRwLzEyNy4wLjAuMSIscmVzcG9uc2U9YTI3YzQzOTVmMzM4Njc0M2JlMTIyMDdiN2QxMTIxYzUscW9wPWF1dGg=
+
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index 202977a64a1f23643c9409d042a2cfd0852763ea..d1a1bdbdc72a4261f9429d95dbfaee4312a28744 100644 (file)
@@ -39,18 +39,18 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH XOAUTH2\r
-dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH XOAUTH2
+dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index e054e49351de66116644cbe30f4544ceb1793127..2c543fe1af7431d45c839fb00ca3805e8004c64f 100644 (file)
@@ -33,19 +33,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-body\r
-.\r
+<upload crlf="yes">
+From: different
+To: another
+
+body
+.
 </upload>
 </verify>
 </testcase>
index 37d8e4e36c0a32ddb9c424b9e8a56016a3795a33..cd15c80e1c410460b352432f6a00b34726dbd1d2 100644 (file)
@@ -90,24 +90,24 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --anyauth -u mydomain\\myself:secret
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAgACABwAAAABgAGAHgAAAALAAsAfgAAAAAAAAAAAAAAhoIBAMIyJpR5mHpg2FZha5kRaFZ9436GAxPu0C5llxexSQ5QzVkiLSfkcpVyRgCXXqR+Am15ZG9tYWlubXlzZWxmV09SS1NUQVRJT04=\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAgACABwAAAABgAGAHgAAAALAAsAfgAAAAAAAAAAAAAAhoIBAMIyJpR5mHpg2FZha5kRaFZ9436GAxPu0C5llxexSQ5QzVkiLSfkcpVyRgCXXqR+Am15ZG9tYWlubXlzZWxmV09SS1NUQVRJT04=
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index 521318ace546f5487922b73a3f9b9c378e226d0f..21a3ef20447ea3ad8b8f9b7474d65d1af4b15ff8 100644 (file)
@@ -33,19 +33,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-body\r
-.\r
+<upload crlf="yes">
+From: different
+To: another
+
+body
+.
 </upload>
 </verify>
 </testcase>
index b0c5d0eb829dc72e091000109e8d4c73827137b3..0ee44f2b84ccfb19be1678e32546e184f5875907 100644 (file)
@@ -32,15 +32,15 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-.\r
+<upload crlf="yes">
+.
 </upload>
 </verify>
 </testcase>
index 4977a4e8217027fb052bc5119cc0a24c3c7bf303..b45d603f9d204d57fce64b29383dc49492b46860 100644 (file)
@@ -37,19 +37,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com> SIZE=38\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com> SIZE=38
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-body\r
-.\r
+<upload crlf="yes">
+From: different
+To: another
+
+body
+.
 </upload>
 </verify>
 </testcase>
index a0aed0072b2d5d88ffd1a70c40569e8574edda72..81a46ca2bd656026b7c25dd4d586b0d267d8b8c7 100644 (file)
@@ -41,10 +41,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <errorcode>
 55
 </errorcode>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com> SIZE=38\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com> SIZE=38
+QUIT
 </protocol>
 </verify>
 </testcase>
index 56ae524b0a3baa2b3de0fddf4de41dbe8773f547..2595dbccffe9261147d812699715674c2420e5fe 100644 (file)
@@ -40,10 +40,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <errorcode>
 55
 </errorcode>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<invalid>\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<invalid>
+QUIT
 </protocol>
 </verify>
 </testcase>
index 9211c3407997e2a89baf57100b41a31ac5d303a9..6b76e62f1339674b61ec4c020a6544aced1a7fb3 100644 (file)
@@ -33,19 +33,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com -T -
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-body\r
-.\r
+<upload crlf="yes">
+From: different
+To: another
+
+body
+.
 </upload>
 </verify>
 </testcase>
index 677a647fd3ba551366089058c1f325d7f15a90b9..138277d580f2619da658047a44713103aa3c8caf 100644 (file)
@@ -37,11 +37,11 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt invalid --mail-from sender@exam
 <errorcode>
 55
 </errorcode>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<invalid>\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<invalid>
+QUIT
 </protocol>
 </verify>
 </testcase>
index d53fbd10c3a3d4770a3b662de7012d5dde3c406c..8607758aa5c05c4fe42eb924077203762543d178 100644 (file)
@@ -33,23 +33,23 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient.one@example.com --mai
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient.one@example.com>\r
-RCPT TO:<recipient.two@example.com>\r
-RCPT TO:<recipient.three@example.com>\r
-RCPT TO:<recipient.four@example.com>\r
-RCPT TO:<recipient.five@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient.one@example.com>
+RCPT TO:<recipient.two@example.com>
+RCPT TO:<recipient.three@example.com>
+RCPT TO:<recipient.four@example.com>
+RCPT TO:<recipient.five@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-body\r
-.\r
+<upload crlf="yes">
+From: different
+To: another
+
+body
+.
 </upload>
 </verify>
 </testcase>
index c49128fa9169f7c8d5f5506a22f155564cb99b25..54485cbb20e90ecdf254570c43cea00d8cf3b993 100644 (file)
@@ -37,12 +37,12 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient.one@example.com --mai
 <errorcode>
 55
 </errorcode>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient.one@example.com>\r
-RCPT TO:<invalid>\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient.one@example.com>
+RCPT TO:<invalid>
+QUIT
 </protocol>
 </verify>
 </testcase>
index 833a67c97b50e3098f4b6d92c533bc6a73c48cae..7448b8a173293c1bcd8ddf132f1b7442f1a36daa 100644 (file)
@@ -39,17 +39,17 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH PLAIN AHVzZXIAc2VjcmV0\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH PLAIN AHVzZXIAc2VjcmV0
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index f6250d19625341de27a7565e6f4c2874090415a9..341f16b23044061fb079373c030bb79ef3fadfab 100644 (file)
@@ -10,32 +10,32 @@ Resume
 
 # Server-side
 <reply>
-<data>
-HTTP/1.1 416 Requested Range Not Satisfiable\r
-Date: Fri, 24 Oct 2003 21:33:12 GMT\r
-Server: Apache/1.3.19 (Unix) (Red-Hat/Linux) mod_ssl/2.8.1 OpenSSL/0.9.6 PHP/4.3.1\r
-Last-Modified: Fri, 24 Oct 2003 18:01:23 GMT\r
-ETag: "ab57a-507-3f9968f3"\r
-Accept-Ranges: bytes\r
-Content-Length: 4\r
-Content-Range: bytes */87\r
-Content-Type: image/gif\r
-\r
+<data crlf="yes">
+HTTP/1.1 416 Requested Range Not Satisfiable
+Date: Fri, 24 Oct 2003 21:33:12 GMT
+Server: Apache/1.3.19 (Unix) (Red-Hat/Linux) mod_ssl/2.8.1 OpenSSL/0.9.6 PHP/4.3.1
+Last-Modified: Fri, 24 Oct 2003 18:01:23 GMT
+ETag: "ab57a-507-3f9968f3"
+Accept-Ranges: bytes
+Content-Length: 4
+Content-Range: bytes */87
+Content-Type: image/gif
+
 bad
 </data>
 
 # The body should be ignored.
-<datacheck>
-HTTP/1.1 416 Requested Range Not Satisfiable\r
-Date: Fri, 24 Oct 2003 21:33:12 GMT\r
-Server: Apache/1.3.19 (Unix) (Red-Hat/Linux) mod_ssl/2.8.1 OpenSSL/0.9.6 PHP/4.3.1\r
-Last-Modified: Fri, 24 Oct 2003 18:01:23 GMT\r
-ETag: "ab57a-507-3f9968f3"\r
-Accept-Ranges: bytes\r
-Content-Length: 4\r
-Content-Range: bytes */87\r
-Content-Type: image/gif\r
-\r
+<datacheck crlf="yes">
+HTTP/1.1 416 Requested Range Not Satisfiable
+Date: Fri, 24 Oct 2003 21:33:12 GMT
+Server: Apache/1.3.19 (Unix) (Red-Hat/Linux) mod_ssl/2.8.1 OpenSSL/0.9.6 PHP/4.3.1
+Last-Modified: Fri, 24 Oct 2003 18:01:23 GMT
+ETag: "ab57a-507-3f9968f3"
+Accept-Ranges: bytes
+Content-Length: 4
+Content-Range: bytes */87
+Content-Type: image/gif
+
 </datacheck>
 </reply>
 
@@ -54,13 +54,13 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C 87
 
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=87-\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=87-
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 
 </verify>
index ac9af7d7bfb9d3ffc1b9e0bb6e1bd02bafc536a1..1445db2413d7aa6f145a3ab8bb04b9c18f473c58 100644 (file)
@@ -39,18 +39,18 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH LOGIN dXNlcg==\r
-c2VjcmV0\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH LOGIN dXNlcg==
+c2VjcmV0
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index 36820ceb74c027bd1f063e4316f23fd4aa0c0930..fbf338081e0d0351be9fdab6f210b8e41cbd1275 100644 (file)
@@ -45,18 +45,18 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>\r
-EHLO %TESTNUMBER\r
-AUTH NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index 554c0965a5d6ee57ce9b6b05a6d1362755a9de7e..76d891296f05fe9935949e0caaaffb4d19851ded 100644 (file)
@@ -39,17 +39,17 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH XOAUTH2 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH XOAUTH2 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index 19cdd9667e1fb2f38ea8fd25476e81e27071c83a..85cc5be4e364047e1beb9d5c07fd205eff6f42de 100644 (file)
@@ -28,10 +28,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-VRFY recipient\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+VRFY recipient
+QUIT
 </protocol>
 </verify>
 </testcase>
index 3a37a5e3c86e6edcbf19bc4997fcf97961a94071..55542583706180a9b2b5cc87f81939605cfdd238 100644 (file)
@@ -34,10 +34,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt smith
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-VRFY smith\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+VRFY smith
+QUIT
 </protocol>
 </verify>
 </testcase>
index 073f1e3a9be908ac294ede113c2038f07840dac4..7640230969bc8b828821b72ea5be9991a6bf322a 100644 (file)
@@ -31,10 +31,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt user@example.net
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-VRFY user@example.net\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+VRFY user@example.net
+QUIT
 </protocol>
 </verify>
 </testcase>
index 4e9623ceb55c4064e82490e4e9574ac36b628d1a..8b76424a6f02f96b9d0064b728bc4929d5f2fffa 100644 (file)
@@ -35,10 +35,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient
 <errorcode>
 8
 </errorcode>
-<protocol>
-EHLO %TESTNUMBER\r
-VRFY recipient\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+VRFY recipient
+QUIT
 </protocol>
 </verify>
 </testcase>
index fb86a1940147c1205b769ead753360287385221d..f2edc050f98edc9f39d0583b30ee36e0e54d64e6 100644 (file)
@@ -34,10 +34,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Friends -X EXPN
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-EXPN Friends\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+EXPN Friends
+QUIT
 </protocol>
 </verify>
 </testcase>
index 4c5ab9eafb5b3d6bcc2e52aa19d7009d40d42c40..33ae7b7d00cb2ce7327bdb282b6f52ad266f367d 100644 (file)
@@ -32,10 +32,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-HELP\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+HELP
+QUIT
 </protocol>
 </verify>
 </testcase>
index 1274921f9bf3737c8d4b90f191d79d3873dfb8cd..956f5fc9b493ffbabed9bd05438477a5f4ba758c 100644 (file)
@@ -29,10 +29,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER -X NOOP -I
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-NOOP\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+NOOP
+QUIT
 </protocol>
 </verify>
 </testcase>
index 83d2b6102259df9ddb8f5a3223eea38188089bbf..1d6cdcc95b9c7901d1b56102d23a8374159a0b84 100644 (file)
@@ -39,13 +39,13 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 94a92577617bcee15f033bf375a147f0798223d7..628777526dd2c167100456e289958db8a468abbd 100644 (file)
@@ -29,10 +29,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER -X RSET -I
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-RSET\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+RSET
+QUIT
 </protocol>
 </verify>
 </testcase>
index e2c9b29a8bc1a7089f033e8ef678e009a15d9727..2ea2b0910fe1a01b32701f010acd1c7ec485146f 100644 (file)
@@ -48,10 +48,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH CRAM-MD5\r
-*\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH CRAM-MD5
+*
 </protocol>
 </verify>
 </testcase>
index 3c25ffa5cafaebd751173129bc38162ac55c3a2f..3c3a5c6be6ee012c2614c3ff178dad76de19afea 100644 (file)
@@ -49,11 +49,11 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH NTLM\r
-TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-*\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH NTLM
+TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+*
 </protocol>
 </verify>
 </testcase>
index 891232e5b807a2b2997ef09e158cf7e667cd7ac8..3f74a625e326c4c06ed632a8cbefc2bf2803a818 100644 (file)
@@ -50,10 +50,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH DIGEST-MD5\r
-*\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH DIGEST-MD5
+*
 </protocol>
 </verify>
 </testcase>
index 57a4c36ca52a8b3b9e49a8b0f4064325c2e28649..dd13a6294bac381d4d8c19755d9dd6b61c9ba438 100644 (file)
@@ -47,20 +47,20 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH CRAM-MD5\r
-*\r
-AUTH PLAIN\r
-AHVzZXIAc2VjcmV0\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH CRAM-MD5
+*
+AUTH PLAIN
+AHVzZXIAc2VjcmV0
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index 723cebca37bb2675c15493c6fc08acf0eba8b321..f829b25e9bfb11ad62045b2d703506c9b6c89a43 100644 (file)
@@ -48,21 +48,21 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH NTLM\r
-TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-*\r
-AUTH PLAIN\r
-AHVzZXIAc2VjcmV0\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH NTLM
+TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+*
+AUTH PLAIN
+AHVzZXIAc2VjcmV0
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index ddd2037e8468664fe87bda5024881937d800e9f7..8a3bfcd4b6fb9345c57b95911429bc6f559f5363 100644 (file)
@@ -49,20 +49,20 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH DIGEST-MD5\r
-*\r
-AUTH PLAIN\r
-AHVzZXIAc2VjcmV0\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH DIGEST-MD5
+*
+AUTH PLAIN
+AHVzZXIAc2VjcmV0
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index 475572b070c3d85e8361475f1a8163cf70ad4254..af1d4c834a252a8eee07b86f0b917bba37ba9d82 100644 (file)
@@ -41,25 +41,25 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER001 --mail-rcpt recipient@example.com --mail
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER001\r
-AUTH PLAIN\r
-dXNlci5vbmUAdXNlci5vbmUAc2VjcmV0\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
-EHLO %TESTNUMBER002\r
-AUTH PLAIN\r
-dXNlci50d28AdXNlci50d28Ac2VjcmV0\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER001
+AUTH PLAIN
+dXNlci5vbmUAdXNlci5vbmUAc2VjcmV0
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
+EHLO %TESTNUMBER002
+AUTH PLAIN
+dXNlci50d28AdXNlci50d28Ac2VjcmV0
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index e1424d2ddbf4e920361f0f2268dd4a6f4cda6637..d0e284574fc610d80fb982cb9b4225768645a963 100644 (file)
@@ -34,17 +34,17 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-HELO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+HELO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index eb745d1df4c7a8d784bd70a6edddfe96e1e183ca..4840bd1f4287c0365cd8602922dd8b6ae2bf1c3f 100644 (file)
@@ -45,12 +45,12 @@ https://test.anything.really.com:%TESTNUMBER --proxy1.0 %HOSTIP:%HTTPPORT
 <errorcode>
 56
 </errorcode>
-<protocol>
-CONNECT test.anything.really.com:%TESTNUMBER HTTP/1.0\r
-Host: test.anything.really.com:%TESTNUMBER\r
-User-Agent: curl/%VERSION\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+CONNECT test.anything.really.com:%TESTNUMBER HTTP/1.0
+Host: test.anything.really.com:%TESTNUMBER
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index afc9da0c93744d8be2ad85916b2785233ab8a4c4..eb9d4a6fb9b2a841005b123c084a02e4527c84fe 100644 (file)
@@ -30,16 +30,16 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index 7b7669fdd90f73d4c56ac29cd33a6b7a1248b4b2..36544e43c835ba0fe5d449d1c23ccce98be19436 100644 (file)
@@ -42,27 +42,27 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-email\r
-headers and body\r
-with Unix newlines\r
-meant to be\r
-converted\r
-with\r
-the\r
---crlf option\r
-%repeat[650 x 0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\r%0a]%\r
-.\r
+<upload crlf="yes">
+From: different
+To: another
+
+email
+headers and body
+with Unix newlines
+meant to be
+converted
+with
+the
+--crlf option
+%repeat[650 x 0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789%0d%0a]%
+.
 </upload>
 </verify>
 </testcase>
index 2286c20e6fbff8f489467c28e4119393a55a6b6b..ba9b9a19eb2c4c107da3ae6e5f9e8aa7c558f605 100644 (file)
@@ -39,18 +39,18 @@ mail body
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH EXTERNAL\r
-dXNlcg==\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH EXTERNAL
+dXNlcg==
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index 80e935fede6359ca1464a366c3b0a904e77be59c..426beae6e648d1d608c0fb60a4294b7d28cced2b 100644 (file)
@@ -39,18 +39,18 @@ mail body
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH EXTERNAL\r
-=\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH EXTERNAL
+=
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index 0dfaefb7169eb14269fc737c6633f4beb8488827..f87fb3b3e46a4b440bfb18309b8a4e580b0a66ee 100644 (file)
@@ -39,17 +39,17 @@ mail body
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH EXTERNAL dXNlcg==\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH EXTERNAL dXNlcg==
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index 5b64127644437845dafacf019bf9bd15f707d2ea..239c3270d31c9a7e5c66c28afe662d71b206a8ef 100644 (file)
@@ -39,17 +39,17 @@ mail body
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH EXTERNAL =\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH EXTERNAL =
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index b306180aaaca1e325fdb97d5992aa93678b76ec6..6c1765bec4050484cc49f41246217991219ba5aa 100644 (file)
@@ -40,18 +40,18 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH OAUTHBEARER\r
-%b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH OAUTHBEARER
+%b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index 5ca2be671462aa4b5acbe0f8c1557737b423edce..c7e4c250375721bb3d83beb8c73735ab2e36172c 100644 (file)
@@ -40,17 +40,17 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index 9b6aefdc63cc7b30de206910ae641a1d00e84a79..c072b3a25c0e9f5985e4ad147fa5281435aced0c 100644 (file)
@@ -48,11 +48,11 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH OAUTHBEARER\r
-%b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%\r
-AQ==\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH OAUTHBEARER
+%b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+AQ==
 </protocol>
 </verify>
 </testcase>
index 0a6be43b375f66bb0325eb70dae1216f50aa44f5..24fdaa4e2a67a66055a1e22f98b0f56e82a04faf 100644 (file)
@@ -48,10 +48,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%\r
-AQ==\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+AQ==
 </protocol>
 </verify>
 </testcase>
index 6628f004343822ae58c9e29ab41fa4f0ab57bad9..670cf8f7e526511e9bbddbe9c9fd99f6dcc234d6 100644 (file)
@@ -34,10 +34,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient --request "vrfy"
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-vrfy recipient\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+vrfy recipient
+QUIT
 </protocol>
 </verify>
 </testcase>
index 2b9315047188487c90684d9c82ef7177e7e10880..c703d3d6adc6ec8056dacfab5c67573d01884466 100644 (file)
@@ -30,16 +30,16 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-..This first line starts with a dot\r
-.\r
+<upload crlf="yes">
+..This first line starts with a dot
+.
 </upload>
 </verify>
 </testcase>
index 716310df65dc69122dfe54491fc298ed95e880c7..e78cd3569a718f601ef79f2abaf37c6bec77fd21 100644 (file)
@@ -30,16 +30,16 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-..\r
-.\r
+<upload crlf="yes">
+..
+.
 </upload>
 </verify>
 </testcase>
index f293f896e8cf0865b67550797300153b869387a7..e5a1ad8d7920f9527b2218671aa63eaff2b52e32 100644 (file)
@@ -39,18 +39,18 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH PLAIN\r
-dXJzZWwAa3VydAB4aXBqM3BsbXE=\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH PLAIN
+dXJzZWwAa3VydAB4aXBqM3BsbXE=
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index b8376669ce59e9f3a80426b6ed979d6f11e968fd..58292372f3ce988d194d9dd8459160eff69647cd 100644 (file)
@@ -46,10 +46,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH PLAIN\r
-dXJzZWwAa3VydAB4aXBqM3BsbXE=\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH PLAIN
+dXJzZWwAa3VydAB4aXBqM3BsbXE=
 </protocol>
 </verify>
 </testcase>
index 633c2e369d3577eb65b9814d31745d852cf57b07..adb5558bc6c5569540ea24c2a24f3a7d12e1fca8 100644 (file)
@@ -47,10 +47,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <errorcode>
 55
 </errorcode>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<Avs%hex[%c3%a4]hex%ndaren@example.com>\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<Avs%hex[%c3%a4]hex%ndaren@example.com>
+QUIT
 </protocol>
 </verify>
 </testcase>
index 9472e96e1596a9b501edad996e911e33fde969b1..fb78275a91c33d8cfa2ea0b30f4f351e5860581e 100644 (file)
@@ -44,11 +44,11 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt St%hex[%c3%b6]hex%dmottagaren@e
 <errorcode>
 55
 </errorcode>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<St%hex[%c3%b6]hex%dmottagaren@example.com>\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<St%hex[%c3%b6]hex%dmottagaren@example.com>
+QUIT
 </protocol>
 </verify>
 </testcase>
index 671d73bbf21864100a8c5b9bb0f58d010170957e..1656416c8a9cfdec9def87f8497252cd940513d3 100644 (file)
@@ -39,10 +39,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Anv%hex[%c3%a4]hex%ndaren
 <errorcode>
 8
 </errorcode>
-<protocol>
-EHLO %TESTNUMBER\r
-VRFY Anv%hex[%c3%a4]hex%ndaren\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+VRFY Anv%hex[%c3%a4]hex%ndaren
+QUIT
 </protocol>
 </verify>
 </testcase>
index 203254bfc2d2c4a8759af5d6382bf9456b01ec47..4809f6bf254149f8b0644cb7ad224ce5ca5c3882 100644 (file)
@@ -39,10 +39,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Anv%hex[%c3%a4]hex%ndaren@examp
 <errorcode>
 8
 </errorcode>
-<protocol>
-EHLO %TESTNUMBER\r
-VRFY Anv%hex[%c3%a4]hex%ndaren@example.com\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+VRFY Anv%hex[%c3%a4]hex%ndaren@example.com
+QUIT
 </protocol>
 </verify>
 </testcase>
index 5693e349449ef32c9873b8e4e3482d569e99629d..07736ff0a91c75e0358355018406730dfa9bb53a 100644 (file)
@@ -48,10 +48,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <errorcode>
 55
 </errorcode>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@%hex[%c3%a5%c3%a4%c3%b6]hex%.se>\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@%hex[%c3%a5%c3%a4%c3%b6]hex%.se>
+QUIT
 </protocol>
 </verify>
 </testcase>
index ced2ba0b54f59a6c0889da34afbcdfa3559399ee..52013ac5cf369a8e8f8e96f24cd4d43517b213ed 100644 (file)
@@ -45,11 +45,11 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@%hex[%c3%a5%c3%a4%c3%
 <errorcode>
 55
 </errorcode>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@%hex[%c3%a5%c3%a4%c3%b6]hex%.se>\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@%hex[%c3%a5%c3%a4%c3%b6]hex%.se>
+QUIT
 </protocol>
 </verify>
 </testcase>
index c52d5df344500b3226ea31927a8b3f8007920844..a78059450cc327d63d776de4ee5cae9909d1e8cf 100644 (file)
@@ -40,10 +40,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt user@%hex[%c3%a5%c3%a4%c3%b6]he
 <errorcode>
 8
 </errorcode>
-<protocol>
-EHLO %TESTNUMBER\r
-VRFY user@%hex[%c3%a5%c3%a4%c3%b6]hex%.se\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+VRFY user@%hex[%c3%a5%c3%a4%c3%b6]hex%.se
+QUIT
 </protocol>
 </verify>
 </testcase>
index 3f737b65ea8dae7d3064affc228165c594e2f6d6..4625b01138e0b68e1d344cfa761dd4696c8810bd 100644 (file)
@@ -42,19 +42,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@xn--4cab6c.se>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@xn--4cab6c.se>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-body\r
-.\r
+<upload crlf="yes">
+From: different
+To: another
+
+body
+.
 </upload>
 </verify>
 </testcase>
index bce626c5e30e11465b2ecdb23a433775d3c965b0..06245f608054aa31cf1f3b1d678114478c862c22 100644 (file)
@@ -42,19 +42,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@%hex[%c3%a5%c3%a4%c3%
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@xn--4cab6c.se>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@xn--4cab6c.se>
+DATA
+QUIT
 </protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-body\r
-.\r
+<upload crlf="yes">
+From: different
+To: another
+
+body
+.
 </upload>
 </verify>
 </testcase>
index 04e5b1c152358baf365c299caa6b6d4ce319c2ce..bf802faa0c51a8ee6c43f3e7786a173f7f689462 100644 (file)
@@ -37,10 +37,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt user@%hex[%c3%a5%c3%a4%c3%b6]he
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-VRFY user@xn--4cab6c.se\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+VRFY user@xn--4cab6c.se
+QUIT
 </protocol>
 </verify>
 </testcase>
index 601db62fe09af7647d7441b5e83106194c4d0182..0bf35b8357ab4865d161158f9d89c90d8195efbf 100644 (file)
@@ -45,19 +45,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<Avs%hex[%c3%a4]hex%ndaren@xn--4cab6c.se> SMTPUTF8\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<Avs%hex[%c3%a4]hex%ndaren@xn--4cab6c.se> SMTPUTF8
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-body\r
-.\r
+<upload crlf="yes">
+From: different
+To: another
+
+body
+.
 </upload>
 </verify>
 </testcase>
index 646e80758979e108f48677000a7e8a51be2b71d1..3a12b8bf967d933a6ad9297bf9b1dde130b27475 100644 (file)
@@ -45,19 +45,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt St%hex[%c3%b6]hex%dmottagaren@%
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com> SMTPUTF8\r
-RCPT TO:<St%hex[%c3%b6]hex%dmottagaren@xn--4cab6c.se>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com> SMTPUTF8
+RCPT TO:<St%hex[%c3%b6]hex%dmottagaren@xn--4cab6c.se>
+DATA
+QUIT
 </protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-body\r
-.\r
+<upload crlf="yes">
+From: different
+To: another
+
+body
+.
 </upload>
 </verify>
 </testcase>
index 7cacbcbdd2006ef16934c62b6c07eca4d41bcb76..b067e9684baa9a01cefd5612f97a7d41b53d50c3 100644 (file)
@@ -43,10 +43,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Anv%hex[%c3%a4]hex%ndaren@%hex[
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-VRFY Anv%hex[%c3%a4]hex%ndaren@xn--4cab6c.se SMTPUTF8\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+VRFY Anv%hex[%c3%a4]hex%ndaren@xn--4cab6c.se SMTPUTF8
+QUIT
 </protocol>
 </verify>
 </testcase>
index 4df600483be65a6a426d82926051c3fd320b2570..2ec5f76e9539d01d6f14f355f19571de07e2e3bb 100644 (file)
@@ -40,10 +40,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Anv%hex[%c3%a4]hex%ndaren
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-VRFY Anv%hex[%c3%a4]hex%ndaren SMTPUTF8\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+VRFY Anv%hex[%c3%a4]hex%ndaren SMTPUTF8
+QUIT
 </protocol>
 </verify>
 </testcase>
index c7bffb9b8f4bc168f2d928063ad2637e92df5a06..00311d5f19b2902a67c8fe813f6fcd7f32e4c220 100644 (file)
@@ -14,10 +14,10 @@ IDN
 <servercmd>
 CAPA SMTPUTF8
 </servercmd>
-<data>
-250-Joe Smith <joe.smith@example.com>\r
-250-Harry Smith <harry.smith@example.com>\r
-250 Melvin Smith <melvin.smith@example.com>\r
+<data crlf="yes">
+250-Joe Smith <joe.smith@example.com>
+250-Harry Smith <harry.smith@example.com>
+250 Melvin Smith <melvin.smith@example.com>
 </data>
 </reply>
 
@@ -42,10 +42,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Friends -X EXPN
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-EXPN Friends SMTPUTF8\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+EXPN Friends SMTPUTF8
+QUIT
 </protocol>
 </verify>
 </testcase>
index edf2973ebeffc8b6ab1f52fd0649782da5eddcd7..64e3702f2085489fe9490b18585016049dc83c66 100644 (file)
@@ -66,23 +66,23 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L -u joe:secret
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[joe:secret]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-USER anonymous\r
-PASS ftp@example.com\r
-PWD\r
-CWD a\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER0002\r
-RETR %TESTNUMBER0002\r
-QUIT\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[joe:secret]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD a
+CWD path
+EPSV
+TYPE I
+SIZE %TESTNUMBER0002
+RETR %TESTNUMBER0002
+QUIT
 </protocol>
 </verify>
 </testcase>
index d62933df56e76ab234fffb26a99a61cb79c4f1c0..04575181a3f94e1d22139aa6544af00fb2cc9486 100644 (file)
@@ -72,20 +72,20 @@ HTTP with auth redirected to HTTP on a diff port w/o auth
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://firsthost.com/ HTTP/1.1\r
-Host: firsthost.com\r
-Authorization: Basic %b64[joe:secret]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://firsthost.com:9999/a/path/%TESTNUMBER0002 HTTP/1.1\r
-Host: firsthost.com:9999\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://firsthost.com/ HTTP/1.1
+Host: firsthost.com
+Authorization: Basic %b64[joe:secret]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://firsthost.com:9999/a/path/%TESTNUMBER0002 HTTP/1.1
+Host: firsthost.com:9999
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 971e35d34014de4e9e895ec8d392c5e352129f79..b29b2a929d9cb654512a4b3eff8b0389b042fd2f 100644 (file)
@@ -66,23 +66,23 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --location-trusted -u joe:secret
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic %b64[joe:secret]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
-USER joe\r
-PASS secret\r
-PWD\r
-CWD a\r
-CWD path\r
-EPSV\r
-TYPE I\r
-SIZE %TESTNUMBER0002\r
-RETR %TESTNUMBER0002\r
-QUIT\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[joe:secret]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
+USER joe
+PASS secret
+PWD
+CWD a
+CWD path
+EPSV
+TYPE I
+SIZE %TESTNUMBER0002
+RETR %TESTNUMBER0002
+QUIT
 </protocol>
 </verify>
 </testcase>
index 264444a56ee9cf62dba08ba9c72dc6e9c9325982..8150a90736e78ca3fd684408566508b57f67d71d 100644 (file)
@@ -72,21 +72,21 @@ HTTP with auth redirected to HTTP on a diff port --location-trusted
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://firsthost.com/ HTTP/1.1\r
-Host: firsthost.com\r
-Authorization: Basic %b64[joe:secret]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://firsthost.com:9999/a/path/%TESTNUMBER0002 HTTP/1.1\r
-Host: firsthost.com:9999\r
-Authorization: Basic %b64[joe:secret]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://firsthost.com/ HTTP/1.1
+Host: firsthost.com
+Authorization: Basic %b64[joe:secret]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://firsthost.com:9999/a/path/%TESTNUMBER0002 HTTP/1.1
+Host: firsthost.com:9999
+Authorization: Basic %b64[joe:secret]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index 8a52559472ba3dba5f03c5e60f888f36a4c4e83e..9f35730ac2be92d748fc5fbc0af43dd5a603baef 100644 (file)
@@ -44,9 +44,9 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <errorcode>
 8
 </errorcode>
-<protocol>
-EHLO %TESTNUMBER\r
-STARTTLS\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+STARTTLS
 </protocol>
 </verify>
 </testcase>
index 02a03fd2f95d3d5380208af780deca0650e22a7c..94de9dfbea4798b70fc7e5a8b2ffa5d45812132b 100644 (file)
@@ -51,9 +51,9 @@ Hello Joe, do you think we can meet at 3:30 tomorrow?
 <errorcode>
 8
 </errorcode>
-<protocol>
-A001 CAPABILITY\r
-A002 STARTTLS\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 STARTTLS
 </protocol>
 </verify>
 </testcase>
index 2f5eccc0a4afc906ceefd80ad592470ba6a5e62e..6098b7255aa54d5e0a49b8d9b6342f3438bda308 100644 (file)
@@ -49,9 +49,9 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --ssl
 <errorcode>
 8
 </errorcode>
-<protocol>
-CAPA\r
-STLS\r
+<protocol crlf="yes">
+CAPA
+STLS
 </protocol>
 </verify>
 </testcase>
index a4294495d06292863770d0d92ee7959b54a70418..7a05471a19ecfba5b403310eedc89f17adc1dbe4 100644 (file)
@@ -45,8 +45,8 @@ works
 <errorcode>
 8
 </errorcode>
-<protocol>
-AUTH SSL\r
+<protocol crlf="yes">
+AUTH SSL
 </protocol>
 </verify>
 </testcase>
index 314a24e6cb5a101bd9343cb435850f767f5159c8..e79efdf84b9791e45d635c02801b37c569ad5467 100644 (file)
@@ -49,8 +49,8 @@ Hello Joe, do you think we can meet at 3:30 tomorrow?
 <errorcode>
 64
 </errorcode>
-<protocol>
-A001 CAPABILITY\r
+<protocol crlf="yes">
+A001 CAPABILITY
 </protocol>
 </verify>
 </testcase>
index c58ae77e1382a86f95552c991667755f51f28dc4..4a0a08b4296ca69630144c48951500de573ee704 100644 (file)
@@ -34,19 +34,19 @@ body
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-body\r
-.\r
+<upload crlf="yes">
+From: different
+To: another
+
+body
+.
 </upload>
 </verify>
 </testcase>
index 46b09fff94d6b76d8bc71034c5129c1c3fa1b536..06ba311084b1ca5b75b7d8dd068e0a8c970858c3 100644 (file)
@@ -9,14 +9,14 @@ FETCH
 #
 # Server-side
 <reply>
-<data>
-From: me@somewhere\r
-To: fake@nowhere\r
-\r
-body\r
-\r
---\r
-  yours sincerely\r
+<data crlf="yes">
+From: me@somewhere
+To: fake@nowhere
+
+body
+
+--
+  yours sincerely
 </data>
 </reply>
 
@@ -37,12 +37,12 @@ IMAPS FETCH with redundant explicit SSL request
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-A001 CAPABILITY\r
-A002 LOGIN "\"user" "sec\"ret{"\r
-A003 SELECT %TESTNUMBER\r
-A004 FETCH 1 BODY[]\r
-A005 LOGOUT\r
+<protocol crlf="yes">
+A001 CAPABILITY
+A002 LOGIN "\"user" "sec\"ret{"
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
index c7bf2494604f1981383b9382533f15ec0a7efb21..dad0291dfd8b75453132119807aab7580555af78 100644 (file)
@@ -37,12 +37,12 @@ POP3S RETR with redundant explicit SSL request
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-USER user\r
-PASS secret\r
-RETR %TESTNUMBER\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+USER user
+PASS secret
+RETR %TESTNUMBER
+QUIT
 </protocol>
 </verify>
 </testcase>
index b0e769a7e31e547497c65586f70d19fae82ea312..e9e887df2f53c1d8f45d410c82620137d49d6607 100644 (file)
@@ -55,13 +55,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 9999999999
 <errorcode>
 33
 </errorcode>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP:%HTTPPORT\r
-Range: bytes=9999999999-\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-\r
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=9999999999-
+User-Agent: curl/%VERSION
+Accept: */*
+
 </protocol>
 </verify>
 </testcase>
index a4b24376f393f38c0d775d0c115e9e15009ca956..2a5d15181edbae563da440468743f8e7abaf6996 100644 (file)
@@ -37,18 +37,18 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-EHLO %TESTNUMBER\r
-AUTH XOAUTH2\r
-dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB\r
-MAIL FROM:<sender@example.com>\r
-RCPT TO:<recipient@example.com>\r
-DATA\r
-QUIT\r
+<protocol crlf="yes">
+EHLO %TESTNUMBER
+AUTH XOAUTH2
+dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
-<upload>
-mail body\r
-.\r
+<upload crlf="yes">
+mail body
+.
 </upload>
 </verify>
 </testcase>
index 2f5607b67935dce947947cb078c554976a135655..e0f0b9ebcfc46c242fe94b3a1b0599fe653375f3 100644 (file)
@@ -31,12 +31,12 @@ pop3://%HOSTIP:%POP3PORT/ -u user:secret
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-USER user\r
-PASS secret\r
-LIST\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+USER user
+PASS secret
+LIST
+QUIT
 </protocol>
 <limits>
 Allocations: 2200
index 2883330f85c28e8b4c96692de2422d8e4da3391f..b17cde4d4d2a8aaef5d574505d37ddd7e917a62e 100644 (file)
@@ -12,11 +12,11 @@ RFC2449
 #
 # Server-side
 <reply>
-<servercmd>\r
-CAPA TOP USER\r
-</servercmd>\r
-<data>\r
-</data>\r
+<servercmd>
+CAPA TOP USER
+</servercmd>
+<data>
+</data>
 </reply>
 
 #
@@ -36,12 +36,12 @@ pop3://%HOSTIP:%POP3PORT -u user:secret -X 'STAT'
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-CAPA\r
-USER user\r
-PASS secret\r
-STAT\r
-QUIT\r
+<protocol crlf="yes">
+CAPA
+USER user
+PASS secret
+STAT
+QUIT
 </protocol>
 </verify>
 </testcase>
index efb03cac4c705b17da97781c42025434036560b5..88d3cb55eaa9f272944426194b6936a9d3636a17 100644 (file)
@@ -69,21 +69,21 @@ HTTP with auth in URL redirected to another host
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://somewhere.example/998 HTTP/1.1\r
-Host: somewhere.example\r
-Authorization: Basic %b64[alberto:einstein]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://somewhere.else.example/a/path/9980002 HTTP/1.1\r
-Host: somewhere.else.example\r
-Authorization: Basic %b64[alberto:einstein]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://somewhere.example/998 HTTP/1.1
+Host: somewhere.example
+Authorization: Basic %b64[alberto:einstein]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://somewhere.else.example/a/path/9980002 HTTP/1.1
+Host: somewhere.else.example
+Authorization: Basic %b64[alberto:einstein]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>
index c0dc52328def40b6cc90fec3487f386897fe8826..cee697e3a29bf57e65919f07f3da4ea94c5f1319 100644 (file)
@@ -59,20 +59,20 @@ HTTP with auth in first URL but not second
 #
 # Verify data after the test has been "shot"
 <verify>
-<protocol>
-GET http://somewhere.example/%TESTNUMBER HTTP/1.1\r
-Host: somewhere.example\r
-Authorization: Basic %b64[alberto:einstein]b64%\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET http://somewhere.else.example/%TESTNUMBER HTTP/1.1\r
-Host: somewhere.else.example\r
-User-Agent: curl/%VERSION\r
-Accept: */*\r
-Proxy-Connection: Keep-Alive\r
-\r
+<protocol crlf="yes">
+GET http://somewhere.example/%TESTNUMBER HTTP/1.1
+Host: somewhere.example
+Authorization: Basic %b64[alberto:einstein]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://somewhere.else.example/%TESTNUMBER HTTP/1.1
+Host: somewhere.else.example
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
 </protocol>
 </verify>
 </testcase>