From 512a73ef7e40be5ec95604bd7a7a41455008f84a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 12 Apr 2024 10:32:35 +0200 Subject: Merging debian version 2.4.59-1. Signed-off-by: Daniel Baumann --- debian/changelog | 16 + .../config-dir/mods-available/proxy_connect.conf | 3 + debian/control | 20 - debian/libapache2-mod-proxy-uwsgi.links | 1 - debian/libapache2-mod-proxy-uwsgi.maintscript | 1 - debian/patches/fhs_compliance.patch | 24 +- debian/patches/reproducible_builds.diff | 2 +- debian/perl-framework/Apache-Test/Changes | 20 +- debian/perl-framework/Apache-Test/RELEASE | 12 +- .../perl-framework/Apache-Test/lib/Apache/Test.pm | 2 +- .../Apache-Test/lib/Apache/TestCommon.pm | 2 +- .../Apache-Test/lib/Apache/TestConfig.pm | 73 +-- .../Apache-Test/lib/Apache/TestRun.pm | 2 +- .../Apache-Test/lib/Apache/TestSSLCA.pm | 19 +- debian/perl-framework/README | 2 +- debian/perl-framework/STATUS | 2 +- debian/perl-framework/t/apache/hostcheck.t | 2 +- debian/perl-framework/t/apache/pr64339.t | 46 ++ debian/perl-framework/t/conf/core.conf.in | 2 +- debian/perl-framework/t/conf/extra.conf.in | 71 ++- debian/perl-framework/t/conf/http2.conf.in | 105 ---- debian/perl-framework/t/conf/ssl/proxyssl.conf.in | 3 +- debian/perl-framework/t/filter/case.t | 2 +- debian/perl-framework/t/htdocs/modules/h2/001.html | 10 - debian/perl-framework/t/htdocs/modules/h2/002.jpg | Bin 90364 -> 0 bytes debian/perl-framework/t/htdocs/modules/h2/003.html | 11 - .../t/htdocs/modules/h2/003/003_img.jpg | Bin 90364 -> 0 bytes debian/perl-framework/t/htdocs/modules/h2/004.html | 23 - .../t/htdocs/modules/h2/004/gophertiles.jpg | Bin 742 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_002.jpg | Bin 945 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_003.jpg | Bin 697 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_004.jpg | Bin 725 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_005.jpg | Bin 837 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_006.jpg | Bin 770 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_007.jpg | Bin 747 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_008.jpg | Bin 694 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_009.jpg | Bin 704 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_010.jpg | Bin 994 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_011.jpg | Bin 979 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_012.jpg | Bin 895 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_013.jpg | Bin 958 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_014.jpg | Bin 894 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_015.jpg | Bin 702 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_016.jpg | Bin 703 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_017.jpg | Bin 707 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_018.jpg | Bin 701 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_019.jpg | Bin 1013 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_020.jpg | Bin 737 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_021.jpg | Bin 801 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_022.jpg | Bin 702 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_023.jpg | Bin 905 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_024.jpg | Bin 980 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_025.jpg | Bin 708 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_026.jpg | Bin 694 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_027.jpg | Bin 697 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_028.jpg | Bin 795 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_029.jpg | Bin 978 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_030.jpg | Bin 707 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_031.jpg | Bin 1060 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_032.jpg | Bin 688 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_033.jpg | Bin 701 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_034.jpg | Bin 898 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_035.jpg | Bin 986 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_036.jpg | Bin 770 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_037.jpg | Bin 959 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_038.jpg | Bin 936 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_039.jpg | Bin 700 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_040.jpg | Bin 784 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_041.jpg | Bin 758 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_042.jpg | Bin 796 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_043.jpg | Bin 813 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_044.jpg | Bin 924 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_045.jpg | Bin 978 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_046.jpg | Bin 752 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_047.jpg | Bin 751 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_048.jpg | Bin 737 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_049.jpg | Bin 992 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_050.jpg | Bin 688 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_051.jpg | Bin 697 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_052.jpg | Bin 699 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_053.jpg | Bin 1052 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_054.jpg | Bin 694 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_055.jpg | Bin 767 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_056.jpg | Bin 952 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_057.jpg | Bin 788 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_058.jpg | Bin 759 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_059.jpg | Bin 700 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_060.jpg | Bin 985 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_061.jpg | Bin 915 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_062.jpg | Bin 681 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_063.jpg | Bin 707 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_064.jpg | Bin 693 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_065.jpg | Bin 861 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_066.jpg | Bin 991 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_067.jpg | Bin 1056 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_068.jpg | Bin 697 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_069.jpg | Bin 1066 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_070.jpg | Bin 1024 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_071.jpg | Bin 784 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_072.jpg | Bin 698 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_073.jpg | Bin 1004 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_074.jpg | Bin 969 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_075.jpg | Bin 915 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_076.jpg | Bin 784 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_077.jpg | Bin 697 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_078.jpg | Bin 692 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_079.jpg | Bin 702 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_080.jpg | Bin 725 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_081.jpg | Bin 877 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_082.jpg | Bin 743 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_083.jpg | Bin 785 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_084.jpg | Bin 690 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_085.jpg | Bin 724 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_086.jpg | Bin 1054 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_087.jpg | Bin 883 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_088.jpg | Bin 702 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_089.jpg | Bin 693 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_090.jpg | Bin 947 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_091.jpg | Bin 959 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_092.jpg | Bin 736 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_093.jpg | Bin 806 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_094.jpg | Bin 820 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_095.jpg | Bin 918 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_096.jpg | Bin 689 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_097.jpg | Bin 796 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_098.jpg | Bin 686 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_099.jpg | Bin 698 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_100.jpg | Bin 686 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_101.jpg | Bin 686 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_102.jpg | Bin 682 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_103.jpg | Bin 703 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_104.jpg | Bin 698 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_105.jpg | Bin 702 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_106.jpg | Bin 989 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_107.jpg | Bin 720 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_108.jpg | Bin 834 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_109.jpg | Bin 756 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_110.jpg | Bin 703 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_111.jpg | Bin 815 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_112.jpg | Bin 780 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_113.jpg | Bin 992 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_114.jpg | Bin 862 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_115.jpg | Bin 1024 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_116.jpg | Bin 756 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_117.jpg | Bin 1012 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_118.jpg | Bin 905 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_119.jpg | Bin 808 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_120.jpg | Bin 814 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_121.jpg | Bin 832 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_122.jpg | Bin 704 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_123.jpg | Bin 741 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_124.jpg | Bin 694 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_125.jpg | Bin 950 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_126.jpg | Bin 770 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_127.jpg | Bin 749 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_128.jpg | Bin 942 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_129.jpg | Bin 997 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_130.jpg | Bin 708 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_131.jpg | Bin 821 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_132.jpg | Bin 849 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_133.jpg | Bin 715 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_134.jpg | Bin 794 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_135.jpg | Bin 869 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_136.jpg | Bin 1040 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_137.jpg | Bin 757 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_138.jpg | Bin 991 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_139.jpg | Bin 704 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_140.jpg | Bin 707 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_141.jpg | Bin 959 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_142.jpg | Bin 691 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_143.jpg | Bin 921 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_144.jpg | Bin 932 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_145.jpg | Bin 696 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_146.jpg | Bin 711 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_147.jpg | Bin 817 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_148.jpg | Bin 966 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_149.jpg | Bin 1002 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_150.jpg | Bin 900 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_151.jpg | Bin 724 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_152.jpg | Bin 1043 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_153.jpg | Bin 702 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_154.jpg | Bin 971 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_155.jpg | Bin 708 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_156.jpg | Bin 699 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_157.jpg | Bin 834 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_158.jpg | Bin 702 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_159.jpg | Bin 880 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_160.jpg | Bin 701 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_161.jpg | Bin 688 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_162.jpg | Bin 853 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_163.jpg | Bin 690 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_164.jpg | Bin 759 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_165.jpg | Bin 831 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_166.jpg | Bin 732 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_167.jpg | Bin 955 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_168.jpg | Bin 1043 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_169.jpg | Bin 969 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_170.jpg | Bin 701 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_171.jpg | Bin 755 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_172.jpg | Bin 924 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_173.jpg | Bin 958 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_174.jpg | Bin 998 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_175.jpg | Bin 702 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_176.jpg | Bin 760 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_177.jpg | Bin 732 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_178.jpg | Bin 929 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_179.jpg | Bin 712 -> 0 bytes .../t/htdocs/modules/h2/004/gophertiles_180.jpg | Bin 1013 -> 0 bytes debian/perl-framework/t/htdocs/modules/h2/006.html | 23 - .../perl-framework/t/htdocs/modules/h2/006/006.css | 21 - .../perl-framework/t/htdocs/modules/h2/006/006.js | 31 -- debian/perl-framework/t/htdocs/modules/h2/007.html | 21 - .../perl-framework/t/htdocs/modules/h2/007/007.py | 29 -- debian/perl-framework/t/htdocs/modules/h2/009.py | 21 - .../t/htdocs/modules/h2/files/empty.txt | 0 debian/perl-framework/t/htdocs/modules/h2/hello.pl | 13 - .../perl-framework/t/htdocs/modules/h2/index.html | 45 -- .../perl-framework/t/htdocs/modules/h2/index.jpg | Bin 952 -> 0 bytes debian/perl-framework/t/htdocs/modules/h2/info.php | 3 - debian/perl-framework/t/htdocs/modules/h2/necho.pl | 29 -- .../perl-framework/t/htdocs/modules/h2/upload.pl | 47 -- .../perl-framework/t/htdocs/modules/h2/upload.py | 47 -- .../t/htdocs/modules/h2/xxx-1.0.2a.tar.gz | Bin 489 -> 0 bytes .../t/htdocs/modules/lua/websockets.lua | 5 + .../t/htdocs/modules/xml2enc/doc.fooxml | 1 + .../t/htdocs/modules/xml2enc/doc.isohtml | 1 + .../t/htdocs/modules/xml2enc/doc.notxml | 1 + .../t/htdocs/modules/xml2enc/doc.xml | 1 + debian/perl-framework/t/modules/headers.t | 24 +- debian/perl-framework/t/modules/http2.t | 535 --------------------- debian/perl-framework/t/modules/proxy_balancer.t | 4 +- debian/perl-framework/t/modules/proxy_websockets.t | 46 +- .../t/modules/proxy_websockets_ssl.t | 86 ++++ debian/perl-framework/t/modules/rewrite.t | 76 ++- debian/perl-framework/t/modules/sed.t | 34 +- debian/rules | 2 +- debian/source/include-binaries | 200 -------- 237 files changed, 498 insertions(+), 1324 deletions(-) create mode 100644 debian/config-dir/mods-available/proxy_connect.conf delete mode 100644 debian/libapache2-mod-proxy-uwsgi.links delete mode 100644 debian/libapache2-mod-proxy-uwsgi.maintscript create mode 100644 debian/perl-framework/t/apache/pr64339.t delete mode 100644 debian/perl-framework/t/conf/http2.conf.in delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/001.html delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/002.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/003.html delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/003/003_img.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004.html delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_002.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_003.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_004.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_005.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_006.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_007.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_008.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_009.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_010.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_011.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_012.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_013.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_014.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_015.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_016.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_017.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_018.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_019.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_020.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_021.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_022.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_023.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_024.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_025.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_026.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_027.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_028.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_029.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_030.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_031.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_032.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_033.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_034.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_035.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_036.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_037.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_038.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_039.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_040.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_041.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_042.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_043.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_044.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_045.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_046.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_047.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_048.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_049.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_050.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_051.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_052.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_053.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_054.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_055.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_056.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_057.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_058.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_059.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_060.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_061.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_062.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_063.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_064.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_065.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_066.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_067.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_068.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_069.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_070.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_071.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_072.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_073.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_074.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_075.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_076.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_077.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_078.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_079.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_080.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_081.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_082.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_083.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_084.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_085.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_086.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_087.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_088.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_089.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_090.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_091.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_092.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_093.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_094.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_095.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_096.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_097.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_098.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_099.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_100.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_101.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_102.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_103.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_104.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_105.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_106.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_107.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_108.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_109.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_110.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_111.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_112.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_113.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_114.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_115.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_116.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_117.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_118.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_119.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_120.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_121.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_122.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_123.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_124.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_125.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_126.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_127.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_128.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_129.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_130.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_131.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_132.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_133.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_134.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_135.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_136.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_137.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_138.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_139.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_140.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_141.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_142.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_143.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_144.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_145.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_146.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_147.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_148.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_149.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_150.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_151.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_152.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_153.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_154.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_155.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_156.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_157.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_158.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_159.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_160.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_161.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_162.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_163.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_164.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_165.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_166.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_167.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_168.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_169.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_170.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_171.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_172.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_173.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_174.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_175.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_176.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_177.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_178.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_179.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_180.jpg delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/006.html delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/006/006.css delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/006/006.js delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/007.html delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/007/007.py delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/009.py delete mode 100644 debian/perl-framework/t/htdocs/modules/h2/files/empty.txt delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/hello.pl delete mode 100644 debian/perl-framework/t/htdocs/modules/h2/index.html delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/index.jpg delete mode 100644 debian/perl-framework/t/htdocs/modules/h2/info.php delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/necho.pl delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/upload.pl delete mode 100755 debian/perl-framework/t/htdocs/modules/h2/upload.py delete mode 100644 debian/perl-framework/t/htdocs/modules/h2/xxx-1.0.2a.tar.gz create mode 100644 debian/perl-framework/t/htdocs/modules/xml2enc/doc.fooxml create mode 100644 debian/perl-framework/t/htdocs/modules/xml2enc/doc.isohtml create mode 100644 debian/perl-framework/t/htdocs/modules/xml2enc/doc.notxml create mode 100644 debian/perl-framework/t/htdocs/modules/xml2enc/doc.xml delete mode 100644 debian/perl-framework/t/modules/http2.t create mode 100644 debian/perl-framework/t/modules/proxy_websockets_ssl.t diff --git a/debian/changelog b/debian/changelog index aabb6aa..423b256 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +apache2 (2.4.59-1) unstable; urgency=medium + + [ Stefan Fritsch ] + * Remove old transitional packages libapache2-mod-md and + libapache2-mod-proxy-uwsgi. Closes: #1032628 + + [ Yadd ] + * mod_proxy_connect: disable AllowCONNECT by default (Closes: #1054564) + * Refresh patches + * New upstream version 2.4.59 + * Refresh patches + * Update patches + * Update test framework + + -- Yadd Fri, 05 Apr 2024 08:08:11 +0400 + apache2 (2.4.58-1~progress7.99u1) graograman-backports; urgency=medium * Initial reupload to graograman-backports. diff --git a/debian/config-dir/mods-available/proxy_connect.conf b/debian/config-dir/mods-available/proxy_connect.conf new file mode 100644 index 0000000..35d6ad9 --- /dev/null +++ b/debian/config-dir/mods-available/proxy_connect.conf @@ -0,0 +1,3 @@ +# Avoid having open-proxy when one vhost uses proxy_connect +# See https://bugs.debian.org/1054564 for more +AllowCONNECT 0 diff --git a/debian/control b/debian/control index 484ce4b..fd9b738 100644 --- a/debian/control +++ b/debian/control @@ -191,23 +191,3 @@ Description: Apache HTTP Server (mod_ssl development headers) . This package provides the development header and the dependencies for modules that interact with mod_ssl's internal openssl state. - -Package: libapache2-mod-md -Architecture: any -Multi-Arch: same -Section: oldlibs -Depends: ${misc:Depends}, - apache2 (= ${binary:Version}) -Description: transitional package - This is a transitional package to apache2 for users of libapache2-mod-md. - It can be safely removed after the installation is complete. - -Package: libapache2-mod-proxy-uwsgi -Architecture: any -Section: oldlibs -Depends: ${misc:Depends}, - apache2 (= ${binary:Version}) -Description: transitional package - This is a transitional package to apache2 for users of - libapache2-mod-proxy-uwsgi. - It can be safely removed after the installation is complete. diff --git a/debian/libapache2-mod-proxy-uwsgi.links b/debian/libapache2-mod-proxy-uwsgi.links deleted file mode 100644 index 857fdf8..0000000 --- a/debian/libapache2-mod-proxy-uwsgi.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/apache2 usr/share/doc/libapache2-mod-proxy-uwsgi diff --git a/debian/libapache2-mod-proxy-uwsgi.maintscript b/debian/libapache2-mod-proxy-uwsgi.maintscript deleted file mode 100644 index ed376da..0000000 --- a/debian/libapache2-mod-proxy-uwsgi.maintscript +++ /dev/null @@ -1 +0,0 @@ -dir_to_symlink /usr/share/doc/libapache2-mod-proxy-uwsgi apache2 2.4.37-1~ diff --git a/debian/patches/fhs_compliance.patch b/debian/patches/fhs_compliance.patch index 1d5fc98..986d8bc 100644 --- a/debian/patches/fhs_compliance.patch +++ b/debian/patches/fhs_compliance.patch @@ -6,30 +6,26 @@ Last-Update: 2023-10-19 --- a/configure +++ b/configure -@@ -41291,17 +41291,17 @@ +@@ -42812,13 +42812,13 @@ + ap_prefix="${ap_cur}" - cat >>confdefs.h <<_ACEOF --#define HTTPD_ROOT "${ap_prefix}" -+#define HTTPD_ROOT "/etc/apache2" - _ACEOF +-printf "%s\n" "#define HTTPD_ROOT \"${ap_prefix}\"" >>confdefs.h ++printf "%s\n" "#define HTTPD_ROOT \"/etc/apache2\"" >>confdefs.h - cat >>confdefs.h <<_ACEOF --#define SERVER_CONFIG_FILE "${rel_sysconfdir}/${progname}.conf" -+#define SERVER_CONFIG_FILE "${progname}.conf" - _ACEOF +-printf "%s\n" "#define SERVER_CONFIG_FILE \"${rel_sysconfdir}/${progname}.conf\"" >>confdefs.h ++printf "%s\n" "#define SERVER_CONFIG_FILE \"${progname}.conf\"" >>confdefs.h - cat >>confdefs.h <<_ACEOF --#define AP_TYPES_CONFIG_FILE "${rel_sysconfdir}/mime.types" -+#define AP_TYPES_CONFIG_FILE "mime.types" - _ACEOF +-printf "%s\n" "#define AP_TYPES_CONFIG_FILE \"${rel_sysconfdir}/mime.types\"" >>confdefs.h ++printf "%s\n" "#define AP_TYPES_CONFIG_FILE \"mime.types\"" >>confdefs.h + perlbin=`$ac_aux_dir/PrintPath perl` --- a/configure.in +++ b/configure.in -@@ -902,11 +902,11 @@ +@@ -928,11 +928,11 @@ echo $MODLIST | $AWK -f $srcdir/build/build-modules-c.awk > modules.c APR_EXPAND_VAR(ap_prefix, $prefix) diff --git a/debian/patches/reproducible_builds.diff b/debian/patches/reproducible_builds.diff index 36f71e2..8f48922 100644 --- a/debian/patches/reproducible_builds.diff +++ b/debian/patches/reproducible_builds.diff @@ -18,7 +18,7 @@ Last-Update: 2015-08-11 -#endif +static const char server_built[] = BUILD_DATETIME; - AP_DECLARE(const char *) ap_get_server_built() + AP_DECLARE(const char *) ap_get_server_built(void) { --- a/server/Makefile.in +++ b/server/Makefile.in diff --git a/debian/perl-framework/Apache-Test/Changes b/debian/perl-framework/Apache-Test/Changes index 052e335..ec0c6ef 100644 --- a/debian/perl-framework/Apache-Test/Changes +++ b/debian/perl-framework/Apache-Test/Changes @@ -6,7 +6,25 @@ Changes - Apache::Test change logfile =over 3 -=item 1.42-dev +=item 1.44-dev + +=item 1.43 Nov 7 2021 + +Our implementation of "which" should not search +for a program in the elements of PATH when program +already contains a path. [rjung] + +Fix hash generation when the openssl command +was overwritten with the environment variable +"APACHE_TEST_OPENSSL_CMD". [rjung] + +Add new config option limitrequestline needed +when the local directory paths are long. [rjung] + +=item 1.42 Aug 28 2019 + +Fix loading apache_test_config.pm for recent perls in which '.' is +no longer in @INC by default. [Steve Hay] =item 1.41 Jul 11 2019 diff --git a/debian/perl-framework/Apache-Test/RELEASE b/debian/perl-framework/Apache-Test/RELEASE index 4f8e5e8..0ec2b46 100644 --- a/debian/perl-framework/Apache-Test/RELEASE +++ b/debian/perl-framework/Apache-Test/RELEASE @@ -15,7 +15,7 @@ Instructions for Apache-Test Release Manager tags, so keep that in mind. b. commit Changes - % svn ci -m "1.42 rc1" Changes + % svn ci -m "1.44 rc1" Changes c. nuke any preinstalled Apache-Test libs and run 'make test' @@ -37,7 +37,7 @@ Instructions for Apache-Test Release Manager (or maybe longer to give most people a chance to catch up). no need to tag this package - Subject: [RELEASE CANDIDATE] Apache-Test-1.42 RC\d+ + Subject: [RELEASE CANDIDATE] Apache-Test-1.44 RC\d+ a. if problems are detected during stage 2, repeat stages 1 and 2. @@ -54,7 +54,7 @@ Instructions for Apache-Test Release Manager % make -n tag c. commit Changes - % svn ci -m "1.42 release" Changes + % svn ci -m "1.44 release" Changes d. tag % make tag @@ -74,7 +74,7 @@ Instructions for Apache-Test Release Manager o dev/perl.apache.org o modperl/perl.apache.org - Subject: [ANNOUNCE] Apache-Test-1.42 + Subject: [ANNOUNCE] Apache-Test-1.44 include: - MD5 sig (as it comes from CPAN upload announce). @@ -87,11 +87,11 @@ Instructions for Apache-Test Release Manager b. edit ./Changes: - start a new item with incremented version + '-dev' - =item 1.43-dev + =item 1.45-dev c. bump up version numbers in this file to make it easier to do the next release. % perl -pi.bak -e 's/(\d+)\.(\d+)/join(".", $1, $2+1)/eg' RELEASE d. commit Changes - % svn ci -m "start 1.42-dev cycle" Changes RELEASE lib/Apache/Test.pm + % svn ci -m "start 1.44-dev cycle" Changes RELEASE lib/Apache/Test.pm diff --git a/debian/perl-framework/Apache-Test/lib/Apache/Test.pm b/debian/perl-framework/Apache-Test/lib/Apache/Test.pm index b3263c6..b18de11 100644 --- a/debian/perl-framework/Apache-Test/lib/Apache/Test.pm +++ b/debian/perl-framework/Apache-Test/lib/Apache/Test.pm @@ -37,7 +37,7 @@ BEGIN { use vars qw(@ISA @EXPORT %EXPORT_TAGS $VERSION %SubTests @SkipReasons); -$VERSION = '1.42'; +$VERSION = '1.44'; my @need = qw(need_lwp need_http11 need_cgi need_access need_auth need_module need_apache need_min_apache_version need_min_apache_fix diff --git a/debian/perl-framework/Apache-Test/lib/Apache/TestCommon.pm b/debian/perl-framework/Apache-Test/lib/Apache/TestCommon.pm index e65d1d3..9722bc2 100644 --- a/debian/perl-framework/Apache-Test/lib/Apache/TestCommon.pm +++ b/debian/perl-framework/Apache-Test/lib/Apache/TestCommon.pm @@ -53,7 +53,7 @@ sub run_write_test { $received += length $chunk; }); - ok t_cmp($length, $received, 'bytes in body'); + ok t_cmp($received, $length, 'bytes in body'); } } } diff --git a/debian/perl-framework/Apache-Test/lib/Apache/TestConfig.pm b/debian/perl-framework/Apache-Test/lib/Apache/TestConfig.pm index 85689b0..274f1a0 100644 --- a/debian/perl-framework/Apache-Test/lib/Apache/TestConfig.pm +++ b/debian/perl-framework/Apache-Test/lib/Apache/TestConfig.pm @@ -59,38 +59,39 @@ use Apache::TestRun (); use vars qw(%Usage); %Usage = ( - top_dir => 'top-level directory (default is $PWD)', - t_dir => 'the t/ test directory (default is $top_dir/t)', - t_conf => 'the conf/ test directory (default is $t_dir/conf)', - t_logs => 'the logs/ test directory (default is $t_dir/logs)', - t_state => 'the state/ test directory (default is $t_dir/state)', - t_pid_file => 'location of the pid file (default is $t_logs/httpd.pid)', - t_conf_file => 'test httpd.conf file (default is $t_conf/httpd.conf)', - src_dir => 'source directory to look for mod_foos.so', - serverroot => 'ServerRoot (default is $t_dir)', - documentroot => 'DocumentRoot (default is $ServerRoot/htdocs', - port => 'Port [port_number|select] (default ' . DEFAULT_PORT . ')', - servername => 'ServerName (default is localhost)', - user => 'User to run test server as (default is $USER)', - group => 'Group to run test server as (default is $GROUP)', - bindir => 'Apache bin/ dir (default is apxs -q BINDIR)', - sbindir => 'Apache sbin/ dir (default is apxs -q SBINDIR)', - httpd => 'server to use for testing (default is $bindir/httpd)', - target => 'name of server binary (default is apxs -q TARGET)', - apxs => 'location of apxs (default is from Apache2::BuildConfig)', - startup_timeout => 'seconds to wait for the server to start (default is 60)', - httpd_conf => 'inherit config from this file (default is apxs derived)', - httpd_conf_extra=> 'inherit additional config from this file', - minclients => 'minimum number of concurrent clients (default is 1)', - maxclients => 'maximum number of concurrent clients (default is minclients+1)', - threadsperchild => 'number of threads per child when using threaded MPMs (default is 10)', - perlpod => 'location of perl pod documents (for testing downloads)', - proxyssl_url => 'url for testing ProxyPass / https (default is localhost)', - sslca => 'location of SSL CA (default is $t_conf/ssl/ca)', - sslcaorg => 'SSL CA organization to use for tests (default is asf)', - sslproto => 'SSL/TLS protocol version(s) to test', - libmodperl => 'path to mod_perl\'s .so (full or relative to LIBEXECDIR)', - defines => 'values to add as -D defines (for example, "VAR1 VAR2")', + top_dir => 'top-level directory (default is $PWD)', + t_dir => 'the t/ test directory (default is $top_dir/t)', + t_conf => 'the conf/ test directory (default is $t_dir/conf)', + t_logs => 'the logs/ test directory (default is $t_dir/logs)', + t_state => 'the state/ test directory (default is $t_dir/state)', + t_pid_file => 'location of the pid file (default is $t_logs/httpd.pid)', + t_conf_file => 'test httpd.conf file (default is $t_conf/httpd.conf)', + src_dir => 'source directory to look for mod_foos.so', + serverroot => 'ServerRoot (default is $t_dir)', + documentroot => 'DocumentRoot (default is $ServerRoot/htdocs', + port => 'Port [port_number|select] (default ' . DEFAULT_PORT . ')', + servername => 'ServerName (default is localhost)', + user => 'User to run test server as (default is $USER)', + group => 'Group to run test server as (default is $GROUP)', + bindir => 'Apache bin/ dir (default is apxs -q BINDIR)', + sbindir => 'Apache sbin/ dir (default is apxs -q SBINDIR)', + httpd => 'server to use for testing (default is $bindir/httpd)', + target => 'name of server binary (default is apxs -q TARGET)', + apxs => 'location of apxs (default is from Apache2::BuildConfig)', + startup_timeout => 'seconds to wait for the server to start (default is 60)', + httpd_conf => 'inherit config from this file (default is apxs derived)', + httpd_conf_extra => 'inherit additional config from this file', + minclients => 'minimum number of concurrent clients (default is 1)', + maxclients => 'maximum number of concurrent clients (default is minclients+1)', + threadsperchild => 'number of threads per child when using threaded MPMs (default is 10)', + limitrequestline => 'global LimitRequestLine setting (default is 128)', + perlpod => 'location of perl pod documents (for testing downloads)', + proxyssl_url => 'url for testing ProxyPass / https (default is localhost)', + sslca => 'location of SSL CA (default is $t_conf/ssl/ca)', + sslcaorg => 'SSL CA organization to use for tests (default is asf)', + sslproto => 'SSL/TLS protocol version(s) to test', + libmodperl => 'path to mod_perl\'s .so (full or relative to LIBEXECDIR)', + defines => 'values to add as -D defines (for example, "VAR1 VAR2")', (map { $_ . '_module_name', "$_ module name"} qw(cgi ssl thread access auth php)), ); @@ -368,6 +369,9 @@ sub new { $vars->{maxclientsthreadedmpm} = $vars->{maxsparethreadedmpm} + $vars->{threadsperchild}; } + $vars->{limitrequestline} ||= 128; + $vars->{limitrequestlinex2} = 2 * $vars->{limitrequestline}; + $vars->{proxy} ||= 'off'; $vars->{proxyssl_url} ||= ''; $vars->{defines} ||= ''; @@ -1778,6 +1782,11 @@ sub which { return undef unless $program; + # No need to search PATH components + # if $program already contains a path + return $program if !OSX and !WINFU and + $program =~ /\// and -f $program and -x $program; + my @dirs = File::Spec->path(); require Config; diff --git a/debian/perl-framework/Apache-Test/lib/Apache/TestRun.pm b/debian/perl-framework/Apache-Test/lib/Apache/TestRun.pm index f398eb5..515f69a 100644 --- a/debian/perl-framework/Apache-Test/lib/Apache/TestRun.pm +++ b/debian/perl-framework/Apache-Test/lib/Apache/TestRun.pm @@ -776,7 +776,7 @@ sub detect_relocation { return unless -e $config_file; my %inc = %INC; - eval { require "$config_file" }; + eval { require "./$config_file" }; %INC = %inc; # be stealth warn($@), return if $@; diff --git a/debian/perl-framework/Apache-Test/lib/Apache/TestSSLCA.pm b/debian/perl-framework/Apache-Test/lib/Apache/TestSSLCA.pm index fc4c685..ca37f16 100644 --- a/debian/perl-framework/Apache-Test/lib/Apache/TestSSLCA.pm +++ b/debian/perl-framework/Apache-Test/lib/Apache/TestSSLCA.pm @@ -294,8 +294,20 @@ nsComment = This Is A Comment 1.3.6.1.4.1.18060.12.0 = DER:0c064c656d6f6e73 subjectAltName = email:\$mail$san_msupn +[ client_ext ] +extendedKeyUsage = clientAuth + [ server_ext ] subjectAltName = DNS:\$CN$san_dnssrv +extendedKeyUsage = serverAuth +subjectKeyIdentifier=hash +authorityKeyIdentifier=keyid,issuer + +[ ca_ext ] +subjectKeyIdentifier=hash +authorityKeyIdentifier=keyid:always,issuer +basicConstraints = critical,CA:true + EOF return $file; @@ -326,7 +338,7 @@ sub new_ca { join ':', dn_oneline('client_snakeoil'), $basic_auth_password); - openssl req => "-new -x509 -keyout $cakey -out $cacert $days", + openssl req => "-new -x509 -extensions ca_ext -keyout $cakey -out $cacert $days", config('ca'); export_cert('ca'); #useful for importing into IE @@ -367,7 +379,8 @@ sub sign_cert { my $name = shift; my $exts = ''; - $exts = ' -extensions client_ok_ext' if $name =~ /client_ok/; + $exts = ' -extensions client_ext' if $name =~ /client/; + $exts .= ' -extensions client_ok_ext' if $name =~ /client_ok/; $exts = ' -extensions server_ext' if $name =~ /server/; @@ -423,7 +436,7 @@ sub hash_certs { for my $file ($dh->read) { next unless $file =~ /\.cr[tl]$/; - chomp(my $hash = `openssl $type -noout -hash < $file`); + chomp(my $hash = `$openssl $type -noout -hash < $file`); next unless $hash; my $symlink = "$hash.r$n"; $n++; diff --git a/debian/perl-framework/README b/debian/perl-framework/README index a7ff46c..639d684 100644 --- a/debian/perl-framework/README +++ b/debian/perl-framework/README @@ -36,7 +36,7 @@ cpanm Bundle::ApacheTest \ HTTP::DAV DateTime Time::HiRes \ Test::Harness Crypt::SSLeay Net::SSLeay IO::Socket::SSL \ IO::Socket::IP IO::Select LWP::Protocol::https AnyEvent \ - AnyEvent::WebSocket::Client FCGI + AnyEvent::WebSocket::Client LWP::Protocol::AnyEvent::http FCGI ``` diff --git a/debian/perl-framework/STATUS b/debian/perl-framework/STATUS index add2641..9975ca7 100644 --- a/debian/perl-framework/STATUS +++ b/debian/perl-framework/STATUS @@ -1,5 +1,5 @@ httpd-test/perl-framework STATUS: -*-text-*- -Last modified at [$Date$] +Last modified at [$Date: 2018-10-10 18:23:46 +0400 (Wed, 10 Oct 2018) $] Stuff to do: * finish the t/TEST exit code issue (ORed with 0x2C if diff --git a/debian/perl-framework/t/apache/hostcheck.t b/debian/perl-framework/t/apache/hostcheck.t index b9e11aa..62bb38d 100644 --- a/debian/perl-framework/t/apache/hostcheck.t +++ b/debian/perl-framework/t/apache/hostcheck.t @@ -21,7 +21,7 @@ my @test_cases = ( [ "GET / HTTP/1.1\r\nHost: nvh-strict\r\n\r\n" => 200, 200, "NVH matches"], [ "GET / HTTP/1.1\r\nHost: nvh-strict:1\r\n\r\n" => 200, 200, "NVH matches port ignored"], ); -plan tests => scalar(@test_cases) * 2, need_min_apache_version('2.5.1'); +plan tests => scalar(@test_cases) * 2, need_min_apache_version('2.4.49'); foreach my $vhosts ((["default" => 1], ["core" => 2])) { diff --git a/debian/perl-framework/t/apache/pr64339.t b/debian/perl-framework/t/apache/pr64339.t new file mode 100644 index 0000000..00097e6 --- /dev/null +++ b/debian/perl-framework/t/apache/pr64339.t @@ -0,0 +1,46 @@ + +use strict; +use warnings FATAL => 'all'; + +use Apache::Test; +use Apache::TestUtil; +use Apache::TestRequest; + +my @testcases = ( + # Backend sends Content-Type: application/xml; charset=utf-8 + ['/doc.xml', "application/xml; charset=utf-8", "fóó\n" ], + + # Backend sends Content-Type: application/foo+xml; charset=utf-8 + ['/doc.fooxml', "application/foo+xml; charset=utf-8", "fóó\n" ], + + # Backend sends Content-Type: application/notreallyxml (no charset) + # This should NOT be transformed or have a charset added. + ['/doc.notxml', "application/notreallyxml", "f\xf3\xf3\n" ], + + # Sent with charset=ISO-8859-1 - should be transformed to utf-8 + ['/doc.isohtml', "text/html;charset=utf-8", "

