Changeset 87:e78ef65c833e

Timestamp:

11/11/09 08:21:04 (4 months ago)

Author:

roberto@…

Branch:

default

Message:

better virtualenv support and a bit of protocol timeout fixes

Files:

• LICENSE (added)
• uwsgi.c (modified) (6 diffs)

uwsgi.c

@@ -101 +101 @@
 #endif
 
+char *pyhome;
 
 char *nl = "\r\n";
@@ -566 +567 @@
 #ifndef UNBIT
         #ifndef ROCK_SOLID
-        while ((i = getopt (argc, argv, "s:p:t:x:d:l:O:v:b:mcaCTPiMhrR:z:w:j:")) != -1) {
+        while ((i = getopt (argc, argv, "s:p:t:x:d:l:O:v:b:mcaCTPiMhrR:z:w:j:H:")) != -1) {
         #else
-        while ((i = getopt (argc, argv, "s:p:t:d:l:v:b:aCMhrR:z:j:")) != -1) {
+        while ((i = getopt (argc, argv, "s:p:t:d:l:v:b:aCMhrR:z:j:H:")) != -1) {
         #endif
 #else
-        while ((i = getopt (argc, argv, "p:t:mTPiv:b:rMR:Sz:w:C:j:")) != -1) {
+        while ((i = getopt (argc, argv, "p:t:mTPiv:b:rMR:Sz:w:C:j:H:")) != -1) {
 #endif
                 switch(i) {
                         case 'j':
                                 test_module = optarg;
+                                break;
+                        case 'H':
+                                pyhome = optarg;
                                 break;
 #ifdef UNBIT
@@ -697 +701 @@
 \t-T\t\tenable threads support (no ROCK_SOLID)\n\
 \t-M\t\tenable master process manager\n\
+\t-H <path>\tset python home/virtualenv\n\
 \t-h\t\tthis help\n\
 \t-d <logfile>  daemonize and log into <logfile>\n", argv[0]);
@@ -722 +727 @@
 #endif
 #endif
-
-#ifndef UNBIT
-#ifndef ROCK_SOLID
-        for (i = optind; i < argc; i++) {
-                fprintf(stderr,"Setting PythonHome to %s...\n", argv[i]);
-                Py_SetPythonHome(argv[i]);              
-        }
-#endif  
-#endif
+        
+
+        if (pyhome != NULL) {
+                fprintf(stderr,"Setting PythonHome to %s...\n", pyhome);
+                Py_SetPythonHome(pyhome);               
+        }
 
 #ifdef PYTHREE
@@ -1043 +1045 @@
                 }
                 rlen = read(wsgi_poll.fd, &wsgi_req, 4) ;
-                if (rlen != 4){
+                if (rlen > 0 && rlen < 4) {
+                        i = rlen ;
+                        while(i < 4) {
+                                rlen = poll(&wsgi_poll, 1, socket_timeout*1000) ;
+                                if (rlen < 0) {
+                                        perror("poll()");
+                                        exit(1);
+                                }
+                                else if (rlen == 0) {
+                                        fprintf(stderr, "timeout waiting for header. skip request.\n");
+                                        close(wsgi_poll.fd);
+                                        break ;
+                                }       
+                                rlen = read(wsgi_poll.fd, (char *)(&wsgi_req)+i, 4-i);
+                                if (rlen <= 0) {
+                                        fprintf(stderr, "broken header. skip request.\n");      
+                                        close(wsgi_poll.fd);
+                                        break ;
+                                }
+                                i += rlen;
+                        }
+                        if (i < 4) {
+                                continue;
+                        }
+                }
+                else if (rlen <= 0){
                         fprintf(stderr,"invalid request header size: %d...skip\n", rlen);
                         close(wsgi_poll.fd);
@@ -1068 +1095 @@
                                 break ;
                         }
-                        i += read(wsgi_poll.fd, buffer, wsgi_req.size-i);
+                        rlen = read(wsgi_poll.fd, buffer, wsgi_req.size-i);
+                        if (rlen <= 0) {
+                                fprintf(stderr, "broken vars. skip request.\n");             
+                                close(wsgi_poll.fd);
+                                break ;
+                        }
+                        i += rlen ;
                 }