last changes...

ggjulio · Nov 2, 2021 · c10e66e · c10e66e
1 parent fc7495d
commit c10e66e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/config/macos_webserv.conf b/config/macos_webserv.conf
@@ -14,7 +14,6 @@ server {
     location ext .php {
         limit_except GET POST;
         cgi_exec /usr/local/bin/php-cgi;
-        return 307 php-cgi;
     }
     location ext .py {
         cgi_exec ./www/hello.py;
@@ -49,14 +48,12 @@ server {
     root ./www;
     index subject.html;
     location / {}
-    location /text {
-        return 204 "this is a return directive with text";
-    }
     location /uri {
         return 301 http://youtube.com;
     }
 }
 server {
+    listen 8080;
     listen 8083;
     index notExist;
     server_name srv_four;

diff --git a/config/ubuntu_webserv.conf b/config/ubuntu_webserv.conf
@@ -14,7 +14,6 @@ server {
     location ext .php {
         limit_except GET POST;
         cgi_exec /usr/bin/php-cgi;
-        return 307 php-cgi;
     }
     location ext .py {
         cgi_exec ./www/hello.py;
@@ -49,14 +48,12 @@ server {
     root ./www;
     index subject.html;
     location / {}
-    location /text {
-        return 204 "this is a return directive with text";
-    }
     location /uri {
         return 301 http://youtube.com;
     }
 }
 server {
+    listen 8080;
     listen 8083;
     index notExist;
     server_name srv_four;

diff --git a/src/web/Server.cpp b/src/web/Server.cpp
@@ -72,6 +72,8 @@ void Server::routine()
 			continue;
 		else if (_fds[i].revents & POLLHUP)
 			_disconnectDevice(i);
+		else if (_fds[i].revents & POLLOUT)
+			_sendResponses(i);
 		else if (_fds[i].revents & POLLIN)
 		{
 			if (_isServerIndex(i))
@@ -83,8 +85,6 @@ void Server::routine()
 				_buildResponses(i);
 			}
 		}
-		else if (_fds[i].revents & POLLOUT)
-			_sendResponses(i);
 		else
 			stop(-1);
 	}