fóó\n

" ], +); + +# mod_xml2enc on trunk behaves quite differently to the 2.4.x version +# after r1785780, and does NOT transform the response body. Unclear if +# this is a regression, so restricting this test to 2.4.x (for now). + +if (have_min_apache_version('2.5.0')) { + print "1..0 # skip: Test only valid for 2.4.x"; + exit 0; +} + +if (not have_min_apache_version('2.4.59')) { + print "1..0 # skip: Test not valid before 2.4.59"; + exit 0; +} + +plan tests => (3*scalar @testcases), need [qw(xml2enc alias proxy_html proxy)]; + +foreach my $t (@testcases) { + my $r = GET("/modules/xml2enc/front".$t->[0]); + + ok t_cmp($r->code, 200, "fetching ".$t->[0]); + ok t_cmp($r->header('Content-Type'), $t->[1], "content-type header test for ".$t->[0]); + ok t_cmp($r->content, $t->[2], "content test for ".$t->[0]); +} diff --git a/debian/perl-framework/t/conf/core.conf.in b/debian/perl-framework/t/conf/core.conf.in index 53122a8..c82f375 100644 --- a/debian/perl-framework/t/conf/core.conf.in +++ b/debian/perl-framework/t/conf/core.conf.in @@ -6,7 +6,7 @@ MaxMemFree 1 ServerName default-strict - = 2.5.1> + = 2.4.49> # StrictHostCheck can only be configure globally or in a "default" vhost StrictHostCheck ON diff --git a/debian/perl-framework/t/conf/extra.conf.in b/debian/perl-framework/t/conf/extra.conf.in index a684f76..2719985 100644 --- a/debian/perl-framework/t/conf/extra.conf.in +++ b/debian/perl-framework/t/conf/extra.conf.in @@ -254,7 +254,7 @@ ### Proxy pass-through to env.pl RewriteRule ^/modules/rewrite/proxy2/(.*)$ http://@SERVERNAME@:@PORT@/modules/cgi/$1 [L,P] - + ### Pass-through conditional on QUERY_STRING RewriteCond %{QUERY_STRING} horse=trigger RewriteRule ^/modules/rewrite/proxy3/(.*)$ http://@SERVERNAME@:@PORT@/modules/cgi/$1 [L,P] @@ -269,6 +269,35 @@ RewriteRule ^/modules/rewrite/cookie/none - [CO=NAME3:VAL:localhost:86400:/0:secure:httponly:none] RewriteRule ^/modules/rewrite/cookie/foo - [CO=NAME3:VAL:localhost:86400:/0:secure:httponly:foo] + RewriteRule ^/modules/rewrite/escaping/local/(.*) /?$1 + RewriteRule ^/modules/rewrite/escaping/local_b/(.*) /?$1 [B] + RewriteRule ^/modules/rewrite/escaping/local_b_justslash/(.*) /?$1 [B=/] + + RewriteRule ^/modules/rewrite/escaping/qsd-like/(.*) /$1? [R] + RewriteRule ^/modules/rewrite/escaping/qsd-like-plus-qsa/(.*) /$1? [R,QSA] + RewriteRule ^/modules/rewrite/escaping/qsd-like-plus-qsa-qsl/(.*) /$1? [R,QSA,QSL] + + = 2.4.57> + RewriteRule ^/modules/rewrite/escaping/local_bctls/(.*) /?$1 [BCTLS] + RewriteRule ^/modules/rewrite/escaping/local_bctls_andslash/(.*) /?$1 [B=/,BCTLS] + RewriteRule ^/modules/rewrite/escaping/local_bctls_nospace/(.*) /?$1 "[BCTLS,BNE= ?]" + RewriteRule ^/modules/rewrite/escaping/local_b_noslash/(.*) /?$1 [B,BNE=/] + + RewriteRule ^/modules/rewrite/escaping/redir/(.*) http://@SERVERNAME@:@PORT@/?$1 [R] + RewriteRule ^/modules/rewrite/escaping/redir_ne/(.*) http://@SERVERNAME@:@PORT@/?$1 [R,NE] + RewriteRule ^/modules/rewrite/escaping/proxy/(.*) http://@SERVERNAME@:@PORT@/?$1 [P] + RewriteRule ^/modules/rewrite/escaping/proxy_ne/(.*) http://@SERVERNAME@:@PORT@/?$1 [P,NE] + + RewriteRule local/(.*) /?$1 + RewriteRule redir/(.*) http://@SERVERNAME@:@PORT@/?$1 [R] + RewriteRule redir_ne/(.*) http://@SERVERNAME@:@PORT@/?$1 [R,NE] + RewriteRule proxy/(.*) http://@SERVERNAME@:@PORT@/?$1 [P] + RewriteRule proxy_ne/(.*) http://@SERVERNAME@:@PORT@/?$1 [P,NE] + + + + Header always set rewritten-query "expr=%{QUERY_STRING}" + DocumentRoot @SERVERROOT@/htdocs/modules/proxy RewriteEngine On @@ -1462,6 +1491,11 @@ LimitRequestFields 32 AliasMatch /apache/sed/[^/]+/(.*) @DocumentRoot@/$1 + + SetHandler echo_post + SetInputFilter sed + + AddOutputFilter sed .html @@ -1469,6 +1503,39 @@ LimitRequestFields 32 OutputSed "s/foo/bar/g" + + InputSed "s/foo/bar/g" + + + SetOutputFilter sed + OutputSed "s/foo/barbarbarbar/g" + - +# +# t/apache/pr64339.t test configuration +# + + + + Alias /modules/xml2enc/back @SERVERROOT@/htdocs/modules/xml2enc + Alias /modules/xml2enc/back/iso @SERVERROOT@/htdocs/modules/xml2enc + + AddType application/foo+xml fooxml + AddType application/notreallyxml notxml + AddType application/xml xml + AddType text/html isohtml + AddCharset ISO-8859-1 .isohtml + AddCharset UTF-8 .xml + AddCharset UTF-8 .fooxml + + + ProxyHTMLEnable on + # mod_proxy_html needs some configuration. + ProxyHTMLURLMap / /blah + ProxyHTMLLinks a href + ProxyPass http://@SERVERNAME@:@PORT@/modules/xml2enc/back + + + + diff --git a/debian/perl-framework/t/conf/http2.conf.in b/debian/perl-framework/t/conf/http2.conf.in deleted file mode 100644 index 2e6ca67..0000000 --- a/debian/perl-framework/t/conf/http2.conf.in +++ /dev/null @@ -1,105 +0,0 @@ -## -## mod_http2 test config -## - - - - - LogLevel http2:debug - - - Protocols h2c http/1.1 - - - - Options +ExecCGI - AddHandler cgi-script .pl - - - - - - - - RewriteEngine on - RewriteRule ^/modules/h2/latest.tar.gz$ /modules/h2/xxx-1.0.2a.tar.gz [R=302,NC] - - - - - - - - Protocols h2 http/1.1 - H2Direct on - - SSLEngine on - SSLCACertificateFile @SSLCA@/asf/certs/ca.crt - SSLCACertificatePath @ServerRoot@/conf/ssl - SSLCARevocationFile @SSLCA@/asf/crl/ca-bundle.crl - SSLCARevocationCheck chain - - # taken from https://wiki.mozilla.org/Security/Server_Side_TLS#Recommended_configurations - # - SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK - SSLProtocol All -SSLv2 -SSLv3 - SSLOptions +StdEnvVars - - = 2.4.18> - # need this off as long as we ran on old openssl - H2ModernTLSOnly off - - - - - Options +ExecCGI - AddHandler cgi-script .pl - - - - - - - RewriteEngine on - RewriteRule ^/modules/h2/latest.tar.gz$ /modules/h2/xxx-1.0.2a.tar.gz [R=302,NC] - - - - - - Protocols http/1.1 - H2Direct off - - - - Protocols h2 http/1.1 - H2Direct on - - SSLEngine on - SSLCACertificateFile @SSLCA@/asf/certs/ca.crt - SSLCACertificatePath @ServerRoot@/conf/ssl - SSLCARevocationFile @SSLCA@/asf/crl/ca-bundle.crl - SSLCARevocationCheck chain - - # taken from https://wiki.mozilla.org/Security/Server_Side_TLS#Recommended_configurations - # - SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK - SSLProtocol All -SSLv2 -SSLv3 - SSLOptions +StdEnvVars - - - - - Protocols http/1.1 h2 - H2Direct on - - - - - - - - - - - diff --git a/debian/perl-framework/t/conf/ssl/proxyssl.conf.in b/debian/perl-framework/t/conf/ssl/proxyssl.conf.in index 3c86c13..161385b 100644 --- a/debian/perl-framework/t/conf/ssl/proxyssl.conf.in +++ b/debian/perl-framework/t/conf/ssl/proxyssl.conf.in @@ -51,6 +51,8 @@ ProxyPass / https://@proxyssl_url@/ ProxyPassReverse / https://@proxyssl_url@/ + + ProxyPass /proxy/wsoc wss://localhost:@proxy_https_https_port@/modules/lua/websockets.lua #here we can test http <-> https using SSLProxyMachine* inside @@ -118,7 +120,6 @@ ProxyPass / http://@servername@:@port@/ ProxyPassReverse / http://@servername@:@port@/ - diff --git a/debian/perl-framework/t/filter/case.t b/debian/perl-framework/t/filter/case.t index 94bbb08..9bd6915 100644 --- a/debian/perl-framework/t/filter/case.t +++ b/debian/perl-framework/t/filter/case.t @@ -9,7 +9,7 @@ my %urls = ( mod_php4 => '/php/hello.php', mod_cgi => '/modules/cgi/perl.pl', mod_test_rwrite => '/test_rwrite', - mod_alias => '/getfiles-perl-pod/perlsub.pod', + mod_alias => '/getfiles-perl-pod/perlsub.pod', # requires perl-doc on Ubuntu ); my @filter = ('X-AddOutputFilter' => 'CaseFilter'); #mod_client_add_filter diff --git a/debian/perl-framework/t/htdocs/modules/h2/001.html b/debian/perl-framework/t/htdocs/modules/h2/001.html deleted file mode 100755 index 184952d..0000000 --- a/debian/perl-framework/t/htdocs/modules/h2/001.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - HTML/2.0 Test File: 001 - - -

