1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
3239
3240
3241
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
3260
3261
3262
3263
3264
3265
3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
3307
3308
3309
3310
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
3345
3346
3347
3348
3349
3350
3351
3352
3353
3354
3355
3356
3357
3358
3359
3360
3361
3362
3363
3364
3365
3366
3367
3368
3369
3370
3371
3372
3373
3374
3375
3376
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
3418
3419
3420
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
3448
3449
3450
3451
3452
3453
3454
3455
3456
3457
3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
3535
3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567
3568
3569
3570
3571
3572
3573
3574
3575
3576
3577
3578
3579
3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
3600
3601
3602
3603
3604
3605
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
3625
3626
3627
3628
3629
3630
3631
3632
3633
3634
3635
3636
3637
3638
3639
3640
3641
3642
3643
3644
3645
3646
3647
3648
3649
3650
3651
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
3666
3667
3668
3669
3670
3671
3672
3673
3674
3675
3676
3677
3678
3679
3680
3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
3691
3692
3693
3694
3695
3696
3697
3698
3699
3700
3701
3702
3703
3704
3705
3706
3707
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
3765
3766
3767
3768
3769
3770
3771
3772
3773
3774
3775
3776
3777
3778
3779
3780
3781
3782
3783
3784
3785
3786
3787
3788
3789
3790
3791
3792
3793
3794
3795
3796
3797
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
3814
3815
3816
3817
3818
3819
3820
3821
3822
3823
3824
3825
3826
3827
3828
3829
3830
3831
3832
3833
3834
3835
3836
3837
3838
3839
3840
3841
3842
3843
3844
3845
3846
3847
3848
3849
3850
3851
3852
3853
3854
3855
3856
3857
3858
3859
3860
3861
3862
3863
3864
3865
3866
3867
3868
3869
3870
3871
3872
3873
3874
3875
3876
3877
3878
3879
3880
3881
3882
3883
3884
3885
3886
3887
3888
3889
3890
3891
3892
3893
3894
3895
3896
3897
3898
3899
3900
3901
3902
3903
3904
3905
3906
3907
3908
3909
3910
3911
3912
3913
3914
3915
3916
3917
3918
3919
3920
3921
3922
3923
3924
3925
3926
3927
3928
3929
3930
3931
3932
3933
3934
3935
3936
3937
3938
3939
3940
3941
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
3980
3981
3982
3983
3984
3985
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
4022
4023
4024
4025
4026
4027
4028
4029
4030
4031
4032
4033
4034
4035
4036
4037
4038
4039
4040
4041
4042
4043
4044
4045
4046
4047
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
4067
4068
4069
4070
4071
4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093
4094
4095
4096
4097
4098
4099
4100
4101
4102
4103
4104
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
4128
4129
4130
4131
4132
4133
4134
4135
4136
4137
4138
4139
4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
4170
4171
4172
4173
4174
4175
4176
4177
4178
4179
4180
4181
4182
4183
4184
4185
4186
4187
4188
4189
4190
4191
4192
4193
4194
4195
4196
4197
4198
4199
4200
4201
4202
4203
4204
4205
4206
4207
4208
4209
4210
4211
4212
4213
4214
4215
4216
4217
4218
4219
4220
4221
4222
4223
4224
4225
4226
4227
4228
4229
4230
4231
4232
4233
4234
4235
4236
4237
4238
4239
4240
4241
4242
4243
4244
4245
4246
4247
4248
4249
4250
4251
4252
4253
4254
4255
4256
4257
4258
4259
4260
4261
4262
4263
4264
4265
4266
4267
4268
4269
4270
4271
4272
4273
4274
4275
4276
4277
4278
4279
4280
4281
4282
4283
4284
4285
4286
4287
4288
4289
4290
4291
4292
4293
4294
4295
4296
4297
4298
4299
4300
4301
4302
4303
4304
4305
4306
4307
4308
4309
4310
4311
4312
4313
4314
4315
4316
4317
4318
4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
4330
4331
4332
4333
4334
4335
4336
4337
4338
4339
4340
4341
4342
4343
4344
4345
4346
4347
4348
4349
4350
4351
4352
4353
4354
4355
4356
4357
4358
4359
4360
4361
4362
4363
4364
4365
4366
4367
4368
4369
4370
4371
4372
4373
4374
4375
4376
4377
4378
4379
4380
4381
4382
4383
4384
4385
4386
4387
4388
4389
4390
4391
4392
4393
4394
4395
4396
4397
4398
4399
4400
4401
4402
4403
4404
4405
4406
4407
4408
4409
4410
4411
4412
4413
4414
4415
4416
4417
4418
4419
4420
4421
4422
4423
4424
4425
4426
4427
4428
4429
4430
4431
4432
4433
4434
4435
4436
4437
4438
4439
4440
4441
4442
4443
4444
4445
4446
4447
4448
4449
4450
4451
4452
4453
4454
4455
4456
4457
4458
4459
4460
4461
4462
4463
4464
4465
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479
4480
4481
4482
4483
4484
4485
4486
4487
4488
4489
4490
4491
4492
4493
4494
4495
4496
4497
4498
4499
4500
4501
4502
4503
4504
4505
4506
4507
4508
4509
4510
4511
4512
4513
4514
4515
4516
4517
4518
4519
4520
4521
4522
4523
4524
4525
4526
4527
4528
4529
4530
4531
4532
4533
4534
4535
4536
4537
4538
4539
4540
4541
4542
4543
4544
4545
4546
4547
4548
4549
4550
4551
4552
4553
4554
4555
4556
4557
4558
4559
4560
4561
4562
4563
4564
4565
4566
4567
4568
4569
4570
4571
4572
4573
4574
4575
4576
4577
4578
4579
4580
4581
4582
4583
4584
4585
4586
4587
4588
4589
4590
4591
4592
4593
4594
4595
4596
4597
4598
4599
4600
4601
4602
4603
4604
4605
4606
4607
4608
4609
4610
4611
4612
4613
4614
4615
4616
4617
4618
4619
4620
4621
4622
4623
4624
4625
4626
4627
4628
4629
4630
4631
4632
4633
4634
4635
4636
4637
4638
4639
4640
4641
4642
4643
4644
4645
4646
4647
4648
4649
4650
4651
4652
4653
4654
4655
4656
4657
4658
4659
4660
4661
4662
4663
4664
4665
4666
4667
4668
4669
4670
4671
4672
4673
4674
4675
4676
4677
4678
4679
4680
4681
4682
4683
4684
4685
4686
4687
4688
4689
4690
4691
4692
4693
4694
4695
4696
4697
4698
4699
4700
4701
4702
4703
4704
4705
4706
4707
4708
4709
4710
4711
4712
4713
4714
4715
4716
4717
4718
4719
4720
4721
4722
4723
4724
4725
4726
4727
4728
4729
4730
4731
4732
4733
4734
4735
4736
4737
4738
4739
4740
4741
4742
4743
4744
4745
4746
4747
4748
4749
4750
4751
4752
4753
4754
4755
4756
4757
4758
4759
4760
4761
4762
4763
4764
4765
4766
4767
4768
4769
4770
4771
4772
4773
4774
4775
4776
4777
4778
4779
4780
4781
4782
4783
4784
4785
4786
4787
4788
4789
4790
4791
4792
4793
4794
4795
4796
4797
4798
4799
4800
4801
4802
4803
4804
4805
4806
4807
4808
4809
4810
4811
4812
4813
4814
4815
4816
4817
4818
4819
4820
4821
4822
4823
4824
4825
4826
4827
4828
4829
4830
4831
4832
4833
4834
4835
4836
4837
4838
4839
4840
4841
4842
4843
4844
4845
4846
4847
4848
4849
4850
4851
4852
4853
4854
4855
4856
4857
4858
4859
4860
4861
4862
4863
4864
4865
4866
4867
4868
4869
4870
4871
4872
4873
4874
4875
4876
4877
4878
4879
4880
4881
4882
4883
4884
4885
4886
4887
4888
4889
4890
4891
4892
4893
4894
4895
4896
4897
4898
4899
4900
4901
4902
4903
4904
4905
4906
4907
4908
4909
4910
4911
4912
4913
4914
4915
4916
4917
4918
4919
4920
4921
4922
4923
4924
4925
4926
4927
4928
4929
4930
4931
4932
4933
4934
4935
4936
4937
4938
4939
4940
4941
4942
4943
4944
4945
4946
4947
4948
4949
4950
4951
4952
4953
4954
4955
4956
4957
4958
4959
4960
4961
4962
4963
4964
4965
4966
4967
4968
4969
4970
4971
4972
4973
4974
4975
4976
4977
4978
4979
4980
4981
4982
4983
4984
4985
4986
4987
4988
4989
4990
4991
4992
4993
4994
4995
4996
4997
4998
4999
5000
5001
5002
5003
5004
5005
5006
5007
5008
5009
5010
5011
5012
5013
5014
5015
5016
5017
5018
5019
5020
5021
5022
5023
5024
5025
5026
5027
5028
5029
5030
5031
5032
5033
5034
5035
5036
5037
5038
5039
5040
5041
5042
5043
5044
5045
5046
5047
5048
5049
5050
5051
5052
5053
5054
5055
5056
5057
5058
5059
5060
5061
5062
5063
5064
5065
5066
5067
5068
5069
5070
5071
5072
5073
5074
5075
5076
5077
5078
5079
5080
5081
5082
5083
5084
5085
5086
5087
5088
5089
5090
5091
5092
5093
5094
5095
5096
5097
5098
5099
5100
5101
5102
5103
5104
5105
5106
5107
5108
5109
5110
5111
5112
5113
5114
5115
5116
5117
5118
5119
5120
5121
5122
5123
5124
5125
5126
5127
5128
5129
5130
5131
5132
5133
5134
5135
5136
5137
5138
5139
5140
5141
5142
5143
5144
5145
5146
5147
5148
5149
5150
5151
5152
5153
5154
5155
5156
5157
5158
5159
5160
5161
5162
5163
5164
5165
5166
5167
5168
5169
5170
5171
5172
5173
5174
5175
5176
5177
5178
5179
5180
5181
5182
5183
5184
5185
5186
5187
5188
5189
5190
5191
5192
5193
5194
5195
5196
5197
5198
5199
5200
5201
5202
5203
5204
5205
5206
5207
5208
5209
5210
5211
5212
5213
5214
5215
5216
5217
5218
5219
5220
5221
5222
5223
5224
5225
5226
5227
5228
5229
5230
5231
5232
5233
5234
5235
5236
5237
5238
5239
5240
5241
5242
5243
5244
5245
5246
5247
5248
5249
5250
5251
5252
5253
5254
5255
5256
5257
5258
5259
5260
5261
5262
5263
5264
5265
5266
5267
5268
5269
5270
5271
5272
5273
5274
5275
5276
5277
5278
5279
5280
5281
5282
5283
5284
5285
5286
5287
5288
5289
5290
5291
5292
5293
5294
5295
5296
5297
5298
5299
5300
5301
5302
5303
5304
5305
5306
5307
5308
5309
5310
5311
5312
5313
5314
5315
5316
5317
5318
5319
5320
5321
5322
5323
5324
5325
5326
5327
5328
5329
5330
5331
5332
5333
5334
5335
5336
5337
5338
5339
5340
5341
5342
5343
5344
5345
5346
5347
5348
5349
5350
5351
5352
5353
5354
5355
5356
5357
5358
5359
5360
5361
5362
5363
5364
5365
5366
5367
5368
5369
5370
5371
5372
5373
5374
5375
5376
5377
5378
5379
5380
5381
5382
5383
5384
5385
5386
5387
5388
5389
5390
5391
5392
5393
5394
5395
5396
5397
5398
5399
5400
5401
5402
5403
5404
5405
5406
5407
5408
5409
5410
5411
5412
5413
5414
5415
5416
5417
5418
5419
5420
5421
5422
5423
5424
5425
5426
5427
5428
5429
5430
5431
5432
5433
5434
5435
5436
5437
5438
5439
5440
5441
5442
5443
5444
5445
5446
5447
5448
5449
5450
5451
5452
5453
5454
5455
5456
5457
5458
5459
5460
5461
5462
5463
5464
5465
5466
5467
5468
5469
5470
5471
5472
5473
5474
5475
5476
5477
5478
5479
5480
5481
5482
5483
5484
5485
5486
5487
5488
5489
5490
5491
5492
5493
5494
5495
5496
5497
5498
5499
5500
5501
5502
5503
5504
5505
5506
5507
5508
5509
5510
5511
5512
5513
5514
5515
5516
5517
5518
5519
5520
5521
5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
5536
5537
5538
5539
5540
5541
5542
5543
5544
5545
5546
5547
5548
5549
5550
5551
5552
5553
5554
5555
5556
5557
5558
5559
5560
5561
5562
5563
5564
5565
5566
5567
5568
5569
5570
5571
5572
5573
5574
5575
5576
5577
5578
5579
5580
5581
5582
5583
5584
5585
5586
5587
5588
5589
5590
5591
5592
5593
5594
5595
5596
5597
5598
5599
5600
5601
5602
5603
5604
5605
5606
5607
5608
5609
5610
5611
5612
5613
5614
5615
5616
5617
5618
5619
5620
5621
5622
5623
5624
5625
5626
5627
5628
5629
5630
5631
5632
5633
5634
5635
5636
5637
5638
5639
5640
5641
5642
5643
5644
5645
5646
5647
5648
5649
5650
5651
5652
5653
5654
5655
5656
5657
5658
5659
5660
5661
5662
5663
5664
5665
5666
5667
5668
5669
5670
5671
5672
5673
5674
5675
5676
5677
5678
5679
5680
5681
5682
5683
5684
5685
5686
5687
5688
5689
5690
5691
5692
5693
5694
5695
5696
5697
5698
5699
5700
5701
5702
5703
5704
5705
5706
5707
5708
5709
5710
5711
5712
5713
5714
5715
5716
5717
5718
5719
5720
5721
5722
5723
5724
5725
5726
5727
5728
5729
5730
5731
5732
5733
5734
5735
5736
5737
5738
5739
5740
5741
5742
5743
5744
5745
5746
5747
5748
5749
5750
5751
5752
5753
5754
5755
5756
5757
5758
5759
5760
5761
5762
5763
5764
5765
5766
5767
5768
5769
5770
5771
5772
5773
5774
5775
5776
5777
5778
5779
5780
5781
5782
5783
5784
5785
5786
5787
5788
5789
5790
5791
5792
5793
5794
5795
5796
5797
5798
5799
5800
5801
5802
5803
5804
5805
5806
5807
5808
5809
5810
5811
5812
5813
5814
5815
5816
5817
5818
5819
5820
5821
5822
5823
5824
5825
5826
5827
5828
5829
5830
5831
5832
5833
5834
5835
5836
5837
5838
5839
5840
5841
5842
5843
5844
5845
5846
5847
5848
5849
5850
5851
5852
5853
5854
5855
5856
5857
5858
5859
5860
5861
5862
5863
5864
5865
5866
5867
5868
5869
5870
5871
5872
5873
5874
5875
5876
5877
5878
5879
5880
5881
5882
5883
5884
5885
5886
5887
5888
5889
5890
5891
5892
5893
5894
5895
5896
5897
5898
5899
5900
5901
5902
5903
5904
5905
5906
5907
5908
5909
5910
5911
5912
5913
5914
5915
5916
5917
5918
5919
5920
5921
5922
5923
5924
5925
5926
5927
5928
5929
5930
5931
5932
5933
5934
5935
5936
5937
5938
5939
5940
5941
5942
5943
5944
5945
5946
5947
5948
5949
5950
5951
5952
5953
5954
5955
5956
5957
5958
5959
5960
5961
5962
5963
5964
5965
5966
5967
5968
5969
5970
5971
5972
5973
5974
5975
5976
5977
5978
5979
5980
5981
5982
5983
5984
5985
5986
5987
5988
5989
5990
5991
5992
5993
5994
5995
5996
5997
5998
5999
6000
6001
6002
6003
6004
6005
6006
6007
6008
6009
6010
6011
6012
6013
6014
6015
6016
6017
6018
6019
6020
6021
6022
6023
6024
6025
6026
6027
6028
6029
6030
6031
6032
6033
6034
6035
6036
6037
6038
6039
6040
6041
6042
6043
6044
6045
6046
6047
6048
6049
6050
6051
6052
6053
6054
6055
6056
6057
6058
6059
6060
6061
6062
6063
6064
6065
6066
6067
6068
6069
6070
6071
6072
6073
6074
6075
6076
6077
6078
6079
6080
6081
6082
6083
6084
6085
6086
6087
6088
6089
6090
6091
6092
6093
6094
6095
6096
6097
6098
6099
6100
6101
6102
6103
6104
6105
6106
6107
6108
6109
6110
6111
6112
6113
6114
6115
6116
6117
6118
6119
6120
6121
6122
6123
6124
6125
6126
6127
6128
6129
6130
6131
6132
6133
6134
6135
6136
6137
6138
6139
6140
6141
6142
6143
6144
6145
6146
6147
6148
6149
6150
6151
6152
6153
6154
6155
6156
6157
6158
6159
6160
6161
6162
6163
6164
6165
6166
6167
6168
6169
6170
6171
6172
6173
6174
6175
6176
6177
6178
6179
6180
6181
6182
6183
6184
6185
6186
6187
6188
6189
6190
6191
6192
6193
6194
6195
6196
6197
6198
6199
6200
6201
6202
6203
6204
6205
6206
6207
6208
6209
6210
6211
6212
6213
6214
6215
6216
6217
6218
6219
6220
6221
6222
6223
6224
6225
6226
6227
6228
6229
6230
6231
6232
6233
6234
6235
6236
6237
6238
6239
6240
6241
6242
6243
6244
6245
6246
6247
6248
6249
6250
6251
6252
6253
6254
6255
6256
6257
6258
6259
6260
6261
6262
6263
6264
6265
6266
6267
6268
6269
6270
6271
6272
6273
6274
6275
6276
6277
6278
6279
6280
6281
6282
6283
6284
6285
6286
6287
6288
6289
6290
6291
6292
6293
6294
6295
6296
6297
6298
6299
6300
6301
6302
6303
6304
6305
6306
6307
6308
6309
6310
6311
6312
6313
6314
6315
6316
6317
6318
6319
6320
6321
6322
6323
6324
6325
6326
6327
6328
6329
6330
6331
6332
6333
6334
6335
6336
6337
6338
6339
6340
6341
6342
6343
6344
6345
6346
6347
6348
6349
6350
6351
6352
6353
6354
6355
6356
6357
6358
6359
6360
6361
6362
6363
6364
6365
6366
6367
6368
6369
6370
6371
6372
6373
6374
6375
6376
6377
6378
6379
6380
6381
6382
6383
6384
6385
6386
6387
6388
6389
6390
6391
6392
6393
6394
6395
6396
6397
6398
6399
6400
6401
6402
6403
6404
6405
6406
6407
6408
6409
6410
6411
6412
6413
6414
6415
6416
6417
6418
6419
6420
6421
6422
6423
6424
6425
6426
6427
6428
6429
6430
6431
6432
6433
6434
6435
6436
6437
6438
6439
6440
6441
6442
6443
6444
6445
6446
6447
6448
6449
6450
6451
6452
6453
6454
6455
6456
6457
6458
6459
6460
6461
6462
6463
6464
6465
6466
6467
6468
6469
6470
6471
6472
6473
6474
6475
6476
6477
6478
6479
6480
6481
6482
6483
6484
6485
6486
6487
6488
6489
6490
6491
6492
6493
6494
6495
6496
6497
6498
6499
6500
6501
6502
6503
6504
6505
6506
6507
6508
6509
6510
6511
6512
6513
6514
6515
6516
6517
6518
6519
6520
6521
6522
6523
6524
6525
6526
6527
6528
6529
6530
6531
6532
6533
6534
6535
6536
6537
6538
6539
6540
6541
6542
6543
6544
6545
6546
6547
6548
6549
6550
6551
6552
6553
6554
6555
6556
6557
6558
6559
6560
6561
6562
6563
6564
6565
6566
6567
6568
6569
6570
6571
6572
6573
6574
6575
6576
6577
6578
6579
6580
6581
6582
6583
6584
6585
6586
6587
6588
6589
6590
6591
6592
6593
6594
6595
6596
6597
6598
6599
6600
6601
6602
6603
6604
6605
6606
6607
6608
6609
6610
6611
6612
6613
6614
6615
6616
6617
6618
6619
6620
6621
6622
6623
6624
6625
6626
6627
6628
6629
6630
6631
6632
6633
6634
6635
6636
6637
6638
6639
6640
6641
6642
6643
6644
6645
6646
6647
6648
6649
6650
6651
6652
6653
6654
6655
6656
6657
6658
6659
6660
6661
6662
6663
6664
6665
6666
6667
6668
6669
6670
6671
6672
6673
6674
6675
6676
6677
6678
6679
6680
6681
6682
6683
6684
6685
6686
6687
6688
6689
6690
6691
6692
6693
6694
6695
6696
6697
6698
6699
6700
6701
6702
6703
6704
6705
6706
6707
6708
6709
6710
6711
6712
6713
6714
6715
6716
6717
6718
6719
6720
6721
6722
6723
6724
6725
6726
6727
6728
6729
6730
6731
6732
6733
6734
6735
6736
6737
6738
6739
6740
6741
6742
6743
6744
6745
6746
6747
6748
6749
6750
6751
6752
6753
6754
6755
6756
6757
6758
6759
6760
6761
6762
6763
6764
6765
6766
6767
6768
6769
6770
6771
6772
6773
6774
6775
6776
6777
6778
6779
6780
6781
6782
6783
6784
6785
6786
6787
6788
6789
6790
6791
6792
6793
6794
6795
6796
6797
6798
6799
6800
6801
6802
6803
6804
6805
6806
6807
6808
6809
6810
6811
6812
6813
6814
6815
6816
6817
6818
6819
6820
6821
6822
6823
6824
6825
6826
6827
6828
6829
6830
6831
6832
6833
6834
6835
6836
6837
6838
6839
6840
6841
6842
6843
6844
6845
6846
6847
6848
6849
6850
6851
6852
6853
6854
6855
6856
6857
6858
6859
6860
6861
6862
6863
6864
6865
6866
6867
6868
6869
6870
6871
6872
6873
6874
6875
6876
6877
6878
6879
6880
6881
6882
6883
6884
6885
6886
6887
6888
6889
6890
6891
6892
6893
6894
6895
6896
6897
6898
6899
6900
6901
6902
6903
6904
6905
6906
6907
6908
6909
6910
6911
6912
6913
6914
6915
6916
6917
6918
6919
6920
6921
6922
6923
6924
6925
6926
6927
6928
6929
6930
6931
6932
6933
6934
6935
6936
6937
6938
6939
6940
6941
6942
6943
6944
6945
6946
6947
6948
6949
6950
6951
6952
6953
6954
6955
6956
6957
6958
6959
6960
6961
6962
6963
6964
6965
6966
6967
6968
6969
6970
6971
6972
6973
6974
6975
6976
6977
6978
6979
6980
6981
6982
6983
6984
6985
6986
6987
6988
6989
6990
6991
6992
6993
6994
6995
6996
6997
6998
6999
7000
7001
7002
7003
7004
7005
7006
7007
7008
7009
7010
7011
7012
7013
7014
7015
7016
7017
7018
7019
7020
7021
7022
7023
7024
7025
7026
7027
7028
7029
7030
7031
7032
7033
7034
7035
7036
7037
7038
7039
7040
7041
7042
7043
7044
7045
7046
7047
7048
7049
7050
7051
7052
7053
7054
7055
7056
7057
7058
7059
7060
7061
7062
7063
7064
7065
7066
7067
7068
7069
7070
7071
7072
7073
7074
7075
7076
7077
7078
7079
7080
7081
7082
7083
7084
7085
7086
7087
7088
7089
7090
7091
7092
7093
7094
7095
7096
7097
7098
7099
7100
7101
7102
7103
7104
7105
7106
7107
7108
7109
7110
7111
7112
7113
7114
7115
7116
7117
7118
7119
7120
7121
7122
7123
7124
7125
7126
7127
7128
7129
7130
7131
7132
7133
7134
7135
7136
7137
7138
7139
7140
7141
7142
7143
7144
7145
7146
7147
7148
7149
7150
7151
7152
7153
7154
7155
7156
7157
7158
7159
7160
7161
7162
7163
7164
7165
7166
7167
7168
7169
7170
7171
7172
7173
7174
7175
7176
7177
7178
7179
7180
7181
7182
7183
7184
7185
7186
7187
7188
7189
7190
7191
7192
7193
7194
7195
7196
7197
7198
7199
7200
7201
7202
7203
7204
7205
7206
7207
7208
7209
7210
7211
7212
7213
7214
7215
7216
7217
7218
7219
7220
7221
7222
7223
7224
7225
7226
7227
7228
7229
7230
7231
7232
7233
7234
7235
7236
7237
7238
7239
7240
7241
7242
7243
7244
7245
7246
7247
7248
7249
7250
7251
7252
7253
7254
7255
7256
7257
7258
7259
7260
7261
7262
7263
7264
7265
7266
7267
7268
7269
7270
7271
7272
7273
7274
7275
7276
7277
7278
7279
7280
7281
7282
7283
7284
7285
7286
7287
7288
7289
7290
7291
7292
7293
7294
7295
7296
7297
7298
7299
7300
7301
7302
7303
7304
7305
7306
7307
7308
7309
7310
7311
7312
7313
7314
7315
7316
7317
7318
7319
7320
7321
7322
7323
7324
7325
7326
7327
7328
7329
7330
7331
7332
7333
7334
7335
7336
7337
7338
7339
7340
7341
7342
7343
7344
7345
7346
7347
7348
7349
7350
7351
7352
7353
7354
7355
7356
7357
7358
7359
7360
7361
7362
7363
7364
7365
7366
7367
7368
7369
7370
7371
7372
7373
7374
7375
7376
7377
7378
7379
7380
7381
7382
7383
7384
7385
7386
7387
7388
7389
7390
7391
7392
7393
7394
7395
7396
7397
7398
7399
7400
7401
7402
7403
7404
7405
7406
7407
7408
7409
7410
7411
7412
7413
7414
7415
7416
7417
7418
7419
7420
7421
7422
7423
7424
7425
7426
7427
7428
7429
7430
7431
7432
7433
7434
7435
7436
7437
7438
7439
7440
7441
7442
7443
7444
7445
7446
7447
|
_ _ ____ _
___| | | | _ \| |
/ __| | | | |_) | |
| (__| |_| | _ <| |___
\___|\___/|_| \_\_____|
Changelog
Version 7.75.0 (3 Feb 2021)
Daniel Stenberg (3 Feb 2021)
- RELEASE-NOTES: synced
- THANKS: added contributors from 7.75.0
- copyright: fix year ranges in need of updates
- TODO: remove items for next SONAME bump etc
We want to avoid that completely, so we don't plan for things after such
an event.
- [Jay Satiro brought this change]
ngtcp2: Fix build error due to change in ngtcp2_settings
- Separate ngtcp2_transport_params.
ngtcp2/ngtcp2@05d7adc made ngtcp2_transport_params separate from
ngtcp2_settings.
ngtcp2 master is required to build curl with http3 support.
Closes #6554
- vtls: remove md5sum
As it is not used anymore.
Reported-by: Jacob Hoffman-Andrews
Bug: https://curl.se/mail/lib-2021-02/0000.html
Closes #6557
- [Alessandro Ghedini brought this change]
quiche: don't use primary_ip / primary_port
Closes #6555
Alessandro Ghedini (1 Feb 2021)
- travis: enable quiche's FFI feature
Daniel Stenberg (30 Jan 2021)
- [Dmitry Wagin brought this change]
http: improve AWS HTTP v4 Signature auth
- Add support services without region and service prefixes in
the URL endpoint (ex. Min.IO, GCP, Yandex Cloud, Mail.Ru Cloud Solutions, etc)
by providing region and service parameters via aws-sigv4 option.
- Add [:region[:service]] suffix to aws-sigv4 option;
- Fix memory allocation errors.
- Refactor memory management.
- Use Curl_http_method instead() STRING_CUSTOMREQUEST.
- Refactor canonical headers generating.
- Remove repeated sha256_to_hex() usage.
- Add some docs fixes.
- Add some codestyle fixes.
- Add overloaded strndup() for debug - curl_dbg_strndup().
- Update tests.
Closes #6524
- hyper: fix CONNECT to set 'data' as userdata
Follow-up to 14e075d1a7fd
- [Layla brought this change]
connect: fix compile errors in `Curl_conninfo_local`
.. for the `#else` (`!HAVE_GETSOCKNAME`) case
Fixes https://github.com/curl/curl/issues/6548
Closes #6549
Signed-off-by: Layla <layla@insightfulvr.com>
- [Michał Antoniak brought this change]
transfer: fix GCC 10 warning with flag '-Wint-in-bool-context'
... and return the error code from the Curl_mime_rewind call.
Closes #6537
- [Michał Antoniak brought this change]
avoid warning: enum constant in boolean context
- copyright: fix missing year (range) updates
- RELEASE-NOTES: synced
- openssl: lowercase the hostname before using it for SNI
... because it turns out several servers out there don't actually behave
correctly otherwise in spite of the fact that the SNI field is
specifically said to be case insensitive in RFC 6066 section 3.
Reported-by: David Earl
Fixes #6540
Closes #6543
- KNOWN_BUGS: cmake: ExternalProject_Add does not set CURL_CA_PATH
Closes #6313
- KNOWN_BUGS: Multi perform hangs waiting for threaded resolver
Closes #4852
- KNOWN_BUGS: "pulseUI VPN client" is known to be buggy
First entry in the new section "applications" for known problems in
libcurl using applications.
Closes #6306
- tool_writeout: make %{errormsg} blank for no errors
Closes #6539
Jay Satiro (27 Jan 2021)
- [Gisle Vanem brought this change]
build: fix djgpp builds
- Update build instructions in packages/DOS/README
- Extend 'VPATH' with 'vquic' and 'vssh'.
- Allow 'Makefile.dist' to build both 'lib' and 'src'.
- Allow using the Windows hosted djgpp cross compiler to build for MSDOS
under Windows.
- 'USE_SSL' -> 'USE_OPENSSL'
- Added a 'link_EXE' macro. Etc, etc.
- Linking 'curl.exe' needs '$(CURLX_CFILES)' too.
- Do not pick-up '../lib/djgpp/*.o' files. Recompile locally.
- Generate a gzipped 'tool_hugehelp.c' if 'USE_ZLIB=1'.
- Remove 'djgpp-clean'
- Adapt to new C-ares directory structure
- Use conditional variable assignments
Clarify the 'conditional variable assignment' in 'common.dj'.
Closes https://github.com/curl/curl/pull/6382
Daniel Stenberg (27 Jan 2021)
- [Ikko Ashimine brought this change]
hyper: fix typo in c-hyper.c
settting -> setting
Closes #6538
- libssh2: fix CURL_LIBSSH2_DEBUG-enabled build
Follow-up to 2dcc940959772a
Reported-by: Gisle Vanem
Bug: https://github.com/curl/curl/commit/2dcc940959772a652f6813fb6bd3092095a4877b#commitcomment-46420088
Jay Satiro (27 Jan 2021)
- asyn-thread: fix build for when getaddrinfo missing
This is a follow-up to 8315343 which several days ago moved the resolver
pointer into the async struct but did not update the code that uses it
when getaddrinfo is not present.
Closes https://github.com/curl/curl/pull/6536
Daniel Stenberg (27 Jan 2021)
- urldata: move 'ints' to the end of 'connectdata'
To optimize storage slightly.
Closes #6534
- urldata: store ip version in a single byte
Closes #6534
- urldata: remove duplicate 'upkeep_interval_ms' from connectdata
... and rely only on the value already set in Curl_easy.
Closes #6534
- urldata: remove 'local_ip' from the connectdata struct
As the info is already stored in the transfer handle anyway, there's no
need to carry around a duplicate buffer for the life-time of the handle.
Closes #6534
- urldata: remove duplicate port number storage
... and use 'int' for ports. We don't use 'unsigned short' since -1 is
still often used internally to signify "unknown value" and 0 - 65535 are
all valid port numbers.
Closes #6534
- urldata: remove the duplicate 'ip_addr_str' field
... as the numerical IP address is already stored and kept in 'primary_ip'.
Closes #6534
- select: convert Curl_select() to private static function
The old function should not be used anywhere anymore (the only remaining
gskit use has to be fixed to instead use Curl_poll or none at all).
The static function version is now called our_select() and is only built
if necessary.
Closes #6531
- Curl_chunker: shrink the struct
... by removing a field, converting the hex index into a byte and
rearranging the order. Cuts it down from 48 bytes to 32 on x86_64.
Closes #6527
- curl: include the file name in --xattr/--remote-time error msgs
- curl: s/config->global/global/ in single_transfer()
- curl: move fprintf outputs to warnf
For setting and getting time of the download. To make the outputs
respect --silent etc.
Reported-by: Viktor Szakats
Fixes #6533
Closes #6535
- [Tatsuhiro Tsujikawa brought this change]
ngtcp2: Fix http3 upload stall
Closes #6521
- [Tatsuhiro Tsujikawa brought this change]
ngtcp2: Fix stack buffer overflow
Closes #6521
- warnless.h: remove the prototype for curlx_ultosi
Follow-up to 217552503ff3
- warnless: remove curlx_ultosi
... not used anywhere
Closes #6530
- [Patrick Monnerat brought this change]
lib: remove conn->data uses
Closes #6515
- pingpong: remove the 'conn' struct member
... as it's superfluous now when Curl_easy is passed in and we can
derive the connection from that instead and avoid the duplicate copy.
Closes #6525
- hostip/proxy: remove conn->data use
Closes #6513
- url: reduce conn->data references
... there are a few left but let's keep them to last
Closes #6512
- scripts/singleuse: add curl_easy_option*
Jay Satiro (25 Jan 2021)
- test410: fix for windows
- Pass the very long request header via file instead of command line.
Prior to this change the 49k very long request header string was passed
via command line and on Windows that is too long so it was truncated and
the test would fail (specifically msys CI).
Closes https://github.com/curl/curl/pull/6516
Daniel Stenberg (25 Jan 2021)
- libssh2: move data from connection object to transfer object
Readdir data, filenames and attributes are strictly related to the
transfer and not the connection. This also reduces the total size of the
fixed connectdata struct.
Closes #6519
- RELEASE-NOTES: synced
- [Patrick Monnerat brought this change]
lib: remove conn->data uses
Closes #6499
- hyper: remove the conn->data references
Closes #6508
- travis: build ngtcp2 --with-gnutls
... since they disable it by default since a few days back.
Closes #6506
Fixes #6493
- hostip: remove conn->data from resolver functions
This also moves the 'async' struct from the connectdata struct into the
Curl_easy struct, which seems like a better home for it.
Closes #6497
Jay Satiro (22 Jan 2021)
- strerror: skip errnum >= 0 assertion on windows
On Windows an error number may be greater than INT_MAX and negative once
cast to int.
The assertion is checked only in debug builds.
Closes https://github.com/curl/curl/pull/6504
Daniel Stenberg (21 Jan 2021)
- doh: make Curl_doh_is_resolved survive a NULL pointer
... if Curl_doh() returned a NULL, this function gets called anyway as
in a asynch procedure. Then the doh struct pointer is NULL and signifies
an OOM situation.
Follow-up to 6246a1d8c6776
- wolfssh: remove conn->data references
... and repair recent build breakage
Closes #6507
- http: empty reply connection are not left intact
... so mark the connection as closed in this condition to prevent that
verbose message to wrongly appear.
Reported-by: Matt Holt
Bug: https://twitter.com/mholt6/status/1352130240265375744
Closes #6503
- chunk/encoding: remove conn->data references
... by anchoring more functions on Curl_easy instead of connectdata
Closes #6498
Jay Satiro (20 Jan 2021)
- [Erik Olsson brought this change]
lib: save a bit of space with some structure packing
- Reorder some internal struct members so that less padding is used.
This is an attempt at saving a bit of space by packing some structs
(using pahole to find the holes) where it might make sense to do
so without losing readability.
I.e., I tried to avoid separating fields that seem grouped
together (like the cwd... fields in struct ftp_conn for instance).
Also abstained from touching fields behind conditional macros as
that quickly can get complicated.
Closes https://github.com/curl/curl/pull/6483
Daniel Stenberg (20 Jan 2021)
- INSTALL.md: fix typo
Found-by: Marcel Raad
- [Fabian Keil brought this change]
http: get CURLOPT_REQUEST_TARGET working with a HTTP proxy
Added test 1613 to verify.
Closes #6490
- Merge branch 'bagder/curl_range-data-conn'
- ftp: remove conn->data leftover
- curl_range: remove conn->data
Closes #6496
- INSTALL: now at 85 operating systems
- quiche: fix unused parameter ‘conn’
Follow-up to 2bdec0b3
- transfer: fix ‘conn’ undeclared mistake for iconv build
Follow-up to 219d9f8620d
- doh: allocate state struct on demand
... instead of having it static within the Curl_easy struct. This takes
away 1176 bytes (18%) from the Curl_easy struct that aren't used very
often and instead makes the code allocate it when needed.
Closes #6492
- socks: use the download buffer instead
The SOCKS code now uses the generic download buffer for temporary
storage during the connection procedure, instead of having its own
private 600 byte buffer that adds to the connectdata struct size. This
works fine because this point the buffer is allocated but is not use for
download yet since the connection hasn't completed.
This reduces the connection struct size by 22% on a 64bit arch!
The SOCKS buffer needs to be at least 600 bytes, and the download buffer
is guaranteed to never be smaller than 1000 bytes.
Closes #6491
- urldata: make magic be the first struct field
By making the `magic` identifier the same size and at the same place
within the structs (easy, multi, share), libcurl will be able to more
reliably detect and safely error out if an application passes in the
wrong handle to APIs. Easier to detect and less likely to cause crashes
if done.
Such mixups can't be detected at compile-time due to them being
typedefed void pointers - unless `CURL_STRICTER` is defined.
Closes #6484
- http_chunks: correct and clarify a comment on hexnumber length
... and also rename the define for max length.
Closes #6489
- curl_path: remove conn->data use
Closes #6487
- transfer: remove conn->data use
Closes #6486
- quic: remove conn->data use
Closes #6485
- [Fabian Keil brought this change]
Add test1181: Proxy request with --proxy-header "Connection: Keep-Alive"
- [Fabian Keil brought this change]
Add test1180: Proxy request with -H "Proxy-Connection: Keep-Alive"
At the moment the test fails as curl sends two Proxy-Connection
headers.
- c-hyper: avoid duplicated Proxy-Connection headers
- http: make providing Proxy-Connection header not cause duplicated headers
Fixes test 1180
Bug: https://curl.se/mail/lib-2021-01/0095.html
Reported-by: Fabian Keil
Closes #6472
- runtests: preprocess DISABLED to allow conditionals
... with this function provided, we can disable tests for specific
environments and setups directly within this file.
Closes #6477
- runtests: turn preprocessing into a separate function
... and remove all other variable substitutions as they're now done once
and for all in the preprocessor.
- lib/Makefile.inc: convert to listing each file on its own line
... to make it diff friendlier and easier to read.
Closes #6448
- ftplistparser: remove use of conn->data
Closes #6482
- lib: more conn->data cleanups
Closes #6479
- [Patrick Monnerat brought this change]
vtls: reduce conn->data use
Closes #6474
- hyper: deliver data to application with Curl_client_write
... just as the native code path does. Avoids sending too large data
chunks in the callback and more.
Reported-by: Gisle Vanem
Fixes #6462
Closes #6473
- gopher: remove accidental conn->data leftover
- libssh: avoid plain free() of libssh-memory
Since curl's own memory debugging system redefines free() calls to track
and fiddle with memory, it cannot be used on memory allocated by 3rd
party libraries.
Third party libraries SHOULD NOT require free() to release allocated
resources for this reason - and libs can use separate healp allocators
on some systems (like Windows) so free() doesn't necessarily work
anyway.
Filed as an issue with libssh: https://bugs.libssh.org/T268
Closes #6481
- send: assert that Curl_write_plain() has a ->conn when called
To help catch bad invokes.
Closes #6476
- test410: verify HTTPS GET with a 49K request header
skip test 410 for mesalink in the CI as it otherwise hangs "forever"
- lib: pass in 'struct Curl_easy *' to most functions
... in most cases instead of 'struct connectdata *' but in some cases in
addition to.
- We mostly operate on transfers and not connections.
- We need the transfer handle to log, store data and more. Everything in
libcurl is driven by a transfer (the CURL * in the public API).
- This work clarifies and separates the transfers from the connections
better.
- We should avoid "conn->data". Since individual connections can be used
by many transfers when multiplexing, making sure that conn->data
points to the current and correct transfer at all times is difficult
and has been notoriously error-prone over the years. The goal is to
ultimately remove the conn->data pointer for this reason.
Closes #6425
Emil Engler (17 Jan 2021)
- docs: fix typos in NEW-PROTOCOL.md
This fixes a misspelled "it" and a grammatically wrong "-ing" suffix.
Closes #6471
Daniel Stenberg (16 Jan 2021)
- RELEASE-NOTES: synced
Jay Satiro (16 Jan 2021)
- [Razvan Cojocaru brought this change]
cmake: expose CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG
This does for cmake builds what --disable-openssl-auto-load-config
does for autoconf builds.
Closes https://github.com/curl/curl/pull/6435
Daniel Stenberg (15 Jan 2021)
- test1918: verify curl_easy_option_by_name() and curl_easy_option_by_id()
... and as a practical side-effect, make sure that the
Curl_easyopts_check() function is asserted in debug builds, which we
want to detect mismatches between the options list in easyoptions.c and
the options in curl.h
Found-by: Gisle Vanem
Bug: https://github.com/curl/curl/commit/08e8455dddc5e48e58a12ade3815c01ae3da3b64#commitcomment-45991815
Closes #6461
- [Gisle Vanem brought this change]
easyoptions: add the missing AWS_SIGV4
Follow-up from AWS_SIGV4
- schannel_verify: fix safefree call typo
Follow-up from e87ad71d1ba00519
Closes #6459
- mime: make sure setting MIMEPOST to NULL resets properly
... so that a function can first use MIMEPOST and then set it to NULL to
reset it back to a blank POST.
Added test 584 to verify the fix.
Reported-by: Christoph M. Becker
Fixes #6455
Closes #6456
- multi: set the PRETRANSFER time-stamp when we switch to PERFORM
... instead of at end of the DO state. This makes the timer more
accurate for the protocols that use the DOING state (such as FTP), and
simplifies how the function (now called init_perform) is called.
The timer will then include the entire procedure up to PERFORM -
including all instructions for getting the transfer started.
Closes #6454
- CURLINFO_PRETRANSFER_TIME.3: clarify
... the timer *does* include the instructions for getting the remote
file.
Ref: #6452
Closes #6453
- [Gisle Vanem brought this change]
schannel: plug a memory-leak
... when built without -DUNICODE.
Closes #6457
Jay Satiro (14 Jan 2021)
- gitattributes: Set batch files to CRLF line endings on checkout
If a batch file is run without CRLF line endings (ie LF-only) then
arbitrary behavior may occur. I consider that a bug in Windows, however
the effects can be serious enough (eg unintended code executed) that
we're fixing it in the repo by requiring CRLF line endings for batch
files on checkout.
Prior to this change the checked-out line endings of batch files were
dependent on a user's git preferences. On Windows it is common for git
users to have automatic CRLF conversion enabled (core.autocrlf true),
but those users that don't would run into this behavior.
For example a user has reported running the Visual Studio project
generator batch file (projects/generate.bat) and it looped forever.
Output showed that the Windows OS interpreter was occasionally jumping
to arbitrary points in the batch file and executing commands. This
resulted in unintended files being removed (a removal sequence called)
and looping forever.
Ref: https://serverfault.com/q/429594
Ref: https://stackoverflow.com/q/232651
Ref: https://www.dostips.com/forum/viewtopic.php?t=8988
Ref: https://git-scm.com/docs/gitattributes#_checking_out_and_checking_in
Ref: https://git-scm.com/book/en/v2/Customizing-Git-Git-Configuration#_core_autocrlf
Bug: https://github.com/curl/curl/discussions/6427
Reported-by: Ganesh Kamath
Closes https://github.com/curl/curl/pull/6442
Daniel Stenberg (14 Jan 2021)
- tool_operate: spellfix a comment
- ROADMAP: refreshed
o removed HSTS - already implemented
o added HTTPS RR records
o mention HTTP/3 completion
- http_chunks: remove Curl_ prefix from static functions
- transfer: remove Curl_ prefix from static functions
- tftp: remove Curl_ prefix from static functions
- multi: remove Curl_ prefix from static functions
- ldap: remove Curl_ prefix from static functions
- doh: remove Curl_ prefix from static functions
- asyn-ares: remove Curl_ prefix from static functions
- vtls: remove Curl_ prefix from static functions
- bearssl: remove Curl_ prefix from static functions
- mbedtls: remove Curl_ prefix from static functions
- wolfssl: remove Curl_ prefix from static functions
- nss: remove Curl_ prefix from static functions
- gnutls: remove Curl_ prefix from static functions
- openssl: remove Curl_ prefix from static functions
... as we reserve this prefix to library-wide functions.
Closes #6443
- nss: get the run-time version instead of build-time
Closes #6445
Jay Satiro (12 Jan 2021)
- tool_doswin: Restore original console settings on CTRL signal
- Move Windows terminal init code from tool_main to tool_doswin.
- Restore the original console settings on CTRL+C and CTRL+BREAK.
Background: On Windows the curl tool changes the console settings to
enable virtual terminal processing (eg color output) if supported
(ie Win 10). The original settings are restored on exit but prior to
this change were not restored in the case of the CTRL signals.
Windows VT behavior varies depending on console/powershell/terminal;
refer to the discussion in #6226.
Assisted-by: Rich Turner
Closes https://github.com/curl/curl/pull/6226
Daniel Stenberg (12 Jan 2021)
- gen.pl: fix perl syntax
Follow-up to 324cf1d2e
- [Emil Engler brought this change]
help: update to current codebase
This commit bumps the help to the current state of the project.
Closes #6437
- [Emil Engler brought this change]
docs: fix line length bug in gen.pl
The script warns if the length of $opt and $desc is > 78. However, these
two variables are on totally separate lines so the check makes no sense.
Also the $bitmask field is totally forgotten. Currently this leads to
two warnings within `--resolve` and `--aws-sigv4`.
Closes #6438
- [Emil Engler brought this change]
docs: fix wrong documentation in help.d
curl does not list all categories when you invoke "--help" without any
parameters.
Closes #6436
- aws-sigv4.d: polish the wording
Make it shorter and imperative form
Closes #6439
- [Fabian Keil brought this change]
misc: fix typos
Bug: https://curl.se/mail/lib-2021-01/0063.html
Closes #6434
- multi_runsingle: bail out early on data->conn == NULL
As that's a significant error condition and scan-build warns for NULL
pointer dereferences if we don't.
Closes #6433
- multi: skip DONE state if there's no connection left for ftp wildcard
... to avoid running in that state with data->conn being NULL.
- libssh2: fix "Value stored to 'readdir_len' is never read"
Detected by scan-build
- connect: mark intentional ignores of setsockopt return values
Pointed out by Coverity
Closes #6431
Jay Satiro (11 Jan 2021)
- http_proxy: Fix CONNECT chunked encoding race condition
- During the end-of-headers response phase do not mark the tunnel
complete unless the response body was completely parsed/ignored.
Prior to this change if the entirety of a CONNECT response with chunked
encoding was not received by the time the final header was parsed then
the connection would be marked done prematurely, before all the chunked
data could be read in and ignored (since this is what we do with any
CONNECT response body) and the connection could not be used.
Bug: https://curl.se/mail/lib-2021-01/0033.html
Reported-by: Fabian Keil
Closes https://github.com/curl/curl/pull/6432
Daniel Stenberg (11 Jan 2021)
- RELEASE-NOTES: synced
- url: if IDNA conversion fails, fallback to Transitional
This improves IDNA2003 compatiblity.
Reported-by: Bubu on github
Fixes #6423
Closes #6428
- travis: make the Hyper build from its master branch
Closes #6430
- http: make 'authneg' also work for Hyper
When doing a request with a request body expecting a 401/407 back, that
initial request is sent with a zero content-length. Test 177 and more.
Closes #6424
Jay Satiro (8 Jan 2021)
- cmake: Add an option to disable libidn2
New option USE_LIBIDN2 defaults to ON for libidn2 detection. Prior to
this change libidn2 detection could not be turned off in cmake builds.
Reported-by: William A Rowe Jr
Fixes https://github.com/curl/curl/issues/6361
Closes https://github.com/curl/curl/pull/6362
Daniel Stenberg (8 Jan 2021)
- HYPER: no longer needs the special branch
- test179: use consistent header line endings
... to make "Hyper mode" work better.
- file: don't provide content-length for directories
... as it is misleading.
Ref #6379
Closes #6421
- TODO: Directory listing for FILE:
Ref #6379
- curl.h: add CURLPROTO_GOPHERS as own protocol identifier
Follow-up to a1f06f32b860, to make sure it can be handled separately
from plain gopher.
Closes #6418
- http: have CURLOPT_FAILONERROR fail after all headers
... so that Retry-After and other meta-content can still be used.
Added 1634 to verify. Adjusted test 194 and 281 since --fail now also
includes the header-terminating CRLF in the output before it exits.
Fixes #6408
Closes #6409
- global_init: debug builds allocates a byte in init
... to make build tools/valgrind warn if no curl_global_cleanup is
called.
This is conditionally only done for debug builds with the env variable
CURL_GLOBAL_INIT set.
Closes #6410
- lib/unit tests: add missing curl_global_cleanup() calls
- travis: adapt to Hyper build change
Closes #6419
- pretransfer: setup the User-Agent header here
... and not in the connection setup, as for multiplexed transfers the
connection setup might be skipped and then the transfer would end up
without the set user-agent!
Reported-by: Flameborn on github
Assisted-by: Andrey Gursky
Assisted-by: Jay Satiro
Assisted-by: Mike Gelfand
Fixes #6312
Closes #6417
- test66: disable with Hyper
...as Hyper doesn't support HTTP/0.9
- c-hyper: poll the tasks until end correctly
... makes test 36 work.
Closes #6412
- [Gergely Nagy brought this change]
mk-ca-bundle.pl: deterministic output when using -t
Printing trust purposes are now sorted, making the output deterministic
when running on the same input certdata.txt.
Closes #6413
- KNOWN_BUGS: fixed "wolfSSL lacks support for renegotiation"
Fixed by #6411
- [Himanshu Gupta brought this change]
wolfssl: add SECURE_RENEGOTIATION support
Closes #6411
- RELEASE-NOTES: synced
- wolfssl: update copyright year range
Follow-up to 7de2e96535e9
- c-hyper: make CURLE_GOT_NOTHING work
Test 30
Closes #6407
- http_proxy: make CONNECT work with the Hyper backend
Makes test 80 run
Closes #6406
- TODO: --fail-with-body perchance?
Jay Satiro (4 Jan 2021)
- tool_operate: fix the suppression logic of some error messages
- Fix the failed truncation and failed writing body error messages to
not be shown unless error messages are shown. (ie the user has
specified -sS, or has not specified -s).
- Also prefix same error messages with "curl: ", for example:
curl: (23) Failed to truncate, exiting
Prior to this change the failed truncation error messages would be shown
if not -s, but did not account for -sS which should show.
Prior to this change the failed writing body error messages would be
shown always.
Ref: https://curl.se/docs/manpage.html#-S
Bug: https://curl.se/mail/archive-2020-12/0017.html
Reported-by: Hongyi Zhao
Closes https://github.com/curl/curl/pull/6402
- wolfssl: Support wolfSSL builds missing TLS 1.1
The wolfSSL TLS library defines NO_OLD_TLS in some of their build
configurations and that causes the library to be built without TLS 1.1.
For example if MD5 is explicitly disabled when building wolfSSL then
that defines NO_OLD_TLS and the library is built without TLS 1.1 [1].
Prior to this change attempting to build curl with a wolfSSL that was
built with NO_OLD_TLS would cause a build link error undefined reference
to wolfTLSv1_client_method.
[1]: https://github.com/wolfSSL/wolfssl/blob/v4.5.0-stable/configure.ac#L2366
Bug: https://curl.se/mail/lib-2020-12/0121.html
Reported-by: Julian Montes
Closes https://github.com/curl/curl/pull/6388
Daniel Stenberg (4 Jan 2021)
- test1633: set appropriate name
"--retry with a 429 response and Retry-After:"
- travis: limit the tests with quiche builds to HTTPS and FTPS only
... since it runs into the 50 minute time limit too often otherwise.
Closes #6403
- HISTORY: added dates to early history
Mostly thanks to this archived web page for urlget:
https://web.archive.org/web/19980216125115/http://www.inf.ufrgs.br/~sagula/urlget.html
- httpauth: make multi-request auth work with custom port
When doing HTTP authentication and a port number set with CURLOPT_PORT,
the code would previously have the URL's port number override as if it
had been a redirect to an absolute URL.
Added test 1568 to verify.
Reported-by: UrsusArctos on github
Fixes #6397
Closes #6400
- [Emil Engler brought this change]
language: s/behaviour/behavior/g
We currently use both spellings the british "behaviour" and the american
"behavior". However "behavior" is more used in the project so I think
it's worth dropping the british name.
Closes #6395
- cmdline-opts/retry.d: mention response code 429 as well
Reported-by: Cherish98
Bug: https://curl.se/mail/archive-2020-12/0018.html
- docs/HYPER.md: mention outstanding issues
To make it more obvious to users what doesn't work (yet)
Closes #6389
- COPYING/configure: bump copyright year range
- c-hyper: add timecondition to the request
Test 77-78
Closes #6391
- c-hyper: make Digest and NTLM work
Test 64, 65, 67, 68, 69, 70, 72
Closes #6390
- examples/curlgtk.c: fix the copyright year range
... and make private functions static.
- [Olaf Hering brought this change]
docs/examples: adjust prototypes for CURLOPT_READFUNCTION
The type of the buffer in curl_read_callback is 'char *', not 'void *'.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Closes #6392
- examples: fix more empty expression statement has no effect
Follow-up to 26e46617b9
- cleanup: fix two empty expression statement has no effect
Follow-up to 26e46617b9
- configure: set -Wextra-semi-stmt for clang with --enable-debug
To have it properly complain on empty statements with no effect.
Ref: #6376
Closes #6378
- tests/unit: fix empty statements with no effect
... by making macros use "do {} while(0)"
- [Paul Groke brought this change]
dns: extend CURLOPT_RESOLVE syntax for adding non-permanent entries
Extend the syntax of CURLOPT_RESOLVE strings: allow using a '+' prefix
(similar to the existing '-' prefix for removing entries) to add
DNS cache entries that will time out just like entries that are added
by libcurl itself.
Append " (non-permanent)" to info log message in case a non-permanent
entry is added.
Adjust relevant comments to reflect the new behavior.
Adjust documentation.
Extend unit1607 to test the new functionality.
Closes #6294
- schannel: fix "empty expression statement has no effect"
Bug: https://github.com/curl/curl/commit/8ab78f720ae478d533e30b202baec4b451741579#commitcomment-45445950
Reported-by: Gisle Vanem
Closes #6381
- [Denis Laxalde brought this change]
docs: remove redundant "better" in --fail help
Closes #6385
- [Kevin Ushey brought this change]
curl.1: fix typo microsft -> microsoft
Closes #6380
- [XhmikosR brought this change]
misc: assorted typo fixes
Closes #6375
- RELEASE-NOTES: synced
- tool_operate: avoid NULL dereference of first_arg
Follow-up to 6a5e020d4d2b04a
Identified by OSS-Fuzz
Bug: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=28999
Closes #6377
- misc: fix "warning: empty expression statement has no effect"
Turned several macros into do-while(0) style to allow their use to work
find with semicolon.
Bug: https://github.com/curl/curl/commit/08e8455dddc5e48e58a12ade3815c01ae3da3b64#commitcomment-45433279
Follow-up to 08e8455dddc5e4
Reported-by: Gisle Vanem
Closes #6376
- KNOWN_BUGS: 6.10 curl never completes Negotiate over HTTP
Closes #5235
Closes #6370
- writeout: fix NULL dereference for "this url"
Detected by torture test 1029
Follow-up to 7a90ddf88f5a
Closes #6374
- failf: remove newline from formatting strings
... as failf adds one itself.
Also: add an assert() to failf() that triggers on a newline in the
format string!
Closes #6365
- [XhmikosR brought this change]
CI: fix warning with the latest versions
`git checkout HEAD^2` is no longer needed
Closes #6369
- INSTALL: update the list known OSes and CPU archs curl has run on
Closes #6366
- [Cherish98 brought this change]
curl: fix handling of -q option
The match of the "-q" option (short for "--disable") should:
a) allow concatenation with other single-letters; and
b) be case-sensitive, lest confusing with "-Q" ("--quote")
Closes #6364
- tests/badsymbols.pl: ignore stand-alone single hash lines
Bug: https://curl.se/mail/lib-2020-12/0084.html
Reported-by: Dennis Clarke
Assisted-by: Jay Satiro
Closes #6355
- curl_easy_pause.3: add multiplexed pause effects
and generally refresh and update. Remove details for ancient versions.
Reviewed-by: Jay Satiro
Closes #6360
Jay Satiro (22 Dec 2020)
- curl_easy_pause.3: fix man page reference
Follow-up to ac9a724 from earlier today.
Ref: https://github.com/curl/curl/pull/6359
Daniel Stenberg (22 Dec 2020)
- EXPERIMENTAL: add the Hyper backend to the list
... of current experimental features in curl.
- speedcheck: exclude paused transfers
Paused transfers should not be stopped due to slow speed even when
CURLOPT_LOW_SPEED_LIMIT is set. Additionally, the slow speed timer is
now reset when the transfer is unpaused - as otherwise it would easily
just trigger immediately after unpausing.
Reported-by: Harry Sintonen
Fixes #6358
Closes #6359
- h2: do not wait for RECV on paused transfers
... as the socket might be readable all the time when paused and thus
causing a busy-loop.
Reported-by: Harry Sintonen
Reviewed-by: Jay Satiro
Fixes #6356
Closes #6357
- RELEASE-NOTES: synced
- cmdline-opts/gen.pl: return hard on errors
... as the warnings tend to go unnoticed otherwise!
Closes #6354
- examples/libtest: add .checksrc to dist
... so that (auto)builds from tarballs also get the correct instructions.
Fixes #6176
Closes #6353
- test: verify new --write-out variables
Extended test 1029 and added 1188
- test970: adapted to the new internal order of variables
- curl: add variables to --write-out
In particular, these ones can help a user to create its own error
message when one or transfers fail.
writeout: add 'onerror', 'url', 'urlnum', 'exitcode', 'errormsg'
onerror - lets a user only show the rest on non-zero exit codes
url - the input URL used for this transfer
urlnum - the numerical URL counter (0 indexed) for this transfer
exitcode - the numerical exit code for the transfer
errormsg - obvious
Reported-by: Earnestly on github
Fixes #6199
Closes #6207
- [Matthias Gatto brought this change]
tests: add very simple AWS HTTP v4 Signature test
Signed-off-by: Matthias Gatto <matthias.gatto@outscale.com>
- [Matthias Gatto brought this change]
docs: add AWS HTTP v4 Signature
- [Matthias Gatto brought this change]
tool: add AWS HTTP v4 Signature support
Signed-off-by: Matthias Gatto <matthias.gatto@outscale.com>
- [Matthias Gatto brought this change]
http: Make the call to v4 signature
This patch allow to call the v4 signature introduce in previous commit
Signed-off-by: Matthias Gatto <matthias.gatto@outscale.com>
- [Matthias Gatto brought this change]
http: introduce AWS HTTP v4 Signature
It is a security process for HTTP.
It doesn't seems to be standard, but it is used by some cloud providers.
Aws:
https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
Outscale:
https://wiki.outscale.net/display/EN/Creating+a+Canonical+Request
GCP (I didn't test that this code work with GCP though):
https://cloud.google.com/storage/docs/access-control/signing-urls-manually
most of the code is in lib/http_v4_signature.c
Information require by the algorithm:
- The URL
- Current time
- some prefix that are append to some of the signature parameters.
The data extracted from the URL are: the URI, the region,
the host and the API type
example:
https://api.eu-west-2.outscale.com/api/latest/ReadNets
~~~ ~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
^ ^ ^
/ \ URI
API type region
Small description of the algorithm:
- make canonical header using content type, the host, and the date
- hash the post data
- make canonical_request using custom request, the URI,
the get data, the canonical header, the signed header
and post data hash
- hash canonical_request
- make str_to_sign using one of the prefix pass in parameter,
the date, the credential scope and the canonical_request hash
- compute hmac from date, using secret key as key.
- compute hmac from region, using above hmac as key
- compute hmac from api_type, using above hmac as key
- compute hmac from request_type, using above hmac as key
- compute hmac from str_to_sign using above hmac as key
- create Authorization header using above hmac, prefix pass in parameter,
the date, and above hash
Signed-off-by: Matthias Gatto <matthias.gatto@outscale.com>
Closes #5703
- [Matthias Gatto brought this change]
http: add hmac support for sha256
It seems current hmac implementation use md5 for the hash,
V4 signature require sha256, so I've added the needed struct in
this commit.
I've added the functions that do the hmac in v4 signature file
as a static function ,in the next patch of the serie,
because it's used only by this file.
Signed-off-by: Matthias Gatto <matthias.gatto@outscale.com>
- [Cristian Rodríguez brought this change]
connect: on linux, enable reporting of all ICMP errors on UDP sockets
The linux kernel does not report all ICMP errors back to userspace due
to historical reasons.
IP*_RECVERR sockopt must be turned on to have the correct behaviour
which is to pass all ICMP errors to userspace.
See https://bugzilla.kernel.org/show_bug.cgi?id=202355
Closes #6341
- curl: add --create-file-mode [mode]
This option sets the (octal) mode to use for the remote file when one is
created, using the SFTP, SCP or FILE protocols. When not set, the
default is 0644.
Closes #6244
- c-hyper: fix compiler warnings
Identified by clang on windows.
Reported-by: Gisle Vanem
Bug: 58974d25d8173aec154e593ed9d866da566c9811
Closes #6351
- KNOWN_BUGS: Remote recursive folder creation with SFTP
Closes #5204
Jay Satiro (20 Dec 2020)
- badsymbols.pl: Add verbose mode -v
Use -v as the first option to enable verbose mode which will show source
input, extracted symbol and line info. For example:
Source: ./../include/curl/typecheck-gcc.h
Symbol: curlcheck_socket_info(info)
Line #423: #define curlcheck_socket_info(info) \
Ref: https://curl.se/mail/lib-2020-12/0084.html
Closes https://github.com/curl/curl/pull/6349
- KNOWN_BUGS: Secure Transport disabling hostname validation also disables SNI
That behavior is a limitation of Apple's Secure Transport.
Reported-by: Cory Benfield
Reported-by: Ian Spence
Confirmed-by: Nick Zitzmann
Ref: https://github.com/curl/curl/issues/998
Closes https://github.com/curl/curl/issues/6347
Closes https://github.com/curl/curl/pull/6348
Daniel Stenberg (18 Dec 2020)
- TODO: alt-svc should fallback if alt-svc doesn't work
Closes #4908
- travis: restrict the openssl3 job to only run https and ftps tests
... as it runs too long otherwise and the other tests are verified in
other builds anyway.
Closes #6345
- build: repair http disabled but mqtt enabled build
... as the mqtt code reuses the "method" originally used for HTTP.
Closes #6344
- [Jon Wilkes brought this change]
cookie: avoid the C1001 internal compiler error with MSVC 14
Fixes #6112
Closes #6135
- RELEASE-NOTES: synced
- mqtt: handle POST/PUBLISH without a set POSTFIELDSIZE
Detected by OSS-Fuzz
Bug: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=28735
Added test 1916 and 1917 to verify.
Closes #6338
- travis: add CI job for Hyper build
- tests: updated tests for Hyper
- lib: introduce c-hyper for using Hyper
... as an alternative HTTP backend within libcurl.
- tool_setopt: provide helper output in debug builds
... for when setopt() returns error.
- setopt: adjust to Hyper and disabled HTTP builds
- rtsp: disable if Hyper is used
- getinfo: build with disabled HTTP support
- version: include hyper version
- docs: add HYPER.md
- configure: add --with-hyper
As the first (optional) HTTP backend alternative instead of native
Close #6110
- test1522: add debug tracing
I used this to track down some issues and I figured I could just as well
keep this extra logging in here for future needs.
Closes #6331
- http: show the request as headers even when split-sending
When the initial request isn't possible to send in its entirety, the
remainder of request would be delivered to the debug callback as data
and would wrongly be counted internally as body-bytes sent.
Extended test 1295 to verify.
Closes #6328
- multi: when erroring in TOOFAST state, act as for PERFORM
When failing in TOOFAST, the multi_done() wasn't called so the same
cleanup and handling wasn't done like when it fails in PERFORM, which in
the case of FTP could mean that the control connection wouldn't be
marked as "dead" for the CURLE_ABORTED_BY_CALLBACK case. Which caused
ftp_disconnect() to use it to send "QUIT", which could end up waiting
for a response a long time before giving up!
Reported-by: Tomas Berger
Fixes #6333
Closes #6337
- cmake: enable gophers correctly in curl-config
Closes #6336
- test1198/9: add two mqtt publish tests without payload lengths
Closes #6335
- tests/mqttd: extract the client id from the correct offset
Closes #6334
- TODO: Prevent terminal injection when writing to terminal
Closes #6150
- Revert "CI/github: work-around for brew breakage on macOS"
This reverts commit 4cbb17a2cbbbe6337142d39479e21c3990b9c22f.
... as the work-around now causes failures.
Closes #6332
- examples: remove superfluous asterisk uses
... for function pointers. Breaks in ancient compilers.
- RELEASE-NOTES: synced
- test1272: fix line ending
Follow-up to f24784f9143
- URL-SYNTAX: add gophers details
- test1272: test gophers
- runtests: add support for gophers, gopher over TLS
- [parazyd brought this change]
gopher: Implement secure gopher protocol.
This commit introduces a "gophers" handler inside the gopher protocol if
USE_SSL is defined. This protocol is no different than the usual gopher
prococol, with the added TLS encapsulation upon connecting. The protocol
has been adopted in the gopher community, and many people have enabled
TLS in their gopher daemons like geomyidae(8), and clients, like clic(1)
and hurl(1).
I have not implemented test units for this protocol because my knowledge
of Perl is sub-par. However, for someone more knowledgeable it might be
fairly trivial, because the same test that tests the plain gopher
protocol can be used for "gophers" just by adding a TLS listener.
Signed-off-by: parazyd <parazyd@dyne.org>
Closes #6208
- TODO: Package curl for Windows in a signed installer
Closes #5424
- mqtt: deal with 0 byte reads correctly
OSS-Fuzz found it
Bug: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=28676
Closes #6327
- BUG-BOUNTY: minor language update
... and remove the wording about entries from before 2019 as the "within
12 months" is still there and covers that.
Closes #6318
- tooĺ_writeout: fix the -w time output units
Fix regression from commit fc813f80e1bcac (#6248) that changed the unit
to microseconds instead of seconds with fractions
Reported-by: 不确定
Fixes #6321
Closes #6322
- quiche: remove fprintf() leftover
Jay Satiro (14 Dec 2020)
- KNOWN_BUGS: SHA-256 digest not supported in Windows SSPI builds
Closes https://github.com/curl/curl/issues/6302
- digest_sspi: Show InitializeSecurityContext errors in verbose mode
The error is shown with infof rather than failf so that the user will
see the extended error message information only in verbose mode, and
will still see the standard CURLE_AUTH_ERROR message. For example:
---
* schannel: InitializeSecurityContext failed: SEC_E_QOP_NOT_SUPPORTED
(0x8009030A) - The per-message Quality of Protection is not supported by
the security package
* multi_done
* Connection #1 to host 127.0.0.1 left intact
curl: (94) An authentication function returned an error
---
Ref: https://github.com/curl/curl/issues/6302
Closes https://github.com/curl/curl/pull/6315
Daniel Stenberg (13 Dec 2020)
- URL-SYNTAX: add default port numbers and IDNA details
Closes #6316
- URL-SYNTAX: mention how FILE:// access can access network on windows
Closes #6314
Jay Satiro (12 Dec 2020)
- URL-SYNTAX: Document default SMTP port 25
Note that ports 25 and 587 are common ports for smtp, the former being
the default.
Closes https://github.com/curl/curl/pull/6310
Daniel Stenberg (12 Dec 2020)
- CURLOPT_URL.3: remove scheme specific details
... that are now found in URL-SYNTAX.md
Closes #6307
Dan Fandrich (12 Dec 2020)
- docs: Fix some typos
[skip ci]
Daniel Stenberg (12 Dec 2020)
- URL-SYNTAX: mention all supported schemes
Closes #6311
- [Douglas R. Reno brought this change]
URL-SYNTAX.md: minor language improvements
Closes #6308
- docs/URL-SYNTAX: the URL syntax curl accepts and works with
Closes #6285
- [0xflotus brought this change]
docs: enable syntax highlighting in several docs files
... for better readability
Closes #6286
- test1564/1565: require the 'wakeup' feature to run
Fixes #6299
Fixes #6300
Closes #6301
- runtests: add 'wakeup' as a feature
- tests/server/disabled: add "wakeup"
To allow the test suite to know if wakeup support is disabled in the
build.
- lib1564/5: verify that curl_multi_wakeup returns OK
- tests: make --libcurl tests only test FTP options if ftp enabled
Adjust six --libcurl tests to only check the FTP option if FTP is
actually present in the build.
Fixes #6303
Closes #6305
- runtests.pl: fix "uninitialized value" warning
follow-up to e12825c642a88774
- runtests: add support for %if [feature] conditions
... to make tests run differently or expect different results depending
on what features that are present or not in curl.
Bonus: initial minor 'Hyper' awareness but nothing is using that yet
Closes #6304
- [Jon Rumsey brought this change]
OS400: update ccsidcurl.c
Add 'struct' to cast and declaration of cfcdata to fix compilation
error.
Fixes #6292
Closes #6297
- ngtcp2: make it build it current master again
Closes #6296
- [Cristian Rodríguez brought this change]
connect: defer port selection until connect() time
If supported, defer port selection until connect() time
if --interface is given and source port is 0.
Reproducer:
* start fast webserver on port 80
* starve system of ephemeral ports
$ sysctl net.ipv4.ip_local_port_range="60990 60999"
* start a curl/libcurl "crawler"
$curl --keepalive --parallel --parallel-immediate --head --interface
127.0.0.2 "http://127.0.0.[1-254]/file[001-002].txt"
current result:
(possible some successful data)
curl: (45) bind failed with errno 98: Address already in use
result after patch:
(complete success or few connections failing, higlhy depending on load)
Fail only when all the possible 4-tuple combinations are exhausted,
which is impossible to do when port is selected at bind() time becuse
the kernel does not know if socket will be listen()'ed on or connect'ed
yet.
Closes #6295
- [Hans-Christian Noren Egtvedt brought this change]
connect: zero variable on stack to silence valgrind complaint
Valgrind will complain that ssrem buffer usage if not explicit
initialized, hence initialize it to zero.
This completes the change intially started in commit 2c0d7212151 ('ftp:
retry getpeername for FTP with TCP_FASTOPEN') where the ssloc buffer has
a similar memset to zero.
Signed-off-by: Hans-Christian Noren Egtvedt <hegtvedt@cisco.com>
Closes #6289
- RELEASE-NOTES: synced
start over on the next release cycle
Version 7.74.0 (9 Dec 2020)
Daniel Stenberg (9 Dec 2020)
- RELEASE-NOTES: synced
for 7.74.0
Jay Satiro (7 Dec 2020)
- [Jacob Hoffman-Andrews brought this change]
urldata: restore comment on ssl_connect_data.use
This comment was originally on the `use` field, but was separated from
its field in 62a2534.
Closes https://github.com/curl/curl/pull/6287
Daniel Stenberg (7 Dec 2020)
- VERSIONS: refreshed
We always use the patch number these days: all releases are
"major.minor.patch"
- [Jakub Zakrzewski brought this change]
cmake: don't use reserved target name 'test'
CMake up to 3.10 always reserves this name
Fixes #6257
Closes #6258
- openssl: make the OCSP verification verify the certificate id
CVE-2020-8286
Reported by anonymous
Bug: https://curl.se/docs/CVE-2020-8286.html
- ftp: make wc_statemach loop instead of recurse
CVE-2020-8285
Fixes #6255
Bug: https://curl.se/docs/CVE-2020-8285.html
Reported-by: xnynx on github
- ftp: CURLOPT_FTP_SKIP_PASV_IP by default
The command line tool also independently sets --ftp-skip-pasv-ip by
default.
Ten test cases updated to adapt the modified --libcurl output.
Bug: https://curl.se/docs/CVE-2020-8284.html
CVE-2020-8284
Reported-by: Varnavas Papaioannou
- urlapi: don't accept blank port number field without scheme
... as it makes the URL parser accept "very-long-hostname://" as a valid
host name and we don't want that. The parser now only accepts a blank
(no digits) after the colon if the URL starts with a scheme.
Reported-by: d4d on hackerone
Closes #6283
- Revert "multi: implement wait using winsock events"
This reverts commit d2a7d7c185f98df8f3e585e5620cbc0482e45fac.
This commit also reverts the subsequent follow-ups to that commit, which
were all done within windows #ifdefs that are removed in this
change. Marc helped me verify this.
Fixes #6146
Closes #6281
- [Klaus Crusius brought this change]
ftp: retry getpeername for FTP with TCP_FASTOPEN
In the case of TFO, the remote host name is not resolved at the
connetion time.
For FTP that has lead to missing hostname for the secondary connection.
Therefore the name resolution is done at the time, when FTP requires it.
Fixes #6252
Closes #6265
Closes #6282
- [Thomas Danielsson brought this change]
scripts/completion.pl: parse all opts
For tab-completion it may be preferable to include all the
available options.
Closes #6280
- RELEASE-NOTES: synced
- openssl: use OPENSSL_init_ssl() with >= 1.1.0
Reported-by: Kovalkov Dmitrii and Per Nilsson
Fixes #6254
Fixes #6256
Closes #6260
- SECURITY-PROCESS: disclose on hackerone
Once a vulnerability has been published, the hackerone issue should be
disclosed. For tranparency.
Closes #6275
Marc Hoersken (3 Dec 2020)
- tests/util.py: fix compatibility with Python 2
Backporting the Python 3 implementation of setStream
to ClosingFileHandler as a fallback within Python 2.
Reported-by: Jay Satiro
Fixes #6259
Closes #6270
Daniel Gustafsson (3 Dec 2020)
- docs: fix typos and markup in ETag manpage sections
Reported-by: emanruse on github
Fixes #6273
Daniel Stenberg (2 Dec 2020)
- quiche: close the connection
Reported-by: Junho Choi
Fixes #6213
Closes #6217
Jay Satiro (2 Dec 2020)
- ngtcp2: Fix build error due to symbol name change
- NGTCP2_CRYPTO_LEVEL_APP -> NGTCP2_CRYPTO_LEVEL_APPLICATION
ngtcp2/ngtcp2@76232e9 changed the name.
ngtcp2 master is required to build curl with http3 support.
Closes https://github.com/curl/curl/pull/6271
Daniel Stenberg (1 Dec 2020)
- [Klaus Crusius brought this change]
cmake: check for linux/tcp.h
The HAVE_LINUX_TCP_H define was not set by cmake.
Closes #6252
- NEW-PROTOCOL: document what needs to be done to add one
Closes #6263
- splay: rename Curl_splayremovebyaddr to Curl_splayremove
... and remove the old unused proto for the old Curl_splayremove
version.
Closes #6269
- openssl: free mem_buf in error path
To fix a memory-leak.
Closes #6267
- openssl: remove #if 0 leftover
Follow-up to 4c9768565ec3a9 (from Sep 2008)
Closes #6268
- ntlm: avoid malloc(0) on zero length user and domain
... and simplify the too-long checks somewhat.
Detected by OSS-Fuzz
Closes #6264
- RELEASE-NOTES: synced
Marc Hoersken (28 Nov 2020)
- tests/server/tftpd.c: close upload file in case of abort
Commit c353207 removed the closing right after do_tftp
which covered the case of abort. This handles that case.
Reviewed-by: Jay Satiro
Reviewed-by: Daniel Stenberg
Follow up to #6209
Closes #6234
Daniel Stenberg (26 Nov 2020)
- [Daiki Ueno brought this change]
ngtcp2: use the minimal version of QUIC supported by ngtcp2
Closes #6250
- [Daiki Ueno brought this change]
ngtcp2: advertise h3 ALPN unconditionally
Closes #6250
- [Daiki Ueno brought this change]
vquic/ngtcp2.h: define local_addr as sockaddr_storage
This field needs to be wide enough to hold sockaddr_in6 when
connecting via IPv6. Otherwise, ngtcp2_conn_read_pkt will drop the
packets because of the address mismatch:
I00000022 [...] con ignore packet from unknown path
We can safely assume that struct sockaddr_storage is available, as it
is used in the public interface of ngtcp2.
Closes #6250
- socks: check for DNS entries with the right port number
The resolve call is done with the right port number, but the subsequent
check used the wrong one, which then could find a previous resolve which
would return and leave the fresh resolve "incomplete" and leaking
memory.
Fixes #6247
Closes #6253
- curl_setup: USE_RESOLVE_ON_IPS is for Apple native resolver use
... so don't define it when instructed to use c-ares!
- test506: make it not run in c-ares builds
As the asynch nature of it may trigger events in another order. A c-ares
upgrade made it break.
Reported-by: Marc Hörsken
Fixes #6247
- runtests: make 'c-ares' a "feature" to depend on
... also added to the docs.
- tool_writeout: use off_t getinfo-types instead of doubles
Commit 3b80d3ca46b12e52342 (June 2017) introduced getinfo replacement
variables that use curl_off_t instead of doubles. Switch the --write-out
function over to use them.
Closes #6248
- [Emil Engler brought this change]
file: avoid duplicated code sequence
file_disconnect() is identical with file_do() except the function header
but as the arguments are unused anyway so why not just return file_do()
directly!
Reviewed-by: Daniel Stenberg
Closes #6249
- [Rikard Falkeborn brought this change]
infof/failf calls: fix format specifiers
Update a few format specifiers to match what is being printed.
Closes #6241
- docs/INTERNALS: remove reference to Curl_sendf()
The function has been removed from common usage. Also removed comment in
gopher.c that still referenced it.
Reported-by: Rikard Falkeborn
Fixes #6242
Closes #6243
- [Rikard Falkeborn brought this change]
examples: update .gitignore
Add files that are generated by 'make examples' and remove some that
have been renamed.
The commits that renamed the programs are e9625c5bc6c046a (imap.c and
simplesmtp.c were renamed to imap-fetch.c and smtp-send.c) and
ad39e7ec01e7 (pop3slist.c and pop3s.c were renamed to pop3-list.c and
pop3-ssl.c).
Closes #6240
- asyn: use 'struct thread_data *' instead of 'void *'
To reduce use of types that can't be checked at compile time. Also
removes several typecasts.
... and rename the struct field from 'os_specific' to 'tdata'.
Closes #6239
Reviewed-by: Jay Satiro
Viktor Szakats (23 Nov 2020)
- Makefile.m32: add support for UNICODE builds
It requires the linker to support the `-municode` option.
This is available in more recent mingw-w64 releases.
Ref: https://gcc.gnu.org/onlinedocs/gcc/x86-Windows-Options.html
Ref: https://stackoverflow.com/questions/3571250/wwinmain-unicode-and-mingw/11706847#11706847
Reviewed-by: Jay Satiro
Reviewed-by: Marcel Raad
Closes #6228
Daniel Stenberg (23 Nov 2020)
- urldata: remove 'void *protop' and create the union 'p'
... to avoid the use of 'void *' for the protocol specific structs done
per transfer.
Closes #6238
- winbuild: remove docs from Makefiles and refer to README.md
Reduce risk for conflicting docs and makes it to a single place to fix
and polish.
add these missing options to the readme:
ENABLE_OPENSSL_AUTO_LOAD_CONFIG and ENABLE_UNICODE
clarify ENABLE_SCHANNEL default varies
Fixes #6216
Closes #6227
Co-Authored-by: Jay Satiro
- [Daiki Ueno brought this change]
http3: use the master branch of GnuTLS for testing
Closes #6235
- KNOWN_BUGS: curl with wolfSSL lacks support for renegotiation
Closes #5839
- KNOWN_BUGS: wakeup socket disconnect causes havoc
Closes #6132
Closes #6133
- RELEASE-NOTES: synced
- [Oliver Urbann brought this change]
curl: add compatibility for Amiga and GCC 6.5
Changes are mainly reordering and adding of includes required
to compile with a more recent version of GCC.
Closes #6220
Marc Hoersken (20 Nov 2020)
- tests/server/tftpd.c: close upload file right after transfer
Make sure uploaded file is no longer locked after the
transfer while waiting for the final ACK to be handled.
Assisted-by: Daniel Stenberg
Bug: #6058
Closes #6209
- CI/cirrus: simplify logic for disabled tests
The OpenSSH server instance for the testsuite cannot
be started on FreeBSD, therefore the SFTP and SCP
tests are disabled right away from the beginning.
The previous OS version specific logic for SKIP_TESTS
is no longer needed/used and can therefore be removed.
Reviewed-by: Daniel Stenberg
Follow up to #6211
Closes #6229
Daniel Gustafsson (20 Nov 2020)
- mailmap: Daniel Hwang
Add Daniel Hwang to the mailmap to cover the alternative spelling
Daniel Lee Hwang which was used in one commit.
Closes #6230
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
- openssl: guard against OOM on context creation
EVP_MD_CTX_create will allocate memory for the context and returns
NULL in case the allocation fails. Make sure to catch any allocation
failures and exit early if so.
In passing, also move to EVP_DigestInit rather than EVP_DigestInit_ex
as the latter is intended for ENGINE selection which we don't do.
Closes #6224
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
Reviewed-by: Emil Engler <me@emilengler.com>
Daniel Stenberg (19 Nov 2020)
- [Vincent Torri brought this change]
cmake: use libcurl.rc in all Windows builds
Reviewed-by: Marcel Raad
Closes #6215
- [Cristian Morales Vega brought this change]
cmake: make CURL_ZLIB a tri-state variable
By differentiating between ON and AUTO it can make a missing zlib
library a hard error when CURL_ZLIB=ON is used.
Reviewed-by: Jakub Zakrzewski
Closes #6221
Fixes #6173
- quiche: remove 'static' from local buffer
For thread-safety
Closes #6223
- KNOWN_BUGS: cmake: libspsl is not supported
Closes #6214
- KNOWN_BUGS: cmake autodetects cert paths when cross-compiling
Closes #6178
- KNOWN_BUGS: cmake build doesn't fail if zlib not found
Closes #6173
- KNOWN_BUGS: cmake libcurl.pc uses absolute library paths
Closes #6169
- KNOWN_BUGS: cmake: generated .pc file contains strange entries
Closes #6167
- KNOWN_BUGS: cmake uses -lpthread instead of Threads::Threads
Closes #6166
- KNOWN_BUGS: cmake build in Linux links libcurl to libdl
Closes #6165
- KNOWN_BUGS: make a new section for cmake topics
Closes #6219
- [Emil Engler brought this change]
cirrus: build with FreeBSD 12.2 in CirrusCI
Closes #6211
Marc Hoersken (14 Nov 2020)
- tests/*server.py: close log file after each log line
Make sure the log file is not locked once a test has
finished and align with the behavior of our logmsg.
Rename curl_test_data.py to be a general util.py.
Format and sort Python imports with isort/VSCode.
Bug: #6058
Closes #6206
Daniel Stenberg (13 Nov 2020)
- CURLOPT_HSTS.3: document the file format
Closes #6205
- RELEASE-NOTES: synced
- release-notes.pl: detect #[number] better for Ref: etc
- curl: only warn not fail, if not finding the home dir
... as there's no good reason to error out completely.
Reported-by: Andreas Fischer
Fixes #6200
Closes #6201
- httpput-postfields.c: new example doing PUT with POSTFIELDS
Proposed-by: Jeroen Ooms
Ref: #6186
Closes #6188
- [Tobias Hieta brought this change]
cmake: correctly handle linker flags for static libs
curl CMake was setting the the EXE flags for static libraries which made
the /manifest:no flag ended up when linking the static library, which is
not a valid flag for lib.exe or llvm-lib.exe and caused llvm-lib to exit
with an error.
The better way to handle this is to make sure that we pass the correct
linker flags to CMAKE_STATIC_LINKER_FLAGS instead.
Reviewed-by: Jakub Zakrzewski
Closes #6195
- [Tobias Hieta brought this change]
cmake: don't pass -fvisibility=hidden to clang-cl on Windows
When using clang-cl on windows -fvisibility=hidden is not an known
argument. Instead it behaves exactly like MSVC in this case. So let's
make sure we take that path.
In CMake clang-cl sets both CMAKE_C_COMPILER_ID=clang and MSVC get's
defined since clang-cl is basically a MSVC emulator. So guarding like we
do in this patch seems logical.
Reviewed-by: Jakub Zakrzewski
Closes #6194
- http_proxy: use enum with state names for 'keepon'
To make the code clearer, change the 'keepon' from an int to an enum
with better state names.
Reported-by: Niranjan Hasabnis
Bug: https://curl.se/mail/lib-2020-11/0026.html
Closes #6193
- curl_easy_escape: limit output string length to 3 * max input
... instead of the limiting it to just the max input size. As every
input byte can be expanded to 3 output bytes, this could limit the input
string to 2.66 MB instead of the intended 8 MB.
Reported-by: Marc Schlatter
Closes #6192
- docs: document the 8MB input string limit
for curl_easy_escape and curl_easy_setopt()
The limit is there to catch mistakes and abuse. It is meant to be large
enough to allow virtually all "fine" use cases.
Reported-by: Marc Schlatter
Fixes #6190
Closes #6191
- mqttd: fclose test file when done
Reported-by: Marc Hörsken
Reviewed-by: Jay Satiro
Bug: #6058
Closes #6189
- RELEASE-NOTES: synced
- THANKS-filter: ignore autobuild links
- Revert "libcurl.pc: make it relocatable"
This reverts commit 3862c37b6373a55ca704171d45ba5ee91dec2c9f.
That fix should either be done differently or with an option.
Reported-by: asavah on github
Fixes #6157
Closes #6183
- examples/httpput: remove use of CURLOPT_PUT
It is deprecated and unnecessary since it already sets CURLOPT_UPLOAD.
Reported-by: Jeroen Ooms
Fixes #6186
Closes #6187
- Curl_pgrsStartNow: init speed limit time stamps at start
By setting the speed limit time stamps unconditionally at transfer
start, we can start off a transfer without speed limits and yet allow
them to get set during transfer and have an effect.
Reported-by: Kael1117 on github
Fixes #6162
Closes #6184
- ngtcp2: adapt to recent nghttp3 updates
'reset_stream' was added to the nghttp3_conn_callbacks struct
Closes #6185
- configure: pass -pthread to Libs.private for pkg-config
Reported-by: Cristian Morales Vega
Fixes #6168
Closes #6181
- altsvc: minimize variable scope and avoid "DEAD_STORE"
Closes #6182
- FAQ: remove "Why is there a HTTP/1.1 in my HTTP/2 request?"
This hasn't been the case for a while now, remove.
- FAQ: refresh "Why do I get "certificate verify failed"
Add more details, remove references to ancient curl version.
- test493: verify --hsts upgrade and that %{url_effective} reflects that
Closes #6175
- url: make sure an HSTS upgrade updates URL and scheme correctly
Closes #6175
- tool_operate: set HSTS with CURLOPT_HSTS to pass on filename
Closes #6175
- hsts: remove debug code leftovers
Closes #6175
- FAQ: refreshed
- remove a few ancient questions
- add configure with static libs question
- updated wording in several places
- lowercased curl
Closes #6177
Daniel Gustafsson (5 Nov 2020)
- examples: fix comment syntax
Commit ac0a88fd2 accidentally added a stray character outside of the
comment which broke compilation. Fix by removing.
Reported-by: autobuild https://curl.se/dev/log.cgi?id=20201105084306-12742
- hsts: Remove pointless call to free in errorpath
The line variable will always be NULL in the error path, so remove
the free call since it's pointless.
Closes #6170
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
- docs: Fix various typos in documentation
Closes #6171
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
Daniel Stenberg (5 Nov 2020)
- copyright: fix year ranges
Follow-up from 4d2f8006777
- HISTORY: the new domain
- curl.se: new home
Closes #6172
- KNOWN_BUGS: FTPS with Schannel times out file list operation
Reported-by: bobmitchell1956 on github
Closes #5284
- KNOWN_BUGS: SMB tests fail with Python 2
Reported-by: Jay Satiro
Closes #5983
- KNOWN_BUGS: LDAPS with NSS is slow
Reported-by: nosajsnikta on github
Closes #5874
Sergei Nikulov (4 Nov 2020)
- travis: use ninja-build for CMake builds
Added package ninja-build to environment
Use ninja to speed up CMake builds
Closes #6077
Daniel Stenberg (4 Nov 2020)
- [Harry Sintonen brought this change]
rtsp: error out on empty Session ID, unified the code
- [Harry Sintonen brought this change]
rtsp: fixed the RTST Session ID mismatch in test 570
Closes #6161
- [Harry Sintonen brought this change]
rtsp: fixed Session ID comparison to refuse prefix
Closes #6161
- RELEASE-NOTES: synced
(forgot to update the list of contributors)
- RELEASE-NOTES: synced
- curlver: bumped to 7.74.0
- hsts: add read/write callbacks
- read/write callback options
- man pages for the 4 new setopts
- test 1915 verifies the callbacks
Closes #5896
- hsts: add support for Strict-Transport-Security
- enable in the build (configure)
- header parsing
- host name lookup
- unit tests for the above
- CI build
- CURL_VERSION_HSTS bit
- curl_version_info support
- curl -V output
- curl-config --features
- CURLOPT_HSTS_CTRL
- man page for CURLOPT_HSTS_CTRL
- curl --hsts (sets CURLOPT_HSTS_CTRL and works with --libcurl)
- man page for --hsts
- save cache to disk
- load cache from disk
- CURLOPT_HSTS
- man page for CURLOPT_HSTS
- added docs/HSTS.md
- fixed --version docs
- adjusted curl_easy_duphandle
Closes #5896
- [Sergei Nikulov brought this change]
CI/tests: enable test target on TravisCI for CMake builds
Added test-nonflaky target to CMake builds
Disabled test 1139 because the cmake build doesn't create docs/curl.1
Closes #6074
- tool_debug_cb: do not assume zero-terminated data
Follow-up to d70a5b5a0f5e3
- sendf: move the verbose-check into Curl_debug
Saves us from having the same check done everywhere.
Closes #6159
- travis: use valgrind when running tests for debug builds
Except the non-x86 and sanitizer builds
Closes #6154
- header.d: fix syntax mistake
follow-up from 1144886f38fd0
- [Harry Sintonen brought this change]
gnutls: fix memory leaks (certfields memory wasn't released)
Closes #6153
- tests: add missing global_init/cleanup calls
Without the cleanup call in these test files, the mbedTLS backend leaks
memory.
Closes #6156
- tool_operate: --retry for HTTP 408 responses too
This was inadvertently dropped from the code when the parallel support
was added.
Regression since b88940850 (7.66.0)
Reviewed-by: Jay Satiro
Closes #6155
- http: pass correct header size to debug callback for chunked post
... when the chunked framing was added, the size of the "body part" of
the data was calculated wrongly so the debug callback would get told a
header chunk a few bytes too big that would also contain the first few
bytes of the request body.
Reported-by: Dirk Wetter
Ref: #6144
Closes #6147
- header.d: mention the "Transfer-Encoding: chunked" handling
Ref: #6144
Closes #6148
- acinclude: detect manually set minimum macos/ipod version
... even if set in the CC or IPHONEOS/MACOSX_DEPLOYMENT_TARGET
variables.
Reported-by: hamstergene on github
Fixes #6138
Closes #6140
Jay Satiro (29 Oct 2020)
- tests: fix some http/2 tests for older versions of nghttpx
- Add regex that strips http/2 server header name to those http/2 tests
that don't already have it.
- Improve that regex in all http/2 tests.
Tests 358 and 359 were failing for me before this change on a system
that uses an older version of nghttpx which includes its version number
in the server header.
Closes https://github.com/curl/curl/pull/6139
Daniel Stenberg (30 Oct 2020)
- RELEASE-NOTES: synced
- [Cristian Morales Vega brought this change]
configure: use pkgconfig to find openSSL when cross-compiling
This reverts 736a40fec (November 2004), which doesn't explain why it was
done.
Closes #6145
- tool_operate: bail out proper on errors for parallel setup
... otherwise for example trying to upload a missing file just causes a
loop.
Reported-by: BrumBrum on hackerone
Closes #6141
- [Sergei Nikulov brought this change]
CMake: make BUILD_TESTING dependent option
CMake will now handle BUILD_TESTING depending on PERL_FOUND and
CURL_DISABLE_TESTING
Ref: #6036
Closes #6072
- libssh2: fix transport over HTTPS proxy
The fix in #6021 was not enough. This fix makes sure SCP/SFTP content
can also be transfered over a HTTPS proxy.
Fixes #6113
Closes #6128
- curl.1: add an "OUTPUT" section at the top of the manpage
Explain the basic concepts behind curl output.
Inspired by #6124
Closes #6134
- mailmap: set Viktor Szakats's email
- runtests: show keywords when no tests ran
To help out future debugging, runtests now outputs the list of keywords
when it fails because no tests ran.
Ref: #6120
Closes #6126
Jay Satiro (26 Oct 2020)
- CURLOPT_DNS_USE_GLOBAL_CACHE.3: fix typo
Reported-by: Rui LIU
Closes https://github.com/curl/curl/issues/6131
- range.d: fix typo
Follow-up to 15ae039 from earlier today.
Daniel Stenberg (26 Oct 2020)
- CI/github: work-around for brew breakage on macOS
... and make it use OpenSSL 1.1 properly
Fixes #6130
Closes #6129
- [José Joaquín Atria brought this change]
range.d: clarify that curl will not parse multipart responses
Closes #6127
Fixes #6124
- RELEASE-NOTES: synced
- [Baruch Siach brought this change]
libssh2: fix build with disabled proxy support
Build breaks because the http_proxy field is missing:
vssh/libssh2.c:3119:10: error: 'struct connectdata' has no member named 'http_proxy'
Regression from #6021, shipped in curl 7.73.0
Closes #6125
- alt-svc: enable by default
Remove CURLALTSVC_IMMEDIATELY, which was never implemented/supported.
alt-svc support in curl is no longer considered experimental
Closes #5868
- CI/appveyor: remove (unused) runtests.pl -b option
- [Emil Engler brought this change]
tool_help: make "output" description less confusing
Currently the description of "output" is misleading when comparing it
"verbose".
Closes #6118
- CI/appveyor: disable test 571 in two cmake builds
... they're simply too flaky there.
Closes #6119
- cmake: set the unicode feature in curl-config on Windows
... if built that way. To make it match curl -V output.
Reviewed-by: Marcel Raad
Closes #6117
- libssh2: require version 1.0 or later
... and simplify the code accordingly. libssh2 version 1.0 was released
in April 2009.
Closes #6116
- KNOWN_BUGS: mention the individual cmake issues
... to make them easier to refer to and address separately and
one-by-one.
- CMake: store IDN2 information in curl_config.h
This allows the build to enable IDN properly and it makes test 1014
happier.
Ref: #6074
Closes #6108
- CMake: call the feature unixsockets without dash
... so that curl-config gets correct and makes test 1014 happy!
Ref: #6074
Closes #6108
- CI/travis: add brotli and zstd to the libssh2 build
... to make sure such tests are run with valgrind. Suppress the zstd
valgrind warnings we get with version 1.3.3 on Ubuntu 18.04 (for debug
and non-debug builds).
Closes #6105
- runtests: revert the mistaken edit of $CURL
Regression from c4693adc62
- RELEASE-NOTES: synced
- curl_url_set.3: fix typo in the RETURN VALUE section
Reported-by: Basuke Suzuki
Fixes #6102
Jay Satiro (17 Oct 2020)
- [Daniel Stenberg brought this change]
packages/OS400: make the source code-style compliant
... and make sure 'make checksrc' in the root dir also verifies the
packages/OS400 sources.
Closes https://github.com/curl/curl/pull/6085
- os400: Sync libcurl API options
This fixes the OS400 build and also an incorrect entry for
CURLINFO_APPCONNECT_TIME_T where it was treated as
CURLINFO_STARTTRANSFER_TIME_T.
Reported-by: Jon Rumsey
Fixes https://github.com/curl/curl/issues/6083
Closes https://github.com/curl/curl/pull/6084
Daniel Stenberg (16 Oct 2020)
- CURLOPT_NOBODY.3: fix typo
Reported-by: Basuke Suzuki
Fixes #6097
Marc Hoersken (16 Oct 2020)
- CI/azure: improve on flakiness by avoiding libtool wrappers
Install curl binaries into MinGW bin folder and use that
for the tests in order to avoid libtool wrapper binaries.
The libtool wrapper binaries (not scripts) on Windows seem
to be one of the possible causes for the following issues:
1. Process output can be lost in the wrapper process chain.
2. Killing the wrapper process does not kill the actual one.
Derived from #5904
Closes #6049
Daniel Stenberg (16 Oct 2020)
- CURLOPT_URL.3: clarify SCP/SFTP URLs are for uploads as well
- [Zenju brought this change]
CURLOPT_TCP_NODELAY.3: fix comment in example code
Closes #6096
- openssl: acknowledge SRP disabling in configure properly
Follow-up to 68a513247409
Use a new separate define that is the combination of both
HAVE_OPENSSL_SRP and USE_TLS_SRP: USE_OPENSSL_SRP
Bug: https://curl.haxx.se/mail/lib-2020-10/0037.html
Closes #6094
Viktor Szakats (16 Oct 2020)
- http3: fix two build errors, silence warnings
* fix two build errors due to mismatch between function
declarations and their definitions
* silence two mismatched signs warnings via casts
Approved-by: Daniel Stenberg
Closes #6093
- Makefile.m32: add support for HTTP/3 via ngtcp2+nghttp3
Approved-by: Daniel Stenberg
Closes #6092
Daniel Stenberg (16 Oct 2020)
- tool_operate: fix compiler warning when --libcurl is disabled
Closes #6095
- checksrc: warn on empty line before open brace
... and fix a few occurances
Closes #6088
- urlapi: URL encode a '+' in the query part
... when asked to with CURLU_URLENCODE.
Extended test 1560 to verify.
Reported-by: Dietmar Hauser
Fixes #6086
Closes #6087
- [Cristian Morales Vega brought this change]
libcurl.pc: make it relocatable
It supposes when people specify the libdir/includedir they do it to
change where under prefix/exec_prefix it should be, not to make it
independent of prefix/exec_prefix.
Closes #6061
- runtests: return error if no tests ran
... and make TESTFAIL stand out a little better by adding newlines
before and after.
Reported-by: Marc Hörsken
Issue: #6052
Closes #6053
- docs/FEATURE: convert to markdown
... and clean it up a bit.
Closes #6067
- [Philipp Klaus Krause brought this change]
strerror: use 'const' as the string should never be modified
Closes #6068
- [Jay Satiro brought this change]
connect: repair build without ipv6 availability
Assisted-by: Daniel Stenberg
Reported-by: Tom G. Christensen
Fixes https://github.com/curl/curl/issues/6069
Closes https://github.com/curl/curl/pull/6071
- RELEASE-NOTES: synced
Started over for the journey to next release.
- src/tool_filetime: disable -Wformat on mingw for this file
With gcc 10 on mingw we otherwise get this warning:
error: ISO C does not support the 'I' printf flag [-Werror=format=]
Fixes #6079
Closes #6082
- test122[12]: remove these two tests
... and remove the objnames scripts they tested. They're not used for
anything anymore so testing them serves no purpose!
Reported-by: Marc Hörsken
Fixes #6080
Closes #6081
Version 7.73.0 (14 Oct 2020)
Daniel Stenberg (14 Oct 2020)
- RELEASE-NOTES: synced
for 7.73.0
- THANKS: from 7.73.0 and .mailmap fixes
- mailmap: fixups of some contributors
- projects/build-wolfssl.bat: fix the copyright year range
Marc Hoersken (14 Oct 2020)
- [Sergei Nikulov brought this change]
CI/tests: fix invocation of tests for CMake builds
Update appveyor.yml to set env variable TFLAGS and run tests
Remove curly braces due to CMake error (${TFLAGS} -> $TFLAGS)
Move testdeps build to build step (per review comments)
Reviewed-by: Marc Hörsken
Closes #6066
Fixes #6052
- tests/server/util.c: fix support for Windows Unicode builds
Detected via #6066
Closes #6070
Daniel Stenberg (13 Oct 2020)
- [Jay Satiro brought this change]
strerror: Revert to local codepage for Windows error string
- Change get_winapi_error() to return the error string in the local
codepage instead of UTF-8 encoding.
Two weeks ago bed5f84 fixed get_winapi_error() to work on xbox, but it
also changed the error string's encoding from local codepage to UTF-8.
We return the local codepage version of the error string because if it
is output to the user's terminal it will likely be with functions which
expect the local codepage (eg fprintf, failf, infof).
This is essentially a partial revert of bed5f84. The support for xbox
remains but the error string is reverted back to local codepage.
Ref: https://github.com/curl/curl/pull/6005
Reviewed-by: Marcel Raad
Closes #6065
Marc Hoersken (13 Oct 2020)
- CI/tests: use verification curl for test reporting APIs
Avoid using our own, potentially installed, curl for
the test reporting APIs in case it is broken.
Reviewed-by: Daniel Stenberg
Preparation for #6049
Closes #6063
Viktor Szakats (12 Oct 2020)
- windows: fix comparison of mismatched types warning
clang 10, mingw-w64:
```
vtls/openssl.c:2917:33: warning: comparison of integers of different signs: 'DWORD' (aka 'unsigned long') and 'HRESULT' (aka 'long')
[-Wsign-compare]
if(GetLastError() != CRYPT_E_NOT_FOUND)
~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~
```
Approved-by: Daniel Stenberg
Closes #6062
Daniel Stenberg (11 Oct 2020)
- [Viktor Szakats brought this change]
src/Makefile.m32: fix undefined curlx_dyn_* errors
by linking `lib/dynbuf.c` when building a static curl binary.
Previously this source file was only included when building
a dynamic curl binary. This was likely possibly because no
functions from the `src/Makefile.inc` / `CURLX_CFILES` sources
were actually required for a curl tool build. This has
recently changed with the introduction of `curlx_dyn_*()`
memory functions and their use by the tool sources.
Closes #6060
- HISTORY: curl verifies SSL certs by default since version 7.10
Marc Hoersken (8 Oct 2020)
- runtests.pl: use $LIBDIR variable instead of hardcoded path
Reviewed-by: Daniel Stenberg
Closes #6051
Daniel Stenberg (7 Oct 2020)
- checksrc: detect // comments on column 0
Spotted while working on #6045
Closes #6048
- [Frederik Wedel-Heinen brought this change]
mbedtls: add missing header when defining MBEDTLS_DEBUG
Closes #6045
- curl: make sure setopt CURLOPT_IPRESOLVE passes on a long
Previously, it would pass on a define (int) which could make libcurl
read junk as a value - which prevented the CURLOPT_IPRESOLVE option to
"take". This could then make test 2100 do two DoH requests instead of
one!
Fixes #6042
Closes #6043
- RELEASE-NOTES: synced
- scripts/release-notes.pl: don't "embed" $ in format string for printf()
... since they might contain %-codes that mess up the output!
Jay Satiro (5 Oct 2020)
- [M.R.T brought this change]
build-wolfssl: fix build with Visual Studio 2019
Closes https://github.com/curl/curl/pull/6033
Daniel Stenberg (4 Oct 2020)
- runtests: add %repeat[]% for test files
... and use this new keywords in all the test files larger than 50K to reduce
their sizes and make them a lot easier to read and understand.
Closes #6040
- [Emil Engler brought this change]
--help: move two options from the misc category
The cmdline opts delegation and suppress-connect-headers
fit better into auth and proxy rather than misc.
Follow-up to aa8777f63febc
Closes #6038
- [Samanta Navarro brought this change]
docs/opts: fix typos in two manual pages
Closes #6039
- ldap: reduce the amount of #ifdefs needed
Closes #6035
- runtests: provide curl's version string as %VERSION for tests
... so that we can check HTTP requests for User-Agent: curl/%VERSION
Update 600+ test cases accordingly.
Closes #6037
- checksrc: warn on space after exclamation mark
Closes #6034
- test1465: verify --libcurl with binary POST data
- runtests: allow generating a binary sequence from hex
- tool_setopt: escape binary data to hex, not octal
- curl: make --libcurl show binary posts correctly
Reported-by: Stephan Mühlstrasser
Fixes #6031
Closes #6032
Jay Satiro (1 Oct 2020)
- strerror: fix null deref on winapi out-of-memory
Follow-up to bed5f84 from several days ago.
Ref: https://github.com/curl/curl/pull/6005
Daniel Stenberg (1 Oct 2020)
- [Kamil Dudka brought this change]
vtls: deduplicate some DISABLE_PROXY ifdefs
... in the code of gtls, nss, and openssl
Closes #5735
- RELEASE-NOTES: synced
- [Emil Engler brought this change]
TODO: Add OpenBSD libtool notice
See #5862
Closes #6030
- tests/unit/README: convert to markdown
... and add to dist!
Closes #6028
- tests/README: convert to markdown
Closes #6028
- include/README: convert to markdown
Closes #6028
- examples/README: convert to markdown
Closes #6028
- configure: don't say HTTPS-proxy is enabled when disabled!
Reported-by: Kamil Dudka
Reviewed-by: Kamil Dudka
Bug: https://github.com/curl/curl/pull/5735#issuecomment-701376388
Closes #6029
Daniel Gustafsson (30 Sep 2020)
- src: Consistently spell whitespace without whitespace
Whitespace is spelled without a space between white and space, so
make sure to consistently spell it that way across the codebase.
Closes #6023
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
Reviewed-by: Emil Engler <me@emilengler.com>
- MANUAL: update examples to resolve without redirects
www.netscape.com is redirecting to a cookie consent form on Aol, and
cool.haxx.se isn't responding to FTP anymore. Replace with examples
that resolves in case users try out the commands when reading the
manual.
Closes #6024
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
Reviewed-by: Emil Engler <me@emilengler.com>
Daniel Stenberg (30 Sep 2020)
- HISTORY: add some 2020 events
- sectransp: make it build with --disable-proxy
Follow-up from #5466 and f3d501dc678d80
Reported-by: Javier Navarro
Fixes #6025
Closes #6026
- ECH: renamed from ESNI in docs and configure
Encrypted Client Hello (ECH) is the current name.
Closes #6022
- configure: use "no" instead of "disabled" for the end summary
... for consistency but also to make them more distinctly stand out next
to the "enabled" lines.
- TODO: SSH over HTTPS proxy with more backends
... as right now only the libssh2 backend supports it.
- libssh2: handle the SSH protocols done over HTTPS proxy
Reported-by: Robin Douine
Fixes #4295
Closes #6021
- [Emil Engler brought this change]
memdebug: remove 9 year old unused debug function
There used to be a way to have memdebug fill allocated memory. 9 years
later this has no value there (valgrind and ASAN etc are way better). If
people need to know about it they can have a look at VCS logs.
Closes #5973
- sendf: move Curl_sendf to dict.c and make it static
... as the only remaining user of that function. Also fix gopher.c to
instead use Curl_write()
Closes #6020
- ROADMAP: updates and cleanups
Fix the HSTS PR
Remove DoT, thread-safe init and hard-coded localhost. I feel very
little interest for these with users so I downgrade them to plain "TODO"
entries again.
- schannel: return CURLE_PEER_FAILED_VERIFICATION for untrusted root
This matches what is returned in other TLS backends in the same
situation.
Reviewed-by: Jay Satiro
Reviewed-by: Emil Engler
Follow-up to 5a3efb1
Reported-by: iammrtau on github
Fixes #6003
Closes #6018
- RELEASE-NOTES: synced
- ftp: make a 552 response return CURLE_REMOTE_DISK_FULL
Added test 348 to verify. Added a 'STOR' command to the test FTP
server to enable test 348. Documented the command in FILEFORMAT.md
Reported-by: Duncan Wilcox
Fixes #6016
Closes #6017
- pause: only trigger a reread if the unpause sticks
As an unpause might itself get paused again and then triggering another
reread doesn't help.
Follow-up from e040146f22608fd9 (shipped since 7.69.1)
Bug: https://curl.haxx.se/mail/lib-2020-09/0081.html
Patch-by: Kunal Chandarana
Fixes #5988
Closes #6013
- test163[12]: require http to be built-in to run
... as speaking over an HTTPS proxy implies http!
Closes #6014
- ngtcp2: adapt to new NGTCP2_PROTO_VER_MAX define
Closes #6012
- [Javier Blazquez brought this change]
strerror: honor Unicode API choice on Windows
Closes #6005
- imap: make imap_send use dynbuf for the send buffer management
Reuses the buffer and thereby reduces number of mallocs over a transfer.
Closes #6010
- Curl_send: return error when pre_receive_plain can't malloc
... will probably trigger some false DEAD CODE positives on non-windows
code analyzers for the conditional code.
Closes #6011
- ftp: separate FTPS from FTP over "HTTPS proxy"
When using HTTPS proxy, SSL is used but not in the view of the FTP
protocol handler itself so separate the connection's use of SSL from the
FTP control connection's sue.
Reported-by: Mingtao Yang
Fixes #5523
Closes #6006
Dan Fandrich (23 Sep 2020)
- tests/data: Fix some mismatched XML tags in test cases
This allows these test files to pass xmllint.
Daniel Stenberg (23 Sep 2020)
- pingpong: use a dynbuf for the *_pp_sendf() function
... reuses the same dynamic buffer instead of doing repeated malloc/free
cycles.
Test case 100 (FTP dir list PASV) does 7 fewer memory allocation calls
after this change in my test setup (132 => 125), curl 7.72.0 needed 140
calls for this.
Test case 103 makes 9 less allocations now (130). Down from 149 in
7.72.0.
Closes #6004
- dynbuf: add Curl_dyn_vaddf
Closes #6004
- dynbuf: make *addf() not require extra mallocs
... by introducing a printf() function that appends directly into a
dynbuf: Curl_dyn_vprintf(). This avoids the mandatory extra malloc so if
the buffer is already big enough it can just printf directly into it.
Since this less-malloc version requires tthe use of a library internal
printf function, we only provide this version when building libcurl and
not for the dynbuf code that is used when building the curl tool.
Closes #5998
- KNOWN_BUGS: Unable to use PKCS12 certificate with Secure Transport
Closes #5403
- pingpong: remove a malloc per Curl_pp_vsendf call
This typically makes 7-9 fewer mallocs per FTP transfer.
Closes #5997
- symbian: drop support
The OS is deprecated. I see no traces of anyone having actually built
curl for Symbian after 2012.
The public headers are unmodified.
Closes #5989
- RELEASE-NOTES: synced
- curl_krb5.h: rename from krb5.h
Follow-up from f4873ebd0be32cf
Turns out some older openssl installations go bananas otherwise.
Reported-by: Tom van der Woerdt
Fixes #5995
Closes #5996
- test1297: verify GOT_NOTHING with http proxy tunnel
- http_proxy: do not count proxy headers in the header bytecount
... as that counter is subsequently used to detect if nothing was
returned from the peer. This made curl return CURLE_OK when it should
have returned CURLE_GOT_NOTHING.
Fixes #5992
Reported-by: Tom van der Woerdt
Closes #5994
- setopt: return CURLE_BAD_FUNCTION_ARGUMENT on bad argument
Fixed two return code mixups. CURLE_UNKNOWN_OPTION is saved for when the
option is, yeah, not known. Clarified this in the setopt man page too.
Closes #5993
- krb5: merged security.c and krb specific FTP functions in here
These two files were always tightly connected and it was hard to
understand what went into which. This also allows us to make the
ftpsend() function static (moved from ftp.c).
Removed security.c
Renamed curl_sec.h to krb5.h
Closes #5987
- Curl_handler: add 'family' to each protocol
Makes get_protocol_family() faster and it moves the knowledge about the
"families" to each protocol handler, where it belongs.
Closes #5986
- parsedate: tune the date to epoch conversion
By avoiding an unnecessary error check and the temp use of the tm
struct, the time2epoch conversion function gets a little bit faster.
When repeating test 517, the updated version is perhaps 1% faster (on
one particular build on one particular architecture).
Closes #5985
- cmake: remove scary warning
Remove the text saying
"the curl cmake build system is poorly maintained. Be aware"
... not because anything changed just now, but to encourage users to use
it and subsequently improve it.
Closes #5984
- docs/MQTT: remove outdated paaragraphs
- docs/MQTT: not experimental anymore
Follow-up to e37e4468688d8f
- docs/RESOURCES: remove
This document is not maintained and rather than trying to refresh it,
let's kill it. A more up-to-date document with relevant RFCs is this
page on the curl website: https://curl.haxx.se/rfc/
Closes #5980
- docs/TheArtOfHttpScripting: convert to markdown
Makes it easier to browse on github etc. Offers (better) links.
It should be noted that this document is already mostly outdated and
"Everything curl" at https://ec.haxx.se/ is a better resource and
tutorial.
Closes #5981
- BUGS: convert document to markdown
Closes #5979
- --help: strdup the category
... since it is converted and the original pointer is freed on Windows
unicode handling.
Follow-up to aa8777f63febc
Fixes #5977
Closes #5978
Reported-by: xwxbug on github
- CHECKSRC: document two missing warnings
- RELEASE-NOTES: synced
- ftp: avoid risk of reading uninitialized integers
If the received PASV response doesn't match the expected pattern, we
could end up reading uninitialized integers for IP address and port
number.
Issue pointed out by muse.dev
Closes #5972
- [Quentin Balland brought this change]
easy_reset: clear retry counter
Closes #5975
Fixes #5974
- ftp: get rid of the PPSENDF macro
The use of such a macro hides some of what's actually going on to the
reader and is generally disapproved of in the project.
Closes #5971
- man pages: switch to https://example.com URLs
Since HTTPS is "the new normal", this update changes a lot of man page
examples to use https://example.com instead of the previous "http://..."
Closes #5969
- github: remove the duplicate "Security vulnerability" entry
... since github adds an entry automatically by itself.
Closes #5970
- [Emil Engler brought this change]
github: use new issue template feature
This helps us to avoid getting feature requests as well as security
bugs reported into the issue tracker.
Closes #5936
- [Emil Engler brought this change]
urlapi: use more Curl_safefree
Closes #5968
Marc Hoersken (17 Sep 2020)
- multi: align WinSock mask variables in Curl_multi_wait
Also skip pre-checking sockets to set timeout_ms to 0
after the first socket has been detected to be ready.
Reviewed-by: rcombs on github
Reviewed-by: Daniel Stenberg
Follow up to #5886
- multi: reuse WinSock events variable in Curl_multi_wait
Since the struct is quite large (1 long and 10 ints) we
declare it once at the beginning of the function instead
of multiple times inside loops to avoid stack movements.
Reviewed-by: Viktor Szakats
Reviewed-by: Daniel Stenberg
Closes #5886
Daniel Stenberg (16 Sep 2020)
- TODO: dynamically decide to use socketpair
Suggested-by: Anders Bakken
Closes #4829
- TODO: add PR reference for native IDN support on macOS
As there was work started on this that never got completed.
Closes #5371
- tool_help.h: update copyright year range
Follow-up from aa8777f63febca
- CI/azure: disable test 571 in the msys2 builds
It's just too flaky there
Reviewed-by: Marc Hoersken
Closes #5954
- tool_writeout: protect fputs() from NULL
When the code was changed to do fputs() instead of fprintf() it got
sensitive for NULL pointers; add checks for that.
Follow-up from 0c1e767e83ec66
Closes #5963
- test3015: verify stdout "as text"
Follow-up from 0c1e767e83e to please win32 tests
Closes #5962
- travis: use libressl v3.1.4 instead of master
... as their git master seems too fragile to use (and 3.2.1 which is the
latest has a build failure).
Closes #5964
- tests/FILEFORMAT: document type=shell for <command>
- tests/FILEFORMAT: document nonewline support for <file>
The one in <client>, that creates files.
Follow-up from b83947c8df7
- [anio brought this change]
tool_writeout: add new writeout variable, %{num_headers}
This variable gives the number of headers.
Closes #5947
- tool_urlglob: fix compiler warning "unreachable code"
(On Windows builds.)
Follow-up to 70a3b003d9
- [Gergely Nagy brought this change]
vtls: deduplicate client certificates in ssl_config_data
Closes #5629
- ftp: a 550 response to SIZE returns CURLE_REMOTE_FILE_NOT_FOUND
This is primarily interesting for cases where CURLOPT_NOBODY is set as
previously curl would not return an error for this case.
MDTM getting 550 now also returns this error (it returned
CURLE_FTP_COULDNT_RETR_FILE before) in order to unify return codes for
missing files across protocols and specific FTP commands.
libcurl already returns error on a 550 as a MDTM response (when
CURLOPT_FILETIME is set). If CURLOPT_NOBODY is not set, an error would
happen subsequently anyway since the RETR command would fail.
Add test 1913 and 1914 to verify. Updated several tests accordingly due
to the updated SIZE behavior.
Reported-by: Tomas Berger
Fixes #5953
Closes #5957
- curl: make checkpasswd use dynbuf
Closes #5952
- curl: make glob_match_url use dynbuf
Closes #5952
- curl: make file2memory use dynbuf
Closes #5952
- curl: make file2string use dynbuf
Closes #5952
- [Antarpreet Singh brought this change]
imap: set cselect_bits to CURL_CSELECT_IN initially
... when continuing a transfer from a FETCH response.
When the size of the file was small enough that the entirety of the
transfer happens in a single go and schannel buffers holds the entire
data. However, it wasn't completely read in Curl_pp_readresp since a
line break was found before that could happen. So, by the time we are in
imap_state_fetch_resp - there's data in buffers that needs to be read
via Curl_read but nothing to read from the socket. After we setup a
transfer (Curl_setup_transfer), curl just waits on the socket state to
change - which doesn't happen since no new data ever comes.
Closes #5961
- RELEASE-NOTES: synced
- test434: test -K use in a single line without newline
Closes #5946
- runtests: allow creating files without newlines
Closes #5946
- curl: use curlx_dynbuf for realloc when loading config files
... fixes an integer overflow at the same time.
Reported-by: ihsinme on github
Assisted-by: Jay Satiro
Closes #5946
- dynbuf: provide curlx_ names for reuse by the curl tool
Closes #5946
- dynbuf: make sure Curl_dyn_tail() zero terminates
Closes #5959
- tests: add test1912 to the dist
Follow-up to 70984ce1be4cab6c
- docs/LICENSE-MIXING: remove
This document is not maintained and I feel that it doesn't provide much
value to users anymore (if it ever did).
Closes #5955
- [Laramie Leavitt brought this change]
http: consolidate nghttp2_session_mem_recv() call paths
Previously there were several locations that called
nghttp2_session_mem_recv and handled responses slightly differently.
Those have been converted to call the existing
h2_process_pending_input() function.
Moved the end-of-session check to h2_process_pending_input() since the
only place the end-of-session state can change is after nghttp2
processes additional input frames.
This will likely fix the fuzzing error. While I don't have a root cause
the out-of-bounds read seems like a use after free, so moving the
nghttp2_session_check_request_allowed() call to a location with a
guaranteed nghttp2 session seems reasonable.
Also updated a few nghttp2 callsites to include error messages and added
a few additional error checks.
Closes #5648
- HISTORY: mention alt-svc added in 2019
... and make 1996 the first year subtitle
- base64: also build for pop3 and imap
Follow-up to the fix in 20417a13fb8f83
Reported-by: Michael Olbrich
Fixes #5937
Closes #5948
- base64: enable in build with SMTP
The oauth2 support is used with SMTP and it uses base64 functions.
Reported-by: Michael Olbrich
Fixes #5937
Closes #5938
- curl_mime_headers.3: fix the example's use of curl_slist_append
Reported-by: sofaboss on github
Fixes #5942
Closes #5943
- lib583: fix enum mixup
grrr the previous follow-up to 17fcdf6a31 was wrong
- libtest: fix build errors
Follow-up from 17fcdf6a310d4c8076
- lib: fix -Wassign-enum warnings
configure --enable-debug now enables -Wassign-enum with clang,
identifying several enum "abuses" also fixed.
Reported-by: Gisle Vanem
Bug: https://github.com/curl/curl/commit/879007f8118771f4896334731aaca5850a154675#commitcomment-42087553
Closes #5929
- RELEASE-NOTES: synced
- [Diven Qi brought this change]
url: use blank credentials when using proxy w/o username and password
Fixes proxy regression brought in commit ad829b21ae (7.71.0)
Fixed #5911
Closes #5914
- travis: add a build using libressl (from git master)
The v3.2.1 tag (latest release atm) results in a broken build.
Closes #5932
- configure: let --enable-debug set -Wenum-conversion with gcc >= 10
Unfortunately, this option is not detecting the same issues as clang's
-Wassign-enum flag, but should still be useful to detect future
mistakes.
Closes #5930
- openssl: consider ALERT_CERTIFICATE_EXPIRED a failed verification
If the error reason from the lib is
SSL_R_SSLV3_ALERT_CERTIFICATE_EXPIRED, libcurl will return
CURLE_PEER_FAILED_VERIFICATION and not CURLE_SSL_CONNECT_ERROR.
This unifies the libcurl return code and makes libressl run test 313
(CRL testing) fine.
Closes #5934
- FAQ: refreshed some very old language
- cmake: make HTTP_ONLY also disable MQTT
... and alphasort the order of disabling protocols to make it easier to
browse.
Closes #5931
- libtest: remove lib1541 leftovers
Caused automake errors.
Follow-up to 8ca54a03ea08a
- tests/libtests: remove test 1900 and 2033
We already remove the test files, now remove the libtest codes as well.
Follow-up to e50a877df74
Marc Hoersken (7 Sep 2020)
- CI/azure: add test number to title for display in analytics
To ease identification of tests the test number is added to
the test case title in order to have it on the Azure DevOps
Analytics pages and reports which currently do not show it.
Bump test case revision to make Azure DevOps update titles.
Closes #5927
Daniel Stenberg (6 Sep 2020)
- altsvc: clone setting in curl_easy_duphandle
The cache content is not duplicated, like other caches, but the setting
and specified file name are.
Test 1908 is extended to verify this somewhat. Since the duplicated
handle gets the same file name, the test unfortunately overwrites the
same file twice (with different contents) which makes it hard to check
automatically.
Closes #5923
- test1541: remove since it is a known bug
A shared connection cache is not thread-safe is a known issue. Stop
testing this until we believe this issue is addressed. Reduces
occasional test failures we don't care about.
The test code in lib1541.c is left in git to allow us to restore it when
we get to fix this.
Closes #5922
- tests: remove pipelining tests
Remove the tests 530, 584, 1900, 1901, 1902, 1903 and 2033. They were
previously disabled.
The Pipelining code was removed from curl in commit 2f44e94efb3df8e,
April 2019.
Closes #5921
- curl: retry delays in parallel mode no longer sleeps blocking
The previous sleep for retries would block all other concurrent
transfers. Starting now, the retry will instead be properly marked to
not get restarted until after the delay time but other transfers can
still continue in the mean time.
Closes #5917
- curl:parallel_transfers: make sure retry readds the transfer
Reported-by: htasta on github
Fixes #5905
Closes #5917
- build: drop support for building with Watcom
These files are not maintained, they seem to have no users, Watcom
compilers look like not having users nor releases anymore.
Closes #5918
- winbuild/rundebug.cmd: remove
Seems to have been added by mistake? Not included in dists.
Closes #5919
- curl: in retry output don't call all problems "transient"
... because when --retry-all-errors is used, the error isn't necessarily
transient at all.
Closes #5916
- easygetopt: pass a valid enum to avoid compiler warning
"integer constant not in range of enumerated type 'CURLoption'"
Reported-by: Gisle Vanem
Bug: https://github.com/curl/curl/commit/6ebe63fac23f38df911edc348e8ccc72280f9434#commitcomment-42042843
Closes #5915
- [Emil Engler brought this change]
tests: Add tests for new --help
This commit is a part of "--help me if you can"
Closes #5680
- [Emil Engler brought this change]
tool: update --help with categories
This commit is a part of "--help me if you can"
Closes #5680
- [Emil Engler brought this change]
docs: add categories to all cmdline opts
Adapted gen.pl with 'listcats'
This commit is a part of "--help me if you can"
Closes #5680
- RELEASE-NOTES: synced
- [ihsinme brought this change]
connect.c: remove superfluous 'else' in Curl_getconnectinfo
Closes #5912
- [Samuel Marks brought this change]
CMake: remove explicit `CMAKE_ANSI_CFLAGS`
This variable was removed from cmake in commit
https://gitlab.kitware.com/cmake/cmake/commit/5a834b0bb0bc288. A later
CMake commit removes the variable from the tests, claiming that it was
removed in CMake 2.6
Reviewed-By: Peter Wu
Closes #5439
- [cbe brought this change]
libssh2: pass on the error from ssh_force_knownhost_key_type
Closes #5909
- scripts/delta: add diffstat summary
... and make output more table-like
- [Martin Bašti brought this change]
http_proxy: do not crash with HTTPS_PROXY and NO_PROXY set
... in case NO_PROXY takes an effect
Without this patch, the following command crashes:
$ GIT_CURL_VERBOSE=1 NO_PROXY=github.com HTTPS_PROXY=https://example.com \
git clone https://github.com/curl/curl.git
Minimal libcurl-based reproducer:
#include <curl/curl.h>
int main() {
CURL *curl = curl_easy_init();
if(curl) {
CURLcode ret;
curl_easy_setopt(curl, CURLOPT_URL, "https://github.com/");
curl_easy_setopt(curl, CURLOPT_PROXY, "example.com");
/* set the proxy type */
curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_HTTPS);
curl_easy_setopt(curl, CURLOPT_NOPROXY, "github.com");
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
ret = curl_easy_perform(curl);
curl_easy_cleanup(curl);
return ret;
}
return -1;
}
Assisted-by: Kamil Dudka
Bug: https://bugzilla.redhat.com/1873327
Closes #5902
- travis: add a CI job with openssl3 (from git master)
Closes #5908
- openssl: avoid error conditions when importing native CA
The code section that is OpenSSL 3+ specific now uses the same logic as
is used in the version < 3 section. It caused a compiler error without
it.
Closes #5907
- setopt: avoid curl_ on local variable
Closes #5906
- mqtt.c: avoid curl_ prefix on local variable
Closes #5906
- wildcard: strip "curl_" prefix from private symbols
Closes #5906
- vtls: make it 'struct Curl_ssl_session'
Use uppercase C for internal symbols.
Closes #5906
- curl_threads: make it 'struct Curl_actual_call'
Internal names should not be prefixed "curl_"
Closes #5906
- schannel: make it 'struct Curl_schannel*'
As internal global names should use captical C.
Closes #5906
- hash: make it 'struct Curl_hash'
As internal global names should use captical C.
Closes #5906
- llist: make it "struct Curl_llist"
As internal global names should use captical C.
Closes #5906
Marc Hoersken (2 Sep 2020)
- telnet.c: depend on static requirement of WinSock version 2
Drop dynamic loading of ws2_32.dll and instead rely on the
imported version which is now required to be at least 2.2.
Reviewed-by: Marcel Raad
Reviewed-by: Jay Satiro
Reviewed-by: Daniel Stenberg
Reviewed-by: Viktor Szakats
Closes #5854
- win32: drop support for WinSock version 1, require version 2
IPv6, telnet and now also the multi API require WinSock
version 2 which is available starting with Windows 95.
Therefore we think it is time to drop support for version 1.
Reviewed-by: Marcel Raad
Reviewed-by: Jay Satiro
Reviewed-by: Daniel Stenberg
Reviewed-by: Viktor Szakats
Follow up to #5634
Closes #5854
- select: align poll emulation to return all relevant events
The poll emulation via select already consumes POLLRDNORM,
POLLWRNORM and POLLRDBAND as input events. Therefore it
should also return them as output events if signaled.
Also fix indentation in input event handling block.
Assisted-by: Jay Satiro
Reviewed-by: Daniel Stenberg
Replaces #5852
Closes #5883
- CI/azure: MQTT is now enabled by default
Reviewed-by: Daniel Stenberg
Follow up to #5858
Closes #5903
Daniel Stenberg (2 Sep 2020)
- copyright.pl: ignore buildconf
- test971: show test mismatches "inline"
- lib/Makefile.am: bump VERSIONINFO due to new functions
... we're generally bad at this, but we are adding new functions for
this release.
Closes #5899
- optiontable: use DEBUGBUILD
Follow-up to commit 6e18568ba38 (#5877)
- cmdline-opts/gen.pl: generate nicer "See Also" in curl.1
If there are more than two items in the list, use commas for all but the
last separator which is set to 'and'. Reads better.
Closes #5898
- curl.1: add see also no-progress-meter on two spots
Ref: #5894
Closes #5897
- RELEASE-NOTES: synced
- mqtt: enable by default
No longer considered experimental.
Closes #5858
- [Michael Baentsch brought this change]
tls: add CURLOPT_SSL_EC_CURVES and --curves
Closes #5892
- url: remove funny embedded comments in Curl_disonnect calls
- [Chris Paulson-Ellis brought this change]
conn: check for connection being dead before reuse
Prevents incorrect reuse of an HTTP connection that has been prematurely
shutdown() by the server.
Partial revert of 755083d00deb16
Fixes #5884
Closes #5893
Marc Hoersken (29 Aug 2020)
- buildconf: exec autoreconf to avoid additional process
Also make buildconf exit with the return code of autoreconf.
Reviewed-by: Daniel Stenberg
Follow up to #5853
Closes #5890
- CI/azure: no longer ignore results of test 1013
Follow up to #5771
Closes #5889
- docs: add description about CI platforms to CONTRIBUTE.md
Reviewed-by: Daniel Stenberg
Reviewed-by: Marcel Raad
Reviewed-by: Jay Satiro
Closes #5882
Daniel Stenberg (29 Aug 2020)
- tests/getpart: use MIME::Base64 instead of home-cooked
Since we already use the base64 package since a while back, we can just
as well switch to that here too.
It also happens to use the exact same function name, which otherwise
causes a run-time warning.
Reported-by: Marc Hörsken
Fixes #5885
Closes #5887
Marcel Raad (29 Aug 2020)
- ntlm: fix condition for curl_ntlm_core usage
`USE_WINDOWS_SSPI` without `USE_WIN32_CRYPTO` but with any other DES
backend is fine, but was excluded before.
This also fixes test 1013 as the condition for SMB support in
configure.ac didn't match the condition in the source code. Now it
does.
Fixes https://github.com/curl/curl/issues/1262
Closes https://github.com/curl/curl/pull/5771
- AppVeyor: switch 64-bit Schannel Debug CMake builds to Unicode
The Schannel builds are the most useful to verify as they make the most
use of the Windows API. Classic MinGW doesn't support Unicode at all,
only MinGW-w64 and MSVC do.
Closes https://github.com/curl/curl/pull/5843
- CMake: add option to enable Unicode on Windows
As already existing for winbuild.
Closes https://github.com/curl/curl/pull/5843
Marc Hoersken (29 Aug 2020)
- select: simplify return code handling for poll and select
poll and select already return -1 on error according to POSIX,
so there is no need to perform a <0 to -1 conversion in code.
Also we can just use one check with <= 0 on the return code.
Assisted-by: Daniel Stenberg
Reviewed-by: Jay Satiro
Replaces #5852
Closes #5880
Daniel Stenberg (28 Aug 2020)
- RELEASE-NOTES: synced
- [Jeroen Ooms brought this change]
tests: add test1912 with typechecks
Validates that gcc-typecheck macros match the new option type API.
Closes #5873
- easyoptions: provide debug function when DEBUGBUILD
... not CURLDEBUG as they're not always set in conjunction.
Follow-up to 6ebe63fac23f38df
Fixes #5877
Closes #5878
Marc Hoersken (28 Aug 2020)
- sockfilt: handle FD_CLOSE winsock event on write socket
Learn from the way Cygwin handles and maps the WinSock events
to simulate correct and complete poll and select behaviour
according to Richard W. Stevens Network Programming book.
Follow up to #5867
Closes #5879
- multi: handle connection state winsock events
Learn from the way Cygwin handles and maps the WinSock events
to simulate correct and complete poll and select behaviour
according to Richard W. Stevens Network Programming book.
Reviewed-by: Jay Satiro
Reviewed-by: Marcel Raad
Follow up to #5634
Closes #5867
Daniel Stenberg (28 Aug 2020)
- Curl_pgrsTime - return new time to avoid timeout integer overflow
Setting a timeout to INT_MAX could cause an immediate error to get
returned as timeout because of an overflow when different values of
'now' were used.
This is primarily fixed by having Curl_pgrsTime() return the "now" when
TIMER_STARTSINGLE is set so that the parent function will continue using
that time.
Reported-by: Ionuț-Francisc Oancea
Fixes #5583
Closes #5847
- TLS: fix SRP detection by using the proper #ifdefs
USE_TLS_SRP will be true if *any* selected TLS backend can use SRP
HAVE_OPENSSL_SRP is defined when OpenSSL can use it
HAVE_GNUTLS_SRP is defined when GnuTLS can use it
Clarify in the curl_verison_info docs that CURL_VERSION_TLSAUTH_SRP is
set if at least one of the supported backends offers SRP.
Reported-by: Stefan Strogin
Fixes #5865
Closes #5870
- [Dan Kenigsberg brought this change]
docs: SSLCERTS: fix English syntax
Signed-off-by: Dan Kenigsberg <danken@redhat.com>
Closes #5876
- [Alessandro Ghedini brought this change]
docs: non-existing macros in man pages
As reported by man(1) when invoked as:
man --warnings -E UTF-8 -l -Tutf8 -Z <file> >/dev/null
Closes #5846
- [Alessandro Ghedini brought this change]
curl.1: fix typo invokved -> invoked
Closes #5846
- buildconf: invoke 'autoreconf -fi' instead
The custom script isn't necessary anymore - but remains for simplicity
and just invokes autoreconf.
Closes #5853
- [Emil Engler brought this change]
lib: make Curl_gethostname accept a const pointer
The address of that variable never gets changed, only the data in it so
why not make it a "char * const"?
Closes #5866
- docs/libcurl: update "Added in" version for curl_easy_option*
Follow-up to 6ebe63fac23f38
- scripts: improve the "get latest curl release tag" logic
... by insiting on it matching "^curl-".
- configure: added --disable-get-easy-options
To allow disabling of the curl_easy_option APIs in a build.
Closes #5365
- options: API for meta-data about easy options
const struct curl_easyoption *curl_easy_option_by_name(const char *name);
const struct curl_easyoption *curl_easy_option_by_id (CURLoption id);
const struct curl_easyoption *
curl_easy_option_next(const struct curl_easyoption *prev);
The purpose is to provide detailed enough information to allow for
example libcurl bindings to get option information at run-time about
what easy options that exist and what arguments they expect.
Assisted-by: Jeroen Ooms
Closes #5365
- [Eric Curtin brought this change]
HTTP/3: update to OpenSSL_1_1_1g-quic-draft-29
Closes #5871
- RELEASE-NOTES: synced
Jay Satiro (26 Aug 2020)
- openssl: Fix wincrypt symbols conflict with BoringSSL
OpenSSL undefines the conflicting symbols but BoringSSL does not so we
must do it ourselves.
Reported-by: Samuel Tranchet
Assisted-by: Javier Blazquez
Ref: https://bugs.chromium.org/p/boringssl/issues/detail?id=371
Ref: https://github.com/openssl/openssl/blob/OpenSSL_1_1_1g/include/openssl/ossl_typ.h#L66-L73
Fixes https://github.com/curl/curl/issues/5669
Closes https://github.com/curl/curl/pull/5857
Daniel Stenberg (26 Aug 2020)
- socketpair: allow CURL_DISABLE_SOCKETPAIR
... to completely disable the use of socketpair
Closes #5850
- curl_get_line: build only if cookies or alt-svc are enabled
Closes #5851
- [fullincome brought this change]
schannel: fix memory leak when using get_cert_location
The get_cert_location function allocates memory only on success.
Previously get_cert_location was able to allocate memory and return
error. It wasn't obvious and in this case the memory wasn't
released.
Fixes #5855
Closes #5860
- [Emil Engler brought this change]
git: ignore libtests in 3XXX area
Currently the file tests/libtest/lib3010 is not getting
ignored by git. This fixes it by adding the 3XXX area to
the according .gitignore file.
Closes #5859
- [Emil Engler brought this change]
doh: add error message for DOH_DNS_NAME_TOO_LONG
When this error code was introduced in b6a53fff6c1d07e8a9, it was
forgotten to be added in the errors array and doh_strerror function.
Closes #5863
- ngtcp2: adapt to the new pkt_info arguments
Guidance-by: Tatsuhiro Tsujikawa
Closes #5864
- winbuild/README.md: make <options> visible
Follow-up to be753add31c2d8c
- winbuild: convert the instruction text to README.md
Closes #5861
- lib1560: verify "redirect" to double-slash leading URL
Closes #5849
Marc Hoersken (25 Aug 2020)
- multi: expand pre-check for socket readiness
Check readiness of all sockets before waiting on them
to avoid locking in case the one-time event FD_WRITE
was already consumed by a previous wait operation.
More information about WinSock network events:
https://docs.microsoft.com/en-us/windows/win32/api/
winsock2/nf-winsock2-wsaeventselect#return-value
Closes #5634
- [rcombs brought this change]
multi: implement wait using winsock events
This avoids using a pair of TCP ports to provide wakeup functionality
for every multi instance on Windows, where socketpair() is emulated
using a TCP socket on loopback which could in turn lead to socket
resource exhaustion.
A previous version of this patch failed to account for how in WinSock,
FD_WRITE is set only once when writing becomes possible and not again
until after a send has failed due to the buffer filling. This contrasts
to how FD_READ and FD_OOB continue to be set until the conditions they
refer to no longer apply. This meant that if a user wrote some data to
a socket, but not enough data to completely fill its send buffer, then
waited on that socket to become writable, we'd erroneously stall until
their configured timeout rather than returning immediately.
This version of the patch addresses that issue by checking each socket
we're waiting on to become writable with select() before the wait, and
zeroing the timeout if it's already writable.
Assisted-by: Marc Hörsken
Reviewed-by: Marcel Raad
Reviewed-by: Daniel Stenberg
Tested-by: Gergely Nagy
Tested-by: Rasmus Melchior Jacobsen
Tested-by: Tomas Berger
Replaces #5397
Reverts #5632
Closes #5634
- select: reduce duplication of Curl_poll in Curl_socket_check
Change Curl_socket_check to use select-fallback in Curl_poll
instead of implementing it in Curl_socket_check and Curl_poll.
Reviewed-by: Daniel Stenberg
Reviewed-by: Jay Satiro
Replaces #5262 and #5492
Closes #5707
- select: fix poll-based check not detecting connect failure
This commit changes Curl_socket_check to use POLLPRI to
check for connect failure on the write socket, because
POLLPRI maps to fds_err. This is in line with select(2).
The select-based socket check correctly checks for connect
failures by adding the write socket also to fds_err.
The poll-based implementation (which internally can itself
fallback to select again) did not previously check for
connect failure by using POLLPRI with the write socket.
See the follow up commit to this for more information.
This commit makes sure connect failures can be detected
and handled if HAVE_POLL_FINE is defined, eg. on msys2-devel.
Reviewed-by: Daniel Stenberg
Reviewed-by: Jay Satiro
Replaces #5509
Prepares #5707
- select.h: make socket validation macros test for INVALID_SOCKET
With Winsock the valid range is [0..INVALID_SOCKET-1] according to
https://docs.microsoft.com/en-us/windows/win32/winsock/socket-data-type-2
Reviewed-by: Jay Satiro
Reviewed-by: Marcel Raad
Reviewed-by: Daniel Stenberg
Closes #5760
Daniel Stenberg (24 Aug 2020)
- docs: --output-dir is added in 7.73.0, nothing else
Follow-up to 5620d2cc78c0
- curl: add --output-dir
Works with --create-dirs and with -J
Add test 3008, 3009, 3011, 3012 and 3013 to verify.
Closes #5637
- configure: fix pkg-config detecting wolfssl
When amending the include path with "/wolfssl", this now properly strips
off all whitespace from the path variable! Previously this would lead to
pkg-config builds creating bad command lines.
Closes #5848
- [Michael Musset brought this change]
sftp: add the option CURLKHSTAT_FINE_REPLACE
Replace the old fingerprint of the host with a new.
Closes #5685
- RELEASE-NOTES: synced
The next release is now to become 7.73.0
- checksrc: verify do-while and spaces between the braces
Updated mprintf.c to comply
Closes #5845
- curl: support XDG_CONFIG_HOME to find .curlrc
Added test433 to verify. Updated documentation.
Reviewed-by: Jay Satiro
Suggested-by: Eli Schwartz
Fixes #5829
Closes #5837
- etag: save and use the full received contents
... which makes it support weak tags and non-standard etags too!
Added test case 347 to verify blank incoming ETag:
Fixes #5610
Closes #5833
- setopt: if the buffer exists, refuse the new BUFFERSIZE
The buffer only exists during transfer and then we shouldn't change the
size (the setopt is not documented to work then).
Reported-by: Harry Sintonen
Closes #5842
- [COFFEETALES brought this change]
sftp: add new quote commands 'atime' and 'mtime'
Closes #5810
- CURLE_PROXY: new error code
Failures clearly returned from a (SOCKS) proxy now causes this return
code. Previously the situation was not very clear as what would be
returned and when.
In addition: when this error code is returned, an application can use
CURLINFO_PROXY_ERROR to query libcurl for the detailed error, which then
returns a value from the new 'CURLproxycode' enum.
Closes #5770
- runtests: make cleardir() erase dot files too
Because test cases might use dot files.
Closes #5838
- KNOWN_BUGS: 'no_proxy' string-matches IPv6 numerical addreses
Also: the current behavior is now documented in the curl.1 and
CURLOPT_NOPROXY.3 man pages.
Reported-by: Andrew Barnes
Closes #5745
Closes #5841
Viktor Szakats (22 Aug 2020)
- Makefile.m32: add ability to override zstd libs [ci skip]
Similarly to brotli, where this was already possible.
E.g. it allows to link zstd statically to libcurl.dll.
Ref: https://github.com/curl/curl-for-win/issues/12
Ref: https://github.com/curl/curl-for-win/commit/d9b266afd2e5d3f5604483010ef62340b5918c89
Closes https://github.com/curl/curl/pull/5840
Daniel Stenberg (21 Aug 2020)
- runtests: avoid 'fail to start' repeated messages in attempt loops
Closes #5834
- runtests: clear pid variables when failing to start a server
... as otherwise the parent doesn't detect the failure and believe it
actually worked to start.
Reported-by: Christian Weisgerber
Bug: https://curl.haxx.se/mail/lib-2020-08/0018.html
Closes #5834
- TODO: Virtual external sockets
Closes #5835
- [Don J Olmstead brought this change]
dist: add missing CMake Find modules to the distribution
Closes #5836
- RELEASE-NOTES: synced
... and version bumped to 7.72.1
- tls: provide the CApath verbose log on its own line
... not newline separated from the previous line. This makes it output
asterisk prefixed properly like other verbose putput!
Reported-by: jmdavitt on github
Fixes #5826
Closes #5827
Version 7.72.0 (19 Aug 2020)
Daniel Stenberg (19 Aug 2020)
- RELEASE-NOTES: synced
The curl 7.72.0 release
- THANKS: add names from curl 7.72.0 release
Jay Satiro (18 Aug 2020)
- KNOWN_BUGS: Schannel TLS 1.2 handshake bug in old Windows versions
Reported-by: plujon@users.noreply.github.com
Closes https://github.com/curl/curl/issues/5488
Daniel Stenberg (17 Aug 2020)
- Curl_easy: remember last connection by id, not by pointer
CVE-2020-8231
Bug: https://curl.haxx.se/docs/CVE-2020-8231.html
Reported-by: Marc Aldorasi
Closes #5824
- examples/rtsp.c: correct the copyright year
- RELEASE-PROCEDURE.md: add more future release dates
- [H3RSKO brought this change]
docs: change "web site" to "website"
According to wikipedia:
While "web site" was the original spelling, this variant has become
rarely used, and "website" has become the standard spelling
Closes #5822
- [Bevan Weiss brought this change]
CMake: don't complain about missing nroff
The curl_nroff_check() was always being called, and complaining if
*NROFF wasn't found, even when not making the manual.
Only check for nroff (and complain) if actually making the manual
Closes #5817
- [Brian Inglis brought this change]
libtest/Makefile.am: add -no-undefined for libstubgss for Cygwin
copy the LDFLAGS approach for adding same option with `libhostname` in
`libtest/Makefile.am`:
- init `libstubgss_la_LDFLAGS_EXTRA` variable,
- add option to variable inside conditional,
- use variable in `libstubgss_la_LDFLAGS`
Fixes #5819
Closes #5820
- docs: clarify MAX_SEND/RECV_SPEED functionality
... in particular what happens if the maximum speed limit is set to a
value that's smaller than the transfer buffer size in use.
Reported-by: Tomas Berger
Fixes #5788
Closes #5813
- test1140: compare stdout
To make problems more immediately obvious when tests fail.
Closes #5814
- asyn-ares: correct some bad comments
Closes #5812
- [Emil Engler brought this change]
docs: Add video link to docs/CONTRIBUTE.md
Closes #5811
- curl-config: ignore REQUIRE_LIB_DEPS in --libs output
Fixes a curl-config issue on cygwin by making sure REQUIRE_LIB_DEPS is
not considered for the --libs output.
Reported-by: ramsay-jones on github
Assisted-by: Brian Inglis and Ken Brown
Fixes #5793
Closes #5808
- copyright: update/correct the year range on a few files
- scripts/copyright.pl: ignore .muse files
- [Emil Engler brought this change]
multi: Remove 10-year old out-commented code
The code hasn't been touched since 2010-08-18
Closes #5805
- KNOWN_BUGS: A shared connection cache is not thread-safe
Closes #4915
Closes #5802
- CONTRIBUTE: extend git commit message description
In particular how the first line works.
Closes #5803
- RELEASE-NOTES: synced
- [Stefan Yohansson brought this change]
transfer: move retrycount from connect struct to easy handle
This flag was applied to the connection struct that is released on
retry. These changes move the retry counter into Curl_easy struct that
lives across retries and retains the new connection.
Reported-by: Cherish98 on github
Fixes #5794
Closes #5800
- libssh2: s/ssherr/sftperr/
The debug output used ssherr instead of sftperr which not only outputs
the wrong error code but also casues a warning on Windows.
Follow-up to 7370b4e39f1
Reported-by: Gisle Vanem
Bug: https://github.com/curl/curl/commit/7370b4e39f1390e701f5b68d910c619151daf72b#r41334700
Closes #5799
- ftp: don't do ssl_shutdown instead of ssl_close
The shutdown function is for downgrading a connection from TLS to plain,
and this is not requested here.
Have ssl_close reset the TLS connection state.
This partially reverts commit f002c850d98d
Reported-by: Rasmus Melchior Jacobsen
Reported-by: Denis Goleshchikhin
Fixes #5797
Marc Hoersken (9 Aug 2020)
- CI/azure: fix test outcome values and use latest API version
This makes sure that tests ignored or skipped are not shown
just in the category "Other", but with their correct state.
Closes #5796
- CI/azure: show runtime stats to investigate slowness
Also avoid naming conflict of TFLAGS env and tflags variables.
Closes #5776
Daniel Stenberg (8 Aug 2020)
- TLS naming: fix more Winssl and Darwinssl leftovers
The CMake option is now called CMAKE_USE_SCHANNEL
The winbuild flag is USE_SCHANNEL
The CI jobs and build scripts only use the new names and the new name
options
Tests now require 'Schannel' (when necessary)
Closes #5795
- smtp_parse_address: handle blank input string properly
Closes #5792
- runtests: run the DICT server on a random port number
Removed support for -b (base port number)
Closes #5783
- RELEASE-NOTES: synced
- runtests: move the TELNET server to a dynamic port
Rename the port variable to TELNETPORT to better match the existing
pattern.
Closes #5785
- ngtcp2: adapt to error code rename
Closes #5786
- runtests: move the smbserver to use a dynamic port number
Closes #5782
- runtests: run the http2 tests on a random port number
Closes #5779
- gtls: survive not being able to get name/issuer
Closes #5778
- runtests: move the gnutls-serv tests to a dynamic port
Affects test 320, 321, 322 and 324.
Closes #5778
- runtests: support dynamicly base64 encoded sections in tests
This allows us to make test cases to use base64 at run-time and still
use and verify information determined at run-time, such as the IMAP test
server's port number in test 842.
This change makes 12 tests run again that basically never ran since we
moved to dynamic port numbers.
ftpserver.pl is adjusted to load test instructions and test number from
the preprocessed test file.
FILEFORMAT.md now documents the new base64 encoding syntax.
Reported-by: Marcel Raad
Fixes #5761
Closes #5775
- curl.1: add a few missing valid exit codes
93 - 96 can be returned as well.
Closes #5777
- TODO: Use multiple parallel transfers for a single download
Closes #5774
- TODO: Set the modification date on an uploaded file
Closes #5768
- [Thomas M. DuBuisson brought this change]
CI: Add muse CI config
Closes #5772
- [Thomas M. DuBuisson brought this change]
travis/script.sh: fix use of `-n' with unquoted envvar
Shellcheck tells us "-n doesn't work with unquoted arguments. quote or
use [[ ]]."
And testing shows:
```
docker run --rm -it ubuntu bash
root@fe85ce156856:/# [ -n $DOES_NOT_EXIST ] && echo "I ran"
I ran
root@fe85ce156856:/# [ -n "$DOES_NOT_EXIST" ] && echo "I ran"
root@fe85ce156856:/#
```
Closes #5773
- h2: repair trailer handling
The previous h2 trailer fix in 54a2b63 was wrong and caused a
regression: it cannot deal with trailers immediately when read since
they may be read off the connection by the wrong 'data' owner.
This change reverts the logic back to gathering all trailers into a
single buffer, like before 54a2b63.
Reported-by: Tadej Vengust
Fixes #5663
Closes #5769
Viktor Szakats (3 Aug 2020)
- windows: disable Unix Sockets for old mingw
Classic mingw and 10y+ old versions of mingw-w64 don't ship with
Windows headers having the typedef necessary for Unix Sockets
support, so try detecting these environments to disable this
feature.
Ref: https://sourceforge.net/p/mingw-w64/mingw-w64/ci/cf6afc57179a5910621215f8f4037d406892072c/
Reviewed-by: Daniel Stenberg
Fixes #5674
Closes #5758
Marcel Raad (3 Aug 2020)
- test1908: treat file as text
Fixes the line endings on Windows.
Closes https://github.com/curl/curl/pull/5767
- TrackMemory tests: ignore realloc and free in getenv.c
These are only called for WIN32.
Closes https://github.com/curl/curl/pull/5767
Daniel Stenberg (3 Aug 2020)
- tests/FILEFORMAT.md: mention %HTTP2PORT
- RELEASE-NOTES: synced
- tlsv1.3.d. only for TLS-using connections
... and rephrase that "not all" TLS backends support it.
Closes #5764
- tls-max.d: this option is only for TLS-using connections
Ref: #5763
Closes #5764
Marcel Raad (2 Aug 2020)
- [Cameron Cawley brought this change]
tool_doswin: Simplify Windows version detection
Closes https://github.com/curl/curl/pull/5754
- [Cameron Cawley brought this change]
win32: Add Curl_verify_windows_version() to curlx
Closes https://github.com/curl/curl/pull/5754
- runtests.pl: treat LibreSSL and BoringSSL as OpenSSL
This makes the tests that require the OpenSSL feature also run for
those two compatible libraries.
Closes https://github.com/curl/curl/pull/5762
Daniel Stenberg (1 Aug 2020)
- multi: Condition 'extrawait' is always true
Reported by Codacy.
Reviewed-by: Marcel Raad
Closes #5759
Marcel Raad (1 Aug 2020)
- openssl: fix build with LibreSSL < 2.9.1
`SSL_CTX_add0_chain_cert` and `SSL_CTX_clear_chain_certs` were
introduced in LibreSSL 2.9.1 [0].
[0] https://github.com/libressl-portable/openbsd/commit/0db809ee178457c8170abfae3931d7bd13abf3ef
Closes https://github.com/curl/curl/pull/5757
Daniel Stenberg (1 Aug 2020)
- [Marc Aldorasi brought this change]
multi_remove_handle: close unused connect-only connections
Previously any connect-only connections in a multi handle would be kept
alive until the multi handle was closed. Since these connections cannot
be re-used, they can be marked for closure when the associated easy
handle is removed from the multi handle.
Closes #5749
- checksrc: invoke script with -D to find .checksrc proper
Without the -D command line option, checksrc.pl won't know which
directory to load the ".checksrc" file from when building out of the
source tree.
Reported-by: Marcel Raad
Fixes #5715
Closes #5755
- [Carlo Marcelo Arenas Belón brought this change]
buildconf: retire ares buildconf invocation
no longer needed after 4259d2df7dd95637a4b1e3fb174fe5e5aef81069
- [Carlo Marcelo Arenas Belón brought this change]
buildconf: excempt defunct reference to ACLOCAL_FLAGS
retired with 09f278121e815028adb24d228d8092fc6cb022aa but kept around as
the name is generic enough that it might be in use and relied upon from
the environment.
- [Carlo Marcelo Arenas Belón brought this change]
buildconf: avoid array concatenation in die()
reported as error SC2145[1] by shellcheck, but not expected to cause
any behavioural differences otherwise.
[1] https://github.com/koalaman/shellcheck/wiki/SC2145
Closes #5701
- travis: add ppc64le and s390x builds
Closes #5752
Marc Hoersken (31 Jul 2020)
- connect: remove redundant message about connect failure
Reviewed-by: Daniel Stenberg
Closes #5708
- tests/sshserver.pl: fix compatibility with OpenSSH for Windows
Follow up to #5721
- CI/azure: install libssh2 for use with msys2-based builds
This enables building and running the SFTP tests.
Unfortunately OpenSSH for Windows does not support SCP (yet).
Reviewed-by: Daniel Stenberg
Closes #5721
- CI/azure: increase Windows job timeout once again
Avoid aborted jobs due to performance issues on Azure DevOps.
Reviewed-by: Daniel Stenberg
Reviewed-by: Jay Satiro
Closes #5738
Jay Satiro (30 Jul 2020)
- TODO: Schannel: 'Add option to allow abrupt server closure'
We should offer an option to allow abrupt server closures (server closes
SSL transfer without sending a known termination point such as length of
transfer or close_notify alert). Abrupt server closures are usually
because of misconfigured or very old servers.
Closes https://github.com/curl/curl/issues/4427
- url: fix CURLU and location following
Prior to this change if the user set a URL handle (CURLOPT_CURLU) it was
incorrectly used for the location follow, resulting in infinite requests
to the original location.
Reported-by: sspiri@users.noreply.github.com
Fixes https://github.com/curl/curl/issues/5709
Closes https://github.com/curl/curl/pull/5713
Daniel Stenberg (30 Jul 2020)
- RELEASE-NOTES: synced
- [divinity76 brought this change]
docs: add date of 7.20 to CURLM_CALL_MULTI_PERFORM mentions
it helps make it obvious that most developers don't have to care about
the CURLM_CALL_MULTI_PERFORM value (last release using it is nearly 11
years old, November 4 2009)
Closes #5744
Jay Satiro (29 Jul 2020)
- tool_cb_wrt: fix outfile mode flags for Windows
- Use S_IREAD and S_IWRITE mode permission flags to create the file
on Windows instead of S_IRUSR, S_IWUSR, etc.
Windows only accepts a combination of S_IREAD and S_IWRITE. It does not
acknowledge other combinations, for which it may generate an assertion.
This is a follow-up to 81b4e99 from yesterday, which improved the
existing file check with -J.
Ref: https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/open-wopen#remarks
Ref: https://github.com/curl/curl/pull/5731
Closes https://github.com/curl/curl/pull/5742
Daniel Stenberg (28 Jul 2020)
- checksrc: ban gmtime/localtime
They're not thread-safe so they should not be used in libcurl code.
Explictly enabled when deemed necessary and in examples and tests
Reviewed-by: Nicolas Sterchele
Closes #5732
- transfer: fix data_pending for builds with both h2 and h3 enabled
Closes #5734
- curl_multi_setopt: fix compiler warning "result is always false"
On systems with 32 bit long the expression is always false. Avoid
the warning.
Reported-by: Gisle Vanem
Bug: https://github.com/curl/curl/commit/61a08508f6a458fe21bbb18cd2a9bac2f039452b#commitcomment-40941232
Closes #5736
- curl: improve the existing file check with -J
Previously a file that isn't user-readable but is user-writable would
not be properly avoided and would get overwritten.
Reported-by: BrumBrum on hackerone
Assisted-by: Jay Satiro
Bug: https://hackerone.com/reports/926638
Closes #5731
- [Jonathan Nieder brought this change]
multi: update comment to say easyp list is linear
Since 09b9fc900 (multi: remove 'Curl_one_easy' struct, phase 1,
2013-08-02), the easy handle list is not circular but ends with
->next pointing to NULL.
Reported-by: Masaya Suzuki <masayasuzuki@google.com>
Closes #5737
- CURLOPT_NOBODY.3: fix the syntax for referring to options
As test 1140 fails otherwise!
Follow-up to e1bac81cc815
- ngtcp2: store address in sockaddr_storage
Reported-by: Tatsuhiro Tsujikawa
Closes #5733
- CURLOPT_NOBODY.3: clarify what setting to 0 means
... and mention that HTTP with other methods than HEAD might get a body and
there's no option available to stop that.
Closes #5729
- setopt: unset NOBODY switches to GET if still HEAD
Unsetting CURLOPT_NOBODY with 0L when doing HTTP has no documented
action but before 7.71.0 that used to switch back to GET and with this
change (assuming the method is still set to HEAD) this behavior is
brought back.
Reported-by: causal-agent on github
Fixes #5725
Closes #5728
- [Ehren Bendler brought this change]
configure: cleanup wolfssl + pkg-config conflicts when cross compiling.
Also choose a different wolfSSL function to test for NTLM support.
Fixes #5605
Closes #5682
- configure: show zstd "no" in summary when built without it
Reported-by: Marc Hörsken
Fixes #5720
Closes #5730
- quiche: handle calling disconnect twice
Reported-by: lilongyan-huawei on github
Fixes #5726
Closes #5727
- [Nicolas Sterchele brought this change]
getinfo: reset retry-after value in initinfo
- Avoid re-using retry_after value from preceding request
- Add libtest 3010 to verify
Reported-by: joey-l-us on github
Fixes #5661
Closes #5672
Marcel Raad (27 Jul 2020)
- WIN32: stop forcing narrow-character API
Except where the results are only used for character output.
getenv is not touched because it's part of the public API, and having
it return UTF-8 instead of ANSI would be a breaking change.
Fixes https://github.com/curl/curl/issues/5658
Fixes https://github.com/curl/curl/issues/5712
Closes https://github.com/curl/curl/pull/5718
Jay Satiro (27 Jul 2020)
- [Tobias Stoeckmann brought this change]
mprintf: Fix stack overflows
Stack overflows can occur with precisions for integers and floats.
Proof of concepts:
- curl_mprintf("%d, %.*1$d", 500, 1);
- curl_mprintf("%d, %+0500.*1$f", 500, 1);
Ideally, compile with -fsanitize=address which makes this undefined
behavior a bit more defined for debug purposes.
The format strings are valid. The overflows occur due to invalid
arguments. If these arguments are variables with contents controlled
by an attacker, the function's stack can be corrupted.
Also see CVE-2016-9586 which partially fixed the float aspect.
Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Closes https://github.com/curl/curl/pull/5722
- [Tobias Stoeckmann brought this change]
mprintf: Fix dollar string handling
Verify that specified parameters are in range. If parameters are too
large, fail early on and avoid out of boundary accesses.
Also do not read behind boundaries of illegal format strings.
These are defensive measures since it is expected that format strings
are well-formed. Format strings should not be modifiable by user
input due to possible generic format string attacks.
Closes https://github.com/curl/curl/pull/5722
Daniel Stenberg (26 Jul 2020)
- ntlm: free target_info before (re-)malloc
OSS-Fuzz found a way this could get called again with the pointer still
pointing to a malloc'ed memory, leading to a leak.
Bug: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=24379
Closes #5724
Marcel Raad (26 Jul 2020)
- CI/macos: set minimum macOS version
This enables some deprecation warnings.
Previously, autotools defaulted to 10.8.
Closes https://github.com/curl/curl/pull/5723
Daniel Stenberg (26 Jul 2020)
- RELEASE-NOTES: synced
Marcel Raad (25 Jul 2020)
- CI/macos: enable warnings as errors for CMake builds
Closes https://github.com/curl/curl/pull/5716
- CMake: fix test for warning suppressions
GCC doesn't warn for unknown `-Wno-` options, except if there are other
warnings or errors [0]. This was problematic with `CURL_WERROR` as that
warning-as-error cannot be suppressed. Notably, this always happened
with `-Wno-pedantic-ms-format` when not targeting Windows. So test for
the positive form of the warning instead, which should always result in
a diagnostic if unknown.
[0] https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
Closes https://github.com/curl/curl/pull/5714
Jay Satiro (23 Jul 2020)
- curl.h: update CURLINFO_LASTONE
CURLINFO_LASTONE should have been updated when
CURLINFO_EFFECTIVE_METHOD was added.
Reported-by: xwxbug@users.noreply.github.com
Fixes https://github.com/curl/curl/issues/5711
Marc Hoersken (22 Jul 2020)
- CI/azure: unconditionally enable warnings-as-errors with autotools
Reviewed-by: Marcel Raad
Follow up to #5694
Closes #5706
Marcel Raad (21 Jul 2020)
- doh: remove redundant cast
Closes https://github.com/curl/curl/pull/5704
- CI/macos: unconditionally enable warnings-as-errors with autotools
Previously, warnings were only visible in the output for most jobs.
Closes https://github.com/curl/curl/pull/5694
- util: silence conversion warnings
timeval::tv_usec might be a 32-bit integer and timespec::tv_nsec might
be a 64-bit integer. This is the case when building for recent macOS
versions, for example. Just treat tv_usec as an int, which should
hopefully always be sufficient on systems with
`HAVE_CLOCK_GETTIME_MONOTONIC`.
Closes https://github.com/curl/curl/pull/5695
- md(4|5): don't use deprecated macOS functions
They are marked as deprecated for -mmacosx-version-min >= 10.15,
which might result in warnings-as-errors.
Closes https://github.com/curl/curl/pull/5695
Daniel Stenberg (18 Jul 2020)
- strdup: remove the odd strlen check
It confuses code analyzers with its use of -1 for unsigned value. Also,
a check that's not normally used in strdup() code - and not necessary.
Closes #5697
- [Alessandro Ghedini brought this change]
travis: update quiche builds for new boringssl layout
This is required after https://github.com/cloudflare/quiche/pull/593
moved BoringSSL around slightly.
This also means that Go is not needed to build BoringSSL anymore (the
one provided by quiche anyway).
Closes #5691
Marcel Raad (17 Jul 2020)
- configure: allow disabling warnings
When using `--enable-warnings`, it was not possible to disable warnings
via CFLAGS that got explicitly enabled. Now warnings are not enabled
anymore if they are explicitly disabled (or enabled) in CFLAGS. This
works for at least GCC, clang, and TCC as they have corresponding
`-Wno-` options for every warning.
Closes https://github.com/curl/curl/pull/5689
Daniel Stenberg (16 Jul 2020)
- ngtcp2: adjust to recent sockaddr updates
Closes #5690
- page-header: provide protocol details in the curl.1 man page
Add protocol and version specific information about all protocols curl
supports.
Fixes #5679
Reported-by: tbugfinder on github
Closes #5686
Daniel Gustafsson (16 Jul 2020)
- docs: Update a few leftover mentions of DarwinSSL
Commit 76a9c3c4be10b3d4d379d5b23ca76806bbae536a renamed DarwinSSL to the
more correct/common name Secure Transport, but a few mentions in the docs
remained.
Closes #5688
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
Daniel Stenberg (16 Jul 2020)
- file2memory: use a define instead of -1 unsigned value
... to use the maximum value for 'size_t' when detecting integer overflow.
Changed the limit to max/4 as already that seems unreasonably large.
Codacy didn't like the previous approach.
Closes #5683
- CURL_PUSH_ERROROUT: allow the push callback to fail the parent stream
... by adding support for a new dedicated return code.
Suggested-by: Jonathan Cardoso
Assisted-by: Erik Johansson
URL: https://curl.haxx.se/mail/lib-2020-06/0099.html
Closes #5636
- [Baruch Siach brought this change]
nss: fix build with disabled proxy support
Avoid reference to fields that do not exist when CURL_DISABLE_PROXY is
defined.
Closes #5667
- test1139: make it display the difference on test failures
- test1119: verify stdout in the test
So that failures will be displayed in the terminal, as it makes test failures
visually displayed easier and faster.
Closes #5644
- curl: add %{method} to the -w variables
Gets the CURLINFO_EFFECTIVE_METHOD from libcurl.
Added test 1197 to verify.
- CURLINFO_EFFECTIVE_METHOD: added
Provide the HTTP method that was used on the latest request, which might
be relevant for users when there was one or more redirects involved.
Closes #5511
Viktor Szakats (14 Jul 2020)
- windows: add unicode to feature list
Reviewed-by: Marcel Raad
Reviewed-by: Marc Hörsken
Closes #5491
Daniel Stenberg (14 Jul 2020)
- multi: remove two checks always true
Detected by Codacy
Closes #5676
Marc Hoersken (13 Jul 2020)
- workflows: limit what branches to run CodeQL on
Align CodeQL action with existing CI actions:
- Update branch filter to avoid duplicate CI runs.
- Shorten workflow name due to informative job name.
Reviewed-by: Daniel Stenberg
Closes #5660
- appveyor: collect libcurl.dll variants with prefix or suffix
On some platforms libcurl is build with a platform-specific
prefix and/or a version number suffix.
Assisted-by: Jay Satiro
Closes #5659
Daniel Stenberg (12 Jul 2020)
- [ihsinme brought this change]
socks: use size_t for size variable
Use the unsigned type (size_t) in the arithmetic of pointers. In this
context, the signed type (ssize_t) is used unnecessarily.
Authored-by: ihsinme on github
Closes #5654
- RELEASE-NOTES: synced
... and bumped to 7.72.0 as the next release version number
- [Gilles Vollant brought this change]
content_encoding: add zstd decoding support
include zstd curl patch for Makefile.m32 from vszakats
and include Add CMake support for zstd from Peter Wu
Helped-by: Viktor Szakats
Helped-by: Peter Wu
Closes #5453
- asyn.h: remove the Curl_resolver_getsock define
- not used
- used the wrong number of arguments
- confused the Codeacy code analyzer
Closes #5647
- [Nicolas Sterchele brought this change]
configure.ac: Sort features name in summary
- Same as protocols
Closes #5656
- [Matthias Naegler brought this change]
cmake: fix windows xp build
Reviewed-by: Marcel Raad
Closes #5662
- ngtcp2: update to modified qlog callback prototype
Closes #5675
- transfer: fix memory-leak with CURLOPT_CURLU in a duped handle
Added test case 674 to reproduce and verify the bug report.
Fixes #5665
Reported-by: NobodyXu on github
Closes #5673
- [Baruch Siach brought this change]
bearssl: fix build with disabled proxy support
Avoid reference to fields that do not exist when CURL_DISABLE_PROXY is
defined.
Reviewed-by: Nicolas Sterchele
Closes #5666
- RELEASE-NOTES: synced
Jay Satiro (11 Jul 2020)
- [Carlo Marcelo Arenas Belón brought this change]
cirrus-ci: upgrade 11-STABLE to 11.4
Meant to be the last of the 11 series and so make sure that all
other references reflect all 11 versions so they can be retired
together later.
Closes https://github.com/curl/curl/pull/5668
- [Filip Salomonsson brought this change]
CURLINFO_CERTINFO.3: fix typo
Closes https://github.com/curl/curl/pull/5655
Daniel Stenberg (4 Jul 2020)
- http2: only do the *done() cleanups for HTTP
Follow-up to ef86daf4d3
Closes #5650
Fixes #5646
- [Alex Kiernan brought this change]
gnutls: repair the build with `CURL_DISABLE_PROXY`
`http_proxy`/`proxy_ssl`/`tunnel_proxy` will not be available in `conn`
if `CURL_DISABLE_PROXY` is enabled. Repair the build with that
configuration.
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Closes #5645
Alex Kiernan (3 Jul 2020)
- gnutls: Fetch backend when using proxy
Fixes: 89865c149 ("gnutls: remove the BACKEND define kludge")
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Daniel Stenberg (3 Jul 2020)
- [Laramie Leavitt brought this change]
http2: close the http2 connection when no more requests may be sent
Well-behaving HTTP2 servers send two GOAWAY messages. The first
message is a warning that indicates that the server is going to
stop accepting streams. The second one actually closes the stream.
nghttp2 reports this state (and the other state of no more stream
identifiers) via the call nghttp2_session_check_request_allowed().
In this state the client should not create more streams on the
session (tcp connection), and in curl this means that the server
has requested that the connection is closed.
It would be also be possible to put the connclose() call into the
on_http2_frame_recv() function that triggers on the GOAWAY message.
This fixes a bug seen when the client sees the following sequence of
frames:
// advisory GOAWAY
HTTP2 GOAWAY [stream-id = 0, promised-stream-id = -1]
... some additional frames
// final GOAWAY
HTTP2 GOAWAY [stream-id = 0, promised-stream-id = N ]
Before this change, curl will attempt to reuse the connection even
after the last stream, will encounter this error:
* Found bundle for host localhost: 0x5595f0a694e0 [can multiplex]
* Re-using existing connection! (#0) with host localhost
* Connected to localhost (::1) port 10443 (#0)
* Using Stream ID: 9 (easy handle 0x5595f0a72e30)
> GET /index.html?5 HTTP/2
> Host: localhost:10443
> user-agent: curl/7.68.0
> accept: */*
>
* stopped the pause stream!
* Connection #0 to host localhost left intact
curl: (16) Error in the HTTP2 framing layer
This error may posion the connection cache, causing future requests
which resolve to the same curl connection to go through the same error
path.
Closes #5643
- ftpserver: don't verify SMTP MAIL FROM names
Rely on tests asking the names to get refused instead - test servers
should be as dumb as possible. Edited test 914, 955 and 959 accordingly.
Closes #5639
- curl_version_info.3: CURL_VERSION_KERBEROS4 is deprecated
This came up in #5640. It make sense to clarify this in the docs!
Reminded-by: Kamil Dudka
Closes #5642
Kamil Dudka (3 Jul 2020)
- tool_getparam: make --krb option work again
It was disabled by mistake in commit curl-7_37_1-23-ge38ba4301.
Bug: https://bugzilla.redhat.com/1833193
Closes #5640
Daniel Stenberg (2 Jul 2020)
- [Jeremy Maitin-Shepard brought this change]
http2: fix nghttp2_strerror -> nghttp2_http2_strerror in debug messages
Confusingly, nghttp2 has two different error code enums:
- nghttp2_error, to be used with nghttp2_strerror
- nghttp2_error_code, to be used with nghttp2_http2_strerror
Closes #5641
Marcel Raad (2 Jul 2020)
- url: silence MSVC warning
Since commit f3d501dc678, if proxy support is disabled, MSVC warns:
url.c : warning C4701: potentially uninitialized local variable
'hostaddr' used
url.c : error C4703: potentially uninitialized local pointer variable
'hostaddr' used
That could actually only happen if both `conn->bits.proxy` and
`CURL_DISABLE_PROXY` were enabled.
Initialize it to NULL to silence the warning.
Closes https://github.com/curl/curl/pull/5638
Daniel Stenberg (1 Jul 2020)
- RELEASE-NOTES: synced
Version 7.71.1 (30 Jun 2020)
Daniel Stenberg (30 Jun 2020)
- RELEASE-NOTES: curl 7.71.1
- THANKS: add contributors to 7.71.1
- scripts/copyright.pl: skip .dcignore
- Revert "multi: implement wait using winsock events"
This reverts commit 8bc25c590e530de87595d1bb3577f699eb1309b9.
That commit (from #5397) introduced a regression in 7.71.0.
Reported-by: tmkk on github
Fixes #5631
Closes #5632
- TODO: Add flag to specify download directory
- TODO: return code to CURLMOPT_PUSHFUNCTION to fail connection
- cirrus-ci: disable FreeBSD 13 (again)
It has been failing for a good while again. This time we better leave it
disabled until we have more reason to believe it behaves.
Closes #5628
- ngtcp2: sync with current master
ngtcp2 added two new callbacks
Reported-by: Lucien Zürcher
Fixes #5624
Closes #5627
- examples/multithread.c: call curl_global_cleanup()
Reported-by: qiandu2006 on github
Fixes #5622
Closes #5623
- vtls: compare cert blob when finding a connection to reuse
Reported-by: Gergely Nagy
Fixes #5617
Closes #5619
- RELEASE-NOTES: synced
- terminology: call them null-terminated strings
Updated terminology in docs, comments and phrases to refer to C strings
as "null-terminated". Done to unify with how most other C oriented docs
refer of them and what users in general seem to prefer (based on a
single highly unscientific poll on twitter).
Reported-by: coinhubs on github
Fixes #5598
Closes #5608
- http: fix proxy auth with blank password
Regression in 7.71.0
Added test case 346 to verify.
Reported-by: Kristoffer Gleditsch
Fixes #5613
Closes #5616
- .dcignore: ignore tests and docs directories
This is a config file for deepcode.ai, a static code analyzer.
Jay Satiro (26 Jun 2020)
- tool_cb_hdr: Fix etag warning output and return code
- Return 'failure' on failure, to follow the existing style.
- Put Warning: and the warning message on the same line.
Ref: https://github.com/curl/curl/issues/5610
Closes https://github.com/curl/curl/pull/5612
Daniel Stenberg (26 Jun 2020)
- CURLOPT_READFUNCTION.3: provide the upload data size up front
Assisted-by: Jay Satiro
Closes #5607
- test1539: do a HTTP 1.0 POST without a set size (fails)
Attempt to reproduce #5593. Test case 1514 is very similar but uses
HTTP/1.1 and thus switches to chunked.
Closes #5595
- [Baruch Siach brought this change]
mbedtls: fix build with disabled proxy support
Don't reference fields that do not exist. Fixes build failure:
vtls/mbedtls.c: In function 'mbed_connect_step1':
vtls/mbedtls.c:249:54: error: 'struct connectdata' has no member named 'http_proxy'
Closes #5615
- codeql-analysis.yml: fix the 'languages' setting
It needs a 'with:' in front of it.
GitHub (26 Jun 2020)
- [Daniel Stenberg brought this change]
gtihub: codeql-analysis.yml
enables code security scanning with github actions
Daniel Stenberg (25 Jun 2020)
- tests: verify newline in username and password for HTTP
test 1296 is a simply command line test
test 1910 is a libcurl test including a redirect
- url: allow user + password to contain "control codes" for HTTP(S)
Reported-by: Jon Johnson Jr
Fixes #5582
Closes #5592
- escape: make the URL decode able to reject only %00 bytes
... or all "control codes" or nothing.
Assisted-by: Nicolas Sterchele
- http2: set the correct URL in pushed transfers
...previously CURLINFO_EFFECTIVE_URL would report the URL of the
original "mother transfer", not the actually pushed resource.
Reported-by: Jonathan Cardoso Machado
Fixes #5589
Closes #5591
Jay Satiro (25 Jun 2020)
- [Javier Blazquez brought this change]
openssl: Fix compilation on Windows when ngtcp2 is enabled
- Include wincrypt before OpenSSL includes so that the latter can
properly handle any conflicts between the two.
Closes https://github.com/curl/curl/pull/5606
Daniel Stenberg (25 Jun 2020)
- test543: extended to verify zero length input
As was reported in #5601
- escape: zero length input should return a zero length output
Regression added in 7.71.0.
Fixes #5601
Reported-by: Kristoffer Gleditsch
Closes #5602
- Curl_inet_ntop: always check the return code
Reported-by: Siva Sivaraman
Fixes #5412
Closes #5597
- sendf: improve the message on client write errors
Replace "Failed writing body (X != Y)" with
"Failure writing output to destination". Possibly slightly less cryptic.
Reported-by: coinhubs on github
Fixes #5594
Closes #5596
- RELEASE-NOTES: synced
- curlver: start working on 7.71.1
- [Denis Baručić brought this change]
DYNBUF.md: fix a typo: trail => tail
Closes #5599
Version 7.71.0 (23 Jun 2020)
Daniel Stenberg (23 Jun 2020)
- RELEASE-NOTES: curl 7.71.0 release
- THANKS: curl 7.71.0 additions
- url: make sure pushed streams get an allocated download buffer
Follow-up to c4e6968127e876b0
When a new transfer is created, as a resuly of an acknowledged push,
that transfer needs a download buffer allocated.
Closes #5590
Jay Satiro (22 Jun 2020)
- openssl: Don't ignore CA paths when using Windows CA store
This commit changes the behavior of CURLSSLOPT_NATIVE_CA so that it does
not override CURLOPT_CAINFO / CURLOPT_CAPATH, or the hardcoded default
locations. Instead the CA store can now be used at the same time.
The change is due to the impending release. The issue is still being
discussed. The behavior of CURLSSLOPT_NATIVE_CA is subject to change and
is now documented as experimental.
Ref: bc052cc (parent commit)
Ref: https://github.com/curl/curl/issues/5585
- tool_operate: Don't use Windows CA store as a fallback
Background:
148534d added CURLSSLOPT_NATIVE_CA to use the Windows OS certificate
store in libcurl w/ OpenSSL on Windows. CURLSSLOPT_NATIVE_CA overrides
CURLOPT_CAINFO if both are set. The curl tool will fall back to
CURLSSLOPT_NATIVE_CA if it could not find a certificate bundle to set
via CURLOPT_CAINFO.
Problem:
libcurl may be built with hardcoded paths to a certificate bundle or
directory, and if CURLSSLOPT_NATIVE_CA is used then those paths are
ignored.
Solution:
A solution is still being discussed but since there's an impending
release this commit removes using CURLSSLOPT_NATIVE_CA in the curl tool.
Ref: https://github.com/curl/curl/issues/5585
- openssl: Fix CA fallback logic for OpenSSL 3.0 build
Prior to this change I assume a build error would occur when
CURL_CA_FALLBACK was used.
Closes https://github.com/curl/curl/pull/5587
Daniel Stenberg (22 Jun 2020)
- copyright: update mismatched copyright years
- test1460: verify that -Ji is not ok
- tool_getparam: -i is not OK if -J is used
Reported-by: sn on hackerone
Bug: https://curl.haxx.se/docs/CVE-2020-8177.html
- [Peter Wu brought this change]
CMake: ignore INTERFACE_LIBRARY targets for pkg-config file
Reviewed-by: Marcel Raad
Fixes #5512
Closes #5517
- [Valentyn Korniienko brought this change]
multibyte: Fixed access-> waccess to file for Windows Plarform
Reviewed-by: Marcel Raad
Closes #5580
- altsvc: bump to h3-29
Closes #5584
- urlglob: treat literal IPv6 addresses with zone IDs as a host name
... and not as a "glob". Now done by passing the supposed host to the
URL parser which supposedly will do a better job at identifying "real"
numerical IPv6 addresses.
Reported-by: puckipedia on github
Fixes #5576
Closes #5579
- test1179: verify error message for non-existing cmdline option
- tool_getparam: repair the error message for unknown flag
Follow-up to 9e5669f3880674
Detected by Coverity CID 1464582 ("Logically dead code")
Closes #5577
- FILEFORMAT: describe verify/stderr
- connect: improve happy eyeballs handling
For QUIC but also for regular TCP when the second family runs out of IPs
with a failure while the first family is still trying to connect.
Separated the timeout handling for IPv4 and IPv6 connections when they
both have a number of addresses to iterate over.
- ngtcp2: never call fprintf() in lib code in release version
- ngtcp2: fix happy eyeballs quic connect crash
Reported-by: Peter Wu
Fixes #5565
Closes #5568
- select: remove the unused ELAPSED_MS() macro
Closes #5573
Marc Hoersken (17 Jun 2020)
- [rcombs brought this change]
multi: implement wait using winsock events
This avoids using a pair of TCP ports to provide wakeup functionality
for every multi instance on Windows, where socketpair() is emulated
using a TCP socket on loopback which could in turn lead to socket
resource exhaustion.
Reviewed-by: Gergely Nagy
Reviewed-by: Marc Hörsken
Closes #5397
Daniel Stenberg (17 Jun 2020)
- manpage: add three missing environment variables
CURL_SSL_BACKEND, QLOGDIR and SSLKEYLOGFILE
Closes #5571
- RELEASE-NOTES: synced
- configure: for wolfSSL, check for the DES func needed for NTLM
Also adds pkg-config support for the wolfSSL detection.
- [Ruurd Beerstra brought this change]
ntlm: enable NTLM support with wolfSSL
When wolfSSL is built with its OpenSSL API layer, it fetures the same DES*
functions that OpenSSL has. This change take advantage of that.
Co-authored-by: Daniel Stenberg
Closes #5556
Fixes #5548
- http: move header storage to Curl_easy from connectdata
Since the connection can be used by many independent requests (using
HTTP/2 or HTTP/3), things like user-agent and other transfer-specific
data MUST NOT be kept connection oriented as it could lead to requests
getting the wrong string for their requests. This struct data was
lingering like this due to old HTTP1 legacy thinking where it didn't
mattered..
Fixes #5566
Closes #5567
- CODE_REVIEW.md: how to do code reviews in curl
Assisted-by: Daniel Gustafsson
Assisted-by: Rich Salz
Assisted-by: Hugo van Kemenade
Assisted-by: James Fuller
Assisted-by: Marc Hörsken
Assisted-by: Jay Satiro
Closes #5555
- altsvc: remove the num field from the altsvc struct
It was superfluous since we have the list.size alredy
Reported-by: Jay Satiro
Fixes #5553
Closes #5563
- version.d: expanded and alpha-sorted
Added a few missing features not previously mentioned. Ordered them
alphabetically.
Closes #5558
- ABI.md: rename to .md and polish the markdown
Closes #5562
- HELP-US: add a section for "smaller tasks"
The point of this section is to meet the CII Best Practices gold level
critera:
"The project MUST clearly identify small tasks that can be performed by
new or casual contributors"
Closes #5560
- TODO: retry on the redirected-to URL
Closes #5462
- mailmap: Nicolas Sterchele
- [Nicolas Sterchele brought this change]
TODO: remove 19.3 section title
Follow-up to ad6416986755e417c66e2c6, which caused wrong formatting on
curl documentation website
Closes #5561
- [Martin V brought this change]
test1560: avoid possibly negative association in wording
Closes #5549
- share: don't set the share flag it something fails
When asking for a specific feature to be shared in the share object,
that bit was previously set unconditionally even if the shared feature
failed or otherwise wouldn't work.
Closes #5554
- buildconf: remove -print from the find command that removes files
It's just too annoying and unnecessary to get a long list of files shown
- RELEASE-NOTES: synced
- wording: avoid blacklist/whitelist stereotypes
Instead of discussing if there's value or meaning (implied or not) in
the colors, let's use words without the same possibly negative
associations.
Closes #5546
Jay Satiro (9 Jun 2020)
- tool_getparam: fix memory leak in parse_args
Prior to this change in Windows Unicode builds most parsed options would
not be freed.
Found using _CrtDumpMemoryLeaks().
Ref: https://github.com/curl/curl/issues/5545
Daniel Stenberg (8 Jun 2020)
- socks: detect connection close during handshake
The SOCKS4/5 state machines weren't properly terminated when the proxy
connection got closed, leading to a busy-loop.
Reported-By: zloi-user on github
Fixes #5532
Closes #5542
- [James Fuller brought this change]
multi: add defensive check on data->multi->num_alive
Closes #5540
- Curl_addrinfo: use one malloc instead of three
To reduce the amount of allocations needed for creating a Curl_addrinfo
struct, make a single larger malloc instead of three separate smaller
ones.
Closes #5533
- [Alessandro Ghedini brought this change]
quiche: update SSLKEYLOGFILE support
quiche now requires the application to explicitly set the keylog path
for each connection, rather than reading the environment variable
itself.
Closes #5541
- tests: add two simple tests for --login-options
Test 895 and 896 - as a follow-up to a3e972313b
Closes #5539
- ngtcp2: update with recent API changes
Syncs with ngtcp2 commit 7e9a917d386d98 merged June 7 2020.
Assisted-by: Tatsuhiro Tsujikawa
Closes #5538
- [James Fuller brought this change]
socks: remove unreachable breaks in socks.c and mime.c
Closes #5537
- tool_cfgable: free login_options at exit
Memory leak
Reported-by: Geeknik Labs
Fixes #5535
Closes #5536
- libssh2: keep sftp errors as 'unsigned long'
Remove weird work-around for storing the SFTP errors as int instead of
the "unsigned long" that libssh2 actually returns for SFTP errors.
Closes #5534
Marc Hoersken (6 Jun 2020)
- timeouts: move ms timeouts to timediff_t from int and long
Now that all functions in select.[ch] take timediff_t instead
of the limited int or long, we can remove type conversions
and related preprocessor checks to silence compiler warnings.
Avoiding conversions from time_t was already done in 842f73de.
Based upon #5262
Supersedes #5214, #5220 and #5221
Follow up to #5343 and #5479
Closes #5490
Daniel Stenberg (6 Jun 2020)
- [François Rigault brought this change]
openssl: set FLAG_TRUSTED_FIRST unconditionally
On some systems, openssl 1.0.x is still the default, but it has been
patched to contain all the recent security fixes. As a result of this
patching, it is possible for macro X509_V_FLAG_NO_ALT_CHAINS to be
defined, while the previous behavior of openssl to not look at trusted
chains first, remains.
Fix it: ensure X509_V_FLAG_TRUSTED_FIRST is always set, do not try to
probe for the behavior of openssl based on the existence ofmacros.
Closes #5530
- server/util: fix logmsg format using curl_off_t argument
... this caused segfaults on armv7.
Regression added in dd0365d560aea5a (7.70.0)
Reviewed-by: Jay Satiro
Closes #5529
- RELEASE-NOTES: synced
- [Cherish98 brought this change]
socks: fix expected length of SOCKS5 reply
Commit 4a4b63d forgot to set the expected SOCKS5 reply length when the
reply ATYP is X'01'. This resulted in erroneously expecting more bytes
when the request length is greater than the reply length (e.g., when
remotely resolving the hostname).
Closes #5527
Marc Hoersken (5 Jun 2020)
- .gitignore: add directory containing the stats repo
Since the new curl/stats repository is designed to be
checked out into the curl repository working tree as stats/
it should be on the ignore list to aid in commit staging.
Daniel Stenberg (5 Jun 2020)
- [Adnan Khan brought this change]
HTTP3.md: clarify cargo build directory
Cargo needs to be called from within the 'quiche' directory.
Closes #5522
- user-agent.d: spell out what happens given a blank argument
Closes #5525
- trailers: switch h1-trailer logic to use dynbuf
In the continued effort to remove "manual" realloc schemes.
Closes #5524
- CURLINFO_ACTIVESOCKET.3: clarify the description
Reported-by: Jay Satiro
Fixes #5299
Closes #5520
- mailmap: Don J Olmstead
- configure: only strip first -L from LDFLAGS
In the logic that works out if a given OpenSSL path works, it stripped
off a possibly leading -L flag using an incorrect sed pattern which
would remove all instances of -L in the string, including if the path
itself contained that two-letter sequence!
The same pattern was used and is now updated in multiple places. Now it
only removes -L if it starts the strings.
Reported-by: Mohamed Osama
Fixes #5519
Closes #5521
Peter Wu (4 Jun 2020)
- quiche: advertise draft 28 support
Fix the verbose message while at it, quiche currently supports draft
27 and draft 28 simultaneously.
Closes #5518
Daniel Stenberg (4 Jun 2020)
- KNOWN_BUGS: RTSP authentication breaks without redirect support
Closes #4750
Jay Satiro (4 Jun 2020)
- projects: Add crypt32.lib to dependencies for all OpenSSL configs
Windows project configurations that use OpenSSL with USE_WIN32_CRYPTO
need crypt32.
Follow-up to 148534d which added CURLSSLOPT_NATIVE_CA for 7.71.0.
The changes that are in this commit were made by script.
Ref: https://gist.github.com/jay/a1861b50ecce2b32931237180f856e28
Closes https://github.com/curl/curl/pull/5516
Marc Hoersken (3 Jun 2020)
- CI/macos: fix 'is already installed' errors by using bundle
Avoid failing CI builds due to nghttp2 being already installed.
Closes #5513
Daniel Stenberg (3 Jun 2020)
- altsvc: fix 'dsthost' may be used uninitialized in this function
- RELEASE-NOTES: synced
- urldata: let the HTTP method be in the set.* struct
When the method is updated inside libcurl we must still not change the
method as set by the user as then repeated transfers with that same
handle might not execute the same operation anymore!
This fixes the libcurl part of #5462
Test 1633 added to verify.
Closes #5499
- hostip: fix the memory-leak introduced in 67d2802
Fixes #5503
Closes #5504
- test970: make it require proxy support
This test verifies the -w %json output and the test case includes a full
generated "blob". If there's no proxy support built into libcurl, it
will return an error for proxy related info variables and they will not
be included in the json, thus causing a mismatch and this test fails.
Reported-by: Marc Hörsken
Fixes #5501
Closes #5502
- [Radoslav Georgiev brought this change]
examples/http2-down/upload: add error checks
If `index.html` does not exist in the directory from which the example
is invoked, the fopen(upload, "rb") invocation in `setup` would fail,
returning NULL. This value is subsequently passed as the FILE* argument
of the `fread` invocation in the `read_callback` function, which is the
actual cause of the crash (apparently `fread` assumes that argument to
be non-null).
In addition, mitigate some possible crashes of similar origin.
Closes #5463
- [kotoriのねこ brought this change]
examples/ephiperfifo: turn off interval when setting timerfd
Reported-by: therealhirudo on github
Fixes #5485
Closes #5497
- [Saleem Abdulrasool brought this change]
vtls: repair the build with `CURL_DISABLE_PROXY`
`http_proxy` will not be available in `conndata` if `CURL_DISABLE_PROXY`
is enabled. Repair the build with that configuration.
Follow-up to f3d501dc67
Closes #5498
- transfer: remove k->str NULL check
"Null-checking k->str suggests that it may be null, but it has already
been dereferenced on all paths leading to the check" - and it can't
legally be NULL at this point. Remove check.
Detected by Coverity CID 1463884
Closes #5495
Marc Hoersken (1 Jun 2020)
- select: always use Sleep in Curl_wait_ms on Win32
Since Win32 almost always will also have USE_WINSOCK,
we can reduce complexity and always use Sleep there.
Assisted-by: Jay Satiro
Reviewed-by: Daniel Stenberg
Follow up to #5343
Closes #5489
Daniel Stenberg (31 May 2020)
- conncache: download buffer needs +1 size for trailing zero
Follow-up to c4e6968127e
Detected by OSS-Fuzz: https://oss-fuzz.com/testcase-detail/5727799779524608
Marc Hoersken (31 May 2020)
- azure: use matrix strategy to avoid configuration redundancy
This also includes the following changes:
- Use the same timeout for all jobs on Linux (60 minutes)
and Windows (90 minutes)
- Use CLI stable apt-get install -y instead of apt install
which warns about that and run apt-get update first
- Enable MQTT for Windows msys2 builds instead of
legacy msys1 builds
- Add ./configure --prefix parameter to the msys2 builds
- The MSYSTEM environment variable is now preset inside
the container images for the msys2 builds
Note: on Azure Pipelines the matrix strategy is basically
just a simple list of job copies and not really a matrix.
Closes #5468
Daniel Stenberg (30 May 2020)
- build: disable more code/data when built without proxy support
Added build to travis to verify
Closes #5466
- url: alloc the download buffer at transfer start
... and free it as soon as the transfer is done. It removes the extra
alloc when a new size is set with setopt() and reduces memory for unused
easy handles.
In addition: the closure_handle now doesn't use an allocated buffer at
all but the smallest supported size as a stack based one.
Closes #5472
- timeouts: change millisecond timeouts to timediff_t from time_t
For millisecond timers we like timediff_t better. Also, time_t can be
unsigned so returning a negative value doesn't work then.
Closes #5479
Marc Hoersken (30 May 2020)
- select: add overflow checks for timeval conversions
Using time_t and suseconds_t if suseconds_t is available,
long on Windows (maybe others in the future) and int elsewhere.
Also handle case of ULONG_MAX being greater or equal to INFINITE.
Assisted-by: Jay Satiro
Reviewed-by: Daniel Stenberg
Part of #5343
- select: use timediff_t instead of time_t and int for timeout_ms
Make all functions in select.[ch] take timeout_ms as timediff_t
which should always be large enough and signed on all platforms
to take all possible timeout values and avoid type conversions.
Reviewed-by: Jay Satiro
Reviewed-by: Daniel Stenberg
Replaces #5107 and partially #5262
Related to #5240 and #5286
Closes #5343
- unit1604.c: fix implicit conv from 'SANITIZEcode' to 'CURLcode'
GCC 10 warns about this with warning: implicit conversion
from 'SANITIZEcode' to 'CURLcode' [-Wenum-conversion]
Since 'expected_result' is not really of type 'CURLcode' and
it is not exposed in any way, we can just use 'SANITIZEcode'.
Reviewed-by: Daniel Stenberg
Reviewed-by: Marcel Raad
Closes #5476
- tests/libtest: fix undefined reference to 'curlx_win32_fopen'
Since curl_setup.h now makes use of curlx_win32_fopen for Win32
builds with USE_WIN32_LARGE_FILES or USE_WIN32_SMALL_FILES defined,
we need to include the relevant files for tests using fopen,
because the libtest sources are also including curl_setup.h
Reviewed-by: Marcel Raad
Reviewed-by: Daniel Stenberg
Follow up to #3784 (ffdddb45d9)
Closes #5475
- appveyor: add non-debug plain autotools-based build
This should enable us to catch linking issues with the
testsuite early, like the one described/fixed in #5475.
Reviewed-by: Daniel Stenberg
Reviewed-by: Marcel Raad
Closes #5477
Daniel Stenberg (29 May 2020)
- RELEASE-NOTES: synced
- Revert "buildconf: use find -execdir"
This partially reverts commit c712009838f44211958854de431315586995bc61.
Keep the ares_ files removed but bring back the older way to run find,
to make it work with busybox's find, as apparently that's being used.
Reported-by: Max Peal
Fixes #5483
Closes #5484
- server/sws: fix asan warning on use of uninitialized variable
- libssh2: improved error output for wrong quote syntax
Reported-by: Werner Stolz
Closes #5474
- mk-lib1521: generate code for testing BLOB options as well
Follow-up to cac5374298b3
Closes #5478
- configure: repair the check if argv can be written to
Due to bad escaping of the test code, the test wouldn't build and thus
result in a negative test result, which would lead to the unconditional
assumption that overwriting the arguments doesn't work and thus curl
would never hide credentials given in the command line, even when it
would otherwise be possible.
Regression from commit 2d4c2152c (7.60.0)
Reported-by: huzunhao on github
Fixes #5470
Closes #5471
Peter Wu (28 May 2020)
- CMake: rebuild Makefile.inc.cmake when Makefile.inc changes
Otherwise the build might fail due to missing source files, as
demonstrated by the recent keylog.c addition on an existing build dir.
Closes #5469
Daniel Stenberg (28 May 2020)
- urldata: fix comments: Curl_done() is called multi_done() now
... since 575e885db
Peter Wu (27 May 2020)
- ngtcp2: use common key log routine for better thread-safety
Tested with ngtcp2 built against the OpenSSL library. Additionally
tested with MultiSSL (NSS for TLS and ngtcp2+OpenSSL for QUIC).
The TLS backend (independent of QUIC) may or may not already have opened
the keylog file before. Therefore Curl_tls_keylog_open is always called
to ensure the file is open.
- wolfssl: add SSLKEYLOGFILE support
Tested following the same curl and tshark commands as in commit
"vtls: Extract and simplify key log file handling from OpenSSL" using
WolfSSL v4.4.0-stable-128-g5179503e8 from git master built with
`./configure --enable-all --enable-debug CFLAGS=-DHAVE_SECRET_CALLBACK`.
Full support for this feature requires certain wolfSSL build options,
see "Availability note" in lib/vtls/wolfssl.c for details.
Closes #5327
- vtls: Extract and simplify key log file handling from OpenSSL
Create a set of routines for TLS key log file handling to enable reuse
with other TLS backends. Simplify the OpenSSL backend as follows:
- Drop the ENABLE_SSLKEYLOGFILE macro as it is unconditionally enabled.
- Do not perform dynamic memory allocation when preparing a log entry.
Unless the TLS specifications change we can suffice with a reasonable
fixed-size buffer.
- Simplify state tracking when SSL_CTX_set_keylog_callback is
unavailable. My original sslkeylog.c code included this tracking in
order to handle multiple calls to SSL_connect and detect new keys
after renegotiation (via SSL_read/SSL_write). For curl however we can
be sure that a single master secret eventually becomes available
after SSL_connect, so a simple flag is sufficient. An alternative to
the flag is examining SSL_state(), but this seems more complex and is
not pursued. Capturing keys after server renegotiation was already
unsupported in curl and remains unsupported.
Tested with curl built against OpenSSL 0.9.8zh, 1.0.2u, and 1.1.1f
(`SSLKEYLOGFILE=keys.txt curl -vkso /dev/null https://localhost:4433`)
against an OpenSSL 1.1.1f server configured with:
# Force non-TLSv1.3, use TLSv1.0 since 0.9.8 fails with 1.1 or 1.2
openssl s_server -www -tls1
# Likewise, but fail the server handshake.
openssl s_server -www -tls1 -Verify 2
# TLS 1.3 test. No need to test the failing server handshake.
openssl s_server -www -tls1_3
Verify that all secrets (1 for TLS 1.0, 4 for TLS 1.3) are correctly
written using Wireshark. For the first and third case, expect four
matches per connection (decrypted Server Finished, Client Finished, HTTP
Request, HTTP Response). For the second case where the handshake fails,
expect a decrypted Server Finished only.
tshark -i lo -pf tcp -otls.keylog_file:keys.txt -Tfields \
-eframe.number -eframe.time -etcp.stream -e_ws.col.Info \
-dtls.port==4433,http -ohttp.desegment_body:FALSE \
-Y 'tls.handshake.verify_data or http'
A single connection can easily be identified via the `tcp.stream` field.
Daniel Stenberg (27 May 2020)
- FILEFORMAT: add more features that tests can depend on
- [Michael Kaufmann brought this change]
transfer: close connection after excess data has been read
For HTTP 1.x, it's a protocol error when the server sends more bytes
than announced. If this happens, don't reuse the connection, because the
start position of the next response is undefined.
Closes #5440
- [Estanislau Augé-Pujadas brought this change]
Revert "ssh: ignore timeouts during disconnect"
This reverts commit f31760e63b4e9ef1eb25f8f211390f8239388515. Shipped in
curl 7.54.1.
Bug: https://curl.haxx.se/mail/lib-2020-05/0068.html
Closes #5465
- urldata: connect related booleans live in struct ConnectBits
And remove a few unused booleans!
Closes #5461
- hostip: on macOS avoid DoH when given a numerical IP address
When USE_RESOLVE_ON_IPS is set (defined on macOS), it means that
numerical IP addresses still need to get "resolved" - but not with DoH.
Reported-by: Viktor Szakats
Fixes #5454
Closes #5459
- ngtcp2: cleanup memory when failing to connect
Reported-by: Peter Wu
Fixes #5447 (the ngtcp2 side of it)
Closes #5451
- quiche: clean up memory properly when failing to connect
Addresses the quiche side of #5447
Reported-by: Peter Wu
Closes #5450
- cleanup: use a single space after equals sign in assignments
- url: accept "any length" credentials for proxy auth
They're only limited to the maximum string input restrictions, not to
256 bytes.
Added test 1178 to verify
Reported-by: Will Roberts
Fixes #5448
Closes #5449
- [Maksim Stsepanenka brought this change]
test1167: fixes in badsymbols.pl
Closes #5442
- altsvc: fix parser for lines ending with CRLF
Fixed the alt-svc parser to treat a newline as end of line.
The unit tests in test 1654 were done without CRLF and thus didn't quite
match the real world. Now they use CRLF as well.
Reported-by: Peter Wu
Assisted-by: Peter Wu
Assisted-by: Jay Satiro
Fixes #5445
Closes #5446
Viktor Szakats (25 May 2020)
- all: fix codespell errors
Reviewed-by: Jay Satiro
Reviewed-by: Daniel Stenberg
Closes https://github.com/curl/curl/pull/5452
Peter Wu (25 May 2020)
- ngtcp2: fix build with current ngtcp2 master implementing draft 28
Based on client.cc changes from ngtcp2. Tested with current git master,
ngtcp2 commit c77d5731ce92, nghttp3 commit 65ff479d4380.
Fixes #5444
Closes #5443
Daniel Stenberg (25 May 2020)
- RELEASE-NOTES: synced
moved the new setopts up to a "change"
- RELEASE-NOTES: synced
- copyright: updated year ranges out of sync
... and whitelisted a few more files in the the copyright.pl script.
- [Gilles Vollant brought this change]
setopt: add CURLOPT_PROXY_ISSUERCERT(_BLOB) for coherency
Closes #5431
- curl: remove -J "informational" written on stdout
curl would previously show "curl: Saved to filename 'name from header'"
if -J was used and a name was picked from the Content-Disposition
header. That output could interfer with other stdout output, such as -w.
This commit removes that output line.
Bug: https://curl.haxx.se/mail/archive-2020-05/0044.html
Reported-by: Коваленко Анатолий Викторович
Closes #5435
Peter Wu (22 May 2020)
- travis: simplify quiche build instructions wrt boringssl
quiche builds boringssl as static library, reuse that instead of
building another shared library.
Closes #5438
- configure: fix pthread check with static boringssl
A shared boringssl/OpenSSL library requires -lcrypto only for linking.
A static build additionally requires `-ldl -lpthread`. In the latter
case `-lpthread` is added to LIBS which prevented `-pthread` from being
added to CFLAGS. Clear LIBS to fix linking failures for libtest tests.
Daniel Stenberg (22 May 2020)
- Revert "sendf: make failf() use the mvsnprintf() return code"
This reverts commit 74623551f306990e70c7c5515b88972005604a74.
Instead mark the function call with (void). Getting the return code and
using it instead triggered Coverity warning CID 1463596 because
snprintf() can return a negative value...
Closes #5441
- typecheck-gcc.h: CURLINFO_PRIVATE does not need a 'char *'
Reported-by: Billyzou0741326 on github
Fixes #5432
Closes #5436
- tests/server/util.h: add extern to silence compiler warning
Follow-up from a3b0699d5c1
- typecheck-gcc.h: fix the OFF_T check
The option number also needs to be less than CURLOPTTYPE_BLOB.
Follow-up to cac5374298
Reported-by: Jeroen Ooms
Bug: https://github.com/curl/curl/pull/5365#issuecomment-631084114
- TODO: --dry-run
Closes #5426
- TODO: Ratelimit or wait between serial requests
Closes #5406
- tool_paramhlp: fixup C89 mistake
Follow-up to c5f0a9db22.
- [Siva Sivaraman brought this change]
tool_paramhlp: fixed potentially uninitialized strtol() variable
Seems highly unlikely to actually be possible, but better safe than
sorry.
Closes #5417
- [Siva Sivaraman brought this change]
tool_operate: fixed potentially uninitialized variables
... in curl_easy_getinfo() calls. They're harmless but clearing the
variables makes the code safer and comforts the reader.
Closes #5416
- sha256: move assign to the declaration line
Follow-up to fae30656. Should've been squashed with that commit...
- [Siva Sivaraman brought this change]
sha256: fixed potentially uninitialized variable
Closes #5414
- sendf: make failf() use the mvsnprintf() return code
... and avoid a strlen() call. Fixes a MonocleAI warning.
Reported-by: MonocleAI
Fixes #5413
Closes #5420
- hostip: make Curl_printable_address not return anything
It was not used much anyway and instead we let it store a blank buffer
in case of failure.
Reported-by: MonocleAI
Fixes #5411
Closes #5418
- ftp: mark return-ignoring calls to Curl_GetFTPResponse with (void)
They're done on purpose, make that visible in the code.
Reported-by: MonocleAI
Fixes #5412
Closes #549
- TODO: forbid TLS post-handshake auth and do TLS record padding
Closes #5396
Closes #5398
- RELEASE-NOTES: synced
- dynbuf: return NULL when there's no buffer length
... as returning a "" is not a good idea as the string is supposed to be
allocated and returning a const string will cause issues.
Reported-by: Brian Carpenter
Follow-up to ed35d6590e72c
Closes #5405
Peter Wu (16 May 2020)
- travis: upgrade to bionic, clang-9, improve readability
Changes, partially to reduce build failures from external dependencies:
- Upgrade Ubuntu and drop unnecessary third-party repos.
- Properly clone apt config to ensure retries.
- Upgrade to clang-9 from the standard repos.
- Use Ubuntu 20.04 focal for the libssh build, use of ssh_get_publickey
fails on -Werror=deprecated-declarations in Ubuntu 18.04. Do not use
focal everywhere yet since Travis CI has not documented this option.
In focal, python-impacket (Py2.7) has been removed, leaving only
python3-impacket. Since it is only needed for SMB tests and not SSH,
skip it for the libssh job since it might need more work.
- apt: Remove gcc-8 and libstdc++-8-dev, already installed via g++-8.
Non-functional cleanups:
- Simplify test matrix, drop redundant os and compiler keys.
- Deprecation fixes: remove sudo, rename matrix -> jobs.
- Every job has an 'env' key, put this key first in a list item.
Closes #5370
- travis: whitespace-only changes for consistency
Automatically apply a consistent indentation with:
python3 -c 'from ruamel.yaml import YAML;y=YAML();d=y.load(open(".travis.yml"));y.width=500;y.dump(d,open(".travis.yml.new","w"))'
followed by manually re-indenting three comments.
Closes #5370
- CMake: add libssh build support
Closes #5372
Daniel Stenberg (15 May 2020)
- KNOWN_BUGS: wolfssh: publickey auth doesn't work
Closes #4820
- KNOWN_BUGS: OS400 port requires deprecated IBM library
Closes #5176
- [Vyron Tsingaras brought this change]
http2: keep trying to send pending frames after req.upload_done
Fixes #1410
Closes #5401
- [Gilles Vollant brought this change]
setopt: support certificate options in memory with struct curl_blob
This change introduces a generic way to provide binary data in setopt
options, called BLOBs.
This change introduces these new setopts:
CURLOPT_ISSUERCERT_BLOB, CURLOPT_PROXY_SSLCERT_BLOB,
CURLOPT_PROXY_SSLKEY_BLOB, CURLOPT_SSLCERT_BLOB and CURLOPT_SSLKEY_BLOB.
Reviewed-by: Daniel Stenberg
Closes #5357
- source cleanup: remove all custom typedef structs
- Stick to a single unified way to use structs
- Make checksrc complain on 'typedef struct {'
- Allow them in tests, public headers and examples
- Let MD4_CTX, MD5_CTX, and SHA256_CTX typedefs remain as they actually
typedef different types/structs depending on build conditions.
Closes #5338
- travis: remove the .checksrc fiddling
- ftp: make domore_getsock() return the secondary socket properly
Previously, after PASV and immediately after the data connection has
connected, the function would only return the control socket to wait for
which then made the data connection simply timeout and not get polled
correctly. This become obvious when running test 1631 and 1632 event-
based.
- test1632: verify FTP through HTTPS-proxy with connection re-use
- test1631: verify FTP download through HTTPS-proxy
- sws: as last resort, get test number from server cmd file
If it can't be found in the request. Also support --cmdfile to set it to
a custom file name.
runtests.pl always writes this file with the test number in it since a
while back.
- ftp: shut down the secondary connection properly when SSL is used
Reported-by: Neal Poole
Fixes #5340
Closes #5385
Marcel Raad (14 May 2020)
- KNOWN_BUGS: adapt 5.5 to recent changes
It only applies to non-Unicode builds now.
Also merge 5.10 into it as it's effectively a duplicate.
Closes https://github.com/curl/curl/pull/3784
- curl_setup: support Unicode functions to open files on Windows
Use them only if `_UNICODE` is defined, in which case command-line
arguments have been converted to UTF-8.
Closes https://github.com/curl/curl/pull/3784
- tool: support UTF-16 command line on Windows
- use `wmain` instead of `main` when `_UNICODE` is defined [0]
- define `argv_item_t` as `wchar_t *` in this case
- use the curl_multibyte gear to convert the command-line arguments to
UTF-8
This makes it possible to pass parameters with characters outside of
the current locale on Windows, which is required for some tests, e.g.
the IDN tests. Out of the box, this currently only works with the
Visual Studio project files, which default to Unicode, and winbuild
with the `ENABLE_UNICODE` option.
[0] https://devblogs.microsoft.com/oldnewthing/?p=40643
Ref: https://github.com/curl/curl/issues/3747
Closes https://github.com/curl/curl/pull/3784
- curl_multibyte: add to curlx
This will also be needed in the tool and tests.
Ref: https://github.com/curl/curl/pull/3758#issuecomment-482197512
Closes https://github.com/curl/curl/pull/3784
Daniel Stenberg (14 May 2020)
- url: make the updated credentials URL-encoded in the URL
Found-by: Gregory Jefferis
Reported-by: Jeroen Ooms
Added test 1168 to verify. Bug spotted when doing a redirect.
Bug: https://github.com/jeroen/curl/issues/224
Closes #5400
- tests: add https-proxy support to the test suite
Initial test 1630 added with basic HTTPS-proxy use. HTTPS-proxy is like
HTTP proxy but with a full TLS connection to the proxy.
Closes #5399
- mailmap: James Fuller
- [Major_Tom brought this change]
vauth/cleartext: fix theoretical integer overflow
Fix theoretical integer overflow in Curl_auth_create_plain_message.
The security impact of the overflow was discussed on hackerone. We
agreed this is more of a theoretical vulnerability, as the integer
overflow would only be triggerable on systems using 32-bits size_t with
over 4GB of available memory space for the process.
Closes #5391
Jay Satiro (13 May 2020)
- curl.1: Quote globbed URLs
- Quote the globbing example URLs that contain characters [] {} since
otherwise they may be interpreted as shell metacharacters.
Bug: https://github.com/curl/curl/issues/5388
Reported-by: John Simpson
Closes https://github.com/curl/curl/pull/5394
Daniel Stenberg (14 May 2020)
- checksrc: enhance the ASTERISKSPACE and update code accordingly
Fine: "struct hello *world"
Not fine: "struct hello* world" (and variations)
Closes #5386
- docs/options-in-versions: which version added each cmdline option
Added test 971 to verify that the list is in sync with the files in
cmdline-opts. The check also verifies that .d-files that uses Added:
specify the same version number as the options-in-versions file does.
Closes #5381
- docs: unify protocol lists
We boast support for 25 transfer protocols. Make sure the lists are
consistent
Closes #5384
|