last

Author: Soufiane Nouae

CGI/cgi.cpp

@@ -123,12 +123,11 @@ std::string run_cgi(request &r,  Respond &res, std::vector<server> server)
         return res.get_response_status(res.get_status_code());
     }
     char buf[1];
-    std::string content;
     int byt;
+    std::string content;
     std::rewind(temp);
-    while ((byt = read(fdtemp, buf, 1)) > 0){
+    while ((byt = read(fdtemp, buf, 1)) > 0)
         content.append(buf, 1);
-    }
     if (byt == -1)
     {
         res.set_status_code(500);

config/server.conf

@@ -4,7 +4,7 @@ server
 
 	host 127.0.0.1;
 	client_max_body_size 100;
-
+	server_name hhjdsghj dsfsdfda dfdsfsdf;
 
 	error_page 404 www/html/error_pages/404.html;
 	error_page 403 www/html/error_pages/403.html;
@@ -24,11 +24,12 @@ server
 	{
 			root ./www/html/cgi_bin;
 			allow_Methods GET;
-			#index hello.html;
+			allow_Methods POST;
+			index hello.html;
 			path_info .py /usr/bin/python3;
 			path_info .php /php-cgi;
 			# listen 8001;
-			autoindex on;
+			#autoindex on;
 	}
 
 	location /red
@@ -45,11 +46,11 @@ server
 
 	location /upload{
 		root ./www/html/upload;
-		# index upload.html;
+		index upload.html;
 		allow_methods POST GET;
 		upload on;
 		upload_store ./www/html/upload;
-		autoindex on;
+		#autoindex on;
 	}
 
 	location /getto {

prs_rsc/location.cpp

@@ -55,8 +55,6 @@ location::~location()
 
 void location::fill_rest(server &s)
 {
-    // if (_index.empty())
-    //     _index = s.get_index();
 	if (!_client_max_body_size)
 		_client_max_body_size = s.get_client_max_body_size();
     if (_root.empty())

prs_rsc/server.cpp

@@ -229,13 +229,22 @@ server::server(Data_config data, bool check_location)
         if (key == "server_name" && check_location)
         {
             is_empty_value(value, line);
-            if (ft_numbers_value(iss) || !isValidServerName(value))
+            if (!isValidServerName(value))
                 ft_error(line, "Error");
             std::vector<std::string>::iterator it = std::find(_server_name.begin(), _server_name.end(), value);
             if(it != _server_name.end())
                 ft_error(line, "duplicate server_name");
-            c_server_name++;
             _server_name.push_back(value);
+             while (iss >> value)
+            {
+                if (!isValidServerName(value))
+                    ft_error(line, "Error");
+                std::vector<std::string>::iterator it = std::find(_server_name.begin(), _server_name.end(), value);
+                if(it != _server_name.end())
+                    ft_error(line, "duplicate server_name");
+                _server_name.push_back(value);
+            }
+            c_server_name++;
         }
         else if (key == "host" && check_location)
         {

prs_rsc/server_utils.cpp

@@ -45,7 +45,7 @@ std::vector<server> ft_fill_servers(char **av, int ac)
     int c = 0;
     int flag = 0;
     int kws = 0;
-    size_t i = 0, j = 0;
+    size_t i = 0, is_server = 0;
     if (ac == 2)
         config_file = av[1];
     else
@@ -65,7 +65,7 @@ std::vector<server> ft_fill_servers(char **av, int ac)
             c -= search_char(line, '}');
              if (is_world(&line[i], "server"))
              {
-                j = 1;
+                is_server = 1;
                 if (!search_char(line, '{'))
                 {
                     while (!file.eof())
@@ -93,7 +93,7 @@ std::vector<server> ft_fill_servers(char **av, int ac)
             }
             if (is_world(&line[i], "location"))
             {
-                if(!j)
+                if(!is_server)
                 {
                     std::cerr << "error something outside of server\n";
                     exit (1);
@@ -124,7 +124,7 @@ std::vector<server> ft_fill_servers(char **av, int ac)
                     }
                 }
             }
-            else if (!j)
+            else if (!is_server)
             {
                 if (!line.empty())
                 {
@@ -134,9 +134,9 @@ std::vector<server> ft_fill_servers(char **av, int ac)
             }
             else if (!line.empty())
                 data.data_server += line + "\n";
-            if (!c && j)
+            if (!c && is_server)
             {
-                j = 0;
+                is_server = 0;
                 kws = 0;
                 v.push_back(data);
                 data.data_server.clear();

www/html/upload/upload.html

@@ -93,7 +93,7 @@ <h1>File Uploader</h1>
     <p>Select files to upload</p>
   </header>
   <main>
-    <form action="http://localhost:8001/upload/success.html" method="post" enctype="multipart/form-data">
+    <form action="http://localhost:8002/upload/success.html" method="post" enctype="multipart/form-data">
       <div class="form-group">
         <label for="file1">File 1</label>
         <input type="file" name="file1" id="file1" accept=".jpg, .jpeg, .png, .pdf, .mp4" required>