Changeset 334

Show
Ignore:
Timestamp:
08/07/06 23:18:19 (2 years ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/branches/0.5/ChangeLog

    r332 r334  
     12006-08-07  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
     2 
     3        * cherokee/common-internal.h: endian.h was being included twice. 
     4        Fixed. 
     5 
     62006-08-07  A.D.F  <adefacc@tin.it> 
     7 
     8        * cherokee/handler_cgi_base.c, cherokee/request.c, 
     9        cherokee/common-internal.h, cherokee/handler_file.c, 
     10        cherokee/handler_remote_control.c, cherokee/handler_webcam.c, 
     11        cherokee/connection.c, cherokee/server.c: Some call to 
     12        cherokee_buffer_add() have been replaced by 
     13        cherokee_buffer_add_str() 
     14 
    1152006-08-05  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
    216 

  • cherokee/branches/0.5/cherokee/common-internal.h

    r332 r334  
    5252#include <stdlib.h> 
    5353#include <string.h> 
    54  
    55 #ifdef HAVE_ENDIAN_H 
    56 # include <endian.h> 
    57 #endif 
    5854 
    5955#ifdef HAVE_SYS_VARARGS 

  • cherokee/branches/0.5/cherokee/connection.c

    r321 r334  
    459459         
    460460        cherokee_http_code_copy (cnt->error_code, buffer); 
    461         cherokee_buffer_add (buffer, CRLF, 2); 
     461        cherokee_buffer_add_str (buffer, CRLF); 
    462462 
    463463        /* Add the "Connection:" header 
    …… 
    478478        cherokee_buffer_add_str (buffer, "Date: "); 
    479479        cherokee_buffer_add_buffer (buffer, CONN_SRV(cnt)->bogo_now_string); 
    480         cherokee_buffer_add (buffer, CRLF, 2); 
     480        cherokee_buffer_add_str (buffer, CRLF); 
    481481 
    482482        /* Add the Server header 

  • cherokee/branches/0.5/cherokee/handler_cgi_base.c

    r236 r334  
    645645        cherokee_buffer_ensure_size (outbuf, len+6); 
    646646        cherokee_buffer_add (outbuf, inbuf->buf, len); 
    647         cherokee_buffer_add (outbuf, CRLF CRLF, 4); 
     647        cherokee_buffer_add_str (outbuf, CRLF CRLF); 
    648648 
    649649        /* Drop out the headers, we already have a copy 

  • cherokee/branches/0.5/cherokee/handler_file.c

    r332 r334  
    610610        cherokee_gmtime (&fhdl->info->st_mtime, &modified_tm); 
    611611 
    612         cherokee_buffer_add_va (buffer, "Last-Modified: %s, %02d %s %d %02d:%02d:%02d GMT"CRLF, 
     612        cherokee_buffer_add_va (buffer, 
     613                                "Last-Modified: %s, %02d %s %d %02d:%02d:%02d GMT"CRLF, 
    613614                                cherokee_weekdays[modified_tm.tm_wday], 
    614615                                modified_tm.tm_mday, 

  • cherokee/branches/0.5/cherokee/handler_remote_control.c

    r122 r334  
    7878        cherokee_connection_parse_args (HANDLER_CONN(hdl)); 
    7979 
    80         cherokee_buffer_add (hdl->buffer, "<?xml version=\"1.0\"?>"CRLF, 23);  
    81         cherokee_buffer_add (hdl->buffer, "<status>"CRLF, 10);  
     80        cherokee_buffer_add_str (hdl->buffer, "<?xml version=\"1.0\"?>"CRLF);  
     81        cherokee_buffer_add_str (hdl->buffer, "<status>"CRLF);  
    8282         
    8383        /* Connections 
    …… 
    123123 
    124124 
    125         cherokee_buffer_add (hdl->buffer, "</status>"CRLF, 11);  
     125        cherokee_buffer_add_str (hdl->buffer, "</status>"CRLF);  
    126126 
    127127        return ret_ok; 
    …… 
    140140cherokee_handler_remote_control_add_headers (cherokee_handler_remote_control_t *hdl, cherokee_buffer_t *buffer) 
    141141{ 
    142         cherokee_buffer_add    (buffer, "Content-Type: text/html"CRLF, 25); 
     142        cherokee_buffer_add_str(buffer, "Content-Type: text/html"CRLF); 
    143143        cherokee_buffer_add_va (buffer, "Content-Length: %d"CRLF, hdl->buffer->len); 
    144144 
    145         cherokee_buffer_add (buffer, "Cache-Control: no-cache"CRLF, 25);                
    146         cherokee_buffer_add (buffer, "Pragma: no-cache"CRLF, 18);               
     145        cherokee_buffer_add_str(buffer, "Cache-Control: no-cache"CRLF); 
     146        cherokee_buffer_add_str(buffer, "Pragma: no-cache"CRLF); 
    147147 
    148148        return ret_ok; 

  • cherokee/branches/0.5/cherokee/handler_webcam.c

    r122 r334  
    9090cherokee_handler_webcam_add_headers (cherokee_handler_webcam_t *hdl, cherokee_buffer_t *buffer) 
    9191{ 
    92            cherokee_buffer_add (buffer, "Content-Type: image/jpeg"CRLF, 26); 
     92           cherokee_buffer_add_str (buffer, "Content-Type: image/jpeg"CRLF); 
    9393           return ret_ok; 
    9494} 

  • cherokee/branches/0.5/cherokee/request.c

    r122 r334  
    106106        switch (REQUEST_VERSION(request)) { 
    107107        case http_version_11: 
    108                 cherokee_buffer_add (buf, " HTTP/1.1" CRLF, 11); 
     108                cherokee_buffer_add_str (buf, " HTTP/1.1" CRLF); 
    109109                break; 
    110110        case http_version_10: 
    111                 cherokee_buffer_add (buf, " HTTP/1.0" CRLF, 11); 
     111                cherokee_buffer_add_str (buf, " HTTP/1.0" CRLF); 
    112112                break; 
    113113        case http_version_09: 
    114                 cherokee_buffer_add (buf, " HTTP/0.9" CRLF, 11); 
     114                cherokee_buffer_add_str (buf, " HTTP/0.9" CRLF); 
    115115                break; 
    116116        default: 
    …… 
    123123                cherokee_buffer_add (buf, "Host: ", 6); 
    124124                cherokee_buffer_add_buffer (buf, URL_HOST(url)); 
    125                 cherokee_buffer_add (buf, CRLF, 2); 
     125                cherokee_buffer_add_str (buf, CRLF); 
    126126        } 
    127127 
    …… 
    136136         */ 
    137137        if (REQUEST_KEEPALIVE(request)) { 
    138                 cherokee_buffer_add (buf, "Connection: Keep-alive"CRLF, 24);  
     138                cherokee_buffer_add_str (buf, "Connection: Keep-alive"CRLF);  
    139139        } else { 
    140                 cherokee_buffer_add (buf, "Connection: Close"CRLF, 19);  
     140                cherokee_buffer_add_str (buf, "Connection: Close"CRLF);  
    141141        } 
    142142 
    …… 
    158158        /* Finish the header 
    159159         */ 
    160         cherokee_buffer_add (buf, CRLF, 2); 
     160        cherokee_buffer_add_str (buf, CRLF); 
    161161 
    162162        return ret_ok; 

  • cherokee/branches/0.5/cherokee/server.c

    r268 r334  
    177177        /* Time managing hack 
    178178         */ 
    179         cherokee_buffer_new (&n->timeout_header); 
    180         cherokee_buffer_add (n->timeout_header, "Keep-Alive: timeout=15"CRLF, 24); 
     179        cherokee_buffer_new(&n->timeout_header); 
     180        cherokee_buffer_add_str(n->timeout_header, "Keep-Alive: timeout=15"CRLF); 
    181181 
    182182        /* Accepting mutexes 
    …… 
    10931093update_bogo_now (cherokee_server_t *srv) 
    10941094{ 
    1095         time_t       prev; 
     1095        time_t       newtime; 
    10961096        static long *this_timezone = NULL; 
    10971097 
    10981098        CHEROKEE_RWLOCK_WRITER (&srv->bogo_now_mutex);      /* 1.- lock as writer */ 
    10991099 
    1100         prev = srv->bogo_now; 
    1101         srv->bogo_now = time (NULL); 
    1102         cherokee_localtime (&srv->bogo_now, &srv->bogo_now_tm); 
    1103          
    1104         /* Update time string if needed 
    1105          */ 
    1106         if (prev < srv->bogo_now) { 
    1107                 int z; 
    1108  
    1109                 cherokee_buffer_clean (srv->bogo_now_string); 
    1110  
    1111                 if (this_timezone == NULL)  
    1112                         this_timezone = cherokee_get_timezone_ref(); 
    1113                 z = - (*this_timezone / 60); 
    1114  
    1115                 cherokee_buffer_add_va (srv->bogo_now_string, "%s, %02d %s %d %02d:%02d:%02d GMT%c%d", 
     1100        newtime = time (NULL); 
     1101        if (srv->bogo_now != newtime) { 
     1102                time_t prevtime = srv->bogo_now; 
     1103 
     1104                srv->bogo_now  = newtime; 
     1105                cherokee_localtime (&newtime, &srv->bogo_now_tm); 
     1106 
     1107                /* Update time string if needed 
     1108                 */ 
     1109                if (prevtime < newtime) { 
     1110                        int z; 
     1111 
     1112                        cherokee_buffer_clean (srv->bogo_now_string); 
     1113 
     1114                        if (this_timezone == NULL)  
     1115                                this_timezone = cherokee_get_timezone_ref(); 
     1116                        z = - (*this_timezone / 60); 
     1117 
     1118                        cherokee_buffer_add_va (srv->bogo_now_string, 
     1119                                        "%s, %02d %s %d %02d:%02d:%02d GMT%c%d", 
    11161120                                        cherokee_weekdays[srv->bogo_now_tm.tm_wday],  
    11171121                                        srv->bogo_now_tm.tm_mday, 
    …… 
    11231127                                        (z < 0) ? '-' : '+', 
    11241128                                        (z / 60)); 
     1129                } 
    11251130        } 
    11261131