Merge branch 'main' of github.com:PythonGermany/42_webserv

Yieen · Yieen · commit 25d589199b4d · 2023-10-20T21:57:23.000+02:00
diff --git a/README.md b/README.md
@@ -34,10 +34,19 @@ This project is a basic HTTP server written in C++98.
 
 ## Compilation
 
+### Native
+
 ```
 make [performance|debug|fsanitize]
 ```
 
+### Docker
+
+This will create a mariadb docker container for the database another container which will setup wordpress, compile webserv execute it. To populate the container env credentials you can make a copy of the [.env-example](docker/.env-example) file and rename it to `.env`, make sure to change the default values according to your needs.
+```
+make -C docker up
+```
+
 # Usage
 ```
 ./webserv [configuration_file] [ [-i|-h|-v|-c|-t] | [-o|-l|-a|-e ARGUMENT] ...]
@@ -70,7 +79,7 @@ You can look at the parsing debug output by setting the flag `o` to `on` and the
 
 # Configuration
 
-The configuration file is used to define the configuration of the webserver. It is composed of directives. A directive is composed of a name arguments and a value. The value can be a string or a block. A block is a list of directives.
+The configuration file is used to define the configuration of the webserver. It is composed of directives. A directive is composed of a name arguments and a value. The value can be a string or a block. A block is a list of directives. The file [webserv.conf](conf/webserv.conf) demonstrates the default configuration of the webserv executable.
 
 | Config type | Options |
 | --- | --- |
@@ -110,7 +119,7 @@ types {
   type MIME_TYPE EXTENSION [EXTENSION ...];
 }
 ```
-Types context. It contains the mime types of the server.  
+Types context. It contains the mime types of the server. The file [mime.types](conf/mime.types) provides an extensive default configuration for this context.  
 **Allowed tokens:** [type](#type)
 
 ### Server
diff --git a/include/poll/Poll.hpp b/include/poll/Poll.hpp
@@ -48,7 +48,8 @@ class Poll {
   void remove(size_t pos);
   void release(CallbackPointer const *callback, struct pollfd const *pollfd,
                size_t size);
-  void handleAddingAttempts();
+  void handleAddingAttempts();  // TODO: Still needed, since it doesnt seem to
+                                // be implemented?
 };
 
 #endif  // POLL_HPP
diff --git a/websites/config_test/lol😀.html b/websites/config_test/lol😀.html
@@ -8,7 +8,7 @@
 
 <body>
   <a href="/">Home</a><br>
-  <a href="/index">Multivalue index test</a><br>
+  <a href="/index/">Multivalue index test</a><br>
   <a href="putRequest.html">PUT Request Example</a><br>
   <a href="deleteRequest.html">DELETE Request Example</a><br>
   <a href="/uploaded/">Uploaded files and autoindex once files are uploaded</a><br>
