diff --git a/plugins/Makefile.am b/plugins/Makefile.am index b5e7d17d9c3..18a08ac1c0d 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -31,6 +31,8 @@ include authproxy/Makefile.inc include background_fetch/Makefile.inc include cachekey/Makefile.inc include cache_promote/Makefile.inc +include cache_range_requests/Makefile.inc +include certifier/Makefile.inc include conf_remap/Makefile.inc include escalate/Makefile.inc include esi/Makefile.inc @@ -42,8 +44,11 @@ include libloader/Makefile.inc if HAS_LUAJIT include lua/Makefile.inc endif +include multiplexer/Makefile.inc +include prefetch/Makefile.inc include regex_remap/Makefile.inc include regex_revalidate/Makefile.inc +include remap_purge/Makefile.inc include s3_auth/Makefile.inc include stats_over_http/Makefile.inc include tcpinfo/Makefile.inc @@ -55,8 +60,6 @@ include experimental/access_control/Makefile.inc include experimental/acme/Makefile.inc include experimental/balancer/Makefile.inc include experimental/buffer_upload/Makefile.inc -include experimental/cache_range_requests/Makefile.inc -include experimental/certifier/Makefile.inc include experimental/cert_reporting_tool/Makefile.inc include experimental/collapsed_forwarding/Makefile.inc include experimental/cookie_remap/Makefile.inc @@ -72,8 +75,6 @@ include experimental/memcache/Makefile.inc include experimental/metalink/Makefile.inc include experimental/money_trace/Makefile.inc include experimental/mp4/Makefile.inc -include experimental/multiplexer/Makefile.inc -include experimental/remap_purge/Makefile.inc include experimental/server_push_preload/Makefile.inc include experimental/slice/Makefile.inc include experimental/sslheaders/Makefile.inc @@ -83,7 +84,6 @@ include experimental/system_stats/Makefile.inc include experimental/traffic_dump/Makefile.inc include experimental/tls_bridge/Makefile.inc include experimental/url_sig/Makefile.inc -include experimental/prefetch/Makefile.inc if BUILD_JA3_PLUGIN include experimental/ja3_fingerprint/Makefile.inc diff --git a/plugins/experimental/cache_range_requests/Changelog b/plugins/cache_range_requests/Changelog similarity index 100% rename from plugins/experimental/cache_range_requests/Changelog rename to plugins/cache_range_requests/Changelog diff --git a/plugins/experimental/cache_range_requests/Makefile.inc b/plugins/cache_range_requests/Makefile.inc similarity index 79% rename from plugins/experimental/cache_range_requests/Makefile.inc rename to plugins/cache_range_requests/Makefile.inc index ff3454ad84c..b1a39fb8463 100644 --- a/plugins/experimental/cache_range_requests/Makefile.inc +++ b/plugins/cache_range_requests/Makefile.inc @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -pkglib_LTLIBRARIES += experimental/cache_range_requests/cache_range_requests.la +pkglib_LTLIBRARIES += cache_range_requests/cache_range_requests.la -experimental_cache_range_requests_cache_range_requests_la_SOURCES = \ - experimental/cache_range_requests/cache_range_requests.cc +cache_range_requests_cache_range_requests_la_SOURCES = \ + cache_range_requests/cache_range_requests.cc diff --git a/plugins/experimental/cache_range_requests/README b/plugins/cache_range_requests/README similarity index 100% rename from plugins/experimental/cache_range_requests/README rename to plugins/cache_range_requests/README diff --git a/plugins/experimental/cache_range_requests/cache_range_requests.cc b/plugins/cache_range_requests/cache_range_requests.cc similarity index 100% rename from plugins/experimental/cache_range_requests/cache_range_requests.cc rename to plugins/cache_range_requests/cache_range_requests.cc diff --git a/plugins/experimental/certifier/Makefile.inc b/plugins/certifier/Makefile.inc similarity index 85% rename from plugins/experimental/certifier/Makefile.inc rename to plugins/certifier/Makefile.inc index fa12713c134..9af0029e783 100644 --- a/plugins/experimental/certifier/Makefile.inc +++ b/plugins/certifier/Makefile.inc @@ -14,6 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -pkglib_LTLIBRARIES += experimental/certifier/certifier.la +pkglib_LTLIBRARIES += certifier/certifier.la -experimental_certifier_certifier_la_SOURCES = experimental/certifier/certifier.cc +certifier_certifier_la_SOURCES = certifier/certifier.cc diff --git a/plugins/experimental/certifier/README b/plugins/certifier/README similarity index 100% rename from plugins/experimental/certifier/README rename to plugins/certifier/README diff --git a/plugins/experimental/certifier/certifier.cc b/plugins/certifier/certifier.cc similarity index 100% rename from plugins/experimental/certifier/certifier.cc rename to plugins/certifier/certifier.cc diff --git a/plugins/experimental/multiplexer/Makefile.inc b/plugins/experimental/multiplexer/Makefile.inc deleted file mode 100644 index d8ba929a443..00000000000 --- a/plugins/experimental/multiplexer/Makefile.inc +++ /dev/null @@ -1,28 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -experimental_multiplexer_multiplexer_la_CPPFLAGS = $(AM_CPPFLAGS) -DPLUGIN_TAG=\"multiplexer\" - -pkglib_LTLIBRARIES += experimental/multiplexer/multiplexer.la - -experimental_multiplexer_multiplexer_la_SOURCES = \ - experimental/multiplexer/ats-multiplexer.cc \ - experimental/multiplexer/chunk-decoder.cc \ - experimental/multiplexer/dispatch.cc \ - experimental/multiplexer/fetcher.cc \ - experimental/multiplexer/original-request.cc \ - experimental/multiplexer/post.cc \ - experimental/multiplexer/ts.cc diff --git a/plugins/experimental/prefetch/Makefile.inc b/plugins/multiplexer/Makefile.inc similarity index 63% rename from plugins/experimental/prefetch/Makefile.inc rename to plugins/multiplexer/Makefile.inc index 566ba82dc71..7c6975f2b27 100644 --- a/plugins/experimental/prefetch/Makefile.inc +++ b/plugins/multiplexer/Makefile.inc @@ -14,15 +14,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -pkglib_LTLIBRARIES += experimental/prefetch/prefetch.la -experimental_prefetch_prefetch_la_SOURCES = \ - experimental/prefetch/plugin.cc \ - experimental/prefetch/common.cc \ - experimental/prefetch/configs.cc \ - experimental/prefetch/fetch.cc \ - experimental/prefetch/headers.cc \ - experimental/prefetch/pattern.cc \ - experimental/prefetch/fetch_policy.cc \ - experimental/prefetch/fetch_policy_simple.cc \ - experimental/prefetch/fetch_policy_lru.cc +multiplexer_multiplexer_la_CPPFLAGS = $(AM_CPPFLAGS) -DPLUGIN_TAG=\"multiplexer\" +pkglib_LTLIBRARIES += multiplexer/multiplexer.la + +multiplexer_multiplexer_la_SOURCES = \ + multiplexer/ats-multiplexer.cc \ + multiplexer/chunk-decoder.cc \ + multiplexer/dispatch.cc \ + multiplexer/fetcher.cc \ + multiplexer/original-request.cc \ + multiplexer/post.cc \ + multiplexer/ts.cc diff --git a/plugins/experimental/multiplexer/README b/plugins/multiplexer/README similarity index 100% rename from plugins/experimental/multiplexer/README rename to plugins/multiplexer/README diff --git a/plugins/experimental/multiplexer/ats-multiplexer.cc b/plugins/multiplexer/ats-multiplexer.cc similarity index 100% rename from plugins/experimental/multiplexer/ats-multiplexer.cc rename to plugins/multiplexer/ats-multiplexer.cc diff --git a/plugins/experimental/multiplexer/chunk-decoder.cc b/plugins/multiplexer/chunk-decoder.cc similarity index 100% rename from plugins/experimental/multiplexer/chunk-decoder.cc rename to plugins/multiplexer/chunk-decoder.cc diff --git a/plugins/experimental/multiplexer/chunk-decoder.h b/plugins/multiplexer/chunk-decoder.h similarity index 100% rename from plugins/experimental/multiplexer/chunk-decoder.h rename to plugins/multiplexer/chunk-decoder.h diff --git a/plugins/experimental/multiplexer/dispatch.cc b/plugins/multiplexer/dispatch.cc similarity index 100% rename from plugins/experimental/multiplexer/dispatch.cc rename to plugins/multiplexer/dispatch.cc diff --git a/plugins/experimental/multiplexer/dispatch.h b/plugins/multiplexer/dispatch.h similarity index 100% rename from plugins/experimental/multiplexer/dispatch.h rename to plugins/multiplexer/dispatch.h diff --git a/plugins/experimental/multiplexer/fetcher.cc b/plugins/multiplexer/fetcher.cc similarity index 100% rename from plugins/experimental/multiplexer/fetcher.cc rename to plugins/multiplexer/fetcher.cc diff --git a/plugins/experimental/multiplexer/fetcher.h b/plugins/multiplexer/fetcher.h similarity index 100% rename from plugins/experimental/multiplexer/fetcher.h rename to plugins/multiplexer/fetcher.h diff --git a/plugins/experimental/multiplexer/original-request.cc b/plugins/multiplexer/original-request.cc similarity index 100% rename from plugins/experimental/multiplexer/original-request.cc rename to plugins/multiplexer/original-request.cc diff --git a/plugins/experimental/multiplexer/original-request.h b/plugins/multiplexer/original-request.h similarity index 100% rename from plugins/experimental/multiplexer/original-request.h rename to plugins/multiplexer/original-request.h diff --git a/plugins/experimental/multiplexer/post.cc b/plugins/multiplexer/post.cc similarity index 100% rename from plugins/experimental/multiplexer/post.cc rename to plugins/multiplexer/post.cc diff --git a/plugins/experimental/multiplexer/post.h b/plugins/multiplexer/post.h similarity index 100% rename from plugins/experimental/multiplexer/post.h rename to plugins/multiplexer/post.h diff --git a/plugins/experimental/multiplexer/remap.config b/plugins/multiplexer/remap.config similarity index 100% rename from plugins/experimental/multiplexer/remap.config rename to plugins/multiplexer/remap.config diff --git a/plugins/experimental/multiplexer/ts.cc b/plugins/multiplexer/ts.cc similarity index 100% rename from plugins/experimental/multiplexer/ts.cc rename to plugins/multiplexer/ts.cc diff --git a/plugins/experimental/multiplexer/ts.h b/plugins/multiplexer/ts.h similarity index 100% rename from plugins/experimental/multiplexer/ts.h rename to plugins/multiplexer/ts.h diff --git a/plugins/prefetch/Makefile.inc b/plugins/prefetch/Makefile.inc new file mode 100644 index 00000000000..cdfdf3066b5 --- /dev/null +++ b/plugins/prefetch/Makefile.inc @@ -0,0 +1,27 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +pkglib_LTLIBRARIES += prefetch/prefetch.la +prefetch_prefetch_la_SOURCES = \ + prefetch/plugin.cc \ + prefetch/common.cc \ + prefetch/configs.cc \ + prefetch/fetch.cc \ + prefetch/headers.cc \ + prefetch/pattern.cc \ + prefetch/fetch_policy.cc \ + prefetch/fetch_policy_simple.cc \ + prefetch/fetch_policy_lru.cc diff --git a/plugins/experimental/prefetch/README.md b/plugins/prefetch/README.md similarity index 100% rename from plugins/experimental/prefetch/README.md rename to plugins/prefetch/README.md diff --git a/plugins/experimental/prefetch/common.cc b/plugins/prefetch/common.cc similarity index 100% rename from plugins/experimental/prefetch/common.cc rename to plugins/prefetch/common.cc diff --git a/plugins/experimental/prefetch/common.h b/plugins/prefetch/common.h similarity index 100% rename from plugins/experimental/prefetch/common.h rename to plugins/prefetch/common.h diff --git a/plugins/experimental/prefetch/configs.cc b/plugins/prefetch/configs.cc similarity index 100% rename from plugins/experimental/prefetch/configs.cc rename to plugins/prefetch/configs.cc diff --git a/plugins/experimental/prefetch/configs.h b/plugins/prefetch/configs.h similarity index 100% rename from plugins/experimental/prefetch/configs.h rename to plugins/prefetch/configs.h diff --git a/plugins/experimental/prefetch/fetch.cc b/plugins/prefetch/fetch.cc similarity index 100% rename from plugins/experimental/prefetch/fetch.cc rename to plugins/prefetch/fetch.cc diff --git a/plugins/experimental/prefetch/fetch.h b/plugins/prefetch/fetch.h similarity index 100% rename from plugins/experimental/prefetch/fetch.h rename to plugins/prefetch/fetch.h diff --git a/plugins/experimental/prefetch/fetch_policy.cc b/plugins/prefetch/fetch_policy.cc similarity index 100% rename from plugins/experimental/prefetch/fetch_policy.cc rename to plugins/prefetch/fetch_policy.cc diff --git a/plugins/experimental/prefetch/fetch_policy.h b/plugins/prefetch/fetch_policy.h similarity index 100% rename from plugins/experimental/prefetch/fetch_policy.h rename to plugins/prefetch/fetch_policy.h diff --git a/plugins/experimental/prefetch/fetch_policy_lru.cc b/plugins/prefetch/fetch_policy_lru.cc similarity index 100% rename from plugins/experimental/prefetch/fetch_policy_lru.cc rename to plugins/prefetch/fetch_policy_lru.cc diff --git a/plugins/experimental/prefetch/fetch_policy_lru.h b/plugins/prefetch/fetch_policy_lru.h similarity index 100% rename from plugins/experimental/prefetch/fetch_policy_lru.h rename to plugins/prefetch/fetch_policy_lru.h diff --git a/plugins/experimental/prefetch/fetch_policy_simple.cc b/plugins/prefetch/fetch_policy_simple.cc similarity index 100% rename from plugins/experimental/prefetch/fetch_policy_simple.cc rename to plugins/prefetch/fetch_policy_simple.cc diff --git a/plugins/experimental/prefetch/fetch_policy_simple.h b/plugins/prefetch/fetch_policy_simple.h similarity index 100% rename from plugins/experimental/prefetch/fetch_policy_simple.h rename to plugins/prefetch/fetch_policy_simple.h diff --git a/plugins/experimental/prefetch/headers.cc b/plugins/prefetch/headers.cc similarity index 100% rename from plugins/experimental/prefetch/headers.cc rename to plugins/prefetch/headers.cc diff --git a/plugins/experimental/prefetch/headers.h b/plugins/prefetch/headers.h similarity index 100% rename from plugins/experimental/prefetch/headers.h rename to plugins/prefetch/headers.h diff --git a/plugins/experimental/prefetch/pattern.cc b/plugins/prefetch/pattern.cc similarity index 100% rename from plugins/experimental/prefetch/pattern.cc rename to plugins/prefetch/pattern.cc diff --git a/plugins/experimental/prefetch/pattern.h b/plugins/prefetch/pattern.h similarity index 100% rename from plugins/experimental/prefetch/pattern.h rename to plugins/prefetch/pattern.h diff --git a/plugins/experimental/prefetch/plugin.cc b/plugins/prefetch/plugin.cc similarity index 100% rename from plugins/experimental/prefetch/plugin.cc rename to plugins/prefetch/plugin.cc diff --git a/plugins/experimental/remap_purge/Makefile.inc b/plugins/remap_purge/Makefile.inc similarity index 83% rename from plugins/experimental/remap_purge/Makefile.inc rename to plugins/remap_purge/Makefile.inc index e1a9b7de981..951722152bb 100644 --- a/plugins/experimental/remap_purge/Makefile.inc +++ b/plugins/remap_purge/Makefile.inc @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -pkglib_LTLIBRARIES += experimental/remap_purge/remap_purge.la +pkglib_LTLIBRARIES += remap_purge/remap_purge.la -experimental_remap_purge_remap_purge_la_SOURCES = \ - experimental/remap_purge/remap_purge.c +remap_purge_remap_purge_la_SOURCES = \ + remap_purge/remap_purge.c diff --git a/plugins/experimental/remap_purge/remap_purge.c b/plugins/remap_purge/remap_purge.c similarity index 100% rename from plugins/experimental/remap_purge/remap_purge.c rename to plugins/remap_purge/remap_purge.c