HTML/2.0 Test File: 001

-

This file only contains a simple HTML structure with plain text.

- - diff --git a/debian/perl-framework/t/htdocs/modules/h2/002.jpg b/debian/perl-framework/t/htdocs/modules/h2/002.jpg deleted file mode 100755 index 3feefb0..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/002.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/003.html b/debian/perl-framework/t/htdocs/modules/h2/003.html deleted file mode 100755 index d5b08c5..0000000 --- a/debian/perl-framework/t/htdocs/modules/h2/003.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - HTML/2.0 Test File: 003 - - -

HTML/2.0 Test File: 003

-

This is a text HTML file with a big image:

-

GSMA Logo

- - diff --git a/debian/perl-framework/t/htdocs/modules/h2/003/003_img.jpg b/debian/perl-framework/t/htdocs/modules/h2/003/003_img.jpg deleted file mode 100755 index 3feefb0..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/003/003_img.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004.html b/debian/perl-framework/t/htdocs/modules/h2/004.html deleted file mode 100755 index 768cb82..0000000 --- a/debian/perl-framework/t/htdocs/modules/h2/004.html +++ /dev/null @@ -1,23 +0,0 @@ - - - HTML/2.0 Test File: 004 - - -

HTML/2.0 Test File: 004

- This file contains plain text with a bunch of images.
-
-
-
-
-
-
-
-
-
-
-
-
-
This page is developed using this template:HTTP/2 demo server -

