From c4e406b62ffb34ca489263d81af1df11658ec9af Mon Sep 17 00:00:00 2001 From: Edwin Smith Date: Sun, 14 Jul 2013 11:03:12 -0700 Subject: [PATCH] Move runtime/base/server to runtime/server This is an incremental step towards moving it all the way to hphp/server. This flattens base but doesn't untangle the server files from lib_hphp_runtime --- hphp/CMakeLists.txt | 5 +- hphp/doc/server.documents | 2 +- hphp/runtime/base/debuggable.cpp | 2 +- hphp/runtime/base/execution_context.cpp | 2 +- hphp/runtime/base/execution_context.h | 4 +- hphp/runtime/base/file/file.cpp | 4 +- .../runtime/base/file/file_stream_wrapper.cpp | 2 +- hphp/runtime/base/file/mem_file.cpp | 2 +- hphp/runtime/base/file/socket.cpp | 2 +- hphp/runtime/base/file_repository.cpp | 2 +- hphp/runtime/base/memory/leak_detectable.cpp | 2 +- hphp/runtime/base/memory/memory_manager.cpp | 2 +- hphp/runtime/base/memory/smart_allocator.cpp | 2 +- hphp/runtime/base/program_functions.cpp | 16 +- hphp/runtime/base/runtime_option.cpp | 4 +- hphp/runtime/base/runtime_option.h | 6 +- .../base/shared/concurrent_shared_store.h | 2 +- .../runtime/base/shared/shared_store_base.cpp | 2 +- hphp/runtime/base/thread_init_fini.cpp | 4 +- hphp/runtime/base/util/http_client.cpp | 2 +- hphp/runtime/base/util/http_client.h | 6 +- .../base/util/libevent_http_client.cpp | 2 +- hphp/runtime/debugger/dummy_sandbox.cpp | 2 +- hphp/runtime/ext/ext_apache.cpp | 6 +- hphp/runtime/ext/ext_apc.h | 2 +- hphp/runtime/ext/ext_curl.cpp | 2 +- hphp/runtime/ext/ext_file.cpp | 2 +- hphp/runtime/ext/ext_function.cpp | 2 +- hphp/runtime/ext/ext_hotprofiler.cpp | 2 +- hphp/runtime/ext/ext_misc.cpp | 2 +- hphp/runtime/ext/ext_mysql.cpp | 2 +- hphp/runtime/ext/ext_network.cpp | 2 +- hphp/runtime/ext/ext_output.h | 2 +- hphp/runtime/ext/ext_server.cpp | 10 +- hphp/runtime/ext/ext_soap.cpp | 2 +- hphp/runtime/ext/ext_socket.cpp | 2 +- hphp/runtime/ext/ext_stream.cpp | 2 +- hphp/runtime/ext/ext_string.cpp | 4 +- hphp/runtime/ext/ext_thread.cpp | 4 +- hphp/runtime/{base => }/server/access_log.cpp | 8 +- hphp/runtime/{base => }/server/access_log.h | 2 +- .../server/admin_request_handler.cpp | 8 +- .../{base => }/server/admin_request_handler.h | 4 +- .../server/dynamic_content_cache.cpp | 2 +- .../{base => }/server/dynamic_content_cache.h | 0 .../runtime/{base => }/server/files_match.cpp | 4 +- hphp/runtime/{base => }/server/files_match.h | 2 +- .../{base => }/server/http_protocol.cpp | 14 +- .../runtime/{base => }/server/http_protocol.h | 2 +- .../server/http_request_handler.cpp | 16 +- .../{base => }/server/http_request_handler.h | 6 +- .../runtime/{base => }/server/http_server.cpp | 16 +- hphp/runtime/{base => }/server/http_server.h | 6 +- .../{base => }/server/ip_block_map.cpp | 2 +- hphp/runtime/{base => }/server/ip_block_map.h | 4 +- .../{base => }/server/job_queue_vm_stack.h | 0 .../{base => }/server/libevent_server.cpp | 6 +- .../{base => }/server/libevent_server.h | 6 +- .../server/libevent_server_factory.cpp | 8 +- .../server/libevent_server_with_fd.cpp | 2 +- .../server/libevent_server_with_fd.h | 2 +- .../server/libevent_server_with_takeover.cpp | 2 +- .../server/libevent_server_with_takeover.h | 2 +- .../{base => }/server/libevent_transport.cpp | 6 +- .../{base => }/server/libevent_transport.h | 2 +- .../{base => }/server/pagelet_server.cpp | 10 +- .../{base => }/server/pagelet_server.h | 0 .../{base => }/server/replay_transport.cpp | 2 +- .../{base => }/server/replay_transport.h | 2 +- .../runtime/{base => }/server/request_uri.cpp | 8 +- hphp/runtime/{base => }/server/request_uri.h | 0 .../{base => }/server/rpc_request_handler.cpp | 14 +- .../{base => }/server/rpc_request_handler.h | 2 +- .../{base => }/server/satellite_server.cpp | 8 +- .../{base => }/server/satellite_server.h | 0 hphp/runtime/{base => }/server/server.cpp | 4 +- hphp/runtime/{base => }/server/server.h | 2 +- .../runtime/server/server_name_indication.cpp | 195 ++++++++++++++++++ hphp/runtime/server/server_name_indication.h | 49 +++++ .../runtime/{base => }/server/server_note.cpp | 2 +- hphp/runtime/{base => }/server/server_note.h | 0 .../{base => }/server/server_stats.cpp | 4 +- hphp/runtime/{base => }/server/server_stats.h | 0 .../{base => }/server/service_thread.cpp | 6 +- .../{base => }/server/service_thread.h | 2 +- .../{base => }/server/source_root_info.cpp | 6 +- .../{base => }/server/source_root_info.h | 0 .../server/static_content_cache.cpp | 2 +- .../{base => }/server/static_content_cache.h | 0 hphp/runtime/{base => }/server/transport.cpp | 10 +- hphp/runtime/{base => }/server/transport.h | 0 hphp/runtime/{base => }/server/upload.cpp | 2 +- hphp/runtime/{base => }/server/upload.h | 2 +- .../{base => }/server/virtual_host.cpp | 2 +- hphp/runtime/{base => }/server/virtual_host.h | 2 +- .../server/warmup_request_handler.cpp | 2 +- .../server/warmup_request_handler.h | 4 +- .../runtime/{base => }/server/xbox_server.cpp | 8 +- hphp/runtime/{base => }/server/xbox_server.h | 2 +- hphp/runtime/vm/bytecode.cpp | 2 +- hphp/runtime/vm/jit/translator-x64.cpp | 2 +- hphp/test/ext/test_cpp_base.cpp | 2 +- hphp/test/ext/test_ext_curl.cpp | 2 +- hphp/test/ext/test_ext_server.cpp | 4 +- hphp/test/ext/test_server.cpp | 4 +- hphp/tools/license.php | 4 +- 106 files changed, 439 insertions(+), 192 deletions(-) rename hphp/runtime/{base => }/server/access_log.cpp (98%) rename hphp/runtime/{base => }/server/access_log.h (98%) rename hphp/runtime/{base => }/server/admin_request_handler.cpp (99%) rename hphp/runtime/{base => }/server/admin_request_handler.h (96%) rename hphp/runtime/{base => }/server/dynamic_content_cache.cpp (97%) rename hphp/runtime/{base => }/server/dynamic_content_cache.h (100%) rename hphp/runtime/{base => }/server/files_match.cpp (94%) rename hphp/runtime/{base => }/server/files_match.h (98%) rename hphp/runtime/{base => }/server/http_protocol.cpp (98%) rename hphp/runtime/{base => }/server/http_protocol.h (98%) rename hphp/runtime/{base => }/server/http_request_handler.cpp (97%) rename hphp/runtime/{base => }/server/http_request_handler.h (94%) rename hphp/runtime/{base => }/server/http_server.cpp (97%) rename hphp/runtime/{base => }/server/http_server.h (93%) rename hphp/runtime/{base => }/server/ip_block_map.cpp (99%) rename hphp/runtime/{base => }/server/ip_block_map.h (97%) rename hphp/runtime/{base => }/server/job_queue_vm_stack.h (100%) rename hphp/runtime/{base => }/server/libevent_server.cpp (99%) rename hphp/runtime/{base => }/server/libevent_server.h (97%) rename hphp/runtime/{base => }/server/libevent_server_factory.cpp (91%) rename hphp/runtime/{base => }/server/libevent_server_with_fd.cpp (97%) rename hphp/runtime/{base => }/server/libevent_server_with_fd.h (97%) rename hphp/runtime/{base => }/server/libevent_server_with_takeover.cpp (99%) rename hphp/runtime/{base => }/server/libevent_server_with_takeover.h (98%) rename hphp/runtime/{base => }/server/libevent_transport.cpp (98%) rename hphp/runtime/{base => }/server/libevent_transport.h (98%) rename hphp/runtime/{base => }/server/pagelet_server.cpp (97%) rename hphp/runtime/{base => }/server/pagelet_server.h (100%) rename hphp/runtime/{base => }/server/replay_transport.cpp (98%) rename hphp/runtime/{base => }/server/replay_transport.h (98%) rename hphp/runtime/{base => }/server/request_uri.cpp (98%) rename hphp/runtime/{base => }/server/request_uri.h (100%) rename hphp/runtime/{base => }/server/rpc_request_handler.cpp (96%) rename hphp/runtime/{base => }/server/rpc_request_handler.h (98%) rename hphp/runtime/{base => }/server/satellite_server.cpp (96%) rename hphp/runtime/{base => }/server/satellite_server.h (100%) rename hphp/runtime/{base => }/server/server.cpp (97%) rename hphp/runtime/{base => }/server/server.h (99%) create mode 100644 hphp/runtime/server/server_name_indication.cpp create mode 100644 hphp/runtime/server/server_name_indication.h rename hphp/runtime/{base => }/server/server_note.cpp (97%) rename hphp/runtime/{base => }/server/server_note.h (100%) rename hphp/runtime/{base => }/server/server_stats.cpp (99%) rename hphp/runtime/{base => }/server/server_stats.h (100%) rename hphp/runtime/{base => }/server/service_thread.cpp (94%) rename hphp/runtime/{base => }/server/service_thread.h (96%) rename hphp/runtime/{base => }/server/source_root_info.cpp (98%) rename hphp/runtime/{base => }/server/source_root_info.h (100%) rename hphp/runtime/{base => }/server/static_content_cache.cpp (98%) rename hphp/runtime/{base => }/server/static_content_cache.h (100%) rename hphp/runtime/{base => }/server/transport.cpp (99%) rename hphp/runtime/{base => }/server/transport.h (100%) rename hphp/runtime/{base => }/server/upload.cpp (99%) rename hphp/runtime/{base => }/server/upload.h (98%) rename hphp/runtime/{base => }/server/virtual_host.cpp (99%) rename hphp/runtime/{base => }/server/virtual_host.h (98%) rename hphp/runtime/{base => }/server/warmup_request_handler.cpp (97%) rename hphp/runtime/{base => }/server/warmup_request_handler.h (96%) rename hphp/runtime/{base => }/server/xbox_server.cpp (98%) rename hphp/runtime/{base => }/server/xbox_server.h (98%) diff --git a/hphp/CMakeLists.txt b/hphp/CMakeLists.txt index 85eb4f10f..779603487 100644 --- a/hphp/CMakeLists.txt +++ b/hphp/CMakeLists.txt @@ -22,7 +22,7 @@ SET(USE_HHVM TRUE) SET(ENV{HHVM} 1) ADD_DEFINITIONS("-DHHVM -DHHVM_BINARY=1 -DHHVM_PATH=\\\"${HPHP_HOME}/hphp/hhvm/hhvm\\\"") -set(RECURSIVE_SOURCE_SUBDIRS runtime/base runtime/debugger runtime/eval runtime/ext runtime/vm util) +set(RECURSIVE_SOURCE_SUBDIRS runtime/base runtime/debugger runtime/eval runtime/ext runtime/server runtime/vm util) foreach (dir ${RECURSIVE_SOURCE_SUBDIRS}) auto_sources(files "*.cpp" "RECURSE" "${CMAKE_CURRENT_SOURCE_DIR}/${dir}") @@ -40,6 +40,9 @@ if(NOT LINUX) list(REMOVE_ITEM CXX_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/runtime/vm/debug/elfwriter.cpp) endif() +# Not working with off-the-shelf libevent +list(REMOVE_ITEM CXX_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/runtime/server/server_name_indication.cpp) + # remove ext_hhvm, and anything in a test folder foreach (file ${CXX_SOURCES}) if (${file} MATCHES "ext_hhvm") diff --git a/hphp/doc/server.documents b/hphp/doc/server.documents index e937bc01f..684b695c0 100644 --- a/hphp/doc/server.documents +++ b/hphp/doc/server.documents @@ -1,7 +1,7 @@

