[Minor] Move html code to a separate subdir (no functional changes)

src/libmime/images.c

@@ -17,7 +17,7 @@
 #include "images.h"
 #include "task.h"
 #include "message.h"
-#include "html.h"
+#include "libserver/html/html.h"
 
 #define msg_debug_images(...)  rspamd_conditional_debug_fast (NULL, NULL, \
         rspamd_images_log_id, "images", task->task_pool->tag.uid, \

src/libmime/message.c

@@ -17,7 +17,7 @@
 #include "util.h"
 #include "rspamd.h"
 #include "message.h"
-#include "html.h"
+#include "libserver/html/html.h"
 #include "images.h"
 #include "archives.h"
 #include "tokenizers/tokenizers.h"

src/libmime/mime_expressions.c

@@ -20,7 +20,7 @@
 #include "rspamd.h"
 #include "message.h"
 #include "mime_expressions.h"
-#include "html.h"
+#include "libserver/html/html.h"
 #include "lua/lua_common.h"
 #include "utlist.h"
 

src/libserver/CMakeLists.txt

@@ -11,7 +11,6 @@ SET(LIBRSPAMDSERVERSRC
 				${CMAKE_CURRENT_SOURCE_DIR}/fuzzy_backend/fuzzy_backend.c
 				${CMAKE_CURRENT_SOURCE_DIR}/fuzzy_backend/fuzzy_backend_sqlite.c
 				${CMAKE_CURRENT_SOURCE_DIR}/fuzzy_backend/fuzzy_backend_redis.c
-				${CMAKE_CURRENT_SOURCE_DIR}/html.c
 				${CMAKE_CURRENT_SOURCE_DIR}/milter.c
 				${CMAKE_CURRENT_SOURCE_DIR}/monitored.c
 				${CMAKE_CURRENT_SOURCE_DIR}/protocol.c
@@ -35,6 +34,7 @@ SET(LIBRSPAMDSERVERSRC
 				${CMAKE_CURRENT_SOURCE_DIR}/http/http_context.c
 				${CMAKE_CURRENT_SOURCE_DIR}/maps/map.c
 				${CMAKE_CURRENT_SOURCE_DIR}/maps/map_helpers.c
+				${CMAKE_CURRENT_SOURCE_DIR}/html/html.c
 				${LIBCSSSRC})
 
 # Librspamd-server

src/libserver/css/css_selector.hxx

@@ -28,7 +28,7 @@
 #include "function2/function2.hpp"
 #include "parse_error.hxx"
 #include "css_parser.hxx"
-#include "html_tags.h"
+#include "libserver/html/html_tags.h"
 
 namespace rspamd::css {
 

src/libstat/stat_process.c

@@ -19,7 +19,7 @@
 #include "stat_internal.h"
 #include "libmime/message.h"
 #include "libmime/images.h"
-#include "libserver/html.h"
+#include "libserver/html/html.h"
 #include "lua/lua_common.h"
 #include "libserver/mempool_vars_internal.h"
 #include "utlist.h"

src/lua/lua_html.c

@@ -13,11 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <src/libserver/html.h>
 #include "lua_common.h"
 #include "message.h"
-#include "html.h"
-#include "html_tags.h"
+#include "libserver/html/html.h"
 #include "images.h"
 #include "contrib/mumhash/mum.h"
 

src/lua/lua_parsers.c

@@ -17,7 +17,7 @@
 #include "lua_common.h"
 #include "tokenizers/tokenizers.h"
 #include "contrib/uthash/utlist.h"
-#include "libserver/html.h"
+#include "libserver/html/html.h"
 #include "libmime/email_addr.h"
 #include "libmime/content_type.h"
 #include "libmime/mime_headers.h"