- - \ No newline at end of file diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles.jpg deleted file mode 100755 index e45ac3b..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_002.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_002.jpg deleted file mode 100755 index 91121de..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_002.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_003.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_003.jpg deleted file mode 100755 index a26648f..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_003.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_004.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_004.jpg deleted file mode 100755 index 1d2db98..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_004.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_005.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_005.jpg deleted file mode 100755 index 05a298c..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_005.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_006.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_006.jpg deleted file mode 100755 index 54a4920..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_006.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_007.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_007.jpg deleted file mode 100755 index 526f850..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_007.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_008.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_008.jpg deleted file mode 100755 index 35f5a2f..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_008.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_009.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_009.jpg deleted file mode 100755 index 96ec2b8..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_009.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_010.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_010.jpg deleted file mode 100755 index 95a9509..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_010.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_011.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_011.jpg deleted file mode 100755 index 65701ed..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_011.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_012.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_012.jpg deleted file mode 100755 index 6242fa6..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_012.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_013.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_013.jpg deleted file mode 100755 index 8096ab2..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_013.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_014.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_014.jpg deleted file mode 100755 index e027312..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_014.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_015.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_015.jpg deleted file mode 100755 index a27076d..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_015.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_016.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_016.jpg deleted file mode 100755 index 04b20db..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_016.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_017.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_017.jpg deleted file mode 100755 index 9b6e44b..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_017.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_018.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_018.jpg deleted file mode 100755 index 209b6fd..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_018.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_019.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_019.jpg deleted file mode 100755 index 3bc23a3..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_019.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_020.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_020.jpg deleted file mode 100755 index ba04297..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_020.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_021.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_021.jpg deleted file mode 100755 index f5a422f..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_021.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_022.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_022.jpg deleted file mode 100755 index cb49051..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_022.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_023.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_023.jpg deleted file mode 100755 index 7e83a7e..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_023.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_024.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_024.jpg deleted file mode 100755 index 87c711b..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_024.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_025.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_025.jpg deleted file mode 100755 index c42eb3c..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_025.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_026.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_026.jpg deleted file mode 100755 index 29f9da6..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_026.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_027.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_027.jpg deleted file mode 100755 index 6ceccde..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_027.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_028.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_028.jpg deleted file mode 100755 index 6e3cb34..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_028.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_029.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_029.jpg deleted file mode 100755 index dac302b..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_029.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_030.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_030.jpg deleted file mode 100755 index 4299071..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_030.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_031.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_031.jpg deleted file mode 100755 index 739924f..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_031.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_032.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_032.jpg deleted file mode 100755 index 4685513..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_032.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_033.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_033.jpg deleted file mode 100755 index 26ea0e1..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_033.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_034.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_034.jpg deleted file mode 100755 index f02930e..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_034.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_035.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_035.jpg deleted file mode 100755 index 8b6bde8..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_035.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_036.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_036.jpg deleted file mode 100755 index 23ac1c0..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_036.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_037.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_037.jpg deleted file mode 100755 index 6de6681..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_037.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_038.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_038.jpg deleted file mode 100755 index aea11a3..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_038.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_039.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_039.jpg deleted file mode 100755 index bb54d13..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_039.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_040.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_040.jpg deleted file mode 100755 index 91591af..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_040.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_041.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_041.jpg deleted file mode 100755 index 96b13dd..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_041.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_042.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_042.jpg deleted file mode 100755 index 0ef80f1..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_042.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_043.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_043.jpg deleted file mode 100755 index c3828a7..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_043.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_044.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_044.jpg deleted file mode 100755 index 036ec10..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_044.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_045.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_045.jpg deleted file mode 100755 index 03f5413..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_045.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_046.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_046.jpg deleted file mode 100755 index 8353e24..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_046.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_047.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_047.jpg deleted file mode 100755 index 86e4d88..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_047.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_048.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_048.jpg deleted file mode 100755 index 8f308ed..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_048.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_049.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_049.jpg deleted file mode 100755 index bf22844..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_049.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_050.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_050.jpg deleted file mode 100755 index 65addde..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_050.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_051.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_051.jpg deleted file mode 100755 index aabb52b..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_051.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_052.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_052.jpg deleted file mode 100755 index 3d4bad8..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_052.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_053.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_053.jpg deleted file mode 100755 index d30c4d0..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_053.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_054.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_054.jpg deleted file mode 100755 index c27a34c..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_054.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_055.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_055.jpg deleted file mode 100755 index bac6e3f..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_055.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_056.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_056.jpg deleted file mode 100755 index 246624e..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_056.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_057.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_057.jpg deleted file mode 100755 index 0122037..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_057.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_058.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_058.jpg deleted file mode 100755 index 71f602f..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_058.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_059.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_059.jpg deleted file mode 100755 index 78b0dd1..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_059.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_060.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_060.jpg deleted file mode 100755 index b2c699c..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_060.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_061.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_061.jpg deleted file mode 100755 index 082fe53..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_061.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_062.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_062.jpg deleted file mode 100755 index 9b3bd8a..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_062.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_063.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_063.jpg deleted file mode 100755 index 34bbfc5..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_063.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_064.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_064.jpg deleted file mode 100755 index ac0ddc7..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_064.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_065.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_065.jpg deleted file mode 100755 index f85dce5..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_065.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_066.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_066.jpg deleted file mode 100755 index 616dd5c..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_066.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_067.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_067.jpg deleted file mode 100755 index bbbaecf..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_067.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_068.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_068.jpg deleted file mode 100755 index d0b6a18..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_068.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_069.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_069.jpg deleted file mode 100755 index 27e1abc..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_069.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_070.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_070.jpg deleted file mode 100755 index de1a15e..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_070.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_071.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_071.jpg deleted file mode 100755 index 40912e3..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_071.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_072.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_072.jpg deleted file mode 100755 index ef01d06..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_072.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_073.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_073.jpg deleted file mode 100755 index 3298be7..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_073.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_074.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_074.jpg deleted file mode 100755 index 28fb75c..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_074.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_075.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_075.jpg deleted file mode 100755 index 1f70c5e..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_075.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_076.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_076.jpg deleted file mode 100755 index d929f53..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_076.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_077.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_077.jpg deleted file mode 100755 index 49c8ca1..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_077.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_078.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_078.jpg deleted file mode 100755 index a21dd87..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_078.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_079.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_079.jpg deleted file mode 100755 index bfbd4c2..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_079.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_080.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_080.jpg deleted file mode 100755 index 6ff068c..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_080.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_081.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_081.jpg deleted file mode 100755 index dd615c7..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_081.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_082.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_082.jpg deleted file mode 100755 index 0c28382..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_082.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_083.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_083.jpg deleted file mode 100755 index 5512c16..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_083.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_084.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_084.jpg deleted file mode 100755 index d08ac7b..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_084.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_085.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_085.jpg deleted file mode 100755 index c098f72..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_085.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_086.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_086.jpg deleted file mode 100755 index 203e41d..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_086.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_087.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_087.jpg deleted file mode 100755 index b664135..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_087.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_088.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_088.jpg deleted file mode 100755 index e211d21..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_088.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_089.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_089.jpg deleted file mode 100755 index 00c4730..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_089.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_090.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_090.jpg deleted file mode 100755 index 7203f10..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_090.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_091.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_091.jpg deleted file mode 100755 index f57baa9..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_091.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_092.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_092.jpg deleted file mode 100755 index cba16c6..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_092.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_093.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_093.jpg deleted file mode 100755 index 6d4c1a5..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_093.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_094.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_094.jpg deleted file mode 100755 index a5f6a2a..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_094.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_095.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_095.jpg deleted file mode 100755 index d213fe5..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_095.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_096.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_096.jpg deleted file mode 100755 index 0fd51eb..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_096.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_097.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_097.jpg deleted file mode 100755 index 2b706cc..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_097.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_098.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_098.jpg deleted file mode 100755 index 7861f2a..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_098.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_099.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_099.jpg deleted file mode 100755 index be10042..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_099.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_100.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_100.jpg deleted file mode 100755 index 8687873..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_100.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_101.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_101.jpg deleted file mode 100755 index fe4b56a..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_101.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_102.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_102.jpg deleted file mode 100755 index d888f6c..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_102.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_103.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_103.jpg deleted file mode 100755 index 4ebf13d..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_103.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_104.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_104.jpg deleted file mode 100755 index b4dc051..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_104.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_105.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_105.jpg deleted file mode 100755 index 4f3c5a1..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_105.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_106.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_106.jpg deleted file mode 100755 index 51d6742..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_106.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_107.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_107.jpg deleted file mode 100755 index ef986b7..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_107.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_108.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_108.jpg deleted file mode 100755 index 8901141..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_108.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_109.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_109.jpg deleted file mode 100755 index a946a2b..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_109.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_110.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_110.jpg deleted file mode 100755 index 35d542c..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_110.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_111.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_111.jpg deleted file mode 100755 index 0ec9641..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_111.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_112.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_112.jpg deleted file mode 100755 index 530739a..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_112.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_113.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_113.jpg deleted file mode 100755 index 0537d7f..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_113.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_114.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_114.jpg deleted file mode 100755 index 9ecb936..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_114.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_115.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_115.jpg deleted file mode 100755 index 221e6f4..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_115.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_116.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_116.jpg deleted file mode 100755 index 0de1084..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_116.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_117.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_117.jpg deleted file mode 100755 index 8ebd1ea..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_117.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_118.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_118.jpg deleted file mode 100755 index 246d055..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_118.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_119.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_119.jpg deleted file mode 100755 index 8d92e15..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_119.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_120.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_120.jpg deleted file mode 100755 index 8ebef73..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_120.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_121.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_121.jpg deleted file mode 100755 index e7a3772..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_121.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_122.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_122.jpg deleted file mode 100755 index 6a57fc8..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_122.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_123.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_123.jpg deleted file mode 100755 index b941523..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_123.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_124.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_124.jpg deleted file mode 100755 index 9dddf38..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_124.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_125.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_125.jpg deleted file mode 100755 index d2e479e..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_125.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_126.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_126.jpg deleted file mode 100755 index 32fc518..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_126.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_127.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_127.jpg deleted file mode 100755 index c5f71cc..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_127.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_128.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_128.jpg deleted file mode 100755 index d899e3d..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_128.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_129.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_129.jpg deleted file mode 100755 index 3508872..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_129.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_130.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_130.jpg deleted file mode 100755 index b26d716..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_130.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_131.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_131.jpg deleted file mode 100755 index 56a27d4..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_131.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_132.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_132.jpg deleted file mode 100755 index b34a2f0..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_132.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_133.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_133.jpg deleted file mode 100755 index b5dc4da..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_133.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_134.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_134.jpg deleted file mode 100755 index 24d6866..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_134.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_135.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_135.jpg deleted file mode 100755 index f0c27c8..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_135.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_136.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_136.jpg deleted file mode 100755 index d3b3b28..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_136.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_137.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_137.jpg deleted file mode 100755 index 7e78d35..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_137.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_138.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_138.jpg deleted file mode 100755 index 5a0024e..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_138.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_139.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_139.jpg deleted file mode 100755 index e0e16bc..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_139.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_140.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_140.jpg deleted file mode 100755 index b9c54c4..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_140.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_141.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_141.jpg deleted file mode 100755 index f62eada..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_141.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_142.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_142.jpg deleted file mode 100755 index 6085722..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_142.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_143.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_143.jpg deleted file mode 100755 index f533fe5..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_143.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_144.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_144.jpg deleted file mode 100755 index bcc5602..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_144.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_145.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_145.jpg deleted file mode 100755 index 3b9402e..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_145.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_146.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_146.jpg deleted file mode 100755 index f2f049b..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_146.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_147.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_147.jpg deleted file mode 100755 index 06fc738..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_147.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_148.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_148.jpg deleted file mode 100755 index e094d96..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_148.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_149.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_149.jpg deleted file mode 100755 index 26ab8d7..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_149.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_150.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_150.jpg deleted file mode 100755 index 02ca417..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_150.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_151.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_151.jpg deleted file mode 100755 index 78fe841..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_151.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_152.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_152.jpg deleted file mode 100755 index 9cfa47a..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_152.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_153.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_153.jpg deleted file mode 100755 index 0a67731..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_153.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_154.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_154.jpg deleted file mode 100755 index 9a38955..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_154.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_155.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_155.jpg deleted file mode 100755 index 5a10b47..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_155.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_156.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_156.jpg deleted file mode 100755 index 809d5f9..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_156.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_157.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_157.jpg deleted file mode 100755 index 8c852e2..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_157.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_158.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_158.jpg deleted file mode 100755 index 5ef80f7..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_158.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_159.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_159.jpg deleted file mode 100755 index 2fe485f..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_159.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_160.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_160.jpg deleted file mode 100755 index 072cfc6..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_160.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_161.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_161.jpg deleted file mode 100755 index cd66e83..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_161.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_162.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_162.jpg deleted file mode 100755 index 6af87e8..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_162.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_163.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_163.jpg deleted file mode 100755 index 1a903c3..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_163.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_164.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_164.jpg deleted file mode 100755 index 71694cf..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_164.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_165.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_165.jpg deleted file mode 100755 index 084c64a..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_165.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_166.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_166.jpg deleted file mode 100755 index 6554740..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_166.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_167.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_167.jpg deleted file mode 100755 index ef2d248..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_167.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_168.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_168.jpg deleted file mode 100755 index fda5636..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_168.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_169.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_169.jpg deleted file mode 100755 index 7b53b20..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_169.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_170.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_170.jpg deleted file mode 100755 index 271c69d..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_170.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_171.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_171.jpg deleted file mode 100755 index a52ac34..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_171.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_172.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_172.jpg deleted file mode 100755 index 7438a7e..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_172.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_173.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_173.jpg deleted file mode 100755 index d91d538..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_173.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_174.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_174.jpg deleted file mode 100755 index 3901ca5..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_174.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_175.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_175.jpg deleted file mode 100755 index 106900d..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_175.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_176.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_176.jpg deleted file mode 100755 index c4a54bf..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_176.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_177.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_177.jpg deleted file mode 100755 index d214f26..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_177.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_178.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_178.jpg deleted file mode 100755 index be6cb55..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_178.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_179.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_179.jpg deleted file mode 100755 index 516faa1..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_179.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_180.jpg b/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_180.jpg deleted file mode 100755 index 67bf870..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_180.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/006.html b/debian/perl-framework/t/htdocs/modules/h2/006.html deleted file mode 100755 index 6b73025..0000000 --- a/debian/perl-framework/t/htdocs/modules/h2/006.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - HTML/2.0 Test File: 006 - - - - -

