You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2011/01/17 17:11:34 UTC
svn commit: r1059969 [1/6] - in /trafficserver/traffic/trunk: ./ ci/
proxy/config/ proxy/mgmt/ proxy/mgmt/api/ proxy/mgmt/api/include/
proxy/mgmt/api/remote/ proxy/mgmt/cli/ proxy/mgmt/cli2/ proxy/mgmt/cluster/
proxy/mgmt/html2/ proxy/mgmt/html2/charti...
Author: igalic
Date: Mon Jan 17 16:11:27 2011
New Revision: 1059969
URL: http://svn.apache.org/viewvc?rev=1059969&view=rev
Log:
Revert, in order:
svn merge -c -1059585 .
svn merge -c -1059550 .
svn merge -c -1059439 .
svn merge -c -1059430 .
svn merge -c -1059421 .
svn merge -c -1059419 .
svn merge -c -1059341 .
svn merge -c -1059339 .
svn merge -c -1059333 .
svn merge -c -1059308 .
This is me giving up on [TS-641] for now.
Lessons learned: use git, lots of micro-testing.
(Either that, or expand the regression test suite.)
Added:
trafficserver/traffic/trunk/proxy/mgmt/html2/ (props changed)
- copied from r1059584, trafficserver/traffic/trunk/proxy/mgmt/html2/
trafficserver/traffic/trunk/proxy/mgmt/html2/Makefile.am
- copied, changed from r1059584, trafficserver/traffic/trunk/proxy/mgmt/html2/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt/html2/charting/ (props changed)
- copied from r1059584, trafficserver/traffic/trunk/proxy/mgmt/html2/charting/
trafficserver/traffic/trunk/proxy/mgmt/html2/charting/Bandwidth_Savings.html
- copied unchanged from r1059584, trafficserver/traffic/trunk/proxy/mgmt/html2/charting/Bandwidth_Savings.html
trafficserver/traffic/trunk/proxy/mgmt/html2/charting/Cache_Percent_Free.html
- copied unchanged from r1059584, trafficserver/traffic/trunk/proxy/mgmt/html2/charting/Cache_Percent_Free.html
trafficserver/traffic/trunk/proxy/mgmt/html2/charting/Cache_Transfers_In_Progress.html
- copied unchanged from r1059584, trafficserver/traffic/trunk/proxy/mgmt/html2/charting/Cache_Transfers_In_Progress.html
trafficserver/traffic/trunk/proxy/mgmt/html2/charting/Client_Throughput.html
- copied unchanged from r1059584, trafficserver/traffic/trunk/proxy/mgmt/html2/charting/Client_Throughput.html
trafficserver/traffic/trunk/proxy/mgmt/html2/charting/DNS_Lookups_Per_Second.html
- copied unchanged from r1059584, trafficserver/traffic/trunk/proxy/mgmt/html2/charting/DNS_Lookups_Per_Second.html
trafficserver/traffic/trunk/proxy/mgmt/html2/charting/Document_Hit_Rate.html
- copied unchanged from r1059584, trafficserver/traffic/trunk/proxy/mgmt/html2/charting/Document_Hit_Rate.html
trafficserver/traffic/trunk/proxy/mgmt/html2/charting/Host_Database_Hit_Rate.html
- copied unchanged from r1059584, trafficserver/traffic/trunk/proxy/mgmt/html2/charting/Host_Database_Hit_Rate.html
trafficserver/traffic/trunk/proxy/mgmt/html2/charting/Makefile.am
- copied unchanged from r1059584, trafficserver/traffic/trunk/proxy/mgmt/html2/charting/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt/html2/charting/Multiple_Graph_View.html
- copied unchanged from r1059584, trafficserver/traffic/trunk/proxy/mgmt/html2/charting/Multiple_Graph_View.html
trafficserver/traffic/trunk/proxy/mgmt/html2/charting/Open_Client_Connections.html
- copied unchanged from r1059584, trafficserver/traffic/trunk/proxy/mgmt/html2/charting/Open_Client_Connections.html
trafficserver/traffic/trunk/proxy/mgmt/html2/charting/Open_Server_Connections.html
- copied unchanged from r1059584, trafficserver/traffic/trunk/proxy/mgmt/html2/charting/Open_Server_Connections.html
trafficserver/traffic/trunk/proxy/mgmt/html2/charting/Transactions_Per_Second.html
- copied unchanged from r1059584, trafficserver/traffic/trunk/proxy/mgmt/html2/charting/Transactions_Per_Second.html
trafficserver/traffic/trunk/proxy/mgmt/html2/checkCookies.ink
- copied unchanged from r1059332, trafficserver/traffic/trunk/proxy/mgmt/html2/checkCookies.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/ (props changed)
- copied from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/Makefile.am
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_autoconf_pac.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_autoconf_pac.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_autoconf_wpad.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_autoconf_wpad.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_basic.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_basic.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_basic.ink.win
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_basic.ink.win
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_buttons.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_buttons.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_buttons_hide.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_buttons_hide.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_cache_general.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_cache_general.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_cache_hosting.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_cache_hosting.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_cache_partition.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_cache_partition.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_clustering.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_clustering.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_config_display.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_config_display.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_congestion.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_congestion.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_dns_host_database.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_dns_host_database.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_dns_resolver.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_dns_resolver.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_dns_split.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_dns_split.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_footer.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_footer.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_header.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_header.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_http_cachability.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_http_cachability.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_http_dyn_cache.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_http_dyn_cache.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_http_general.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_http_general.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_http_parent_proxy.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_http_parent_proxy.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_http_privacy.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_http_privacy.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_http_response_custom.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_http_response_custom.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_http_response_general.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_http_response_general.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_http_timeout.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_http_timeout.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_http_update_general.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_http_update_general.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_http_update_urls.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_http_update_urls.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_icp.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_icp.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_inspector.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_inspector.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_inspector_display.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_inspector_display.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_ldap_general.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_ldap_general.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_logging_collation.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_logging_collation.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_logging_custom.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_logging_custom.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_logging_format.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_logging_format.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_logging_general.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_logging_general.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_logging_search.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_logging_search.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_logging_splitting.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_logging_splitting.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_mapping.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_mapping.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_media_common.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_media_common.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_media_push.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_media_push.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_mgmt_access.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_mgmt_access.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_mgmt_general.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_mgmt_general.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_mgmt_login.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_mgmt_login.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_net_config.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_net_config.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_net_devdri.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_net_devdri.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_net_device.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_net_device.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_net_driver.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_net_driver.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_net_nic.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_net_nic.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_ntlm_general.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_ntlm_general.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_phonehome.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_phonehome.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_proxy_access.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_proxy_access.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_quicktime_general.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_quicktime_general.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_quicktime_mbridge.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_quicktime_mbridge.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_radius_general.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_radius_general.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_real_networks_general.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_real_networks_general.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_reverse_proxy.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_reverse_proxy.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_snapshot.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_snapshot.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_snapshot_filesystem.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_snapshot_filesystem.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_socks_general.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_socks_general.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_socks_proxy.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_socks_proxy.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_socks_server.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_socks_server.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_ssl_accelerator.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_ssl_accelerator.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_ssl_client_proxy.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_ssl_client_proxy.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_ssl_general.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_ssl_general.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_ssl_proxy_server.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_ssl_proxy_server.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_tab.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_tab.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_throttling.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_throttling.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_view_access_logs.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_view_access_logs.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_view_debug_logs.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_view_debug_logs.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_view_system_logs.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_view_system_logs.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_virtual_ip.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_virtual_ip.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_windows_media_general.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_windows_media_general.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_windows_media_mbridge.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_windows_media_mbridge.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_windows_media_mcast.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/c_windows_media_mcast.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_cache_config.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_cache_config.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_configs.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_configs.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_hosting_config.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_hosting_config.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_icp_config.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_icp_config.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_ip_allow_config.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_ip_allow_config.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_ipnat_config.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_ipnat_config.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_mgmt_allow_config.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_mgmt_allow_config.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_parent_config.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_parent_config.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_partition_config.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_partition_config.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_remap_config.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_remap_config.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_socks_config.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_socks_config.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_split_dns_config.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_split_dns_config.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_update_config.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_update_config.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_vaddrs_config.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/configure/f_vaddrs_config.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/enableCookies.ink
- copied unchanged from r1059332, trafficserver/traffic/trunk/proxy/mgmt/html2/enableCookies.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/english.dict
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/english.dict
trafficserver/traffic/trunk/proxy/mgmt/html2/images/ (props changed)
- copied from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/images/
trafficserver/traffic/trunk/proxy/mgmt/html2/images/Makefile.am
- copied, changed from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/images/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt/html2/images/arrow_add.gif
- copied unchanged from r1059338, trafficserver/traffic/trunk/proxy/mgmt/html2/images/arrow_add.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/arrow_cross.gif
- copied unchanged from r1059338, trafficserver/traffic/trunk/proxy/mgmt/html2/images/arrow_cross.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/arrow_down.gif
- copied unchanged from r1059338, trafficserver/traffic/trunk/proxy/mgmt/html2/images/arrow_down.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/arrow_set.gif
- copied unchanged from r1059338, trafficserver/traffic/trunk/proxy/mgmt/html2/images/arrow_set.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/arrow_up.gif
- copied unchanged from r1059338, trafficserver/traffic/trunk/proxy/mgmt/html2/images/arrow_up.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/blankIcon.gif
- copied unchanged from r1059438, trafficserver/traffic/trunk/proxy/mgmt/html2/images/blankIcon.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/configure_off.gif
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/images/configure_off.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/configure_on.gif
- copied unchanged from r1059338, trafficserver/traffic/trunk/proxy/mgmt/html2/images/configure_on.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/dot_clear.gif
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/images/dot_clear.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/header_bg.gif
- copied unchanged from r1059338, trafficserver/traffic/trunk/proxy/mgmt/html2/images/header_bg.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/header_bg_pe.gif
- copied unchanged from r1059338, trafficserver/traffic/trunk/proxy/mgmt/html2/images/header_bg_pe.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/ink_logo.gif
- copied unchanged from r1059338, trafficserver/traffic/trunk/proxy/mgmt/html2/images/ink_logo.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/ink_logo_slim.gif
- copied unchanged from r1059429, trafficserver/traffic/trunk/proxy/mgmt/html2/images/ink_logo_slim.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/ink_logo_trans.gif
- copied unchanged from r1059338, trafficserver/traffic/trunk/proxy/mgmt/html2/images/ink_logo_trans.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/ink_top_internet.jpg
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/images/ink_top_internet.jpg
trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_begin_off.gif
- copied unchanged from r1059418, trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_begin_off.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_begin_on.gif
- copied unchanged from r1059418, trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_begin_on.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_bg_off.gif
- copied unchanged from r1059418, trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_bg_off.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_bg_on.gif
- copied unchanged from r1059418, trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_bg_on.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_end_off.gif
- copied unchanged from r1059418, trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_end_off.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_end_on.gif
- copied unchanged from r1059418, trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_end_on.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_separator_off_off.gif
- copied unchanged from r1059418, trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_separator_off_off.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_separator_off_on.gif
- copied unchanged from r1059418, trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_separator_off_on.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_separator_on_off.gif
- copied unchanged from r1059418, trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_separator_on_off.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/minusIcon.gif
- copied unchanged from r1059338, trafficserver/traffic/trunk/proxy/mgmt/html2/images/minusIcon.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/monitor_off.gif
- copied unchanged from r1059338, trafficserver/traffic/trunk/proxy/mgmt/html2/images/monitor_off.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/monitor_on.gif
- copied unchanged from r1059420, trafficserver/traffic/trunk/proxy/mgmt/html2/images/monitor_on.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/images/plusIcon.gif
- copied unchanged from r1059338, trafficserver/traffic/trunk/proxy/mgmt/html2/images/plusIcon.gif
trafficserver/traffic/trunk/proxy/mgmt/html2/include/ (props changed)
- copied from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/include/
trafficserver/traffic/trunk/proxy/mgmt/html2/include/Makefile.am
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/include/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt/html2/include/body_footer.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/include/body_footer.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/include/body_header.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/include/body_header.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/include/footer.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/include/footer.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/include/form_footer.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/include/form_footer.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/include/form_header.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/include/form_header.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/include/header.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/include/header.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/include/html_footer.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/include/html_footer.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/include/html_header.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/include/html_header.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/include/tree_footer.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/include/tree_footer.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/include/tree_header.ink
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/include/tree_header.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/index.ink
- copied unchanged from r1059429, trafficserver/traffic/trunk/proxy/mgmt/html2/index.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/inktomi.css
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/inktomi.css
trafficserver/traffic/trunk/proxy/mgmt/html2/inktomiLarge.css
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/inktomiLarge.css
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/ (props changed)
- copied from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/Makefile.am
- copied, changed from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_alarm.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_alarm.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_blue_bar.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_blue_bar.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_cache.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_cache.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_cluster.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_cluster.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_dns.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_dns.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_footer.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_footer.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_graphs.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_graphs.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_header.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_header.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_http.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_http.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_http_trans.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_http_trans.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_icp.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_icp.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_ldap.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_ldap.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_logging.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_logging.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_mpeg4.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_mpeg4.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_net.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_net.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_net_device.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_net_device.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_node.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_node.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_ntlm.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_ntlm.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_overview.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_overview.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_overview_details_less.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_overview_details_less.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_overview_details_more.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_overview_details_more.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_quicktime.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_quicktime.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_real_networks.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_real_networks.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_socks.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_socks.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_tab.ink
- copied unchanged from r1059420, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_tab.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_virtual_ip.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_virtual_ip.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_windows_media.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/monitor/m_windows_media.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/mrtg/ (props changed)
- copied from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/mrtg/
trafficserver/traffic/trunk/proxy/mgmt/html2/mrtg/Makefile.am
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/mrtg/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt/html2/mrtg/detailed.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/mrtg/detailed.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/mrtg/overview.ink
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/mrtg/overview.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/navigation_tree.xml
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/navigation_tree.xml
trafficserver/traffic/trunk/proxy/mgmt/html2/navigation_tree.xml.win
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/navigation_tree.xml.win
trafficserver/traffic/trunk/proxy/mgmt/html2/plugin.ink
- copied unchanged from r1059332, trafficserver/traffic/trunk/proxy/mgmt/html2/plugin.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/rename.ink
- copied unchanged from r1059332, trafficserver/traffic/trunk/proxy/mgmt/html2/rename.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/resize.js
- copied unchanged from r1059549, trafficserver/traffic/trunk/proxy/mgmt/html2/resize.js
trafficserver/traffic/trunk/proxy/mgmt/html2/restart.ink
- copied unchanged from r1059332, trafficserver/traffic/trunk/proxy/mgmt/html2/restart.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/ssl_redirect.ink
- copied unchanged from r1059332, trafficserver/traffic/trunk/proxy/mgmt/html2/ssl_redirect.ink
trafficserver/traffic/trunk/proxy/mgmt/html2/tune/ (props changed)
- copied from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/tune/
trafficserver/traffic/trunk/proxy/mgmt/html2/tune/Makefile.am
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/tune/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt/html2/tune/navigation_tree.xmlcpp
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/html2/tune/navigation_tree.xmlcpp
trafficserver/traffic/trunk/proxy/mgmt/web2/WebCompatibility.cc
- copied unchanged from r1059438, trafficserver/traffic/trunk/proxy/mgmt/web2/WebCompatibility.cc
trafficserver/traffic/trunk/proxy/mgmt/web2/WebCompatibility.h
- copied unchanged from r1059438, trafficserver/traffic/trunk/proxy/mgmt/web2/WebCompatibility.h
trafficserver/traffic/trunk/proxy/mgmt/web2/WebConfig.cc
- copied, changed from r1059438, trafficserver/traffic/trunk/proxy/mgmt/web2/WebConfig.cc
trafficserver/traffic/trunk/proxy/mgmt/web2/WebConfig.h
- copied, changed from r1059438, trafficserver/traffic/trunk/proxy/mgmt/web2/WebConfig.h
trafficserver/traffic/trunk/proxy/mgmt/web2/WebConfigRender.cc
- copied, changed from r1059438, trafficserver/traffic/trunk/proxy/mgmt/web2/WebConfigRender.cc
trafficserver/traffic/trunk/proxy/mgmt/web2/WebConfigRender.h
- copied, changed from r1059438, trafficserver/traffic/trunk/proxy/mgmt/web2/WebConfigRender.h
trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttp.cc
- copied, changed from r1059429, trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttp.cc
trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttp.h
- copied, changed from r1059429, trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttp.h
trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpAuth.cc
- copied unchanged from r1059429, trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpAuth.cc
trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpAuth.h
- copied unchanged from r1059429, trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpAuth.h
trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpContext.cc
- copied unchanged from r1059429, trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpContext.cc
trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpContext.h
- copied unchanged from r1059429, trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpContext.h
trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpLog.cc
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpLog.cc
trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpLog.h
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpLog.h
trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpMessage.cc
- copied unchanged from r1059438, trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpMessage.cc
trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpMessage.h
- copied unchanged from r1059438, trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpMessage.h
trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpRender.cc
- copied, changed from r1059438, trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpRender.cc
trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpRender.h
- copied, changed from r1059438, trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpRender.h
trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpSession.cc
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpSession.cc
trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpSession.h
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpSession.h
trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpTree.cc
- copied, changed from r1059438, trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpTree.cc
trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpTree.h
- copied, changed from r1059438, trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpTree.h
trafficserver/traffic/trunk/proxy/mgmt/web2/WebIntrMain.cc
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/web2/WebIntrMain.cc
trafficserver/traffic/trunk/proxy/mgmt/web2/WebIntrMain.h
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/web2/WebIntrMain.h
trafficserver/traffic/trunk/proxy/mgmt/web2/WebReconfig.cc
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/web2/WebReconfig.cc
trafficserver/traffic/trunk/proxy/mgmt/web2/WebReconfig.h
- copied unchanged from r1059307, trafficserver/traffic/trunk/proxy/mgmt/web2/WebReconfig.h
Modified:
trafficserver/traffic/trunk/CHANGES
trafficserver/traffic/trunk/ci/rat-excludes.txt
trafficserver/traffic/trunk/configure.ac
trafficserver/traffic/trunk/proxy/config/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt/AddConfigFilesHere.cc
trafficserver/traffic/trunk/proxy/mgmt/FileManager.h
trafficserver/traffic/trunk/proxy/mgmt/LocalManager.cc
trafficserver/traffic/trunk/proxy/mgmt/Main.cc
trafficserver/traffic/trunk/proxy/mgmt/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt/RecordsConfig.cc
trafficserver/traffic/trunk/proxy/mgmt/api/CfgContextImpl.cc
trafficserver/traffic/trunk/proxy/mgmt/api/CfgContextImpl.h
trafficserver/traffic/trunk/proxy/mgmt/api/CfgContextUtils.cc
trafficserver/traffic/trunk/proxy/mgmt/api/CfgContextUtils.h
trafficserver/traffic/trunk/proxy/mgmt/api/GenericParser.cc
trafficserver/traffic/trunk/proxy/mgmt/api/INKMgmtAPI.cc
trafficserver/traffic/trunk/proxy/mgmt/api/INKMgmtAPIStub.cc
trafficserver/traffic/trunk/proxy/mgmt/api/include/INKMgmtAPI.h
trafficserver/traffic/trunk/proxy/mgmt/api/remote/APITestCliRemote.cc
trafficserver/traffic/trunk/proxy/mgmt/cli/CLI.cc
trafficserver/traffic/trunk/proxy/mgmt/cli/CLI.h
trafficserver/traffic/trunk/proxy/mgmt/cli2/ConfigCmd.cc
trafficserver/traffic/trunk/proxy/mgmt/cluster/ClusterCom.cc
trafficserver/traffic/trunk/proxy/mgmt/utils/WebMgmtUtils.cc
trafficserver/traffic/trunk/proxy/mgmt/utils/WebMgmtUtils.h
trafficserver/traffic/trunk/proxy/mgmt/web2/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt/web2/WebGlobals.h
trafficserver/traffic/trunk/proxy/mgmt/web2/WebOverview.cc
trafficserver/traffic/trunk/proxy/mgmt/web2/WebOverview.h
trafficserver/traffic/trunk/proxy/mgmt/web2/WebUtils.h
Modified: trafficserver/traffic/trunk/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1059969&r1=1059968&r2=1059969&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Mon Jan 17 16:11:27 2011
@@ -2,9 +2,6 @@
Changes with Apache Traffic Server 2.1.6
- *) Purge of WebUI, by starting with html2 and recursively
- moving through the code, removing everything useless. [TS-641]
-
*) Rename proxy/http2 -> proxy/http and proxy/mgmt2 to proxy/mgmt [TS-631].
*) Add an example to records.config for how to bind a specific IP [TS-582].
Modified: trafficserver/traffic/trunk/ci/rat-excludes.txt
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/ci/rat-excludes.txt?rev=1059969&r1=1059968&r2=1059969&view=diff
==============================================================================
--- trafficserver/traffic/trunk/ci/rat-excludes.txt (original)
+++ trafficserver/traffic/trunk/ci/rat-excludes.txt Mon Jan 17 16:11:27 2011
@@ -78,6 +78,7 @@ test/SDKtest/synth_server/SDKtest_server
test/deft/defs/climatelab.def
test/deft/defs/localhost.def
test/plugin/INKHttpHooksTrans/altSelect.notes
+proxy/mgmt/html2/tune/navigation_tree.xml
proxy/mgmt/cli2/hashtable.cc
lib/ts/ink_res_init.cc
lib/ts/ink_res_mkquery.cc
Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=1059969&r1=1059968&r2=1059969&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Mon Jan 17 16:11:27 2011
@@ -1231,6 +1231,16 @@ AC_CONFIG_FILES([proxy/mgmt/cli2/Makefil
AC_CONFIG_FILES([proxy/mgmt/cli/Makefile])
AC_CONFIG_FILES([proxy/mgmt/cluster/Makefile])
AC_CONFIG_FILES([proxy/mgmt/cop/Makefile])
+AS_IF([test "x$enable_webui" = "xyes"],
+ [AC_CONFIG_FILES([proxy/mgmt/html2/Makefile])
+ AC_CONFIG_FILES([proxy/mgmt/html2/charting/Makefile])
+ AC_CONFIG_FILES([proxy/mgmt/html2/configure/Makefile])
+ AC_CONFIG_FILES([proxy/mgmt/html2/images/Makefile])
+ AC_CONFIG_FILES([proxy/mgmt/html2/include/Makefile])
+ AC_CONFIG_FILES([proxy/mgmt/html2/monitor/Makefile])
+ AC_CONFIG_FILES([proxy/mgmt/html2/mrtg/Makefile])
+ AC_CONFIG_FILES([proxy/mgmt/html2/tune/Makefile])
+])
AC_CONFIG_FILES([proxy/mgmt/Makefile])
AC_CONFIG_FILES([proxy/mgmt/preparse/Makefile])
AC_CONFIG_FILES([proxy/mgmt/stats/Makefile])
Modified: trafficserver/traffic/trunk/proxy/config/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/config/Makefile.am?rev=1059969&r1=1059968&r2=1059969&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/config/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/config/Makefile.am Mon Jan 17 16:11:27 2011
@@ -53,3 +53,6 @@ dist_sysconf_DATA = \
update.config \
vaddrs.config
+if BUILD_WEBUI
+ dist_sysconf_DATA += $(webui_conf)
+endif
\ No newline at end of file
Modified: trafficserver/traffic/trunk/proxy/mgmt/AddConfigFilesHere.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/AddConfigFilesHere.cc?rev=1059969&r1=1059968&r2=1059969&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/AddConfigFilesHere.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/AddConfigFilesHere.cc Mon Jan 17 16:11:27 2011
@@ -81,6 +81,7 @@ initializeRegistry()
configFiles->addFile("parent.config", false);
configFiles->addFile("remap.config", false);
configFiles->addFile("update.config", false);
+ configFiles->addFile("admin_access.config", false);
configFiles->addFile("partition.config", false);
configFiles->addFile("hosting.config", false);
configFiles->addFile("congestion.config", false);
Modified: trafficserver/traffic/trunk/proxy/mgmt/FileManager.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/FileManager.h?rev=1059969&r1=1059968&r2=1059969&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/FileManager.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/FileManager.h Mon Jan 17 16:11:27 2011
@@ -37,6 +37,7 @@
#include "List.h"
#include "WebGlobals.h"
#include "MultiFile.h"
+#include "WebHttpMessage.h"
class Rollback;
Modified: trafficserver/traffic/trunk/proxy/mgmt/LocalManager.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/LocalManager.cc?rev=1059969&r1=1059968&r2=1059969&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/LocalManager.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/LocalManager.cc Mon Jan 17 16:11:27 2011
@@ -37,6 +37,7 @@
#include "Compatability.h"
#include "LocalManager.h"
#include "NTDefs.h"
+#include "WebReconfig.h"
#include "MgmtSocket.h"
#if TS_USE_POSIX_CAP
@@ -1034,6 +1035,11 @@ LocalManager::processEventQueue()
}
handled_by_mgmt = true;
}
+ // admin_access.config
+ if (!(strcmp(data_raw, "admin_access.config"))) {
+ markAuthOtherUsersChange();
+ handled_by_mgmt = true;
+ }
}
Modified: trafficserver/traffic/trunk/proxy/mgmt/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/Main.cc?rev=1059969&r1=1059968&r2=1059969&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/Main.cc Mon Jan 17 16:11:27 2011
@@ -37,8 +37,10 @@
#include "MgmtUtils.h"
#include "MgmtSchema.h"
#include "WebMgmtUtils.h"
+#include "WebIntrMain.h"
#include "WebOverview.h"
#include "FileManager.h"
+#include "WebReconfig.h"
#include "I_Layout.h"
#include "I_Version.h"
#include "ink_syslog.h"
@@ -482,6 +484,7 @@ main(int argc, char **argv)
char userToRunAs[80];
int fds_throttle = -1;
time_t ticker;
+ ink_thread webThrId;
while ((setsid() == (pid_t) - 1) && (errno == EINTR)) {
}
@@ -491,6 +494,15 @@ main(int argc, char **argv)
__DATE__, __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
initSignalHandlers();
+ // Process Environment Variables
+ if ((envVar = getenv("MGMT_WEB_PORT")) != NULL) {
+ web_port_arg = atoi(envVar);
+ }
+
+ if ((envVar = getenv("MGMT_ACONF_PORT")) != NULL) {
+ aconf_port_arg = atoi(envVar);
+ }
+
if ((envVar = getenv("MGMT_CLUSTER_PORT")) != NULL) {
cluster_port = atoi(envVar);
}
@@ -517,7 +529,13 @@ main(int argc, char **argv)
// The rest of the options require an argument in the form of -<Flag> <val>
if ((i + 1) < argc) {
- if (strcmp(argv[i], "-clusterPort") == 0) {
+ if (strcmp(argv[i], "-webPort") == 0) {
+ ++i;
+ web_port_arg = atoi(argv[i]);
+ } else if (strcmp(argv[i], "-aconfPort") == 0) {
+ ++i;
+ aconf_port_arg = atoi(argv[i]);
+ } else if (strcmp(argv[i], "-clusterPort") == 0) {
++i;
cluster_port = atoi(argv[i]);
} else if (strcmp(argv[i], "-groupAddr") == 0) {
@@ -809,6 +827,8 @@ main(int argc, char **argv)
// UI record for this machine
overviewGenerator->addSelfRecord();
+ webThrId = ink_thread_create(webIntr_main, NULL); /* Spin web agent thread */
+ Debug("lm", "Created Web Agent thread (%d)", webThrId);
lmgmt->listenForProxy();
/* Check the permissions on vip_config */
@@ -1083,6 +1103,7 @@ printUsage()
" -noProxy Do not launch the proxy process.\n");
*/
fprintf(stderr, " -tsArgs [...] Args to proxy, everything till eol is passed.\n");
+ fprintf(stderr, " -webPort <port> Port for web interface.\n");
/*
fprintf(stderr,
" -graphPort <port> Port for dynamic graphs.\n");
@@ -1133,8 +1154,7 @@ fileUpdated(char *fname)
lmgmt->signalFileChange("proxy.config.admin.ip_allow.filename");
// signalFileChange does not cause callbacks in the manager
// so generate one here by hand
- // markMgmtIpAllowChange();
- // XXX Cannot do this after purging WebReconfig -- what to do?
+ markMgmtIpAllowChange();
} else if (strcmp(fname, "ip_allow.config") == 0) {
lmgmt->signalFileChange("proxy.config.cache.ip_allow.filename");
} else if (strcmp(fname, "vaddrs.config") == 0) {
@@ -1156,6 +1176,9 @@ fileUpdated(char *fname)
} else if (strcmp(fname, "update.config") == 0) {
lmgmt->signalFileChange("proxy.config.update.update_configuration");
+ } else if (strcmp(fname, "admin_access.config") == 0) {
+ lmgmt->signalFileChange("admin_access.config");
+
} else if (strcmp(fname, "partition.config") == 0) {
mgmt_log(stderr, "[fileUpdated] partition.config changed, need restart\n");
Modified: trafficserver/traffic/trunk/proxy/mgmt/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/Makefile.am?rev=1059969&r1=1059968&r2=1059969&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/Makefile.am Mon Jan 17 16:11:27 2011
@@ -17,7 +17,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+if BUILD_WEBUI
+SUBDIRS = cli cluster cop preparse tools utils web2 html2 stats api $(CLI_DIR)
+else
SUBDIRS = cli cluster cop preparse tools utils web2 stats api $(CLI_DIR)
+endif
DIST_SUBDIRS = $(SUBDIRS)
Modified: trafficserver/traffic/trunk/proxy/mgmt/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/RecordsConfig.cc?rev=1059969&r1=1059968&r2=1059969&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/RecordsConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/RecordsConfig.cc Mon Jan 17 16:11:27 2011
@@ -267,6 +267,8 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.cluster.log_bogus_mc_msgs", RECD_INT, "1", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
+ {RECT_CONFIG, "proxy.config.admin.html_doc_root", RECD_STRING, "<html_doc_root>", RECU_NULL, RR_REQUIRED, RECC_NULL, NULL, RECA_NULL}
+ ,
{RECT_CONFIG, "proxy.config.admin.web_interface_port", RECD_INT, "8081", RECU_RESTART_TM, RR_REQUIRED, RECC_INT, "[0-65535]", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.admin.autoconf_port", RECD_INT, "8083", RECU_RESTART_TM, RR_REQUIRED, RECC_INT, "[0-65535]", RECA_NULL}
@@ -286,6 +288,8 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.admin.admin_password", RECD_STRING, "<admin_user_password>", RECU_DYNAMIC, RR_REQUIRED, RECC_STR, ".*", RECA_NO_ACCESS}
,
+ {RECT_CONFIG, "proxy.config.admin.access_control_file", RECD_STRING, "admin_access.config", RECU_RESTART_TM, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
{RECT_CONFIG, "proxy.config.feature_set", RECD_INT, "1", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.admin.basic_auth", RECD_INT, "1", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
@@ -316,6 +320,8 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.admin.cli_port", RECD_INT, "9000", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
+ {RECT_CONFIG, "proxy.config.admin.lang_dict", RECD_STRING, "english.dict", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
{RECT_CONFIG, "proxy.config.admin.session", RECD_INT, "1", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.admin.session.timeout", RECD_INT, "600", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
Modified: trafficserver/traffic/trunk/proxy/mgmt/api/CfgContextImpl.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/api/CfgContextImpl.cc?rev=1059969&r1=1059968&r2=1059969&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/api/CfgContextImpl.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/api/CfgContextImpl.cc Mon Jan 17 16:11:27 2011
@@ -71,6 +71,160 @@ CommentObj::getCfgEleCopy()
return (INKCfgEle *) copy_comment_ele(m_ele);
}
+//--------------------------------------------------------------------------
+// AdminAccessObj
+//--------------------------------------------------------------------------
+AdminAccessObj::AdminAccessObj(INKAdminAccessEle * ele)
+{
+ m_ele = ele;
+ m_valid = true;
+ m_valid = isValid();
+}
+
+AdminAccessObj::AdminAccessObj(TokenList * tokens)
+{
+ Token *tok;
+ int accessType;
+
+ m_ele = INKAdminAccessEleCreate();
+ m_ele->cfg_ele.error = INK_ERR_OKAY;
+ m_valid = true;
+
+ if (!tokens || tokens->length < 3) {
+ goto FORMAT_ERR;
+ }
+
+ m_ele->cfg_ele.type = get_rule_type(tokens, INK_FNAME_ADMIN_ACCESS);
+ if (m_ele->cfg_ele.type == INK_TYPE_UNDEFINED) {
+ goto FORMAT_ERR;
+ }
+ // The first token
+ tok = tokens->first();
+#ifdef TIGHT_RULE_CHECK
+ if (tok->value)
+ goto FORMAT_ERR;
+#endif
+ m_ele->user = xstrdup(tok->name);
+
+ // The second token
+ tok = tokens->next(tok);
+#ifdef TIGHT_RULE_CHECK
+ if (tok->value)
+ goto FORMAT_ERR;
+#endif
+ m_ele->password = xstrdup(tok->name);
+
+ // The third (last) token
+ tok = tokens->next(tok);
+#ifdef TIGHT_RULE_CHECK
+ if (tok->value)
+ goto FORMAT_ERR;
+#endif
+ accessType = ink_atoi(tok->name);
+ switch (accessType) {
+ case 0:
+ m_ele->access = INK_ACCESS_NONE;
+ break;
+ case 1:
+ m_ele->access = INK_ACCESS_MONITOR;
+ break;
+ case 2:
+ m_ele->access = INK_ACCESS_MONITOR_VIEW;
+ break;
+ case 3:
+ m_ele->access = INK_ACCESS_MONITOR_CHANGE;
+ break;
+ default:
+ m_ele->access = INK_ACCESS_UNDEFINED;
+ goto FORMAT_ERR;
+ }
+ m_ele->cfg_ele.error = INK_ERR_OKAY;
+ return;
+
+FORMAT_ERR:
+ m_ele->cfg_ele.error = INK_ERR_INVALID_CONFIG_RULE;
+ m_valid = false;
+}
+
+AdminAccessObj::~AdminAccessObj()
+{
+ INKAdminAccessEleDestroy(m_ele);
+}
+
+char *
+AdminAccessObj::formatEleToRule()
+{
+ if (!isValid()) {
+ m_ele->cfg_ele.error = INK_ERR_INVALID_CONFIG_RULE;
+ return NULL;
+ }
+
+ short accessType;
+
+ char buf[MAX_RULE_SIZE];
+ memset(buf, 0, MAX_RULE_SIZE);
+
+ switch (m_ele->access) {
+ case INK_ACCESS_NONE:
+ accessType = 0;
+ break;
+ case INK_ACCESS_MONITOR:
+ accessType = 1;
+ break;
+ case INK_ACCESS_MONITOR_VIEW:
+ accessType = 2;
+ break;
+ case INK_ACCESS_MONITOR_CHANGE:
+ accessType = 3;
+ break;
+ default:
+ accessType = 0; // lv: just zero it
+ // Handled here:
+ // INK_ACCESS_UNDEFINED
+ break;
+ }
+
+ snprintf(buf, sizeof(buf), "%s:%s:%d:", m_ele->user, m_ele->password, accessType);
+
+ return xstrdup(buf);
+}
+
+bool AdminAccessObj::isValid()
+{
+ if (m_ele->cfg_ele.error != INK_ERR_OKAY) {
+ m_valid = false;
+ }
+ // Must have a user
+ if (!m_ele->user) {
+ m_valid = false;
+ }
+ // Must have a password
+ if (!m_ele->password) {
+ m_valid = false;
+ }
+ // validate access type
+ switch (m_ele->access) {
+ case INK_ACCESS_NONE:
+ case INK_ACCESS_MONITOR:
+ case INK_ACCESS_MONITOR_VIEW:
+ case INK_ACCESS_MONITOR_CHANGE:
+ break;
+ default:
+ m_valid = false;
+ }
+
+ if (!m_valid) {
+ m_ele->cfg_ele.error = INK_ERR_INVALID_CONFIG_RULE;
+ }
+
+ return m_valid;
+}
+
+INKCfgEle *
+AdminAccessObj::getCfgEleCopy()
+{
+ return (INKCfgEle *) copy_admin_access_ele(m_ele);
+}
//--------------------------------------------------------------------------
// CacheObj
Modified: trafficserver/traffic/trunk/proxy/mgmt/api/CfgContextImpl.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/api/CfgContextImpl.h?rev=1059969&r1=1059968&r2=1059969&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/api/CfgContextImpl.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/api/CfgContextImpl.h Mon Jan 17 16:11:27 2011
@@ -102,6 +102,29 @@ private:
};
+/* admin_access.config ****************************************/
+class AdminAccessObj:public CfgEleObj
+{
+public:
+ AdminAccessObj(INKAdminAccessEle * ele);
+ AdminAccessObj(TokenList * tokens); //creates the ele
+ ~AdminAccessObj();
+
+ virtual char *formatEleToRule();
+ virtual bool isValid();
+ virtual INKCfgEle *getCfgEleCopy();
+ virtual INKCfgEle *getCfgEle()
+ {
+ return (INKCfgEle *) m_ele;
+ }
+ virtual INKRuleTypeT getRuleType()
+ {
+ return m_ele->cfg_ele.type;
+ }
+
+private:
+ INKAdminAccessEle * m_ele;
+};
/* cache.config ***************************************************/
class CacheObj:public CfgEleObj
Modified: trafficserver/traffic/trunk/proxy/mgmt/api/CfgContextUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/api/CfgContextUtils.cc?rev=1059969&r1=1059968&r2=1059969&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/api/CfgContextUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/api/CfgContextUtils.cc Mon Jan 17 16:11:27 2011
@@ -1439,6 +1439,9 @@ char *
filename_to_string(INKFileNameT file)
{
switch (file) {
+ case INK_FNAME_ADMIN_ACCESS:
+ return xstrdup("admin_access.config");
+
case INK_FNAME_CACHE_OBJ:
return xstrdup("cache.config");
@@ -1510,6 +1513,44 @@ string_to_congest_scheme_type(const char
return INK_HTTP_CONGEST_UNDEFINED;
}
+/* -------------------------------------------------------------------------
+ * string_to_admin_acc_type
+ * -------------------------------------------------------------------------
+ */
+INKAccessT
+string_to_admin_acc_type(const char *access)
+{
+ if (strcmp(access, "none") == 0) {
+ return INK_ACCESS_NONE;
+ } else if (strcmp(access, "monitor_only") == 0) {
+ return INK_ACCESS_MONITOR;
+ } else if (strcmp(access, "monitor_config_view") == 0) {
+ return INK_ACCESS_MONITOR_VIEW;
+ } else if (strcmp(access, "monitor_config_change") == 0) {
+ return INK_ACCESS_MONITOR_CHANGE;
+ }
+
+ return INK_ACCESS_UNDEFINED;
+}
+
+char *
+admin_acc_type_to_string(INKAccessT access)
+{
+ switch (access) {
+ case INK_ACCESS_NONE:
+ return xstrdup("none");
+ case INK_ACCESS_MONITOR:
+ return xstrdup("monitor_only");
+ case INK_ACCESS_MONITOR_VIEW:
+ return xstrdup("monitor_config_view");
+ case INK_ACCESS_MONITOR_CHANGE:
+ return xstrdup("monitor_config_change");
+ default:
+ break;
+ }
+
+ return NULL;
+}
/***************************************************************************
@@ -1910,6 +1951,9 @@ create_ele_obj_from_rule_node(Rule * rul
// convert TokenList into an Ele
// need switch statement to determine which Ele constructor to call
switch (rule_type) {
+ case INK_ADMIN_ACCESS: /* admin_access.config */
+ ele = (CfgEleObj *) new AdminAccessObj(token_list);
+ break;
case INK_CACHE_NEVER: /* all cache rules use same constructor */
case INK_CACHE_IGNORE_NO_CACHE:
case INK_CACHE_IGNORE_CLIENT_NO_CACHE:
@@ -2000,6 +2044,10 @@ create_ele_obj_from_ele(INKCfgEle * ele)
return NULL;
switch (ele->type) {
+ case INK_ADMIN_ACCESS: /* admin_access.config */
+ ele_obj = (CfgEleObj *) new AdminAccessObj((INKAdminAccessEle *) ele);
+ break;
+
case INK_CACHE_NEVER: /* cache.config */
case INK_CACHE_IGNORE_NO_CACHE: // fall-through
case INK_CACHE_IGNORE_CLIENT_NO_CACHE: // fall-through
@@ -2104,6 +2152,9 @@ get_rule_type(TokenList * token_list, IN
/* Depending on the file and rule type, need to find out which
token specifies which type of rule it is */
switch (file) {
+ case INK_FNAME_ADMIN_ACCESS: /* admin_access.config */
+ return INK_ADMIN_ACCESS;
+
case INK_FNAME_CACHE_OBJ: /* cache.config */
tok = token_list->first();
while (tok != NULL) {
@@ -2450,6 +2501,27 @@ copy_int_list(INKIntList list)
}
//////////////////////////////////////////////////
+INKAdminAccessEle *
+copy_admin_access_ele(INKAdminAccessEle * ele)
+{
+ if (!ele)
+ return NULL;
+
+ INKAdminAccessEle *nele = INKAdminAccessEleCreate();
+ if (!nele)
+ return NULL;
+
+ copy_cfg_ele(&(ele->cfg_ele), &(nele->cfg_ele));
+
+ if (ele->user)
+ nele->user = xstrdup(ele->user);
+ if (ele->password)
+ nele->password = xstrdup(ele->password);
+ nele->access = ele->access;
+
+ return nele;
+}
+
INKCacheEle *
copy_cache_ele(INKCacheEle * ele)
{
Modified: trafficserver/traffic/trunk/proxy/mgmt/api/CfgContextUtils.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/api/CfgContextUtils.h?rev=1059969&r1=1059968&r2=1059969&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/api/CfgContextUtils.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/api/CfgContextUtils.h Mon Jan 17 16:11:27 2011
@@ -174,6 +174,7 @@ INKDomainList copy_domain_list(INKDomain
INKStringList copy_string_list(INKStringList list);
INKIntList copy_int_list(INKIntList list);
+INKAdminAccessEle *copy_admin_access_ele(INKAdminAccessEle * ele);
INKCacheEle *copy_cache_ele(INKCacheEle * ele);
INKCongestionEle *copy_congestion_ele(INKCongestionEle * ele);
INKHostingEle *copy_hosting_ele(INKHostingEle * ele);
Modified: trafficserver/traffic/trunk/proxy/mgmt/api/GenericParser.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/api/GenericParser.cc?rev=1059969&r1=1059968&r2=1059969&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/api/GenericParser.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/api/GenericParser.cc Mon Jan 17 16:11:27 2011
@@ -206,6 +206,8 @@ Rule::parse(const char *const_rule, INKF
m_filetype = filetype;
switch (m_filetype) {
+ case INK_FNAME_ADMIN_ACCESS: /* admin_access.config */
+ return admin_accessParse(rule);
case INK_FNAME_CACHE_OBJ: /* cache.config */
return cacheParse(rule);
case INK_FNAME_CONGESTION: /* congestion.config */
@@ -245,6 +247,16 @@ Rule::parse(const char *const_rule, INKF
/**
+ * admin_accessParse
+ **/
+TokenList *
+Rule::admin_accessParse(char *rule)
+{
+ return icpParse(rule, 3, 3);
+}
+
+
+/**
* arm_securityParse
**/
TokenList *
@@ -954,7 +966,9 @@ RuleList::parse(char *fileBuf, const cha
{
m_filename = xstrdup(filename);
- if (strstr(filename, "cache.config")) {
+ if (strstr(filename, "admin_access.config")) {
+ m_filetype = INK_FNAME_ADMIN_ACCESS; /* admin_access.config */
+ } else if (strstr(filename, "cache.config")) {
m_filetype = INK_FNAME_CACHE_OBJ; /* cache.config */
} else if (strstr(filename, "congestion.config")) {
m_filetype = INK_FNAME_CONGESTION; /* congestion.config */
Modified: trafficserver/traffic/trunk/proxy/mgmt/api/INKMgmtAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/api/INKMgmtAPI.cc?rev=1059969&r1=1059968&r2=1059969&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/api/INKMgmtAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/api/INKMgmtAPI.cc Mon Jan 17 16:11:27 2011
@@ -938,6 +938,40 @@ INKPdSsFormatDestroy(INKPdSsFormat * ele
return;
}
+/*-------------------------------------------------------------
+ * INKAdminAccessEle
+ *-------------------------------------------------------------*/
+inkapi INKAdminAccessEle *
+INKAdminAccessEleCreate()
+{
+ INKAdminAccessEle *ele;
+
+ ele = (INKAdminAccessEle *) xmalloc(sizeof(INKAdminAccessEle));
+ if (!ele)
+ return NULL;
+
+ ele->cfg_ele.type = INK_ADMIN_ACCESS;
+ ele->cfg_ele.error = INK_ERR_OKAY;
+ ele->user = NULL;
+ ele->password = NULL;
+ ele->access = INK_ACCESS_UNDEFINED;
+
+ return ele;
+}
+
+inkapi void
+INKAdminAccessEleDestroy(INKAdminAccessEle * ele)
+{
+ if (ele) {
+ if (ele->user)
+ xfree(ele->user);
+ if (ele->password)
+ xfree(ele->password);
+ xfree(ele);
+ }
+ return;
+}
+
/*-------------------------------------------------------------
* CacheObj
Modified: trafficserver/traffic/trunk/proxy/mgmt/api/INKMgmtAPIStub.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/api/INKMgmtAPIStub.cc?rev=1059969&r1=1059968&r2=1059969&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/api/INKMgmtAPIStub.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/api/INKMgmtAPIStub.cc Mon Jan 17 16:11:27 2011
@@ -295,6 +295,18 @@ INKPdSsFormatDestroy(INKPdSsFormat * ele
return;
}
+inkapi INKAdminAccessEle *
+INKAdminAccessEleCreate()
+{
+ return NULL;
+}
+
+inkapi void
+INKAdminAccessEleDestroy(INKAdminAccessEle * ele)
+{
+ return;
+}
+
inkapi INKArmSecurityEle *
INKArmSecurityEleCreate()
{
Modified: trafficserver/traffic/trunk/proxy/mgmt/api/include/INKMgmtAPI.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/api/include/INKMgmtAPI.h?rev=1059969&r1=1059968&r2=1059969&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/api/include/INKMgmtAPI.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/api/include/INKMgmtAPI.h Mon Jan 17 16:11:27 2011
@@ -389,6 +389,7 @@ typedef enum
typedef enum
{
+ INK_FNAME_ADMIN_ACCESS, /* admin_access.config */
INK_FNAME_CACHE_OBJ, /* cache.config */
INK_FNAME_CONGESTION, /* congestion.config */
INK_FNAME_HOSTING, /* hosting.config */
@@ -419,6 +420,7 @@ typedef enum
*/
typedef enum
{
+ INK_ADMIN_ACCESS, /* admin_access.config */
INK_CACHE_NEVER, /* cache.config */
INK_CACHE_IGNORE_NO_CACHE,
INK_CACHE_IGNORE_CLIENT_NO_CACHE,
@@ -582,6 +584,15 @@ typedef enum
INKError error;
} INKCfgEle;
+/* admin_access.config */
+ typedef struct
+ {
+ INKCfgEle cfg_ele;
+ char *user; /* username */
+ char *password; /* MD5 encrypted */
+ INKAccessT access; /* type of access allowed for user */
+ } INKAdminAccessEle;
+
/* cache.config */
typedef struct
{
@@ -917,6 +928,8 @@ typedef enum
inkapi void INKSspecDestroy(INKSspec * ele);
inkapi INKPdSsFormat *INKPdSsFormatCreate();
inkapi void INKPdSsFormatDestroy(INKPdSsFormat * ele);
+ inkapi INKAdminAccessEle *INKAdminAccessEleCreate();
+ inkapi void INKAdminAccessEleDestroy(INKAdminAccessEle * ele);
inkapi INKCacheEle *INKCacheEleCreate(INKRuleTypeT type);
inkapi void INKCacheEleDestroy(INKCacheEle * ele);
inkapi INKCongestionEle *INKCongestionEleCreate();
Modified: trafficserver/traffic/trunk/proxy/mgmt/api/remote/APITestCliRemote.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/api/remote/APITestCliRemote.cc?rev=1059969&r1=1059968&r2=1059969&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/api/remote/APITestCliRemote.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/api/remote/APITestCliRemote.cc Mon Jan 17 16:11:27 2011
@@ -377,6 +377,38 @@ print_pd_sspec(INKPdSsFormat info)
// Ele printing functions
//
+void
+print_admin_access_ele(INKAdminAccessEle * ele)
+{
+ if (!ele) {
+ fprintf(stderr, "print_admin_access_ele: ele is NULL\n");
+ return;
+ }
+
+ char accessType;
+ switch (ele->access) {
+ case INK_ACCESS_NONE:
+ accessType = '0';
+ break;
+ case INK_ACCESS_MONITOR:
+ accessType = '1';
+ break;
+ case INK_ACCESS_MONITOR_VIEW:
+ accessType = '2';
+ break;
+ case INK_ACCESS_MONITOR_CHANGE:
+ accessType = '3';
+ break;
+ default:
+ accessType = '?'; /* lv: to make gcc happy and don't brake fprintf */
+ // Handled here:
+ // INK_ACCESS_UNDEFINED
+ break;
+ }
+
+ fprintf(stderr, "%s:%s:%c:\n", ele->user, ele->password, accessType);
+ return;
+}
void
print_cache_ele(INKCacheEle * ele)
@@ -826,6 +858,9 @@ print_ele_list(INKFileNameT file, INKCfg
ele = INKCfgContextGetEleAt(ctx, i);
switch (filename) {
+ case INK_FNAME_ADMIN_ACCESS:
+ print_admin_access_ele((INKAdminAccessEle *) ele);
+ break;
case INK_FNAME_CACHE_OBJ:
print_cache_ele((INKCacheEle *) ele);
break;
@@ -1569,7 +1604,9 @@ test_cfg_context_get(char *args)
name[strlen(filename) - 1] = '\0';
// convert file name to INKFileNameT
- if (strcmp(name, "cache.config") == 0) {
+ if (strcmp(name, "admin_access.config") == 0) {
+ file = INK_FNAME_ADMIN_ACCESS;
+ } else if (strcmp(name, "cache.config") == 0) {
file = INK_FNAME_CACHE_OBJ;
} else if (strcmp(name, "congestion.config") == 0) {
file = INK_FNAME_CONGESTION;
@@ -1643,7 +1680,9 @@ test_cfg_context_move(char *args)
name[strlen(filename) - 1] = '\0';
// convert file name to INKFileNameT
- if (strcmp(name, "cache.config") == 0) {
+ if (strcmp(name, "admin_access.config") == 0) {
+ file = INK_FNAME_ADMIN_ACCESS;
+ } else if (strcmp(name, "cache.config") == 0) {
file = INK_FNAME_CACHE_OBJ;
} else if (strcmp(name, "congestion.config") == 0) {
file = INK_FNAME_CONGESTION;