« back to all changes in this revision
Viewing changes to lib/inets/test/httpd_SUITE_data/server_root/htdocs/echo.shtml
- Committer: Bazaar Package Importer
- Date: 2011-05-05 15:48:43 UTC
- mfrom: (3.5.13 sid)
- Revision ID: james.westby@ubuntu.com-20110505154843-0om6ekzg6m7ugj27
* Merge from debian unstable. Remaining changes:
- Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not
supposed to.
- Drop erlang-wx binary.
- Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they
do not really need wx. Also drop it from -debugger; the GUI needs wx,
but it apparently has CLI bits as well, and is also needed by -megaco,
so let's keep the package for now.
- debian/patches/series: Do what I meant, and enable build-options.patch
instead.
* Additional changes:
- Drop erlang-wx from -et
* Dropped Changes:
- patches/pcre-crash.patch: CVE-2008-2371: outer level option with
alternatives caused crash. (Applied Upstream)
- fix for ssl certificate verification in newSSL:
ssl_cacertfile_fix.patch (Applied Upstream)
- debian/patches/series: Enable native.patch again, to get stripped beam
files and reduce the package size again. (build-options is what
actually accomplished this)
- Remove build-options.patch on advice from upstream and because it caused
odd build failures.
- Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not
supposed to.
- Drop erlang-wx binary.
- Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they
do not really need wx. Also drop it from -debugger; the GUI needs wx,
but it apparently has CLI bits as well, and is also needed by -megaco,
so let's keep the package for now.
- debian/patches/series: Do what I meant, and enable build-options.patch
instead.
* Additional changes:
- Drop erlang-wx from -et
* Dropped Changes:
- patches/pcre-crash.patch: CVE-2008-2371: outer level option with
alternatives caused crash. (Applied Upstream)
- fix for ssl certificate verification in newSSL:
ssl_cacertfile_fix.patch (Applied Upstream)
- debian/patches/series: Enable native.patch again, to get stripped beam
files and reduce the package size again. (build-options is what
actually accomplished this)
- Remove build-options.patch on advice from upstream and because it caused
odd build failures.
- files added:
- .mailmap
- bin
- erts/emulator/test/mtx_SUITE_data
- erts/emulator/test/trace_call_time_SUITE_data
- erts/include/internal/gcc
- erts/include/internal/libatomic_ops
- erts/include/internal/pthread
- erts/include/internal/win
- erts/lib_src/pthread
- erts/lib_src/win
- erts/test/autoimport_SUITE_data
- erts/test/install_SUITE_data
- lib/asn1/test
- lib/asn1/test/asn1_SUITE_data
- lib/asn1/test/asn1_SUITE_data/megacomessages
- lib/asn1/test/asn1_SUITE_data/modified_x420
- lib/asn1/test/asn1_SUITE_data/nbapsystem
- lib/asn1/test/asn1_SUITE_data/subdir
- lib/asn1/test/asn1_SUITE_data/subdir/subsubdir
- lib/asn1/test/asn1_SUITE_data/tcapsystem
- lib/asn1/test/asn1_SUITE_data/x420
- lib/common_test/test
- lib/common_test/test/ct_config_SUITE_data
- lib/common_test/test/ct_config_SUITE_data/config
- lib/common_test/test/ct_config_SUITE_data/config/test
- lib/common_test/test/ct_error_SUITE_data
- lib/common_test/test/ct_error_SUITE_data/error
- lib/common_test/test/ct_error_SUITE_data/error/test
- lib/common_test/test/ct_event_handler_SUITE_data
- lib/common_test/test/ct_event_handler_SUITE_data/event_handling_1
- lib/common_test/test/ct_event_handler_SUITE_data/event_handling_1/test
- lib/common_test/test/ct_groups_test_1_SUITE_data
- lib/common_test/test/ct_groups_test_1_SUITE_data/groups_1
- lib/common_test/test/ct_groups_test_1_SUITE_data/groups_1/test
- lib/common_test/test/ct_groups_test_1_SUITE_data/groups_2
- lib/common_test/test/ct_groups_test_1_SUITE_data/groups_2/test
- lib/common_test/test/ct_groups_test_2_SUITE_data
- lib/common_test/test/ct_groups_test_2_SUITE_data/cfgs
- lib/common_test/test/ct_groups_test_2_SUITE_data/groups_1
- lib/common_test/test/ct_groups_test_2_SUITE_data/groups_2
- lib/common_test/test/ct_hooks_SUITE_data
- lib/common_test/test/ct_hooks_SUITE_data/cth
- lib/common_test/test/ct_hooks_SUITE_data/cth/tests
- lib/common_test/test/ct_master_SUITE_data
- lib/common_test/test/ct_master_SUITE_data/master
- lib/common_test/test/ct_master_SUITE_data/master/include
- lib/common_test/test/ct_misc_1_SUITE_data
- lib/common_test/test/ct_repeat_1_SUITE_data
- lib/common_test/test/ct_sequence_1_SUITE_data
- lib/common_test/test/ct_skip_SUITE_data
- lib/common_test/test/ct_skip_SUITE_data/skip
- lib/common_test/test/ct_skip_SUITE_data/skip/test
- lib/common_test/test/ct_smoke_test_SUITE_data
- lib/common_test/test/ct_smoke_test_SUITE_data/happy_1
- lib/common_test/test/ct_smoke_test_SUITE_data/happy_1/cfg
- lib/common_test/test/ct_smoke_test_SUITE_data/happy_1/test
- lib/common_test/test/ct_smoke_test_SUITE_data/happy_2_cfg
- lib/common_test/test/ct_smoke_test_SUITE_data/happy_2_test
- lib/common_test/test/ct_test_server_if_1_SUITE_data
- lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if
- lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test
- lib/common_test/test/ct_testspec_1_SUITE_data
- lib/common_test/test/ct_testspec_1_SUITE_data/groups_1
- lib/common_test/test/ct_testspec_1_SUITE_data/groups_2
- lib/common_test/test/ct_testspec_1_SUITE_data/suites_1
- lib/compiler/test/receive_SUITE_data
- lib/compiler/test/receive_SUITE_data/ref_opt
- lib/cosEvent/test
- lib/cosEvent/test/idl_output
- lib/cosEventDomain/test
- lib/cosFileTransfer/test
- lib/cosNotification/test
- lib/cosProperty/test
- lib/cosTime/test
- lib/cosTransactions/test
- lib/crypto/test
- lib/debugger/test
- lib/debugger/test/bug_SUITE_data
- lib/debugger/test/dbg_ui_SUITE_data
- lib/debugger/test/dbg_ui_SUITE_data/manual_data
- lib/debugger/test/dbg_ui_SUITE_data/manual_data/src
- lib/debugger/test/int_SUITE_data
- lib/debugger/test/int_break_SUITE_data
- lib/debugger/test/int_eval_SUITE_data
- lib/dialyzer/test
- lib/dialyzer/test/callgraph_tests_SUITE_data
- lib/dialyzer/test/callgraph_tests_SUITE_data/results
- lib/dialyzer/test/callgraph_tests_SUITE_data/src
- lib/dialyzer/test/callgraph_tests_SUITE_data/src/test_missing_functions
- lib/dialyzer/test/opaque_tests_SUITE_data
- lib/dialyzer/test/opaque_tests_SUITE_data/results
- lib/dialyzer/test/opaque_tests_SUITE_data/src
- lib/dialyzer/test/opaque_tests_SUITE_data/src/array
- lib/dialyzer/test/opaque_tests_SUITE_data/src/crash
- lib/dialyzer/test/opaque_tests_SUITE_data/src/dict
- lib/dialyzer/test/opaque_tests_SUITE_data/src/ets
- lib/dialyzer/test/opaque_tests_SUITE_data/src/gb_sets
- lib/dialyzer/test/opaque_tests_SUITE_data/src/int
- lib/dialyzer/test/opaque_tests_SUITE_data/src/mixed_opaque
- lib/dialyzer/test/opaque_tests_SUITE_data/src/my_digraph
- lib/dialyzer/test/opaque_tests_SUITE_data/src/my_queue
- lib/dialyzer/test/opaque_tests_SUITE_data/src/opaque
- lib/dialyzer/test/opaque_tests_SUITE_data/src/queue
- lib/dialyzer/test/opaque_tests_SUITE_data/src/rec
- lib/dialyzer/test/opaque_tests_SUITE_data/src/timer
- lib/dialyzer/test/opaque_tests_SUITE_data/src/union
- lib/dialyzer/test/opaque_tests_SUITE_data/src/wings
- lib/dialyzer/test/options1_tests_SUITE_data
- lib/dialyzer/test/options1_tests_SUITE_data/my_include
- lib/dialyzer/test/options1_tests_SUITE_data/my_include/CVS
- lib/dialyzer/test/options1_tests_SUITE_data/results
- lib/dialyzer/test/options1_tests_SUITE_data/src
- lib/dialyzer/test/options1_tests_SUITE_data/src/compiler
- lib/dialyzer/test/options2_tests_SUITE_data
- lib/dialyzer/test/options2_tests_SUITE_data/results
- lib/dialyzer/test/options2_tests_SUITE_data/src
- lib/dialyzer/test/options2_tests_SUITE_data/src/kernel
- lib/dialyzer/test/r9c_tests_SUITE_data
- lib/dialyzer/test/r9c_tests_SUITE_data/results
- lib/dialyzer/test/r9c_tests_SUITE_data/src
- lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1
- lib/dialyzer/test/r9c_tests_SUITE_data/src/inets
- lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia
- lib/dialyzer/test/race_tests_SUITE_data
- lib/dialyzer/test/race_tests_SUITE_data/results
- lib/dialyzer/test/race_tests_SUITE_data/src
- lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules1
- lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules1_pathsens
- lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules1_rec
- lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules2
- lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules2_pathsens
- lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules2_rec
- lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules3
- lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules_nested
- lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules_twice
- lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module1
- lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module2
- lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module3
- lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module4
- lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module5
- lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module6
- lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module7
- lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module8
- lib/dialyzer/test/race_tests_SUITE_data/src/whereis_param_inter_module
- lib/dialyzer/test/small_tests_SUITE_data
- lib/dialyzer/test/small_tests_SUITE_data/results
- lib/dialyzer/test/small_tests_SUITE_data/src
- lib/dialyzer/test/small_tests_SUITE_data/src/comm_layer
- lib/dialyzer/test/small_tests_SUITE_data/src/pubsub
- lib/dialyzer/test/user_tests_SUITE_data
- lib/dialyzer/test/user_tests_SUITE_data/results
- lib/dialyzer/test/user_tests_SUITE_data/src
- lib/erl_docgen/ebin
- lib/erl_docgen/src
- lib/erl_interface/test
- lib/erl_interface/test/all_SUITE_data
- lib/erl_interface/test/ei_accept_SUITE_data
- lib/erl_interface/test/ei_connect_SUITE_data
- lib/erl_interface/test/ei_decode_SUITE_data
- lib/erl_interface/test/ei_decode_encode_SUITE_data
- lib/erl_interface/test/ei_encode_SUITE_data
- lib/erl_interface/test/ei_format_SUITE_data
- lib/erl_interface/test/ei_print_SUITE_data
- lib/erl_interface/test/ei_tmo_SUITE_data
- lib/erl_interface/test/erl_connect_SUITE_data
- lib/erl_interface/test/erl_eterm_SUITE_data
- lib/erl_interface/test/erl_ext_SUITE_data
- lib/erl_interface/test/erl_format_SUITE_data
- lib/erl_interface/test/erl_global_SUITE_data
- lib/erl_interface/test/erl_match_SUITE_data
- lib/erl_interface/test/port_call_SUITE_data
- lib/et/test
- lib/ic/test
- lib/ic/test/c_client_erl_server_SUITE_data
- lib/ic/test/c_client_erl_server_proto_SUITE_data
- lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data
- lib/ic/test/erl_client_c_server_SUITE_data
- lib/ic/test/erl_client_c_server_proto_SUITE_data
- lib/ic/test/ic_SUITE_data
- lib/ic/test/ic_be_SUITE_data
- lib/ic/test/ic_pp_SUITE_data
- lib/ic/test/ic_pragma_SUITE_data
- lib/ic/test/ic_register_SUITE_data
- lib/ic/test/java_client_erl_server_SUITE_data
- lib/inets/examples/httpd_load_test
- lib/inets/include
- lib/inets/test
- lib/inets/test/ftp_SUITE_data
- lib/inets/test/httpc_SUITE_data
- lib/inets/test/httpd_SUITE_data
- lib/inets/test/httpd_SUITE_data/server_root
- lib/inets/test/httpd_SUITE_data/server_root/auth
- lib/inets/test/httpd_SUITE_data/server_root/cgi-bin
- lib/inets/test/httpd_SUITE_data/server_root/conf
- lib/inets/test/httpd_SUITE_data/server_root/htdocs
- lib/inets/test/httpd_SUITE_data/server_root/htdocs/dets_open
- lib/inets/test/httpd_SUITE_data/server_root/htdocs/dets_secret
- lib/inets/test/httpd_SUITE_data/server_root/htdocs/dets_secret/top_secret
- lib/inets/test/httpd_SUITE_data/server_root/htdocs/misc
- lib/inets/test/httpd_SUITE_data/server_root/htdocs/mnesia_open
- lib/inets/test/httpd_SUITE_data/server_root/htdocs/mnesia_secret
- lib/inets/test/httpd_SUITE_data/server_root/htdocs/mnesia_secret/top_secret
- lib/inets/test/httpd_SUITE_data/server_root/htdocs/open
- lib/inets/test/httpd_SUITE_data/server_root/htdocs/secret
- lib/inets/test/httpd_SUITE_data/server_root/htdocs/secret/top_secret
- lib/inets/test/httpd_SUITE_data/server_root/icons
- lib/inets/test/httpd_SUITE_data/server_root/logs
- lib/inets/test/httpd_SUITE_data/server_root/ssl
- lib/inets/test/httpd_test_data
- lib/inets/test/httpd_test_data/server_root
- lib/inets/test/httpd_test_data/server_root/auth
- lib/inets/test/httpd_test_data/server_root/cgi-bin
- lib/inets/test/httpd_test_data/server_root/conf
- lib/inets/test/httpd_test_data/server_root/htdocs
- lib/inets/test/httpd_test_data/server_root/htdocs/dets_open
- lib/inets/test/httpd_test_data/server_root/htdocs/dets_secret
- lib/inets/test/httpd_test_data/server_root/htdocs/dets_secret/top_secret
- lib/inets/test/httpd_test_data/server_root/htdocs/misc
- lib/inets/test/httpd_test_data/server_root/htdocs/mnesia_open
- lib/inets/test/httpd_test_data/server_root/htdocs/mnesia_secret
- lib/inets/test/httpd_test_data/server_root/htdocs/mnesia_secret/top_secret
- lib/inets/test/httpd_test_data/server_root/htdocs/open
- lib/inets/test/httpd_test_data/server_root/htdocs/secret
- lib/inets/test/httpd_test_data/server_root/htdocs/secret/top_secret
- lib/inets/test/httpd_test_data/server_root/icons
- lib/inets/test/httpd_test_data/server_root/logs
- lib/inets/test/httpd_test_data/server_root/ssl
- lib/inets/test/inets_SUITE_data
- lib/inets/test/inets_sup_SUITE_data
- lib/jinterface/test
- lib/jinterface/test/jinterface_SUITE_data
- lib/jinterface/test/nc_SUITE_data
- lib/kernel/test/code_SUITE_data/clash
- lib/kernel/test/code_SUITE_data/clash/foobar-0.1
- lib/kernel/test/code_SUITE_data/clash/foobar-0.1/ebin
- lib/kernel/test/code_SUITE_data/clash/zork-0.8
- lib/kernel/test/code_SUITE_data/clash/zork-0.8/ebin
- lib/kernel/test/code_SUITE_data/on_load_errors
- lib/megaco/priv/obj
- lib/mnesia/test
- lib/observer/test
- lib/observer/test/crashdump_viewer_SUITE_data
- lib/odbc/test
- lib/orber/test
- lib/orber/test/idl_output
- lib/os_mon/test
- lib/parsetools/test
- lib/reltool/bin
- lib/reltool/test
- lib/runtime_tools/test
- lib/runtime_tools/test/dbg_SUITE_data
- lib/snmp/doc/man1
- lib/snmp/test/test_config
- lib/snmp/test/test_config/agent
- lib/snmp/test/test_config/manager
- lib/ssl/test
- lib/ssl/test/ssl_basic_SUITE_data
- lib/test_server/test
- lib/test_server/test/test_server_SUITE_data
- lib/test_server/test/test_server_SUITE_data/test_server_SUITE_data
- lib/test_server/test/test_server_line_SUITE_data
- lib/tools/test
- lib/tools/test/cover_SUITE_data
- lib/tools/test/cover_SUITE_data/compile_beam
- lib/tools/test/cover_SUITE_data/compile_beam/d
- lib/tools/test/cover_SUITE_data/d1
- lib/tools/test/cover_SUITE_data/included_functions
- lib/tools/test/cover_SUITE_data/otp_6115
- lib/tools/test/cprof_SUITE_data
- lib/tools/test/eprof_SUITE_data
- lib/tools/test/fprof_SUITE_data
- lib/tools/test/lcnt_SUITE_data
- lib/tools/test/make_SUITE_data
- lib/tools/test/xref_SUITE_data
- lib/tools/test/xref_SUITE_data/dir
- lib/tools/test/xref_SUITE_data/dir/dir
- lib/tools/test/xref_SUITE_data/dir/jam
- lib/tools/test/xref_SUITE_data/lib_test
- lib/tools/test/xref_SUITE_data/md
- lib/tools/test/xref_SUITE_data/read
- lib/tools/test/xref_SUITE_data/rel2
- lib/tools/test/xref_SUITE_data/rel2/lib
- lib/tools/test/xref_SUITE_data/rel2/lib/app1-1.0
- lib/tools/test/xref_SUITE_data/rel2/lib/app1-1.0/ebin
- lib/tools/test/xref_SUITE_data/rel2/lib/app1-1.1
- lib/tools/test/xref_SUITE_data/rel2/lib/app1-1.1/ebin
- lib/tools/test/xref_SUITE_data/rel2/lib/app2-1.1
- lib/tools/test/xref_SUITE_data/rel2/lib/app2-1.1/ebin
- lib/tools/test/xref_SUITE_data/update
- plt
- system
- system/doc
- system/doc/definitions
- system/doc/design_principles
- system/doc/efficiency_guide
- system/doc/embedded
- system/doc/getting_started
- system/doc/html
- system/doc/installation_guide
- system/doc/oam
- system/doc/pdf
- system/doc/programming_examples
- system/doc/reference_manual
- system/doc/system_architecture_intro
- system/doc/system_principles
- system/doc/top
- system/doc/top/bin
- system/doc/top/ebin
- system/doc/top/src
- system/doc/top/templates
- system/doc/tutorial
- files removed:
- README
- erts/emulator/obsolete
- erts/emulator/test/obsolete_SUITE_data
- lib/ssl/examples/certs/ebin
- lib/ssl/examples/certs/etc/erlangCA/certs
- lib/ssl/examples/certs/etc/erlangCA/crl
- lib/ssl/examples/certs/etc/erlangCA/newcerts
- lib/ssl/examples/certs/etc/erlangCA/private
- lib/ssl/examples/certs/etc/otpCA/certs
- lib/ssl/examples/certs/etc/otpCA/crl
- lib/ssl/examples/certs/etc/otpCA/newcerts
- lib/ssl/examples/certs/etc/otpCA/private
- lib/ssl/examples/certs/rnd
- lib/ssl/pkix
- files modified:
- Makefile.in
- lib/common_test/priv/auxdir/config.guess *
- lib/common_test/priv/auxdir/config.sub *
- lib/common_test/priv/auxdir/install-sh *
- lib/erl_interface/src/auxdir/config.guess *
- lib/erl_interface/src/auxdir/config.sub *
- lib/erl_interface/src/auxdir/install-sh *
- lib/percept/src/egd_png.erl *
- lib/test_server/src/config.guess *
- lib/test_server/src/config.sub *
- lib/test_server/src/install-sh *
added
removed
lib/inets/test/httpd_SUITE_data/server_root/htdocs/echo.shtml