HTML/2.0 Test File: 006

-
This page contains: -
    -
  • HTML -
  • CSS -
  • JavaScript -
-
-
- -
- - \ No newline at end of file diff --git a/debian/perl-framework/t/htdocs/modules/h2/006/006.css b/debian/perl-framework/t/htdocs/modules/h2/006/006.css deleted file mode 100755 index de6aa5f..0000000 --- a/debian/perl-framework/t/htdocs/modules/h2/006/006.css +++ /dev/null @@ -1,21 +0,0 @@ -@CHARSET "ISO-8859-1"; -body{ - background:HoneyDew; -} -p{ -color:#0000FF; -text-align:left; -} - -h1{ -color:#FF0000; -text-align:center; -} - -.listTitle{ - font-size:large; -} - -.listElements{ - color:#3366FF -} \ No newline at end of file diff --git a/debian/perl-framework/t/htdocs/modules/h2/006/006.js b/debian/perl-framework/t/htdocs/modules/h2/006/006.js deleted file mode 100755 index b450067..0000000 --- a/debian/perl-framework/t/htdocs/modules/h2/006/006.js +++ /dev/null @@ -1,31 +0,0 @@ -/** - * JavaScript Functions File - */ -function returnDate() -{ - var currentDate; - currentDate=new Date(); - var dateString=(currentDate.getMonth()+1)+'/'+currentDate.getDate()+'/'+currentDate.getFullYear(); - return dateString; -} - -function returnHour() -{ - var currentDate; - currentDate=new Date(); - var hourString=currentDate.getHours()+':'+currentDate.getMinutes()+':'+currentDate.getSeconds(); - return hourString; -} - -function javaScriptMessage(){ - return 'This section is generated under JavaScript:
'; -} - -function mainJavascript(){ - document.write(javaScriptMessage()) - document.write('
    '); - document.write('
  • Current date (dd/mm/yyyy): ' + returnDate()); - document.write('
    '); - document.write('
  • Current time (hh:mm:ss): '+returnHour()); - document.write('
'); -} \ No newline at end of file diff --git a/debian/perl-framework/t/htdocs/modules/h2/007.html b/debian/perl-framework/t/htdocs/modules/h2/007.html deleted file mode 100755 index 4db93e4..0000000 --- a/debian/perl-framework/t/htdocs/modules/h2/007.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - -HTML/2.0 Test File: 007 - - -

HTML/2.0 Test File: 007

-

This page is used to send data from the client to the server:

-
- - Name:
- Age:
- Gender: Male - Female
- - -
-
- - \ No newline at end of file diff --git a/debian/perl-framework/t/htdocs/modules/h2/007/007.py b/debian/perl-framework/t/htdocs/modules/h2/007/007.py deleted file mode 100755 index 02b5466..0000000 --- a/debian/perl-framework/t/htdocs/modules/h2/007/007.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -import cgi, sys -import cgitb; cgitb.enable() - -print "Content-Type: text/html;charset=UTF-8" -print - -print """\ - - HTML/2.0 Test File: 007 (received data) -

HTML/2.0 Test File: 007

""" - -# alternative output: parsed form params <-> plain POST body -parseContent = True # <-> False - -if parseContent: - print '

Data processed:

    ' - form = cgi.FieldStorage() - for name in form: - print '
  • ', name, ': ', form[name].value, '
    • ' - print '
' -else: - print '

POST data output:

'
-	data = sys.stdin.read()
-	print data
-	print '
' - -print '' \ No newline at end of file diff --git a/debian/perl-framework/t/htdocs/modules/h2/009.py b/debian/perl-framework/t/htdocs/modules/h2/009.py deleted file mode 100755 index 8fd9095..0000000 --- a/debian/perl-framework/t/htdocs/modules/h2/009.py +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -import cgi, sys, time -import cgitb; cgitb.enable() - -print "Content-Type: text/html;charset=UTF-8" -print - -print """\ - - HTML/2.0 Test File: 009 (server time) -

HTML/2.0 Test File: 009

-

60 seconds of server time, one by one.

""" - -for i in range(60): - s = time.strftime("%Y-%m-%d %H:%M:%S") - print "
", s, "
" - sys.stdout.flush() - time.sleep(1) - -print "

done.

" \ No newline at end of file diff --git a/debian/perl-framework/t/htdocs/modules/h2/files/empty.txt b/debian/perl-framework/t/htdocs/modules/h2/files/empty.txt deleted file mode 100644 index e69de29..0000000 diff --git a/debian/perl-framework/t/htdocs/modules/h2/hello.pl b/debian/perl-framework/t/htdocs/modules/h2/hello.pl deleted file mode 100755 index 688b102..0000000 --- a/debian/perl-framework/t/htdocs/modules/h2/hello.pl +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env perl - -use Env; - -print "Content-Type: text/html\n"; -print "\n"; - -#my $ssl_protocol = $ENV{'SSL_TLS_SNI'}; -print < -

Hello World!

- -EOF diff --git a/debian/perl-framework/t/htdocs/modules/h2/index.html b/debian/perl-framework/t/htdocs/modules/h2/index.html deleted file mode 100644 index aa11d4f..0000000 --- a/debian/perl-framework/t/htdocs/modules/h2/index.html +++ /dev/null @@ -1,45 +0,0 @@ - - - mod_h2 test site - - -

mod_h2 test site

-

-

served directly

- -

mod_proxyied

- -

mod_rewritten

- - - \ No newline at end of file diff --git a/debian/perl-framework/t/htdocs/modules/h2/index.jpg b/debian/perl-framework/t/htdocs/modules/h2/index.jpg deleted file mode 100755 index 246624e..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/index.jpg and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/h2/info.php b/debian/perl-framework/t/htdocs/modules/h2/info.php deleted file mode 100644 index 640e4f2..0000000 --- a/debian/perl-framework/t/htdocs/modules/h2/info.php +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/debian/perl-framework/t/htdocs/modules/h2/necho.pl b/debian/perl-framework/t/htdocs/modules/h2/necho.pl deleted file mode 100755 index bc9b6c0..0000000 --- a/debian/perl-framework/t/htdocs/modules/h2/necho.pl +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env perl - -use Env; - -my $query = $ENV{QUERY_STRING}; - -if ($query) { - $query =~ /count=([0-9]+)/; - my $count = $1; - $query =~ /text=([^&]+)/; - my $text = $1; - - print "Status: 200\n"; - print "Content-Type: text/plain\n"; - print "\n"; - foreach my $i (1..$count) { - print $text; - } -} -else { - print "Status: 400 Parameter Missing\n"; - print "Content-Type: text/plain\n"; - print "\n"; - print < -

No query was specified.

- -EOF -} diff --git a/debian/perl-framework/t/htdocs/modules/h2/upload.pl b/debian/perl-framework/t/htdocs/modules/h2/upload.pl deleted file mode 100755 index 71880f1..0000000 --- a/debian/perl-framework/t/htdocs/modules/h2/upload.pl +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env python -import cgi, os -import cgitb; cgitb.enable() - -status = '200 Ok' - -try: # Windows needs stdio set for binary mode. - import msvcrt - msvcrt.setmode (0, os.O_BINARY) # stdin = 0 - msvcrt.setmode (1, os.O_BINARY) # stdout = 1 -except ImportError: - pass - -form = cgi.FieldStorage() - -# Test if the file was uploaded -if 'file' in form: - # A nested FieldStorage instance holds the file - fileitem = form['file'] - - # strip leading path from file name to avoid directory traversal attacks - fn = os.path.basename(fileitem.filename) - open('./files/' + fn, 'wb').write(fileitem.file.read()) - message = 'The file "' + fn + '" was uploaded successfully' - -elif 'remove' in form: - remove = form['remove'].value - try: - fn = os.path.basename(remove) - os.remove('./files/' + fn) - message = 'The file "' + fn + '" was removed successfully' - except OSError, e: - message = 'Error removing ' + fn + ': ' + e.strerror - status = '404 File Not Found' -else: - message = '''\ - Upload File
- -
- ''' - -print "Status: %s" % (status,) -print """\ - Content-Type: text/html\n - -

%s

- """ % (message,) diff --git a/debian/perl-framework/t/htdocs/modules/h2/upload.py b/debian/perl-framework/t/htdocs/modules/h2/upload.py deleted file mode 100755 index 71880f1..0000000 --- a/debian/perl-framework/t/htdocs/modules/h2/upload.py +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env python -import cgi, os -import cgitb; cgitb.enable() - -status = '200 Ok' - -try: # Windows needs stdio set for binary mode. - import msvcrt - msvcrt.setmode (0, os.O_BINARY) # stdin = 0 - msvcrt.setmode (1, os.O_BINARY) # stdout = 1 -except ImportError: - pass - -form = cgi.FieldStorage() - -# Test if the file was uploaded -if 'file' in form: - # A nested FieldStorage instance holds the file - fileitem = form['file'] - - # strip leading path from file name to avoid directory traversal attacks - fn = os.path.basename(fileitem.filename) - open('./files/' + fn, 'wb').write(fileitem.file.read()) - message = 'The file "' + fn + '" was uploaded successfully' - -elif 'remove' in form: - remove = form['remove'].value - try: - fn = os.path.basename(remove) - os.remove('./files/' + fn) - message = 'The file "' + fn + '" was removed successfully' - except OSError, e: - message = 'Error removing ' + fn + ': ' + e.strerror - status = '404 File Not Found' -else: - message = '''\ - Upload File
- -
- ''' - -print "Status: %s" % (status,) -print """\ - Content-Type: text/html\n - -

%s

- """ % (message,) diff --git a/debian/perl-framework/t/htdocs/modules/h2/xxx-1.0.2a.tar.gz b/debian/perl-framework/t/htdocs/modules/h2/xxx-1.0.2a.tar.gz deleted file mode 100644 index f025d43..0000000 Binary files a/debian/perl-framework/t/htdocs/modules/h2/xxx-1.0.2a.tar.gz and /dev/null differ diff --git a/debian/perl-framework/t/htdocs/modules/lua/websockets.lua b/debian/perl-framework/t/htdocs/modules/lua/websockets.lua index 1acd91b..6e6d5ba 100644 --- a/debian/perl-framework/t/htdocs/modules/lua/websockets.lua +++ b/debian/perl-framework/t/htdocs/modules/lua/websockets.lua @@ -2,6 +2,11 @@ function handle(r) if r:wsupgrade() then -- if we can upgrade: while true do local line, isFinal = r:wsread() + local len = string.len(line); + r:debug(string.format("writing line of len %d: %s", len, line)) + if len >= 1024 then + r:debug("writing line ending in '" .. string.sub(line, -127, -1) .. "'") + end r:wswrite(line) if line == "quit" then r:wsclose() -- goodbye! diff --git a/debian/perl-framework/t/htdocs/modules/xml2enc/doc.fooxml b/debian/perl-framework/t/htdocs/modules/xml2enc/doc.fooxml new file mode 100644 index 0000000..612ba3c --- /dev/null +++ b/debian/perl-framework/t/htdocs/modules/xml2enc/doc.fooxml @@ -0,0 +1 @@ +fóó diff --git a/debian/perl-framework/t/htdocs/modules/xml2enc/doc.isohtml b/debian/perl-framework/t/htdocs/modules/xml2enc/doc.isohtml new file mode 100644 index 0000000..9a07943 --- /dev/null +++ b/debian/perl-framework/t/htdocs/modules/xml2enc/doc.isohtml @@ -0,0 +1 @@ +fóó diff --git a/debian/perl-framework/t/htdocs/modules/xml2enc/doc.notxml b/debian/perl-framework/t/htdocs/modules/xml2enc/doc.notxml new file mode 100644 index 0000000..9a07943 --- /dev/null +++ b/debian/perl-framework/t/htdocs/modules/xml2enc/doc.notxml @@ -0,0 +1 @@ +fóó diff --git a/debian/perl-framework/t/htdocs/modules/xml2enc/doc.xml b/debian/perl-framework/t/htdocs/modules/xml2enc/doc.xml new file mode 100644 index 0000000..612ba3c --- /dev/null +++ b/debian/perl-framework/t/htdocs/modules/xml2enc/doc.xml @@ -0,0 +1 @@ +fóó diff --git a/debian/perl-framework/t/modules/headers.t b/debian/perl-framework/t/modules/headers.t index c72c690..4892b95 100644 --- a/debian/perl-framework/t/modules/headers.t +++ b/debian/perl-framework/t/modules/headers.t @@ -116,7 +116,29 @@ my @testcases = ( [ 'Test-Header' => 'foo' ], ], ); - +if (have_min_apache_version('2.5.1')) { + push(@testcases, + ( + # edit* + [ + "Header echo Test-Header\nHeader edit* Test-Header (?<=a)(ba) cd", # lookbehind + [ 'Test-Header' => 'ababa' ], + [ 'Test-Header' => 'acdcd' ], + ], + [ + "Header echo Test-Header\nHeader edit* Test-Header ^ foo", # empty match (no infinite loop!) + [ 'Test-Header' => 'bar' ], + [ 'Test-Header' => 'foobar' ], + ], + [ + "Header echo Test-Header\nHeader edit* Test-Header ^(.*)\$ \$1;httpOnly;secure", # empty header/match (no infinite loop!) + [ 'Test-Header' => '' ], + [ 'Test-Header' => ';httpOnly;secure' ], + ], + ) + ); +} + plan tests => @header_types**4 + @header_types**3 + @header_types**2 + @header_types**1 + scalar @testcases * 2, have_module 'headers'; diff --git a/debian/perl-framework/t/modules/http2.t b/debian/perl-framework/t/modules/http2.t deleted file mode 100644 index 02725f5..0000000 --- a/debian/perl-framework/t/modules/http2.t +++ /dev/null @@ -1,535 +0,0 @@ -use strict; -use warnings FATAL => 'all'; - -use Net::SSLeay; -use Apache::Test; -use Apache::TestRequest; -use Apache::TestUtil; -use Apache::TestConfig (); - -my $tls_version_suite = 4; -my $num_suite = 24; -my $vhost_suite = 4; -my $total_tests = 2 * $num_suite + $vhost_suite + $tls_version_suite; - -Net::SSLeay::initialize(); - -my $sni_available = Net::SSLeay::OPENSSL_VERSION_NUMBER() >= 0x01000000; -my $alpn_available = $sni_available && exists &Net::SSLeay::CTX_set_alpn_protos; - -plan tests => $total_tests, need 'Protocol::HTTP2::Client', 'AnyEvent', - need_module 'http2', need_min_apache_version('2.4.17'); - -# Check support for TLSv1_2 and later - -Apache::TestRequest::set_ca_cert(); - -# If we can, detect the SSL protocol the server speaks and do not run -# against anything pre-TLSv1.2 -# On some setups, we do not get a socket here (for not understood reasons) -# and run the tests. Better to fail visibly then. -# -my $tls_modern = 1; -my $tls_version = 0; - -my $sock = Apache::TestRequest::vhost_socket('h2'); -if ($sock) { - ok ($sock->connected); - - my $req = "GET / HTTP/1.1\r\n". - "Host: " . Apache::TestRequest::hostport() . "\r\n". - "\r\n"; - - ok $sock->print($req); - my $line = Apache::TestRequest::getline($sock) || ''; - ok t_cmp($line, qr{^HTTP/1\.. 200}, "read first response-line"); - $tls_version = $sock->get_sslversion(); - ok t_cmp($tls_version, qr{^(SSL|TLSv\d(_\d)?$)}, "TLS version in use"); - - if ($tls_version =~ /^(SSL|TLSv1(|_0|_1)$)/) { - print STDOUT "Disabling TLS tests due to TLS version $tls_version\n"; - $tls_modern = 0; - } -} -else { - skip "skipping test as socket not defined" foreach(1..$tls_version_suite); -} - -Apache::TestRequest::module("http2"); - -my $config = Apache::Test::config(); -my $host = $config->{vhosts}->{h2c}->{servername}; -my $port = $config->{vhosts}->{h2c}->{port}; - -my $shost = $config->{vhosts}->{h2}->{servername}; -my $sport = $config->{vhosts}->{h2}->{port}; -my $serverdir = $config->{vars}->{t_dir}; -my $htdocs = $serverdir . "/htdocs"; - -require Protocol::HTTP2::Client; -use AnyEvent; -use AnyEvent::Socket; -use AnyEvent::Handle; -use Net::SSLeay; -use AnyEvent::TLS; -use Carp qw( croak ); - -no warnings 'redefine'; -no strict 'refs'; -{ - my $old_ref = \&{ 'AnyEvent::TLS::new' }; - *{ 'AnyEvent::TLS::new' } = sub { - my ( $class, %param ) = @_; - - my $self = $old_ref->( $class, %param ); - - $self->{host_name} = $param{host_name} - if exists $param{host_name}; - - $self; - }; -} - -{ - my $old_ref = \&{ 'AnyEvent::TLS::_get_session' }; - *{ 'AnyEvent::TLS::_get_session' } = sub($$;$$) { - my ($self, $mode, $ref, $cn) = @_; - - my $session = $old_ref->( @_ ); - - if ( $mode eq 'connect' ) { - if ( $self->{host_name} ) { - print 'setting host_name to ' . $self->{host_name}; - Net::SSLeay::set_tlsext_host_name( $session, $self->{host_name} ); - } - } - - $session; - }; -} - - -sub connect_and_do { - my %args = ( - @_ - ); - my $scheme = $args{ctx}->{scheme}; - my $host = $args{ctx}->{host}; - my $port = $args{ctx}->{port}; - my $client = $args{ctx}->{client}; - my $host_name = $args{ctx}->{host_name}; - my $w = AnyEvent->condvar; - - tcp_connect $host, $port, sub { - my ($fh) = @_ or do { - print "connection failed: $!\n"; - $w->send; - return; - }; - - my $tls; - my $tls_ctx; - if ($scheme eq 'https') { - $tls = "connect"; - eval { - # ALPN (Net-SSLeay > 1.55, openssl >= 1.0.1) - if ( $alpn_available ) { - $tls_ctx = AnyEvent::TLS->new( method => "TLSv1_2", - host_name => $host_name ); - Net::SSLeay::CTX_set_alpn_protos( $tls_ctx->ctx, ['h2'] ); - } - else { - $tls_ctx = AnyEvent::TLS->new( host_name => $host_name ); - } - }; - if ($@) { - print "Some problem with SSL CTX: $@\n"; - $w->send; - return; - } - } - - my $handle; - $handle = AnyEvent::Handle->new( - fh => $fh, - tls => $tls, - tls_ctx => $tls_ctx, - autocork => 1, - on_error => sub { - $_[0]->destroy; - print "connection error\n"; - $w->send; - }, - on_eof => sub { - $handle->destroy; - $w->send; - } - ); - - # First write preface to peer - while ( my $frame = $client->next_frame ) { - $handle->push_write($frame); - } - - $handle->on_read(sub { - my $handle = shift; - - $client->feed( $handle->{rbuf} ); - $handle->{rbuf} = undef; - - while ( my $frame = $client->next_frame ) { - $handle->push_write($frame); - } - - # Terminate connection if all done - $handle->push_shutdown if $client->shutdown; - }); - }; - $w->recv; - -} - -################################################################################ -# -# Add a request to the client, will be started whenever a STREAM to -# the server is available. -# -sub add_request { - my ($scheme, $client, $host, $port); - my %args = ( - method => 'GET', - headers => [], - rc => 200, - on_done => sub { - my %args = ( @_ ); - my $ctx = $args{ctx}; - my $req = $args{request}; - my $resp = $args{response}; - my $hr = $resp->{headers}; - my %headers = @$hr; - ok t_cmp($headers{':status'}, $req->{rc}, - "$req->{method} $ctx->{scheme}://$ctx->{host}:$ctx->{port}$req->{path}"); - }, - @_ - ); - $client = $args{ctx}->{client}; - $scheme = $args{ctx}->{scheme}; - $host = $args{ctx}->{host}; - $port = $args{ctx}->{port}; - - $client->request( - ':scheme' => $scheme, - ':authority' => $args{authority} || $host . ':' . $port, - ':path' => $args{path}, - ':method' => $args{method}, - headers => $args{headers}, - on_done => sub { - my ($headers, $data) = @_; - $args{on_done}( - ctx => $args{ctx}, - request => \%args, - response => { headers => \@$headers, data => $data } - ); - } - ); -} - -################################################################################ -# -# Add a list of request that will be processed in order. Only when the previous -# request is done, will a new one be started. -# -sub add_sequential { - my ($scheme, $client, $host, $port); - my %args = ( @_ ); - my $ctx = $args{ctx}; - my $requests = $args{requests}; - - $client = $args{ctx}->{client}; - $scheme = $args{ctx}->{scheme}; - $host = $args{ctx}->{host}; - $port = $args{ctx}->{port}; - - my $request = shift @$requests; - - if ($request) { - my %r = ( - method => 'GET', - headers => [], - rc => 200, - on_done => sub { - my %args = ( @_ ); - my $ctx = $args{ctx}; - my $req = $args{request}; - my $resp = $args{response}; - my $hr = $resp->{headers}; - my %headers = @$hr; - ok t_cmp($headers{':status'}, $req->{rc}, - "$req->{method} $ctx->{scheme}://$ctx->{host}:$ctx->{port}$req->{path}"); - }, - %$request - ); - - print "test case: $r{descr}: $r{method} $ctx->{scheme}://$ctx->{host}:$ctx->{port}$r{path}\n"; - $client->request( - ':scheme' => $scheme, - ':authority' => $r{authority} || $host . ':' . $port, - ':path' => $r{path}, - ':method' => $r{method}, - headers => $r{headers}, - on_done => sub { - my ($headers, $data) = @_; - $r{on_done}( - ctx => ${ctx}, - request => \%r, - response => { headers => \@$headers, data => $data } - ); - add_sequential( - ctx => $ctx, - requests => $requests - ); - } - ); - } -} - -sub cmp_content_length { - my %args = ( @_ ); - my $ctx = $args{ctx}; - my $req = $args{request}; - my $resp = $args{response}; - my $hr = $resp->{headers}; - my %headers = @$hr; - ok t_cmp($headers{':status'}, $req->{rc}, "response status"); - ok t_cmp(length $resp->{data}, $req->{content_length}, "content-length"); -} - -sub cmp_content { - my %args = ( @_ ); - my $ctx = $args{ctx}; - my $req = $args{request}; - my $resp = $args{response}; - my $hr = $resp->{headers}; - my %headers = @$hr; - ok t_cmp($headers{':status'}, $req->{rc}, "response status"); - ok t_cmp($resp->{data}, $req->{content}, "content comparision"); -} - -sub cmp_file_response { - my %args = ( @_ ); - my $ctx = $args{ctx}; - my $req = $args{request}; - my $resp = $args{response}; - my $hr = $resp->{headers}; - my %headers = @$hr; - ok t_cmp($headers{':status'}, $req->{rc}, "response status"); - open(FILE, "<$htdocs$req->{path}") or die "cannot open $req->{path}"; - undef $/; - my $content = ; - close(FILE); - ok t_is_equal($resp->{data}, $content); -} - -sub check_redir { - my %args = ( @_ ); - my $ctx = $args{ctx}; - my $req = $args{request}; - my $resp = $args{response}; - my $hr = $resp->{headers}; - my %headers = @$hr; - ok t_cmp($headers{':status'}, 302, "response status"); - ok t_cmp( - $headers{location}, - "$ctx->{scheme}://$ctx->{host}:$ctx->{port}$req->{redir_path}", - "location header" - ); -} - -################################################################################ -# -# Perform common tests to h2c + h2 hosts -# -sub do_common { - my %args = ( - scheme => 'http', - host => 'localhost', - port => 80, - @_ - ); - my $true_tls = ($args{scheme} eq 'https' and $sni_available); - - $args{client} = Protocol::HTTP2::Client->new( upgrade => 0 ); - - my $r = [ - { - descr => 'TC0001, expecting 200', - path => '/' - }, - { - descr => 'TC0002, expecting 404', - rc => 404, - path => '/not_here' - }, - { - descr => 'TC0005, cmp index.html file', - path => '/modules/h2/index.html', - on_done => \&cmp_file_response - }, - { - descr => 'TC0006, cmp image file', - path => '/modules/h2/003/003_img.jpg', - on_done => \&cmp_file_response - }, - ]; - - if (have_module 'mod_rewrite') { - push @$r, { - descr => 'TC0007, rewrite handling', - path => '/modules/h2/latest.tar.gz', - redir_path => "/modules/h2/xxx-1.0.2a.tar.gz", - on_done => \&check_redir - } - } - else { - skip "skipping test as mod_rewrite not available" foreach(1..2); - } - - if (have_cgi) { - # my $sni_host = $true_tls? 'localhost' : ''; - my $content = < -

Hello World!

- -EOF - - push @$r, { - descr => 'TC0008, hello.pl with ssl vars', - path => '/modules/h2/hello.pl', - content => $content, - on_done => \&cmp_content, - }; - - $content = < -

No query was specified.

- -EOF - push @$r, { - descr => 'TC0009, necho.pl without arguments', - path => '/modules/h2/necho.pl', - content => $content, - rc => 400, - on_done => \&cmp_content, - }; - push @$r, { - descr => 'TC0010, necho.pl 2x10', - path => '/modules/h2/necho.pl?count=2&text=0123456789', - content => "01234567890123456789", - on_done => \&cmp_content, - }; - push @$r, { - descr => 'TC0011, necho.pl 10x10', - path => '/modules/h2/necho.pl?count=10&text=0123456789', - content_length => 100, - on_done => \&cmp_content_length, - }; - push @$r, { - descr => 'TC0012, necho.pl 100x10', - path => '/modules/h2/necho.pl?count=100&text=0123456789', - content_length => 1000, - on_done => \&cmp_content_length, - }; - push @$r, { - descr => 'TC0013, necho.pl 1000x10', - path => '/modules/h2/necho.pl?count=1000&text=0123456789', - content_length => 10000, - on_done => \&cmp_content_length, - }; - push @$r, { - descr => 'TC0014, necho.pl 10000x10', - path => '/modules/h2/necho.pl?count=10000&text=0123456789', - content_length => 100000, - on_done => \&cmp_content_length, - }; - push @$r, { - descr => 'TC0015, necho.pl 100000x10', - path => '/modules/h2/necho.pl?count=100000&text=0123456789', - content_length => 1000000, - on_done => \&cmp_content_length, - }; - } - else { - skip "skipping test as mod_cgi not available" foreach(1..16); - } - - add_sequential( - ctx => \%args, - requests => $r - ); - connect_and_do( ctx => \%args ); -} - -################################################################################ -# -# Perform tests for virtual host setups, requires a client with SNI+ALPN -# -sub do_vhosts { - my %args = ( - scheme => 'http', - host => 'localhost', - port => 80, - @_ - ); - $args{client} = Protocol::HTTP2::Client->new( upgrade => 0 ); - - my $r = [ - { - descr => 'VHOST000, expecting 200', - path => '/' - }, - { - descr => 'VHOST001, expect 404 or 421 (using Host:)', - rc => 404, - path => '/misdirected', - header => [ 'host' => 'noh2.example.org' . $args{port} ] - }, - { - descr => 'VHOST002, expect 421 (using :authority)', - rc => 421, - path => '/misdirected', - authority => 'noh2.example.org:' . $args{port} - }, - { - descr => 'VHOST003, expect 421 ', - rc => (have_min_apache_version('2.4.18')? 404 : 421), - path => '/misdirected', - authority => 'test.example.org:' . $args{port} - }, - ]; - - add_sequential( - ctx => \%args, - requests => $r - ); - connect_and_do( ctx => \%args ); -} - -################################################################################ -# -# Bring it on -# -do_common( 'scheme' => 'http', 'host' => $host, 'port' => $port ); -if ($tls_modern) { - do_common( 'scheme' => 'https', 'host' => $shost, 'port' => $sport ); -} else { - skip "skipping test as TLS version '$tls_version' is not supported" foreach(1..$num_suite); -} -if ($sni_available) { - if ($tls_modern) { - do_vhosts( 'scheme' => 'https', 'host' => $shost, 'port' => $sport, host_name => "$shost:${sport}" ); - } else { - skip "skipping test as TLS version '$tls_version' is not supported" foreach(1..$vhost_suite); - } -} else { - skip "skipping test as SNI not available" foreach(1..$vhost_suite); -} diff --git a/debian/perl-framework/t/modules/proxy_balancer.t b/debian/perl-framework/t/modules/proxy_balancer.t index 94753b7..ee31507 100644 --- a/debian/perl-framework/t/modules/proxy_balancer.t +++ b/debian/perl-framework/t/modules/proxy_balancer.t @@ -111,10 +111,10 @@ if (have_min_apache_version("2.4.49") && have_module('lbmethod_byrequests')) { $r = GET("/dynproxy"); ok t_cmp($r->code, 503, "request should fail for /dynproxy"); # create it - $query = "b_lbm=byrequests&b_tmo=0&b_max=0&b_sforce=0&b_ss=&b_nwrkr=http%3A%2F%2Flocalhost%3A8529&b_wyes=1&b=dynproxy&nonce=" . $result; + $query = 'b_lbm=byrequests&b_tmo=0&b_max=0&b_sforce=0&b_ss=&b_nwrkr=http%3A%2F%2F' . $vars->{servername} . '%3A' . $vars->{port} . '&b_wyes=1&b=dynproxy&nonce=' . $result; $r = POST("/balancer-manager", content => $query, @proxy_balancer_headers); # enable it. - $query = "w=http%3A%2F%2Flocalhost%3A8529&b=dynproxy&w_status_D=0&nonce=" . $result; + $query = 'w=http%3A%2F%2F' . $vars->{servername} . '%3A' . $vars->{port} . '&b=dynproxy&w_status_D=0&nonce=' . $result; $r = POST("/balancer-manager", content => $query, @proxy_balancer_headers); # make a query $r = GET("/dynproxy"); diff --git a/debian/perl-framework/t/modules/proxy_websockets.t b/debian/perl-framework/t/modules/proxy_websockets.t index ed7ea97..f2d6558 100644 --- a/debian/perl-framework/t/modules/proxy_websockets.t +++ b/debian/perl-framework/t/modules/proxy_websockets.t @@ -6,7 +6,10 @@ use Apache::TestRequest; use Apache::TestUtil; use Apache::TestConfig (); -my $total_tests = 1; +# not reliable, hangs for some people: +# my @test_cases = ( "ping0", "ping1" x 10, "ping2" x 100, "ping3" x 1024, "ping4" x 4096, "sendquit"); +my @test_cases = ( "ping0", "ping1" x 10, "ping2" x 100, "ping3" x 1024, "sendquit"); +my $total_tests = 2; plan tests => $total_tests, need 'AnyEvent::WebSocket::Client', need_module('proxy_http', 'lua'), need_min_apache_version('2.4.47'); @@ -21,7 +24,8 @@ my $client = AnyEvent::WebSocket::Client->new(timeout => 5); my $quit_program = AnyEvent->condvar; -my $pingok = 0; +my $responses = 0; +my $surprised = 0; $client->connect("ws://$hostport/proxy/wsoc")->cb(sub { our $connection = eval { shift->recv }; @@ -33,21 +37,45 @@ $client->connect("ws://$hostport/proxy/wsoc")->cb(sub { return; } - $connection->send('ping'); + # AnyEvent::WebSocket::Connection does not pass the PONG message down to the callback + # my $actualpingmsg = AnyEvent::WebSocket::Message->new(opcode => 0x09, body => "xxx"); + # $connection->send($actualpingmsg); + + foreach (@test_cases){ + $connection->send($_); + } + + $connection->on(finish => sub { + t_debug("finish"); + }); + # recieve message from the websocket... $connection->on(each_message => sub { # $connection is the same connection object # $message isa AnyEvent::WebSocket::Message my($connection, $message) = @_; - t_debug("wsoc msg received: " . $message->body); - if ("ping" eq $message->body) { - $pingok = 1; + $responses++; + t_debug("wsoc msg received: " . substr($message->body, 0, 5). " opcode " . $message->opcode); + if ("sendquit" eq $message->body) { + $connection->send('quit'); + t_debug("closing"); + $connection->close; # doesn't seem to close TCP. + $quit_program->send(); + } + elsif ($message->body =~ /^ping(\d)/) { + my $offset = $1; + if ($message->body ne $test_cases[$offset]) { + $surprised++; + } + } + else { + $surprised++; } - $connection->send('quit'); - $quit_program->send(); }); + }); $quit_program->recv; -ok t_cmp($pingok, 1); +ok t_cmp($surprised, 0); +ok t_cmp($responses, scalar(@test_cases) ); diff --git a/debian/perl-framework/t/modules/proxy_websockets_ssl.t b/debian/perl-framework/t/modules/proxy_websockets_ssl.t new file mode 100644 index 0000000..793ff48 --- /dev/null +++ b/debian/perl-framework/t/modules/proxy_websockets_ssl.t @@ -0,0 +1,86 @@ +use strict; +use warnings FATAL => 'all'; + +use Apache::Test; +use Apache::TestRequest; +use Apache::TestUtil; +use Apache::TestConfig (); + +# my @test_cases = ( "ping0", "ping1" x 10, "ping2" x 100, "ping3" x 1024, "ping4" x 4000, "sendquit"); +my @test_cases = ( "ping0", "ping1" x 10, "ping2" x 100, "ping3" x 1024, "sendquit"); +my $total_tests = 2; + +plan tests => $total_tests, need 'AnyEvent::WebSocket::Client', + need_module('ssl', 'proxy_http', 'lua'), need_min_apache_version('2.4.47'); + +require AnyEvent; +require AnyEvent::WebSocket::Client; + +my $config = Apache::Test::config(); +#my $hostport = $config->{vhosts}->{proxy_https_https}->{hostport}; +my $hostport = $config->{vhosts}->{$config->{vars}->{ssl_module_name}}->{hostport}; +my $client = AnyEvent::WebSocket::Client->new(timeout => 5, ssl_ca_file => $config->{vars}->{sslca} . "/" . $config->{vars}->{sslcaorg} . "/certs/ca.crt"); + +my $quit_program = AnyEvent->condvar; + +my $responses = 0; +my $surprised = 0; + +t_debug("wss://$hostport/modules/lua/websockets.lua"); + +# $client->connect("wss://$hostport/proxy/wsoc")->cb(sub { +$client->connect("wss://$hostport/modules/lua/websockets.lua")->cb(sub { + our $connection = eval { shift->recv }; + t_debug("wsoc connected"); + if($@) { + # handle error... + warn $@; + $quit_program->send(); + return; + } + + + # AnyEvent::WebSocket::Connection does not pass the PONG message down to the callback + # my $actualpingmsg = AnyEvent::WebSocket::Message->new(opcode => 0x09, body => "xxx"); + # $connection->send($actualpingmsg); + + foreach (@test_cases){ + $connection->send($_); + } + + $connection->on(finish => sub { + t_debug("finish"); + $quit_program->send(); + }); + + # recieve message from the websocket... + $connection->on(each_message => sub { + # $connection is the same connection object + # $message isa AnyEvent::WebSocket::Message + my($connection, $message) = @_; + $responses++; + t_debug("wsoc msg received: " . substr($message->body, 0, 5). " opcode " . $message->opcode); + if ("sendquit" eq $message->body) { + $connection->send('quit'); + t_debug("closing"); + $connection->close; # doesn't seem to close TCP. + $quit_program->send(); + } + elsif ($message->body =~ /^ping(\d)/) { + my $offset = $1; + if ($message->body ne $test_cases[$offset]) { + t_debug("wrong data"); + $surprised++; + } + } + else { + $surprised++; + } + }); + +}); + +$quit_program->recv; +ok t_cmp($surprised, 0); +# We don't expect the 20k over SSL to work, and we won't read the "sendquit" echoed back either. +ok t_cmp($responses, scalar(@test_cases)); diff --git a/debian/perl-framework/t/modules/rewrite.t b/debian/perl-framework/t/modules/rewrite.t index 30bb334..4673431 100644 --- a/debian/perl-framework/t/modules/rewrite.t +++ b/debian/perl-framework/t/modules/rewrite.t @@ -15,6 +15,49 @@ my @url = qw(forbidden gone perm temp); my @todo; my $r; +my @redirects_all = ( + ["/modules/rewrite/escaping/qsd-like/foo", "/foo\$", have_min_apache_version('2.4.57')], # PR66547 + ["/modules/rewrite/escaping/qsd-like-plus-qsa/foo?preserve-me", "/foo\\?preserve-me\$", have_min_apache_version('2.5.1')], # PR66672 + ["/modules/rewrite/escaping/qsd-like-plus-qsa-qsl/foo/%3fbar/?preserve-me", "/foo/%3fbar/\\?preserve-me\$", have_min_apache_version('2.5.1')], # PR66672 + ); + +my @escapes = ( + # rewrite to local/PT is not escaped + [ "/modules/rewrite/escaping/local/foo%20bar" => 403], + # rewrite to redir escape opted out + [ "/modules/rewrite/escaping/redir_ne/foo%20bar" => 403], + # rewrite never escapes proxy targets, even though [NE] is kind or repurposed. + [ "/modules/rewrite/escaping/proxy/foo%20bar" => 403], + [ "/modules/rewrite/escaping/proxy_ne/foo%20bar" => 403], + + [ "/modules/rewrite/escaping/fixups/local/foo%20bar" => 403], + [ "/modules/rewrite/escaping/fixups/redir_ne/foo%20bar" => 403], + [ "/modules/rewrite/escaping/fixups/proxy/foo%20bar" => 403], + [ "/modules/rewrite/escaping/fixups/proxy_ne/foo%20bar" => 403], +); +if (have_min_apache_version('2.4.57')) { + push(@escapes, ( + # rewrite to redir escaped by default + [ "/modules/rewrite/escaping/redir/foo%20bar" => 302], + [ "/modules/rewrite/escaping/fixups/redir/foo%20bar" => 302], + )); +} + +my @bflags = ( + # t/conf/extra.conf.in + [ "/modules/rewrite/escaping/local_b/foo/bar/%20baz%0d" => "foo%2fbar%2f+baz%0d"], # this is why [B] sucks + [ "/modules/rewrite/escaping/local_b_justslash/foo/bar/%20baz/" => "foo%2fbar%2f baz%2f"], # test basic B=/ +); +if (have_min_apache_version('2.4.57')) { + # [BCTLS] / [BNE] + push(@bflags, ( + [ "/modules/rewrite/escaping/local_bctls/foo/bar/%20baz/%0d" => "foo/bar/+baz/%0d"], # spaces and ctls only + [ "/modules/rewrite/escaping/local_bctls_nospace/foo/bar/%20baz/%0d" => "foo/bar/ baz/%0d"], # ctls but keep space + [ "/modules/rewrite/escaping/local_bctls_andslash/foo/bar/%20baz/%0d" => "foo%2fbar%2f+baz%2f%0d"], # not realistic, but opt in to slashes + [ "/modules/rewrite/escaping/local_b_noslash/foo/bar/%20baz/%0d" => "foo/bar/+baz/%0d"], # negate something from [B] + )); +} + if (!have_min_apache_version('2.4.19')) { # PR 50447, server context push @todo, 26 @@ -27,8 +70,10 @@ if (!have_min_apache_version('2.4')) { # Specific tests for PR 58231 my $vary_header_tests = (have_min_apache_version("2.4.30") ? 9 : 0) + (have_min_apache_version("2.4.29") ? 4 : 0); my $cookie_tests = have_min_apache_version("2.4.47") ? 6 : 0; +my @redirects = map {$_->[2] ? $_ : ()} @redirects_all; -plan tests => @map * @num + 16 + $vary_header_tests + $cookie_tests, todo => \@todo, need_module 'rewrite'; +plan tests => @map * @num + 16 + $vary_header_tests + $cookie_tests + scalar(@escapes) + scalar(@redirects) + scalar(@bflags), + todo => \@todo, need_module 'rewrite'; foreach (@map) { foreach my $n (@num) { @@ -129,6 +174,7 @@ if (have_min_apache_version('2.4')) { if (have_min_apache_version("2.4.29")) { # PR 58231: Vary:Host header (was) mistakenly added to the response + # XXX: If LWP uses http2, this can result in "Host: localhost, test1" $r = GET("/modules/rewrite/vary1.html", "Host" => "test1"); ok t_cmp($r->content, qr/VARY2/, "Correct internal redirect happened, OK"); ok t_cmp($r->header("Vary"), qr/(?!.*Host.*)/, "Vary:Host header not added, OK"); @@ -184,3 +230,31 @@ if (have_min_apache_version("2.4.47")) { $r = GET("/modules/rewrite/cookie/foo"); ok t_cmp($r->header("Set-Cookie"), qr/SameSite=foo/, "samesite=foo"); } + + +foreach my $t (@escapes) { + my $url= $t->[0]; + my $expect = $t->[1]; + t_debug "Check $url for $expect\n"; + $r = GET($url, redirect_ok => 0); + ok t_cmp $r->code, $expect; +} +foreach my $t (@bflags) { + my $url= $t->[0]; + my $expect= $t->[1]; + t_debug "Check $url for $expect\n"; + $r = GET($url, redirect_ok => 0); + t_debug("rewritten query '" . $r->header("rewritten-query") . "'"); + ok t_cmp $r->header("rewritten-query"), $expect; +} + +foreach my $t (@redirects) { + my $url= $t->[0]; + my $expect= $t->[1]; + t_debug "Check $url for redir $expect\n"; + $r = GET($url, redirect_ok => 0); + my $loc = $r->header("location"); + t_debug " redirect is $loc"; + ok $loc =~ /$expect/; +} + diff --git a/debian/perl-framework/t/modules/sed.t b/debian/perl-framework/t/modules/sed.t index 10edcd7..6ab1ee1 100644 --- a/debian/perl-framework/t/modules/sed.t +++ b/debian/perl-framework/t/modules/sed.t @@ -7,20 +7,42 @@ use Apache::TestUtil; my @ts = ( # see t/conf/extra.conf.in - { url => "/apache/sed/out-foo/foobar.html", content => 'barbar', msg => "sed output filter", code => 200 } + { url => "/apache/sed/out-foo/foobar.html", content => 'barbar', msg => "sed output filter", code => '200' }, + # error after status sent + { url => "/apache/sed-echo/out-foo-grow/foobar.html", content => "", msg => "sed output filter too large", code => '200', body=>"foo" x (8192*1024), resplen=>0}, + { url => "/apache/sed-echo/input", content => 'barbar', msg => "sed input filter", code => '200', body=>"foobar" }, + { url => "/apache/sed-echo/input", content => undef, msg => "sed input filter", code => '200', body=>"foo" x (1024)}, + # fixme: returns 400 default error doc for some people instead + # { url => "/apache/sed-echo/input", content => '!!!ERROR!!!', msg => "sed input filter", code => '200', skippable=>true body=>"foo" x (1024*4096)} ); my $tests = 2*scalar @ts; -plan tests => $tests, need_module('sed'); +plan tests => $tests, need 'LWP::Protocol::AnyEvent::http', need_module('sed'); +# Hack to allow streaming of data in/out of mod_echo +require LWP::Protocol::AnyEvent::http; for my $t (@ts) { - my $req = GET $t->{'url'}; + my $req; + if (defined($t->{'body'})) { + t_debug "posting body of size ". length($t->{'body'}); + $req = POST $t->{'url'}, content => $t->{'body'}; + t_debug "... posted body of size ". length($t->{'body'}); + } + else { + $req = GET $t->{'url'}; + } + t_debug "Content Length " . length $req->content; ok t_cmp($req->code, $t->{'code'}, "status code for " . $t->{'url'}); - my $content = $req->content; - chomp($content); - ok t_cmp($content, $t->{content}, $t->{msg}); + if (defined($t->{content})) { + my $content = $req->content; + chomp($content); + ok t_cmp($content, $t->{content}, $t->{msg}); + } + else { + ok "no body check"; + } } diff --git a/debian/rules b/debian/rules index 9461014..705d226 100755 --- a/debian/rules +++ b/debian/rules @@ -180,7 +180,7 @@ override_dh_installdocs-indep: dh_installdocs -i override_dh_installdocs-arch: - dh_installdocs --link-doc=apache2 -papache2 -plibapache2-mod-md -plibapache2-mod-proxy-uwsgi + dh_installdocs --link-doc=apache2 -papache2 dh_installdocs --link-doc=apache2-dev -papache2-ssl-dev dh_installdocs -a diff --git a/debian/source/include-binaries b/debian/source/include-binaries index d617b1d..35c26b8 100644 --- a/debian/source/include-binaries +++ b/debian/source/include-binaries @@ -268,206 +268,6 @@ debian/perl-framework/t/htdocs/modules/filter/bytype/test.txt debian/perl-framework/t/htdocs/modules/filter/bytype/test.xml debian/perl-framework/t/htdocs/modules/filter/pr49328/included.shtml debian/perl-framework/t/htdocs/modules/filter/pr49328/pr49328.shtml -debian/perl-framework/t/htdocs/modules/h2/001.html -debian/perl-framework/t/htdocs/modules/h2/002.jpg -debian/perl-framework/t/htdocs/modules/h2/003.html -debian/perl-framework/t/htdocs/modules/h2/003/003_img.jpg -debian/perl-framework/t/htdocs/modules/h2/004.html -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_002.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_003.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_004.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_005.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_006.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_007.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_008.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_009.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_010.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_011.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_012.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_013.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_014.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_015.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_016.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_017.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_018.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_019.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_020.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_021.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_022.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_023.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_024.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_025.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_026.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_027.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_028.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_029.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_030.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_031.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_032.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_033.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_034.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_035.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_036.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_037.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_038.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_039.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_040.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_041.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_042.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_043.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_044.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_045.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_046.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_047.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_048.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_049.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_050.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_051.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_052.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_053.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_054.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_055.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_056.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_057.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_058.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_059.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_060.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_061.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_062.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_063.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_064.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_065.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_066.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_067.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_068.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_069.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_070.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_071.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_072.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_073.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_074.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_075.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_076.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_077.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_078.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_079.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_080.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_081.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_082.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_083.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_084.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_085.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_086.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_087.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_088.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_089.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_090.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_091.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_092.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_093.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_094.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_095.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_096.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_097.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_098.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_099.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_100.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_101.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_102.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_103.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_104.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_105.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_106.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_107.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_108.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_109.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_110.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_111.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_112.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_113.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_114.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_115.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_116.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_117.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_118.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_119.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_120.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_121.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_122.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_123.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_124.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_125.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_126.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_127.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_128.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_129.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_130.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_131.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_132.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_133.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_134.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_135.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_136.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_137.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_138.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_139.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_140.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_141.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_142.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_143.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_144.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_145.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_146.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_147.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_148.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_149.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_150.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_151.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_152.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_153.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_154.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_155.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_156.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_157.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_158.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_159.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_160.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_161.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_162.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_163.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_164.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_165.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_166.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_167.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_168.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_169.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_170.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_171.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_172.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_173.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_174.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_175.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_176.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_177.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_178.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_179.jpg -debian/perl-framework/t/htdocs/modules/h2/004/gophertiles_180.jpg -debian/perl-framework/t/htdocs/modules/h2/006.html -debian/perl-framework/t/htdocs/modules/h2/006/006.css -debian/perl-framework/t/htdocs/modules/h2/006/006.js -debian/perl-framework/t/htdocs/modules/h2/007.html -debian/perl-framework/t/htdocs/modules/h2/007/007.py -debian/perl-framework/t/htdocs/modules/h2/009.py -debian/perl-framework/t/htdocs/modules/h2/files/empty.txt -debian/perl-framework/t/htdocs/modules/h2/hello.pl -debian/perl-framework/t/htdocs/modules/h2/index.html -debian/perl-framework/t/htdocs/modules/h2/index.jpg -debian/perl-framework/t/htdocs/modules/h2/info.php -debian/perl-framework/t/htdocs/modules/h2/necho.pl -debian/perl-framework/t/htdocs/modules/h2/upload.pl -debian/perl-framework/t/htdocs/modules/h2/upload.py -debian/perl-framework/t/htdocs/modules/h2/xxx-1.0.2a.tar.gz debian/perl-framework/t/htdocs/modules/headers/htaccess/index.html debian/perl-framework/t/htdocs/modules/headers/ssl/.htaccess debian/perl-framework/t/htdocs/modules/headers/ssl/index.html -- cgit v1.2.3