Server Documents

-This flow is implemented in hphp/runtime/base/server/http_server.cpp: +This flow is implemented in hphp/runtime/server/http_server.cpp: +-------------+ | APC Priming | diff --git a/hphp/runtime/base/debuggable.cpp b/hphp/runtime/base/debuggable.cpp index 9cd5a2ef8..bb53b3208 100644 --- a/hphp/runtime/base/debuggable.cpp +++ b/hphp/runtime/base/debuggable.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/base/debuggable.h" -#include "hphp/runtime/base/server/server_stats.h" +#include "hphp/runtime/server/server_stats.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/execution_context.cpp b/hphp/runtime/base/execution_context.cpp index 66c6b214a..31712c343 100644 --- a/hphp/runtime/base/execution_context.cpp +++ b/hphp/runtime/base/execution_context.cpp @@ -27,7 +27,7 @@ #include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/memory/memory_manager.h" #include "hphp/runtime/base/memory/sweepable.h" -#include "hphp/runtime/base/server/server_stats.h" +#include "hphp/runtime/server/server_stats.h" #include "hphp/runtime/base/util/request_local.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/comparisons.h" diff --git a/hphp/runtime/base/execution_context.h b/hphp/runtime/base/execution_context.h index 30f326017..a59973474 100644 --- a/hphp/runtime/base/execution_context.h +++ b/hphp/runtime/base/execution_context.h @@ -19,10 +19,10 @@ #include "hphp/runtime/base/class_info.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/server/transport.h" +#include "hphp/runtime/server/transport.h" #include "hphp/runtime/base/resource_data.h" #include "hphp/runtime/base/debuggable.h" -#include "hphp/runtime/base/server/virtual_host.h" +#include "hphp/runtime/server/virtual_host.h" #include "hphp/runtime/base/util/string_buffer.h" #include "hphp/runtime/base/hphp_array.h" #include "hphp/runtime/vm/funcdict.h" diff --git a/hphp/runtime/base/file/file.cpp b/hphp/runtime/base/file/file.cpp index 948af66d3..3109d3d82 100644 --- a/hphp/runtime/base/file/file.cpp +++ b/hphp/runtime/base/file/file.cpp @@ -19,8 +19,8 @@ #include "hphp/runtime/base/util/string_buffer.h" #include "hphp/runtime/base/type_conversions.h" #include "hphp/runtime/base/builtin_functions.h" -#include "hphp/runtime/base/server/static_content_cache.h" -#include "hphp/runtime/base/server/virtual_host.h" +#include "hphp/runtime/server/static_content_cache.h" +#include "hphp/runtime/server/virtual_host.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/runtime_error.h" #include "hphp/runtime/base/array_init.h" diff --git a/hphp/runtime/base/file/file_stream_wrapper.cpp b/hphp/runtime/base/file/file_stream_wrapper.cpp index de469582a..1c7b6b14e 100644 --- a/hphp/runtime/base/file/file_stream_wrapper.cpp +++ b/hphp/runtime/base/file/file_stream_wrapper.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/base/file/file_stream_wrapper.h" #include "hphp/runtime/base/runtime_error.h" #include "hphp/runtime/base/file/plain_file.h" -#include "hphp/runtime/base/server/static_content_cache.h" +#include "hphp/runtime/server/static_content_cache.h" #include namespace HPHP { diff --git a/hphp/runtime/base/file/mem_file.cpp b/hphp/runtime/base/file/mem_file.cpp index 62f04c535..1bca8c2d5 100644 --- a/hphp/runtime/base/file/mem_file.cpp +++ b/hphp/runtime/base/file/mem_file.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/base/file/mem_file.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/util/http_client.h" -#include "hphp/runtime/base/server/static_content_cache.h" +#include "hphp/runtime/server/static_content_cache.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/util/compression.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/base/file/socket.cpp b/hphp/runtime/base/file/socket.cpp index ba4fcd576..4720ca13b 100644 --- a/hphp/runtime/base/file/socket.cpp +++ b/hphp/runtime/base/file/socket.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/base/util/exceptions.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/server/server_stats.h" +#include "hphp/runtime/server/server_stats.h" #include "hphp/runtime/base/util/request_local.h" #include "hphp/util/logger.h" #include diff --git a/hphp/runtime/base/file_repository.cpp b/hphp/runtime/base/file_repository.cpp index 98f9bbd91..02b6f3b3f 100644 --- a/hphp/runtime/base/file_repository.cpp +++ b/hphp/runtime/base/file_repository.cpp @@ -20,7 +20,7 @@ #include "hphp/util/process.h" #include "hphp/util/trace.h" #include "hphp/runtime/base/stat_cache.h" -#include "hphp/runtime/base/server/source_root_info.h" +#include "hphp/runtime/server/source_root_info.h" #include "hphp/runtime/vm/jit/target-cache.h" #include "hphp/runtime/vm/jit/translator.h" diff --git a/hphp/runtime/base/memory/leak_detectable.cpp b/hphp/runtime/base/memory/leak_detectable.cpp index a76ba3358..23f0a73f6 100644 --- a/hphp/runtime/base/memory/leak_detectable.cpp +++ b/hphp/runtime/base/memory/leak_detectable.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/base/memory/leak_detectable.h" #include "hphp/runtime/base/program_functions.h" -#include "hphp/runtime/base/server/server_stats.h" +#include "hphp/runtime/server/server_stats.h" #include #include "tbb/concurrent_hash_map.h" #include "hphp/runtime/base/runtime_option.h" diff --git a/hphp/runtime/base/memory/memory_manager.cpp b/hphp/runtime/base/memory/memory_manager.cpp index b79f8aa66..cc5e205e5 100644 --- a/hphp/runtime/base/memory/memory_manager.cpp +++ b/hphp/runtime/base/memory/memory_manager.cpp @@ -28,7 +28,7 @@ #include "hphp/runtime/base/memory/sweepable.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/server/http_server.h" +#include "hphp/runtime/server/http_server.h" #include "hphp/util/alloc.h" #include "hphp/util/process.h" #include "hphp/util/trace.h" diff --git a/hphp/runtime/base/memory/smart_allocator.cpp b/hphp/runtime/base/memory/smart_allocator.cpp index 43fb1ebad..28c2e80d6 100644 --- a/hphp/runtime/base/memory/smart_allocator.cpp +++ b/hphp/runtime/base/memory/smart_allocator.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/base/memory/smart_allocator.h" #include "hphp/runtime/base/memory/memory_manager.h" #include "hphp/runtime/base/resource_data.h" -#include "hphp/runtime/base/server/server_stats.h" +#include "hphp/runtime/server/server_stats.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/util/logger.h" #include "hphp/util/trace.h" diff --git a/hphp/runtime/base/program_functions.cpp b/hphp/runtime/base/program_functions.cpp index de8511bd7..1044ff5e0 100644 --- a/hphp/runtime/base/program_functions.cpp +++ b/hphp/runtime/base/program_functions.cpp @@ -23,14 +23,14 @@ #include "hphp/runtime/base/code_coverage.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/util/shared_memory_allocator.h" -#include "hphp/runtime/base/server/pagelet_server.h" -#include "hphp/runtime/base/server/xbox_server.h" -#include "hphp/runtime/base/server/http_server.h" -#include "hphp/runtime/base/server/replay_transport.h" -#include "hphp/runtime/base/server/http_request_handler.h" -#include "hphp/runtime/base/server/admin_request_handler.h" -#include "hphp/runtime/base/server/server_stats.h" -#include "hphp/runtime/base/server/server_note.h" +#include "hphp/runtime/server/pagelet_server.h" +#include "hphp/runtime/server/xbox_server.h" +#include "hphp/runtime/server/http_server.h" +#include "hphp/runtime/server/replay_transport.h" +#include "hphp/runtime/server/http_request_handler.h" +#include "hphp/runtime/server/admin_request_handler.h" +#include "hphp/runtime/server/server_stats.h" +#include "hphp/runtime/server/server_note.h" #include "hphp/runtime/base/memory/memory_manager.h" #include "hphp/util/process.h" #include "hphp/util/capability.h" diff --git a/hphp/runtime/base/runtime_option.cpp b/hphp/runtime/base/runtime_option.cpp index d1c440586..1709e751f 100644 --- a/hphp/runtime/base/runtime_option.cpp +++ b/hphp/runtime/base/runtime_option.cpp @@ -27,7 +27,7 @@ #include "hphp/runtime/base/type_conversions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/shared/shared_store_base.h" -#include "hphp/runtime/base/server/access_log.h" +#include "hphp/runtime/server/access_log.h" #include "hphp/runtime/base/memory/leak_detectable.h" #include "hphp/runtime/base/util/extended_logger.h" #include "hphp/runtime/base/util/simple_counter.h" @@ -40,7 +40,7 @@ #include "hphp/runtime/base/hardware_counter.h" #include "hphp/runtime/base/preg.h" #include "hphp/util/parser/scanner.h" -#include "hphp/runtime/base/server/access_log.h" +#include "hphp/runtime/server/access_log.h" #include "hphp/runtime/base/crash_reporter.h" namespace HPHP { diff --git a/hphp/runtime/base/runtime_option.h b/hphp/runtime/base/runtime_option.h index 539c8b4f5..a0ba4a48c 100644 --- a/hphp/runtime/base/runtime_option.h +++ b/hphp/runtime/base/runtime_option.h @@ -17,9 +17,9 @@ #ifndef incl_HPHP_RUNTIME_OPTION_H_ #define incl_HPHP_RUNTIME_OPTION_H_ -#include "hphp/runtime/base/server/virtual_host.h" -#include "hphp/runtime/base/server/satellite_server.h" -#include "hphp/runtime/base/server/files_match.h" +#include "hphp/runtime/server/virtual_host.h" +#include "hphp/runtime/server/satellite_server.h" +#include "hphp/runtime/server/files_match.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/shared/concurrent_shared_store.h b/hphp/runtime/base/shared/concurrent_shared_store.h index ef56c9e81..40309aca4 100644 --- a/hphp/runtime/base/shared/concurrent_shared_store.h +++ b/hphp/runtime/base/shared/concurrent_shared_store.h @@ -25,7 +25,7 @@ #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/type_conversions.h" #include "hphp/runtime/base/builtin_functions.h" -#include "hphp/runtime/base/server/server_stats.h" +#include "hphp/runtime/server/server_stats.h" #include "tbb/concurrent_hash_map.h" #include "tbb/concurrent_priority_queue.h" #include "hphp/runtime/base/shared/shared_store_stats.h" diff --git a/hphp/runtime/base/shared/shared_store_base.cpp b/hphp/runtime/base/shared/shared_store_base.cpp index 81b06bd37..ad0603046 100644 --- a/hphp/runtime/base/shared/shared_store_base.cpp +++ b/hphp/runtime/base/shared/shared_store_base.cpp @@ -20,7 +20,7 @@ #include "hphp/runtime/base/type_conversions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/memory/leak_detectable.h" -#include "hphp/runtime/base/server/server_stats.h" +#include "hphp/runtime/server/server_stats.h" #include "hphp/runtime/base/shared/concurrent_shared_store.h" #include "hphp/util/timer.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/base/thread_init_fini.cpp b/hphp/runtime/base/thread_init_fini.cpp index 6154f1377..82062dd4f 100644 --- a/hphp/runtime/base/thread_init_fini.cpp +++ b/hphp/runtime/base/thread_init_fini.cpp @@ -18,8 +18,8 @@ #include "hphp/runtime/base/memory/smart_allocator.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/preg.h" -#include "hphp/runtime/base/server/server_stats.h" -#include "hphp/runtime/base/server/server_note.h" +#include "hphp/runtime/server/server_stats.h" +#include "hphp/runtime/server/server_note.h" #include "hphp/runtime/base/zend/zend_strtod.h" #include "hphp/runtime/base/zend/zend_math.h" #include "hphp/util/async_func.h" diff --git a/hphp/runtime/base/util/http_client.cpp b/hphp/runtime/base/util/http_client.cpp index e7efea7a5..af72575b6 100644 --- a/hphp/runtime/base/util/http_client.cpp +++ b/hphp/runtime/base/util/http_client.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/base/util/http_client.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/server/server_stats.h" +#include "hphp/runtime/server/server_stats.h" #include "hphp/runtime/base/util/curl_tls_workarounds.h" #include "hphp/util/timer.h" #include "curl/curl.h" diff --git a/hphp/runtime/base/util/http_client.h b/hphp/runtime/base/util/http_client.h index 10e070478..6b5c0975d 100644 --- a/hphp/runtime/base/util/http_client.h +++ b/hphp/runtime/base/util/http_client.h @@ -18,15 +18,15 @@ #define incl_HPHP_HTTP_CLIENT_H_ #include "hphp/runtime/base/util/string_buffer.h" -#include "hphp/runtime/base/server/transport.h" +#include "hphp/runtime/server/transport.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// class HttpClient { public: - HttpClient(int timeout = 5 /* seconds */, int maxRedirect = 1, - bool use11 = true, bool decompress = false); + explicit HttpClient(int timeout = 5 /* seconds */, int maxRedirect = 1, + bool use11 = true, bool decompress = false); /** * Authentication. diff --git a/hphp/runtime/base/util/libevent_http_client.cpp b/hphp/runtime/base/util/libevent_http_client.cpp index 7f5a0350f..58f839338 100644 --- a/hphp/runtime/base/util/libevent_http_client.cpp +++ b/hphp/runtime/base/util/libevent_http_client.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/base/util/libevent_http_client.h" -#include "hphp/runtime/base/server/server_stats.h" +#include "hphp/runtime/server/server_stats.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/util/compression.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/debugger/dummy_sandbox.cpp b/hphp/runtime/debugger/dummy_sandbox.cpp index 30871fe05..82e5d85a8 100644 --- a/hphp/runtime/debugger/dummy_sandbox.cpp +++ b/hphp/runtime/debugger/dummy_sandbox.cpp @@ -21,7 +21,7 @@ #include "hphp/runtime/debugger/debugger.h" #include "hphp/runtime/debugger/cmd/cmd_signal.h" #include "hphp/runtime/base/program_functions.h" -#include "hphp/runtime/base/server/source_root_info.h" +#include "hphp/runtime/server/source_root_info.h" #include "hphp/runtime/base/externals.h" #include "hphp/runtime/base/hphp_system.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/ext/ext_apache.cpp b/hphp/runtime/ext/ext_apache.cpp index 5809544ca..97abff289 100644 --- a/hphp/runtime/ext/ext_apache.cpp +++ b/hphp/runtime/ext/ext_apache.cpp @@ -16,10 +16,10 @@ */ #include "hphp/runtime/ext/ext_apache.h" -#include "hphp/runtime/base/server/http_server.h" +#include "hphp/runtime/server/http_server.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/server/server_note.h" -#include "hphp/runtime/base/server/transport.h" +#include "hphp/runtime/server/server_note.h" +#include "hphp/runtime/server/transport.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/ext_apc.h b/hphp/runtime/ext/ext_apc.h index 40c29ea22..734c9550e 100644 --- a/hphp/runtime/ext/ext_apc.h +++ b/hphp/runtime/ext/ext_apc.h @@ -20,7 +20,7 @@ #include "hphp/runtime/base/base_includes.h" #include "hphp/runtime/base/shared/shared_store_base.h" -#include "hphp/runtime/base/server/upload.h" +#include "hphp/runtime/server/upload.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/ext_curl.cpp b/hphp/runtime/ext/ext_curl.cpp index 3d2c4dee3..bd76b70e1 100644 --- a/hphp/runtime/ext/ext_curl.cpp +++ b/hphp/runtime/ext/ext_curl.cpp @@ -21,7 +21,7 @@ #include "hphp/runtime/base/util/libevent_http_client.h" #include "hphp/runtime/base/util/curl_tls_workarounds.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/server/server_stats.h" +#include "hphp/runtime/server/server_stats.h" #include "hphp/runtime/vm/jit/translator-inline.h" #define CURLOPT_RETURNTRANSFER 19913 diff --git a/hphp/runtime/ext/ext_file.cpp b/hphp/runtime/ext/ext_file.cpp index eb3ceccd1..355a0bc59 100644 --- a/hphp/runtime/ext/ext_file.cpp +++ b/hphp/runtime/ext/ext_file.cpp @@ -26,7 +26,7 @@ #include "hphp/runtime/base/array_util.h" #include "hphp/runtime/base/util/http_client.h" #include "hphp/runtime/base/util/request_local.h" -#include "hphp/runtime/base/server/static_content_cache.h" +#include "hphp/runtime/server/static_content_cache.h" #include "hphp/runtime/base/zend/zend_scanf.h" #include "hphp/runtime/base/file/pipe.h" #include "hphp/system/systemlib.h" diff --git a/hphp/runtime/ext/ext_function.cpp b/hphp/runtime/ext/ext_function.cpp index a3fd130c8..758368a58 100644 --- a/hphp/runtime/ext/ext_function.cpp +++ b/hphp/runtime/ext/ext_function.cpp @@ -21,7 +21,7 @@ #include "hphp/runtime/ext/ext_closure.h" #include "hphp/runtime/base/class_info.h" #include "hphp/runtime/base/util/libevent_http_client.h" -#include "hphp/runtime/base/server/http_protocol.h" +#include "hphp/runtime/server/http_protocol.h" #include "hphp/runtime/vm/runtime.h" #include "hphp/runtime/vm/jit/translator.h" #include "hphp/runtime/vm/jit/translator-inline.h" diff --git a/hphp/runtime/ext/ext_hotprofiler.cpp b/hphp/runtime/ext/ext_hotprofiler.cpp index 3ee2e7f53..291b1e1f8 100644 --- a/hphp/runtime/ext/ext_hotprofiler.cpp +++ b/hphp/runtime/ext/ext_hotprofiler.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/base/memory/memory_manager.h" #include "hphp/runtime/base/util/request_local.h" #include "hphp/runtime/base/zend/zend_math.h" -#include "hphp/runtime/base/server/server_stats.h" +#include "hphp/runtime/server/server_stats.h" #include "hphp/runtime/base/ini_setting.h" #include "hphp/runtime/vm/event_hook.h" #include "hphp/util/alloc.h" diff --git a/hphp/runtime/ext/ext_misc.cpp b/hphp/runtime/ext/ext_misc.cpp index 43b6f2ef4..a656ff45e 100644 --- a/hphp/runtime/ext/ext_misc.cpp +++ b/hphp/runtime/ext/ext_misc.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/ext/ext_misc.h" -#include "hphp/runtime/base/server/server_stats.h" +#include "hphp/runtime/server/server_stats.h" #include "hphp/runtime/base/util/exceptions.h" #include "hphp/runtime/base/zend/zend_pack.h" #include "hphp/runtime/base/hphp_system.h" diff --git a/hphp/runtime/ext/ext_mysql.cpp b/hphp/runtime/ext/ext_mysql.cpp index 99aea36a9..8c01daf00 100644 --- a/hphp/runtime/ext/ext_mysql.cpp +++ b/hphp/runtime/ext/ext_mysql.cpp @@ -23,7 +23,7 @@ #include "hphp/runtime/ext/mysql_stats.h" #include "hphp/runtime/base/file/socket.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/server/server_stats.h" +#include "hphp/runtime/server/server_stats.h" #include "hphp/runtime/base/util/request_local.h" #include "hphp/runtime/base/util/extended_logger.h" #include "hphp/util/timer.h" diff --git a/hphp/runtime/ext/ext_network.cpp b/hphp/runtime/ext/ext_network.cpp index 55c0eb8f8..823669263 100644 --- a/hphp/runtime/ext/ext_network.cpp +++ b/hphp/runtime/ext/ext_network.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/ext/ext_apc.h" #include "hphp/runtime/ext/ext_string.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/server/server_stats.h" +#include "hphp/runtime/server/server_stats.h" #include "hphp/util/lock.h" #include "hphp/runtime/base/file/file.h" #include "netinet/in.h" diff --git a/hphp/runtime/ext/ext_output.h b/hphp/runtime/ext/ext_output.h index e433dd639..a06d198c5 100644 --- a/hphp/runtime/ext/ext_output.h +++ b/hphp/runtime/ext/ext_output.h @@ -19,7 +19,7 @@ #define incl_HPHP_EXT_OUTPUT_H_ #include "hphp/runtime/base/base_includes.h" -#include "hphp/runtime/base/server/server_stats.h" +#include "hphp/runtime/server/server_stats.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/ext_server.cpp b/hphp/runtime/ext/ext_server.cpp index 992e6b2d7..3944faf2f 100644 --- a/hphp/runtime/ext/ext_server.cpp +++ b/hphp/runtime/ext/ext_server.cpp @@ -16,13 +16,13 @@ */ #include "hphp/runtime/ext/ext_server.h" -#include "hphp/runtime/base/server/satellite_server.h" -#include "hphp/runtime/base/server/pagelet_server.h" -#include "hphp/runtime/base/server/xbox_server.h" -#include "hphp/runtime/base/server/http_protocol.h" +#include "hphp/runtime/server/satellite_server.h" +#include "hphp/runtime/server/pagelet_server.h" +#include "hphp/runtime/server/xbox_server.h" +#include "hphp/runtime/server/http_protocol.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/util/string_buffer.h" -#include "hphp/runtime/base/server/rpc_request_handler.h" +#include "hphp/runtime/server/rpc_request_handler.h" #define DANGLING_HEADER "HPHP_DANGLING" diff --git a/hphp/runtime/ext/ext_soap.cpp b/hphp/runtime/ext/ext_soap.cpp index 25e492f17..5e19e0711 100644 --- a/hphp/runtime/ext/ext_soap.cpp +++ b/hphp/runtime/ext/ext_soap.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/ext/ext_soap.h" #include "hphp/runtime/base/util/http_client.h" -#include "hphp/runtime/base/server/http_protocol.h" +#include "hphp/runtime/server/http_protocol.h" #include "hphp/runtime/base/class_info.h" #include "hphp/runtime/ext/soap/soap.h" #include "hphp/runtime/ext/soap/packet.h" diff --git a/hphp/runtime/ext/ext_socket.cpp b/hphp/runtime/ext/ext_socket.cpp index 367bf2434..37380b745 100644 --- a/hphp/runtime/ext/ext_socket.cpp +++ b/hphp/runtime/ext/ext_socket.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/ext/ext_socket.h" #include "hphp/runtime/base/file/socket.h" #include "hphp/runtime/base/file/ssl_socket.h" -#include "hphp/runtime/base/server/server_stats.h" +#include "hphp/runtime/server/server_stats.h" #include #include diff --git a/hphp/runtime/ext/ext_stream.cpp b/hphp/runtime/ext/ext_stream.cpp index 360771bb4..4cf8e6895 100644 --- a/hphp/runtime/ext/ext_stream.cpp +++ b/hphp/runtime/ext/ext_stream.cpp @@ -22,7 +22,7 @@ #include "hphp/runtime/base/file/plain_file.h" #include "hphp/runtime/base/util/string_buffer.h" #include "hphp/runtime/base/zend/zend_printf.h" -#include "hphp/runtime/base/server/server_stats.h" +#include "hphp/runtime/server/server_stats.h" #include "hphp/runtime/base/file/stream_wrapper.h" #include "hphp/runtime/base/file/stream_wrapper_registry.h" #include "hphp/runtime/base/file/user_stream_wrapper.h" diff --git a/hphp/runtime/ext/ext_string.cpp b/hphp/runtime/ext/ext_string.cpp index becaf4f82..42f9f6343 100644 --- a/hphp/runtime/ext/ext_string.cpp +++ b/hphp/runtime/ext/ext_string.cpp @@ -25,8 +25,8 @@ #include "hphp/runtime/base/util/request_local.h" #include "hphp/util/lock.h" #include -#include "hphp/runtime/base/server/http_request_handler.h" -#include "hphp/runtime/base/server/http_protocol.h" +#include "hphp/runtime/server/http_request_handler.h" +#include "hphp/runtime/server/http_protocol.h" namespace HPHP { diff --git a/hphp/runtime/ext/ext_thread.cpp b/hphp/runtime/ext/ext_thread.cpp index 37f55d730..b12cc176c 100644 --- a/hphp/runtime/ext/ext_thread.cpp +++ b/hphp/runtime/ext/ext_thread.cpp @@ -16,8 +16,8 @@ */ #include "hphp/runtime/ext/ext_thread.h" -#include "hphp/runtime/base/server/service_thread.h" -#include "hphp/runtime/base/server/http_server.h" +#include "hphp/runtime/server/service_thread.h" +#include "hphp/runtime/server/http_server.h" #include "hphp/runtime/base/program_functions.h" #include "hphp/util/process.h" diff --git a/hphp/runtime/base/server/access_log.cpp b/hphp/runtime/server/access_log.cpp similarity index 98% rename from hphp/runtime/base/server/access_log.cpp rename to hphp/runtime/server/access_log.cpp index acd57eadf..2417b23ce 100644 --- a/hphp/runtime/base/server/access_log.cpp +++ b/hphp/runtime/server/access_log.cpp @@ -13,14 +13,14 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/access_log.h" +#include "hphp/runtime/server/access_log.h" #include "hphp/runtime/base/time/datetime.h" #include "hphp/runtime/base/time/timestamp.h" #include #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/server/server_note.h" -#include "hphp/runtime/base/server/server_stats.h" -#include "hphp/runtime/base/server/request_uri.h" +#include "hphp/runtime/server/server_note.h" +#include "hphp/runtime/server/server_stats.h" +#include "hphp/runtime/server/request_uri.h" #include "hphp/util/process.h" #include "hphp/util/atomic.h" #include "hphp/util/compatibility.h" diff --git a/hphp/runtime/base/server/access_log.h b/hphp/runtime/server/access_log.h similarity index 98% rename from hphp/runtime/base/server/access_log.h rename to hphp/runtime/server/access_log.h index 8311dad68..361c45356 100644 --- a/hphp/runtime/base/server/access_log.h +++ b/hphp/runtime/server/access_log.h @@ -47,7 +47,7 @@ public: int prevBytesWritten; }; typedef ThreadData* (*GetThreadDataFunc)(); - AccessLog(GetThreadDataFunc f) : + explicit AccessLog(GetThreadDataFunc f) : m_initialized(false), m_fGetThreadData(f) {} ~AccessLog(); void init(const std::string &defaultFormat, diff --git a/hphp/runtime/base/server/admin_request_handler.cpp b/hphp/runtime/server/admin_request_handler.cpp similarity index 99% rename from hphp/runtime/base/server/admin_request_handler.cpp rename to hphp/runtime/server/admin_request_handler.cpp index 5d5078cc2..c8dba8bc9 100644 --- a/hphp/runtime/base/server/admin_request_handler.cpp +++ b/hphp/runtime/server/admin_request_handler.cpp @@ -14,12 +14,12 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/admin_request_handler.h" +#include "hphp/runtime/server/admin_request_handler.h" #include "hphp/runtime/base/file_repository.h" -#include "hphp/runtime/base/server/http_server.h" -#include "hphp/runtime/base/server/pagelet_server.h" +#include "hphp/runtime/server/http_server.h" +#include "hphp/runtime/server/pagelet_server.h" #include "hphp/runtime/base/util/http_client.h" -#include "hphp/runtime/base/server/server_stats.h" +#include "hphp/runtime/server/server_stats.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/preg.h" #include "hphp/util/process.h" diff --git a/hphp/runtime/base/server/admin_request_handler.h b/hphp/runtime/server/admin_request_handler.h similarity index 96% rename from hphp/runtime/base/server/admin_request_handler.h rename to hphp/runtime/server/admin_request_handler.h index c9ab3268c..86fdcf6d0 100644 --- a/hphp/runtime/base/server/admin_request_handler.h +++ b/hphp/runtime/server/admin_request_handler.h @@ -17,8 +17,8 @@ #ifndef incl_HPHP_ADMIN_REQUEST_HANDLER_H_ #define incl_HPHP_ADMIN_REQUEST_HANDLER_H_ -#include "hphp/runtime/base/server/access_log.h" -#include "hphp/runtime/base/server/server.h" +#include "hphp/runtime/server/access_log.h" +#include "hphp/runtime/server/server.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/server/dynamic_content_cache.cpp b/hphp/runtime/server/dynamic_content_cache.cpp similarity index 97% rename from hphp/runtime/base/server/dynamic_content_cache.cpp rename to hphp/runtime/server/dynamic_content_cache.cpp index dbd8acfe3..c4ac2dea8 100644 --- a/hphp/runtime/base/server/dynamic_content_cache.cpp +++ b/hphp/runtime/server/dynamic_content_cache.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/dynamic_content_cache.h" +#include "hphp/runtime/server/dynamic_content_cache.h" #include "hphp/util/lock.h" #include "hphp/util/compression.h" diff --git a/hphp/runtime/base/server/dynamic_content_cache.h b/hphp/runtime/server/dynamic_content_cache.h similarity index 100% rename from hphp/runtime/base/server/dynamic_content_cache.h rename to hphp/runtime/server/dynamic_content_cache.h diff --git a/hphp/runtime/base/server/files_match.cpp b/hphp/runtime/server/files_match.cpp similarity index 94% rename from hphp/runtime/base/server/files_match.cpp rename to hphp/runtime/server/files_match.cpp index 8f508d562..725542cc0 100644 --- a/hphp/runtime/base/server/files_match.cpp +++ b/hphp/runtime/server/files_match.cpp @@ -14,9 +14,9 @@ +----------------------------------------------------------------------+ */ +#include "hphp/runtime/server/files_match.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/server/files_match.h" -#include "hphp/runtime/base/server/virtual_host.h" +#include "hphp/runtime/server/virtual_host.h" #include "hphp/runtime/base/preg.h" #include "hphp/util/util.h" diff --git a/hphp/runtime/base/server/files_match.h b/hphp/runtime/server/files_match.h similarity index 98% rename from hphp/runtime/base/server/files_match.h rename to hphp/runtime/server/files_match.h index 9dcae98f0..690116d93 100644 --- a/hphp/runtime/base/server/files_match.h +++ b/hphp/runtime/server/files_match.h @@ -25,7 +25,7 @@ namespace HPHP { DECLARE_BOOST_TYPES(FilesMatch); class FilesMatch { public: - FilesMatch(Hdf vh); + explicit FilesMatch(Hdf vh); bool match(const std::string &filename) const; const std::vector &getHeaders() const { return m_headers;} diff --git a/hphp/runtime/base/server/http_protocol.cpp b/hphp/runtime/server/http_protocol.cpp similarity index 98% rename from hphp/runtime/base/server/http_protocol.cpp rename to hphp/runtime/server/http_protocol.cpp index 07f8e9a9b..25a9b3a21 100644 --- a/hphp/runtime/base/server/http_protocol.cpp +++ b/hphp/runtime/server/http_protocol.cpp @@ -14,20 +14,20 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/http_protocol.h" +#include "hphp/runtime/server/http_protocol.h" #include "hphp/runtime/base/hphp_system.h" #include "hphp/runtime/base/zend/zend_url.h" #include "hphp/runtime/base/zend/zend_string.h" #include "hphp/runtime/base/program_functions.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/server/source_root_info.h" -#include "hphp/runtime/base/server/request_uri.h" -#include "hphp/runtime/base/server/transport.h" +#include "hphp/runtime/server/source_root_info.h" +#include "hphp/runtime/server/request_uri.h" +#include "hphp/runtime/server/transport.h" #include "hphp/util/logger.h" #include "hphp/util/util.h" -#include "hphp/runtime/base/server/upload.h" -#include "hphp/runtime/base/server/replay_transport.h" -#include "hphp/runtime/base/server/virtual_host.h" +#include "hphp/runtime/server/upload.h" +#include "hphp/runtime/server/replay_transport.h" +#include "hphp/runtime/server/virtual_host.h" #include "hphp/runtime/base/util/http_client.h" #define DEFAULT_POST_CONTENT_TYPE "application/x-www-form-urlencoded" diff --git a/hphp/runtime/base/server/http_protocol.h b/hphp/runtime/server/http_protocol.h similarity index 98% rename from hphp/runtime/base/server/http_protocol.h rename to hphp/runtime/server/http_protocol.h index 4fe63277e..6b5b943b2 100644 --- a/hphp/runtime/base/server/http_protocol.h +++ b/hphp/runtime/server/http_protocol.h @@ -18,7 +18,7 @@ #define incl_HPHP_HTTP_PROTOCOL_H_ #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/server/transport.h" +#include "hphp/runtime/server/transport.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/server/http_request_handler.cpp b/hphp/runtime/server/http_request_handler.cpp similarity index 97% rename from hphp/runtime/base/server/http_request_handler.cpp rename to hphp/runtime/server/http_request_handler.cpp index fc827c7aa..2c2f9a683 100644 --- a/hphp/runtime/base/server/http_request_handler.cpp +++ b/hphp/runtime/server/http_request_handler.cpp @@ -14,21 +14,21 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/http_request_handler.h" +#include "hphp/runtime/server/http_request_handler.h" #include "hphp/runtime/base/program_functions.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/util/timer.h" -#include "hphp/runtime/base/server/static_content_cache.h" -#include "hphp/runtime/base/server/dynamic_content_cache.h" -#include "hphp/runtime/base/server/server_stats.h" +#include "hphp/runtime/server/static_content_cache.h" +#include "hphp/runtime/server/dynamic_content_cache.h" +#include "hphp/runtime/server/server_stats.h" #include "hphp/util/network.h" #include "hphp/runtime/base/preg.h" #include "hphp/runtime/ext/ext_function.h" -#include "hphp/runtime/base/server/access_log.h" -#include "hphp/runtime/base/server/source_root_info.h" -#include "hphp/runtime/base/server/request_uri.h" -#include "hphp/runtime/base/server/http_protocol.h" +#include "hphp/runtime/server/access_log.h" +#include "hphp/runtime/server/source_root_info.h" +#include "hphp/runtime/server/request_uri.h" +#include "hphp/runtime/server/http_protocol.h" #include "hphp/runtime/base/time/datetime.h" #include "hphp/runtime/debugger/debugger.h" #include "hphp/util/alloc.h" diff --git a/hphp/runtime/base/server/http_request_handler.h b/hphp/runtime/server/http_request_handler.h similarity index 94% rename from hphp/runtime/base/server/http_request_handler.h rename to hphp/runtime/server/http_request_handler.h index 9a3e23b49..7bc673498 100644 --- a/hphp/runtime/base/server/http_request_handler.h +++ b/hphp/runtime/server/http_request_handler.h @@ -18,9 +18,9 @@ #define incl_HPHP_HTTP_REQUEST_HANDLER_H_ #include "hphp/runtime/base/util/string_buffer.h" -#include "hphp/runtime/base/server/virtual_host.h" -#include "hphp/runtime/base/server/access_log.h" -#include "hphp/runtime/base/server/server.h" +#include "hphp/runtime/server/virtual_host.h" +#include "hphp/runtime/server/access_log.h" +#include "hphp/runtime/server/server.h" namespace HPHP { diff --git a/hphp/runtime/base/server/http_server.cpp b/hphp/runtime/server/http_server.cpp similarity index 97% rename from hphp/runtime/base/server/http_server.cpp rename to hphp/runtime/server/http_server.cpp index f22879748..c2347eb21 100644 --- a/hphp/runtime/base/server/http_server.cpp +++ b/hphp/runtime/server/http_server.cpp @@ -14,20 +14,20 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/http_server.h" -#include "hphp/runtime/base/server/http_request_handler.h" -#include "hphp/runtime/base/server/admin_request_handler.h" -#include "hphp/runtime/base/server/server_stats.h" -#include "hphp/runtime/base/server/warmup_request_handler.h" -#include "hphp/runtime/base/server/xbox_server.h" +#include "hphp/runtime/server/http_server.h" +#include "hphp/runtime/server/http_request_handler.h" +#include "hphp/runtime/server/admin_request_handler.h" +#include "hphp/runtime/server/server_stats.h" +#include "hphp/runtime/server/warmup_request_handler.h" +#include "hphp/runtime/server/xbox_server.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/server/static_content_cache.h" +#include "hphp/runtime/server/static_content_cache.h" #include "hphp/runtime/base/class_info.h" #include "hphp/runtime/base/memory/memory_manager.h" #include "hphp/util/logger.h" #include "hphp/runtime/base/externals.h" #include "hphp/runtime/base/util/http_client.h" -#include "hphp/runtime/base/server/replay_transport.h" +#include "hphp/runtime/server/replay_transport.h" #include "hphp/runtime/base/program_functions.h" #include "hphp/runtime/debugger/debugger.h" #include "hphp/util/db_conn.h" diff --git a/hphp/runtime/base/server/http_server.h b/hphp/runtime/server/http_server.h similarity index 93% rename from hphp/runtime/base/server/http_server.h rename to hphp/runtime/server/http_server.h index 616bb1805..c3ed2096f 100644 --- a/hphp/runtime/base/server/http_server.h +++ b/hphp/runtime/server/http_server.h @@ -17,10 +17,10 @@ #ifndef incl_HPHP_HTTP_SERVER_H_ #define incl_HPHP_HTTP_SERVER_H_ -#include "hphp/runtime/base/server/server.h" -#include "hphp/runtime/base/server/satellite_server.h" +#include "hphp/runtime/server/server.h" +#include "hphp/runtime/server/satellite_server.h" #include "hphp/util/async_func.h" -#include "hphp/runtime/base/server/service_thread.h" +#include "hphp/runtime/server/service_thread.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/server/ip_block_map.cpp b/hphp/runtime/server/ip_block_map.cpp similarity index 99% rename from hphp/runtime/base/server/ip_block_map.cpp rename to hphp/runtime/server/ip_block_map.cpp index 9ba3035e7..84f87deb3 100644 --- a/hphp/runtime/base/server/ip_block_map.cpp +++ b/hphp/runtime/server/ip_block_map.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/ip_block_map.h" +#include "hphp/runtime/server/ip_block_map.h" #include "hphp/util/logger.h" namespace HPHP { diff --git a/hphp/runtime/base/server/ip_block_map.h b/hphp/runtime/server/ip_block_map.h similarity index 97% rename from hphp/runtime/base/server/ip_block_map.h rename to hphp/runtime/server/ip_block_map.h index a2f0a7975..5315dd620 100644 --- a/hphp/runtime/base/server/ip_block_map.h +++ b/hphp/runtime/server/ip_block_map.h @@ -38,7 +38,7 @@ public: int &significant_bits); public: - IpBlockMap(Hdf config); + explicit IpBlockMap(Hdf config); bool isBlocking(const std::string &command, const std::string &ip) const; @@ -50,7 +50,7 @@ public: // the candidate address is the value for that address's network. class BinaryPrefixTrie { public: - BinaryPrefixTrie(bool allow); + explicit BinaryPrefixTrie(bool allow); // Returns the "allow" value of the longest matching prefix of the // search value. diff --git a/hphp/runtime/base/server/job_queue_vm_stack.h b/hphp/runtime/server/job_queue_vm_stack.h similarity index 100% rename from hphp/runtime/base/server/job_queue_vm_stack.h rename to hphp/runtime/server/job_queue_vm_stack.h diff --git a/hphp/runtime/base/server/libevent_server.cpp b/hphp/runtime/server/libevent_server.cpp similarity index 99% rename from hphp/runtime/base/server/libevent_server.cpp rename to hphp/runtime/server/libevent_server.cpp index 835090071..82d1c333e 100644 --- a/hphp/runtime/base/server/libevent_server.cpp +++ b/hphp/runtime/server/libevent_server.cpp @@ -14,12 +14,12 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/libevent_server.h" +#include "hphp/runtime/server/libevent_server.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/memory/memory_manager.h" -#include "hphp/runtime/base/server/server_stats.h" -#include "hphp/runtime/base/server/http_protocol.h" +#include "hphp/runtime/server/server_stats.h" +#include "hphp/runtime/server/http_protocol.h" #include "hphp/runtime/debugger/debugger.h" #include "hphp/util/compatibility.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/base/server/libevent_server.h b/hphp/runtime/server/libevent_server.h similarity index 97% rename from hphp/runtime/base/server/libevent_server.h rename to hphp/runtime/server/libevent_server.h index bf34cb543..c58be7e8e 100644 --- a/hphp/runtime/base/server/libevent_server.h +++ b/hphp/runtime/server/libevent_server.h @@ -17,10 +17,10 @@ #ifndef incl_HPHP_HTTP_SERVER_LIB_EVENT_SERVER_H_ #define incl_HPHP_HTTP_SERVER_LIB_EVENT_SERVER_H_ -#include "hphp/runtime/base/server/server.h" -#include "hphp/runtime/base/server/libevent_transport.h" +#include "hphp/runtime/server/server.h" +#include "hphp/runtime/server/libevent_transport.h" #include "hphp/runtime/base/timeout_thread.h" -#include "hphp/runtime/base/server/job_queue_vm_stack.h" +#include "hphp/runtime/server/job_queue_vm_stack.h" #include "hphp/util/job_queue.h" #include "hphp/util/process.h" diff --git a/hphp/runtime/base/server/libevent_server_factory.cpp b/hphp/runtime/server/libevent_server_factory.cpp similarity index 91% rename from hphp/runtime/base/server/libevent_server_factory.cpp rename to hphp/runtime/server/libevent_server_factory.cpp index 6d0af6354..561ccefec 100644 --- a/hphp/runtime/base/server/libevent_server_factory.cpp +++ b/hphp/runtime/server/libevent_server_factory.cpp @@ -13,10 +13,10 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -// Copyright 2004-present Facebook. All Rights Reserved. -#include "hphp/runtime/base/server/libevent_server.h" -#include "hphp/runtime/base/server/libevent_server_with_fd.h" -#include "hphp/runtime/base/server/libevent_server_with_takeover.h" + +#include "hphp/runtime/server/libevent_server.h" +#include "hphp/runtime/server/libevent_server_with_fd.h" +#include "hphp/runtime/server/libevent_server_with_takeover.h" #include diff --git a/hphp/runtime/base/server/libevent_server_with_fd.cpp b/hphp/runtime/server/libevent_server_with_fd.cpp similarity index 97% rename from hphp/runtime/base/server/libevent_server_with_fd.cpp rename to hphp/runtime/server/libevent_server_with_fd.cpp index 2cc2aac36..53d01311d 100644 --- a/hphp/runtime/base/server/libevent_server_with_fd.cpp +++ b/hphp/runtime/server/libevent_server_with_fd.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/libevent_server_with_fd.h" +#include "hphp/runtime/server/libevent_server_with_fd.h" #include "hphp/util/logger.h" /* diff --git a/hphp/runtime/base/server/libevent_server_with_fd.h b/hphp/runtime/server/libevent_server_with_fd.h similarity index 97% rename from hphp/runtime/base/server/libevent_server_with_fd.h rename to hphp/runtime/server/libevent_server_with_fd.h index 801ff56d0..fad957096 100644 --- a/hphp/runtime/base/server/libevent_server_with_fd.h +++ b/hphp/runtime/server/libevent_server_with_fd.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_HTTP_SERVER_LIB_EVENT_SERVER_WITH_FD_H_ #define incl_HPHP_HTTP_SERVER_LIB_EVENT_SERVER_WITH_FD_H_ -#include "hphp/runtime/base/server/libevent_server.h" +#include "hphp/runtime/server/libevent_server.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/server/libevent_server_with_takeover.cpp b/hphp/runtime/server/libevent_server_with_takeover.cpp similarity index 99% rename from hphp/runtime/base/server/libevent_server_with_takeover.cpp rename to hphp/runtime/server/libevent_server_with_takeover.cpp index 1dc4ad1e6..3e8420f11 100644 --- a/hphp/runtime/base/server/libevent_server_with_takeover.cpp +++ b/hphp/runtime/server/libevent_server_with_takeover.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/libevent_server_with_takeover.h" +#include "hphp/runtime/server/libevent_server_with_takeover.h" #include "hphp/util/logger.h" #include "hphp/runtime/base/string_util.h" #include diff --git a/hphp/runtime/base/server/libevent_server_with_takeover.h b/hphp/runtime/server/libevent_server_with_takeover.h similarity index 98% rename from hphp/runtime/base/server/libevent_server_with_takeover.h rename to hphp/runtime/server/libevent_server_with_takeover.h index 592579788..77c3670f5 100644 --- a/hphp/runtime/base/server/libevent_server_with_takeover.h +++ b/hphp/runtime/server/libevent_server_with_takeover.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_HTTP_SERVER_LIB_EVENT_SERVER_WITH_TAKEOVER_H_ #define incl_HPHP_HTTP_SERVER_LIB_EVENT_SERVER_WITH_TAKEOVER_H_ -#include "hphp/runtime/base/server/libevent_server.h" +#include "hphp/runtime/server/libevent_server.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/server/libevent_transport.cpp b/hphp/runtime/server/libevent_transport.cpp similarity index 98% rename from hphp/runtime/base/server/libevent_transport.cpp rename to hphp/runtime/server/libevent_transport.cpp index def59de02..e476cb1e8 100644 --- a/hphp/runtime/base/server/libevent_transport.cpp +++ b/hphp/runtime/server/libevent_transport.cpp @@ -14,9 +14,9 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/libevent_transport.h" -#include "hphp/runtime/base/server/libevent_server.h" -#include "hphp/runtime/base/server/server.h" +#include "hphp/runtime/server/libevent_transport.h" +#include "hphp/runtime/server/libevent_server.h" +#include "hphp/runtime/server/server.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/util/util.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/base/server/libevent_transport.h b/hphp/runtime/server/libevent_transport.h similarity index 98% rename from hphp/runtime/base/server/libevent_transport.h rename to hphp/runtime/server/libevent_transport.h index c96711adb..880aedea8 100644 --- a/hphp/runtime/base/server/libevent_transport.h +++ b/hphp/runtime/server/libevent_transport.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_HTTP_SERVER_LIB_EVENT_TRANSPORT_H_ #define incl_HPHP_HTTP_SERVER_LIB_EVENT_TRANSPORT_H_ -#include "hphp/runtime/base/server/transport.h" +#include "hphp/runtime/server/transport.h" #include namespace HPHP { diff --git a/hphp/runtime/base/server/pagelet_server.cpp b/hphp/runtime/server/pagelet_server.cpp similarity index 97% rename from hphp/runtime/base/server/pagelet_server.cpp rename to hphp/runtime/server/pagelet_server.cpp index 2a79ae221..5cb5dce67 100644 --- a/hphp/runtime/base/server/pagelet_server.cpp +++ b/hphp/runtime/server/pagelet_server.cpp @@ -14,11 +14,11 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/pagelet_server.h" -#include "hphp/runtime/base/server/transport.h" -#include "hphp/runtime/base/server/http_request_handler.h" -#include "hphp/runtime/base/server/upload.h" -#include "hphp/runtime/base/server/job_queue_vm_stack.h" +#include "hphp/runtime/server/pagelet_server.h" +#include "hphp/runtime/server/transport.h" +#include "hphp/runtime/server/http_request_handler.h" +#include "hphp/runtime/server/upload.h" +#include "hphp/runtime/server/job_queue_vm_stack.h" #include "hphp/runtime/base/util/string_buffer.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/resource_data.h" diff --git a/hphp/runtime/base/server/pagelet_server.h b/hphp/runtime/server/pagelet_server.h similarity index 100% rename from hphp/runtime/base/server/pagelet_server.h rename to hphp/runtime/server/pagelet_server.h diff --git a/hphp/runtime/base/server/replay_transport.cpp b/hphp/runtime/server/replay_transport.cpp similarity index 98% rename from hphp/runtime/base/server/replay_transport.cpp rename to hphp/runtime/server/replay_transport.cpp index f7ad9fe1e..7b5bf0289 100644 --- a/hphp/runtime/base/server/replay_transport.cpp +++ b/hphp/runtime/server/replay_transport.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/replay_transport.h" +#include "hphp/runtime/server/replay_transport.h" #include "hphp/runtime/base/string_util.h" #include "hphp/runtime/base/zend/zend_functions.h" #include "hphp/runtime/base/zend/zend_string.h" diff --git a/hphp/runtime/base/server/replay_transport.h b/hphp/runtime/server/replay_transport.h similarity index 98% rename from hphp/runtime/base/server/replay_transport.h rename to hphp/runtime/server/replay_transport.h index 2d8b31166..94a3c86fe 100644 --- a/hphp/runtime/base/server/replay_transport.h +++ b/hphp/runtime/server/replay_transport.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_REPLAY_TRANSPORT_H_ #define incl_HPHP_REPLAY_TRANSPORT_H_ -#include "hphp/runtime/base/server/transport.h" +#include "hphp/runtime/server/transport.h" #include "hphp/util/hdf.h" #include "hphp/runtime/base/complex_types.h" diff --git a/hphp/runtime/base/server/request_uri.cpp b/hphp/runtime/server/request_uri.cpp similarity index 98% rename from hphp/runtime/base/server/request_uri.cpp rename to hphp/runtime/server/request_uri.cpp index 5fb7e3177..7f4eb9832 100644 --- a/hphp/runtime/base/server/request_uri.cpp +++ b/hphp/runtime/server/request_uri.cpp @@ -14,11 +14,11 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/request_uri.h" -#include "hphp/runtime/base/server/virtual_host.h" -#include "hphp/runtime/base/server/transport.h" +#include "hphp/runtime/server/request_uri.h" +#include "hphp/runtime/server/virtual_host.h" +#include "hphp/runtime/server/transport.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/server/static_content_cache.h" +#include "hphp/runtime/server/static_content_cache.h" #include "hphp/runtime/base/string_util.h" namespace HPHP { diff --git a/hphp/runtime/base/server/request_uri.h b/hphp/runtime/server/request_uri.h similarity index 100% rename from hphp/runtime/base/server/request_uri.h rename to hphp/runtime/server/request_uri.h diff --git a/hphp/runtime/base/server/rpc_request_handler.cpp b/hphp/runtime/server/rpc_request_handler.cpp similarity index 96% rename from hphp/runtime/base/server/rpc_request_handler.cpp rename to hphp/runtime/server/rpc_request_handler.cpp index 0207f9133..34c442d08 100644 --- a/hphp/runtime/base/server/rpc_request_handler.cpp +++ b/hphp/runtime/server/rpc_request_handler.cpp @@ -14,16 +14,16 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/rpc_request_handler.h" +#include "hphp/runtime/server/rpc_request_handler.h" -#include "hphp/runtime/base/server/http_request_handler.h" +#include "hphp/runtime/server/http_request_handler.h" #include "hphp/runtime/base/program_functions.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/server/server_stats.h" -#include "hphp/runtime/base/server/http_protocol.h" -#include "hphp/runtime/base/server/access_log.h" -#include "hphp/runtime/base/server/source_root_info.h" -#include "hphp/runtime/base/server/request_uri.h" +#include "hphp/runtime/server/server_stats.h" +#include "hphp/runtime/server/http_protocol.h" +#include "hphp/runtime/server/access_log.h" +#include "hphp/runtime/server/source_root_info.h" +#include "hphp/runtime/server/request_uri.h" #include "hphp/runtime/ext/ext_json.h" #include "hphp/util/process.h" diff --git a/hphp/runtime/base/server/rpc_request_handler.h b/hphp/runtime/server/rpc_request_handler.h similarity index 98% rename from hphp/runtime/base/server/rpc_request_handler.h rename to hphp/runtime/server/rpc_request_handler.h index af0816e1d..a79252ee6 100644 --- a/hphp/runtime/base/server/rpc_request_handler.h +++ b/hphp/runtime/server/rpc_request_handler.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_RPC_REQUEST_HANDLER_H_ #define incl_HPHP_RPC_REQUEST_HANDLER_H_ -#include "hphp/runtime/base/server/server.h" +#include "hphp/runtime/server/server.h" #include "hphp/runtime/base/execution_context.h" namespace HPHP { diff --git a/hphp/runtime/base/server/satellite_server.cpp b/hphp/runtime/server/satellite_server.cpp similarity index 96% rename from hphp/runtime/base/server/satellite_server.cpp rename to hphp/runtime/server/satellite_server.cpp index 9876a931e..9cae035b8 100644 --- a/hphp/runtime/base/server/satellite_server.cpp +++ b/hphp/runtime/server/satellite_server.cpp @@ -14,10 +14,10 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/satellite_server.h" -#include "hphp/runtime/base/server/http_request_handler.h" -#include "hphp/runtime/base/server/rpc_request_handler.h" -#include "hphp/runtime/base/server/virtual_host.h" +#include "hphp/runtime/server/satellite_server.h" +#include "hphp/runtime/server/http_request_handler.h" +#include "hphp/runtime/server/rpc_request_handler.h" +#include "hphp/runtime/server/virtual_host.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/preg.h" #include "hphp/util/util.h" diff --git a/hphp/runtime/base/server/satellite_server.h b/hphp/runtime/server/satellite_server.h similarity index 100% rename from hphp/runtime/base/server/satellite_server.h rename to hphp/runtime/server/satellite_server.h diff --git a/hphp/runtime/base/server/server.cpp b/hphp/runtime/server/server.cpp similarity index 97% rename from hphp/runtime/base/server/server.cpp rename to hphp/runtime/server/server.cpp index 56c8e28e9..8a4b4a09b 100644 --- a/hphp/runtime/base/server/server.cpp +++ b/hphp/runtime/server/server.cpp @@ -14,9 +14,9 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/server.h" +#include "hphp/runtime/server/server.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/server/satellite_server.h" +#include "hphp/runtime/server/satellite_server.h" #include "hphp/runtime/base/preg.h" #include diff --git a/hphp/runtime/base/server/server.h b/hphp/runtime/server/server.h similarity index 99% rename from hphp/runtime/base/server/server.h rename to hphp/runtime/server/server.h index e7b564fc5..43e4de918 100644 --- a/hphp/runtime/base/server/server.h +++ b/hphp/runtime/server/server.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_HTTP_SERVER_SERVER_H_ #define incl_HPHP_HTTP_SERVER_SERVER_H_ -#include "hphp/runtime/base/server/transport.h" +#include "hphp/runtime/server/transport.h" #include "hphp/util/exception.h" #include "hphp/util/lock.h" diff --git a/hphp/runtime/server/server_name_indication.cpp b/hphp/runtime/server/server_name_indication.cpp new file mode 100644 index 000000000..25b939bbb --- /dev/null +++ b/hphp/runtime/server/server_name_indication.cpp @@ -0,0 +1,195 @@ +/* + +----------------------------------------------------------------------+ + | HipHop for PHP | + +----------------------------------------------------------------------+ + | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ +*/ + +#include "hphp/runtime/server/server_name_indication.h" +#include "hphp/runtime/base/runtime_option.h" +#include "hphp/runtime/base/util/extended_logger.h" +#include "hphp/util/util.h" +#include "openssl/ssl.h" + +#include +#include +#include + +namespace HPHP { + +hphp_string_map ServerNameIndication::sn_ctxd_map; +std::string ServerNameIndication::path; +struct ssl_config ServerNameIndication::config; + +const std::string ServerNameIndication::crt_ext = ".crt"; +const std::string ServerNameIndication::key_ext = ".key"; + +/** + * Given a default SSL config, SSL_CTX, and certificate path, load certs. + */ +void ServerNameIndication::load(void *ctx, const struct ssl_config &cfg, + const std::string &cert_dir) { + + if (!ctx) { + return; + } + + // We use these later to dynamically load certs, so make copies. + path = cert_dir; + config = cfg; + + // Ensure path ends with '/'. This helps our pruning later. + if (path.size() > 0 && path[path.size() - 1] != '/') { + path.append("/"); + } + + vector server_names; + find_server_names(path, server_names); + + for (vector::iterator it = server_names.begin(); + it != server_names.end(); + ++it) { + loadFromFile(*it); + } + + // Register our per-request server name indication callback. + // We register our callback even if there's no additional certs so that + // a cert added in the future will get picked up without a restart. + SSL_CTX_set_tlsext_servername_callback( + (SSL_CTX*)ctx, + ServerNameIndication::callback); +} + +bool ServerNameIndication::loadFromFile(const std::string &server_name) { + std::string key_file = path + server_name + key_ext; + std::string crt_file = path + server_name + crt_ext; + struct ssl_config tmp_config = config; + + if (!fileIsValid(key_file) || !fileIsValid(crt_file)) { + return false; + } + + // Create an SSL_CTX for this cert pair. + tmp_config.cert_file = (char *)(crt_file.c_str()); + tmp_config.pk_file = (char *)(key_file.c_str()); + SSL_CTX *tmp_ctx = (SSL_CTX*)evhttp_init_openssl(&tmp_config); + if (tmp_ctx) { + sn_ctxd_map.insert(make_pair(server_name, tmp_ctx)); + return true; + } + return false; +} + +bool ServerNameIndication::fileIsValid(const std::string &filename) { + if (filename.empty()) { + return false; + } + int fd = open(filename.c_str(), O_RDONLY); + if (fd >= 0) { + close(fd); + return true; + } + return false; +} + +void ServerNameIndication::find_server_names( + const std::string &path, + vector &server_names) { + + hphp_string_map crt_files; + hphp_string_map key_files; + + // Iterate through all files in the cert directory. + vector crt_dir_files; + Util::find(crt_dir_files, "/", path.c_str(), /* php */ false); + for (vector::iterator it = crt_dir_files.begin(); + it != crt_dir_files.end(); + ++it) { + + // Skip default cert and key; we'll fall back to those anyway. + size_t filename_len = it->size() - path.size(); + if (ends_with(*it, crt_ext) && *it != RuntimeOption::SSLCertificateFile) { + std::string name = it->substr(path.size(), filename_len - crt_ext.size()); + crt_files.insert(make_pair(name, true)); + } else if (ends_with(*it, key_ext) && + *it != RuntimeOption::SSLCertificateKeyFile) { + std::string name = it->substr(path.size(), filename_len - key_ext.size()); + key_files.insert(make_pair(name, true)); + } + } + + // Intersect key_files and crt_files to find valid pairs. + for (hphp_string_map::iterator it = key_files.begin(); + it != key_files.end(); + ++it) { + if (crt_files.find(it->first) == crt_files.end()) { + continue; + } + server_names.push_back(it->first); + } +} + +bool ServerNameIndication::ends_with(const std::string &s, + const std::string &end) { + if (s.size() > end.size()) { + return std::equal(s.begin() + s.size() - end.size(), s.end(), end.begin()); + } + return false; +} + +int ServerNameIndication::callback(void *s, int *ad, void *arg) { + SSL *ssl = (SSL *)s; + const char *sn_ptr = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name); + if (!sn_ptr) { + return SSL_TLSEXT_ERR_OK; // No server name; use the default. + } + + // Calculate the names to search for: fqdn and wildcard. + std::string fqdn = sn_ptr; + size_t pos = fqdn.find('.'); + std::string wildcard; + if (pos != string::npos) { + wildcard = fqdn.substr(pos + 1); + } + + // Search in memory for matching certificate. + if (setCTXFromMemory(ssl, wildcard) || setCTXFromMemory(ssl, fqdn)) { + return SSL_TLSEXT_ERR_OK; + } + + if (setCTXFromFile(ssl, wildcard) || setCTXFromFile(ssl, fqdn)) { + return SSL_TLSEXT_ERR_OK; + } + + // Didn't find a match based on SNI, fallback to default. + return SSL_TLSEXT_ERR_OK; +} + +bool ServerNameIndication::setCTXFromMemory(SSL *ssl, const std::string &name) { + if (!ssl || name.empty()) { + return false; + } + hphp_string_map::iterator it = sn_ctxd_map.find(name); + if (it != sn_ctxd_map.end()) { + SSL_CTX *ctx = it->second; + if (ctx && ctx == SSL_set_SSL_CTX(ssl, ctx)) { + return true; + } + } + return false; +} + +bool ServerNameIndication::setCTXFromFile(SSL *ssl, const std::string &name) { + return loadFromFile(name) && setCTXFromMemory(ssl, name); +} + +} diff --git a/hphp/runtime/server/server_name_indication.h b/hphp/runtime/server/server_name_indication.h new file mode 100644 index 000000000..932059e71 --- /dev/null +++ b/hphp/runtime/server/server_name_indication.h @@ -0,0 +1,49 @@ +/* + +----------------------------------------------------------------------+ + | HipHop for PHP | + +----------------------------------------------------------------------+ + | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ +*/ + +#ifndef incl_HPHP_SERVER_NAME_INDICATION_H_ +#define incl_HPHP_SERVER_NAME_INDICATION_H_ + +#include "hphp/util/base.h" +#include +#include "openssl/ssl.h" + +namespace HPHP { + +class ServerNameIndication { + static hphp_string_map sn_ctxd_map; + static const std::string crt_ext; + static const std::string key_ext; + static std::string path; + static struct ssl_config config; + +public: + static void load(void *ctx, const struct ssl_config &config, + const std::string &cert_dir); + static int callback(void *s, int *ad, void *arg); + +private: + static bool setCTXFromMemory(SSL*, const string&); + static bool setCTXFromFile(SSL*, const string&); + static void find_server_names(const std::string &, vector &); + static bool ends_with(const std::string &, const std::string &); + static bool loadFromFile(const std::string &); + static bool fileIsValid(const std::string &); +}; + +} + +#endif // incl_HPHP_SERVER_NAME_INDICATION_H_ diff --git a/hphp/runtime/base/server/server_note.cpp b/hphp/runtime/server/server_note.cpp similarity index 97% rename from hphp/runtime/base/server/server_note.cpp rename to hphp/runtime/server/server_note.cpp index 0164718fe..a4b944248 100644 --- a/hphp/runtime/base/server/server_note.cpp +++ b/hphp/runtime/server/server_note.cpp @@ -13,7 +13,7 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/server_note.h" +#include "hphp/runtime/server/server_note.h" #include "hphp/runtime/base/util/request_local.h" namespace HPHP { diff --git a/hphp/runtime/base/server/server_note.h b/hphp/runtime/server/server_note.h similarity index 100% rename from hphp/runtime/base/server/server_note.h rename to hphp/runtime/server/server_note.h diff --git a/hphp/runtime/base/server/server_stats.cpp b/hphp/runtime/server/server_stats.cpp similarity index 99% rename from hphp/runtime/base/server/server_stats.cpp rename to hphp/runtime/server/server_stats.cpp index e2c237040..19f4d4bf7 100644 --- a/hphp/runtime/base/server/server_stats.cpp +++ b/hphp/runtime/server/server_stats.cpp @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/server_stats.h" -#include "hphp/runtime/base/server/http_server.h" +#include "hphp/runtime/server/server_stats.h" +#include "hphp/runtime/server/http_server.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/program_functions.h" #include "hphp/runtime/base/memory/memory_manager.h" diff --git a/hphp/runtime/base/server/server_stats.h b/hphp/runtime/server/server_stats.h similarity index 100% rename from hphp/runtime/base/server/server_stats.h rename to hphp/runtime/server/server_stats.h diff --git a/hphp/runtime/base/server/service_thread.cpp b/hphp/runtime/server/service_thread.cpp similarity index 94% rename from hphp/runtime/base/server/service_thread.cpp rename to hphp/runtime/server/service_thread.cpp index affa28be1..e584fb887 100644 --- a/hphp/runtime/base/server/service_thread.cpp +++ b/hphp/runtime/server/service_thread.cpp @@ -14,12 +14,12 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/service_thread.h" +#include "hphp/runtime/server/service_thread.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/util/thread_local.h" #include "hphp/util/hdf.h" -#include "hphp/runtime/base/server/replay_transport.h" -#include "hphp/runtime/base/server/http_request_handler.h" +#include "hphp/runtime/server/replay_transport.h" +#include "hphp/runtime/server/http_request_handler.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/server/service_thread.h b/hphp/runtime/server/service_thread.h similarity index 96% rename from hphp/runtime/base/server/service_thread.h rename to hphp/runtime/server/service_thread.h index 885a00023..270948fb6 100644 --- a/hphp/runtime/base/server/service_thread.h +++ b/hphp/runtime/server/service_thread.h @@ -29,7 +29,7 @@ public: static ServiceThread *GetThisThread(); public: - ServiceThread(const std::string &url, bool loop = false); + explicit ServiceThread(const std::string &url, bool loop = false); void threadRun(); void waitForStarted(); diff --git a/hphp/runtime/base/server/source_root_info.cpp b/hphp/runtime/server/source_root_info.cpp similarity index 98% rename from hphp/runtime/base/server/source_root_info.cpp rename to hphp/runtime/server/source_root_info.cpp index 3467111ec..c2ca34a1f 100644 --- a/hphp/runtime/base/server/source_root_info.cpp +++ b/hphp/runtime/server/source_root_info.cpp @@ -14,11 +14,11 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/source_root_info.h" +#include "hphp/runtime/server/source_root_info.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/preg.h" -#include "hphp/runtime/base/server/http_request_handler.h" -#include "hphp/runtime/base/server/transport.h" +#include "hphp/runtime/server/http_request_handler.h" +#include "hphp/runtime/server/transport.h" #include "hphp/runtime/debugger/debugger.h" #include "hphp/runtime/base/tv_arith.h" diff --git a/hphp/runtime/base/server/source_root_info.h b/hphp/runtime/server/source_root_info.h similarity index 100% rename from hphp/runtime/base/server/source_root_info.h rename to hphp/runtime/server/source_root_info.h diff --git a/hphp/runtime/base/server/static_content_cache.cpp b/hphp/runtime/server/static_content_cache.cpp similarity index 98% rename from hphp/runtime/base/server/static_content_cache.cpp rename to hphp/runtime/server/static_content_cache.cpp index 880179691..b910d2d56 100644 --- a/hphp/runtime/base/server/static_content_cache.cpp +++ b/hphp/runtime/server/static_content_cache.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/static_content_cache.h" +#include "hphp/runtime/server/static_content_cache.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/util/timer.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/base/server/static_content_cache.h b/hphp/runtime/server/static_content_cache.h similarity index 100% rename from hphp/runtime/base/server/static_content_cache.h rename to hphp/runtime/server/static_content_cache.h diff --git a/hphp/runtime/base/server/transport.cpp b/hphp/runtime/server/transport.cpp similarity index 99% rename from hphp/runtime/base/server/transport.cpp rename to hphp/runtime/server/transport.cpp index fe0bd8584..08a1e433f 100644 --- a/hphp/runtime/base/server/transport.cpp +++ b/hphp/runtime/server/transport.cpp @@ -14,16 +14,16 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/transport.h" -#include "hphp/runtime/base/server/server.h" -#include "hphp/runtime/base/server/upload.h" -#include "hphp/runtime/base/server/server_stats.h" +#include "hphp/runtime/server/transport.h" +#include "hphp/runtime/server/server.h" +#include "hphp/runtime/server/upload.h" +#include "hphp/runtime/server/server_stats.h" #include "hphp/runtime/base/file/file.h" #include "hphp/runtime/base/string_util.h" #include "hphp/runtime/base/time/datetime.h" #include "hphp/runtime/base/zend/zend_url.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/server/access_log.h" +#include "hphp/runtime/server/access_log.h" #include "hphp/runtime/ext/ext_openssl.h" #include "hphp/util/compression.h" #include "hphp/util/util.h" diff --git a/hphp/runtime/base/server/transport.h b/hphp/runtime/server/transport.h similarity index 100% rename from hphp/runtime/base/server/transport.h rename to hphp/runtime/server/transport.h diff --git a/hphp/runtime/base/server/upload.cpp b/hphp/runtime/server/upload.cpp similarity index 99% rename from hphp/runtime/base/server/upload.cpp rename to hphp/runtime/server/upload.cpp index 24952f757..6d813af69 100644 --- a/hphp/runtime/base/server/upload.cpp +++ b/hphp/runtime/server/upload.cpp @@ -15,7 +15,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/upload.h" +#include "hphp/runtime/server/upload.h" #include "hphp/runtime/base/program_functions.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/hphp_system.h" diff --git a/hphp/runtime/base/server/upload.h b/hphp/runtime/server/upload.h similarity index 98% rename from hphp/runtime/base/server/upload.h rename to hphp/runtime/server/upload.h index 7389720ea..62e71a5da 100644 --- a/hphp/runtime/base/server/upload.h +++ b/hphp/runtime/server/upload.h @@ -19,7 +19,7 @@ #define incl_HPHP_UPLOAD_H_ #include -#include "hphp/runtime/base/server/transport.h" +#include "hphp/runtime/server/transport.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/server/virtual_host.cpp b/hphp/runtime/server/virtual_host.cpp similarity index 99% rename from hphp/runtime/base/server/virtual_host.cpp rename to hphp/runtime/server/virtual_host.cpp index d6728c837..2fec30172 100644 --- a/hphp/runtime/base/server/virtual_host.cpp +++ b/hphp/runtime/server/virtual_host.cpp @@ -13,7 +13,7 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/virtual_host.h" +#include "hphp/runtime/server/virtual_host.h" #include "hphp/runtime/base/comparisons.h" #include "hphp/runtime/base/preg.h" diff --git a/hphp/runtime/base/server/virtual_host.h b/hphp/runtime/server/virtual_host.h similarity index 98% rename from hphp/runtime/base/server/virtual_host.h rename to hphp/runtime/server/virtual_host.h index 645640600..b6166693a 100644 --- a/hphp/runtime/base/server/virtual_host.h +++ b/hphp/runtime/server/virtual_host.h @@ -19,7 +19,7 @@ #include "hphp/util/hdf.h" #include "hphp/runtime/base/types.h" -#include "hphp/runtime/base/server/ip_block_map.h" +#include "hphp/runtime/server/ip_block_map.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/server/warmup_request_handler.cpp b/hphp/runtime/server/warmup_request_handler.cpp similarity index 97% rename from hphp/runtime/base/server/warmup_request_handler.cpp rename to hphp/runtime/server/warmup_request_handler.cpp index 67e8f014d..768605393 100644 --- a/hphp/runtime/base/server/warmup_request_handler.cpp +++ b/hphp/runtime/server/warmup_request_handler.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/warmup_request_handler.h" +#include "hphp/runtime/server/warmup_request_handler.h" #include "folly/Memory.h" diff --git a/hphp/runtime/base/server/warmup_request_handler.h b/hphp/runtime/server/warmup_request_handler.h similarity index 96% rename from hphp/runtime/base/server/warmup_request_handler.h rename to hphp/runtime/server/warmup_request_handler.h index 3eb650f76..e52783c17 100644 --- a/hphp/runtime/base/server/warmup_request_handler.h +++ b/hphp/runtime/server/warmup_request_handler.h @@ -17,8 +17,8 @@ #ifndef incl_HPHP_WARMUP_REQUEST_HANDLER_H_ #define incl_HPHP_WARMUP_REQUEST_HANDLER_H_ -#include "hphp/runtime/base/server/server.h" -#include "hphp/runtime/base/server/http_request_handler.h" +#include "hphp/runtime/server/server.h" +#include "hphp/runtime/server/http_request_handler.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/server/xbox_server.cpp b/hphp/runtime/server/xbox_server.cpp similarity index 98% rename from hphp/runtime/base/server/xbox_server.cpp rename to hphp/runtime/server/xbox_server.cpp index f6bae7743..a5ddf6249 100644 --- a/hphp/runtime/base/server/xbox_server.cpp +++ b/hphp/runtime/server/xbox_server.cpp @@ -14,12 +14,12 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/server/xbox_server.h" +#include "hphp/runtime/server/xbox_server.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/server/rpc_request_handler.h" -#include "hphp/runtime/base/server/satellite_server.h" +#include "hphp/runtime/server/rpc_request_handler.h" +#include "hphp/runtime/server/satellite_server.h" #include "hphp/runtime/base/util/libevent_http_client.h" -#include "hphp/runtime/base/server/job_queue_vm_stack.h" +#include "hphp/runtime/server/job_queue_vm_stack.h" #include "hphp/runtime/ext/ext_json.h" #include "hphp/util/job_queue.h" #include "hphp/util/lock.h" diff --git a/hphp/runtime/base/server/xbox_server.h b/hphp/runtime/server/xbox_server.h similarity index 98% rename from hphp/runtime/base/server/xbox_server.h rename to hphp/runtime/server/xbox_server.h index 72733211f..271498d73 100644 --- a/hphp/runtime/base/server/xbox_server.h +++ b/hphp/runtime/server/xbox_server.h @@ -19,7 +19,7 @@ #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/server/satellite_server.h" +#include "hphp/runtime/server/satellite_server.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/vm/bytecode.cpp b/hphp/runtime/vm/bytecode.cpp index 54afbae00..973884cbf 100644 --- a/hphp/runtime/vm/bytecode.cpp +++ b/hphp/runtime/vm/bytecode.cpp @@ -63,7 +63,7 @@ #include "hphp/runtime/ext/ext_array.h" #include "hphp/runtime/base/stats.h" #include "hphp/runtime/vm/type_profile.h" -#include "hphp/runtime/base/server/source_root_info.h" +#include "hphp/runtime/server/source_root_info.h" #include "hphp/runtime/base/util/extended_logger.h" #include "hphp/runtime/base/memory/tracer.h" diff --git a/hphp/runtime/vm/jit/translator-x64.cpp b/hphp/runtime/vm/jit/translator-x64.cpp index b7cb02b05..dfcde14db 100644 --- a/hphp/runtime/vm/jit/translator-x64.cpp +++ b/hphp/runtime/vm/jit/translator-x64.cpp @@ -71,7 +71,7 @@ #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/strings.h" #include "hphp/runtime/base/strings.h" -#include "hphp/runtime/base/server/source_root_info.h" +#include "hphp/runtime/server/source_root_info.h" #include "hphp/runtime/base/zend/zend_string.h" #include "hphp/runtime/ext/ext_closure.h" #include "hphp/runtime/ext/ext_continuation.h" diff --git a/hphp/test/ext/test_cpp_base.cpp b/hphp/test/ext/test_cpp_base.cpp index ea1827269..97975c8cc 100644 --- a/hphp/test/ext/test_cpp_base.cpp +++ b/hphp/test/ext/test_cpp_base.cpp @@ -25,7 +25,7 @@ #include "hphp/runtime/ext/ext_curl.h" #include "hphp/runtime/base/shared/shared_store_base.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/server/ip_block_map.h" +#include "hphp/runtime/server/ip_block_map.h" #include "hphp/test/ext/test_mysql_info.h" #include "hphp/system/systemlib.h" diff --git a/hphp/test/ext/test_ext_curl.cpp b/hphp/test/ext/test_ext_curl.cpp index abe847d67..f285a185e 100644 --- a/hphp/test/ext/test_ext_curl.cpp +++ b/hphp/test/ext/test_ext_curl.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/ext/ext_curl.h" #include "hphp/runtime/ext/ext_output.h" #include "hphp/runtime/ext/ext_zlib.h" -#include "hphp/runtime/base/server/libevent_server.h" +#include "hphp/runtime/server/libevent_server.h" #include diff --git a/hphp/test/ext/test_ext_server.cpp b/hphp/test/ext/test_ext_server.cpp index d4886cf8d..c4848d976 100644 --- a/hphp/test/ext/test_ext_server.cpp +++ b/hphp/test/ext/test_ext_server.cpp @@ -16,8 +16,8 @@ #include "hphp/test/ext/test_ext_server.h" #include "hphp/runtime/ext/ext_server.h" -#include "hphp/runtime/base/server/pagelet_server.h" -#include "hphp/runtime/base/server/xbox_server.h" +#include "hphp/runtime/server/pagelet_server.h" +#include "hphp/runtime/server/xbox_server.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/ext/ext_file.h" diff --git a/hphp/test/ext/test_server.cpp b/hphp/test/ext/test_server.cpp index 88bed64d6..739d11a2a 100644 --- a/hphp/test/ext/test_server.cpp +++ b/hphp/test/ext/test_server.cpp @@ -25,10 +25,10 @@ #include "hphp/util/async_func.h" #include "hphp/runtime/ext/ext_curl.h" #include "hphp/runtime/ext/ext_options.h" -#include "hphp/runtime/base/server/http_request_handler.h" +#include "hphp/runtime/server/http_request_handler.h" #include "hphp/runtime/base/util/http_client.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/server/libevent_server.h" +#include "hphp/runtime/server/libevent_server.h" #include diff --git a/hphp/tools/license.php b/hphp/tools/license.php index a01610a7f..1c9ab88b6 100644 --- a/hphp/tools/license.php +++ b/hphp/tools/license.php @@ -47,8 +47,8 @@ $files_zend = array( ); $files_php = array( 'runtime/ext/', - 'runtime/base/server/upload.h', - 'runtime/base/server/upload.cpp', + 'runtime/server/upload.h', + 'runtime/server/upload.cpp', 'util/compression.cpp', );