Changeset 472

Timestamp:

07/24/2005 06:58:03 AM (3 years ago)

Author:

jan

Message:

added functions file_isreg() and dir_files() and added last-modified handling

Location:

branches/lighttpd-1.3.x/src

Files:

• mod_cml_funcs.c (modified) (3 diffs)
• mod_cml_funcs.h (modified) (1 diff)
• mod_cml_lua.c (modified) (3 diffs)

branches/lighttpd-1.3.x/src/mod_cml_funcs.c

@@ -6 +6 @@
 #include <errno.h>
 #include <unistd.h>
+#include <dirent.h>
 #include <stdio.h>
 
@@ -75 +76 @@
         
         if (n != 1) {
-                lua_pushstring(L, "expected one argument");
-                lua_error(L);
-        }
-        
-        if (!lua_isstring(L, 1)) {
-                lua_pushstring(L, "argument has to be a string");
+                lua_pushstring(L, "file_mtime: expected one argument");
+                lua_error(L);
+        }
+        
+        if (!lua_isstring(L, 1)) {
+                lua_pushstring(L, "file_mtime: argument has to be a string");
                 lua_error(L);
         }
         
         if (-1 == stat(lua_tostring(L, 1), &st)) {
-                lua_pushstring(L, "stat failed");
-                lua_error(L);
+                lua_pushnil(L);
+                return 1;
         }
         
@@ -93 +94 @@
         return 1;
 }
+
+int f_dir_files_iter(lua_State *L) {
+        DIR *d;
+        struct dirent *de;
+        int n = lua_gettop(L);
+        
+        d = lua_touserdata(L, lua_upvalueindex(1));
+        
+        if (NULL == (de = readdir(d))) {
+                /* EOF */
+                closedir(d);
+                
+                return 0;
+        } else {
+                lua_pushstring(L, de->d_name);
+                return 1;
+        }
+}
+
+int f_dir_files(lua_State *L) {
+        DIR *d;
+        int n = lua_gettop(L);
+        
+        if (n != 1) {
+                lua_pushstring(L, "dir_files: expected one argument");
+                lua_error(L);
+        }
+        
+        if (!lua_isstring(L, 1)) {
+                lua_pushstring(L, "dir_files: argument has to be a string");
+                lua_error(L);
+        }
+        
+        /* check if there is a valid DIR handle on the stack */ 
+        if (NULL == (d = opendir(lua_tostring(L, 1)))) {
+                lua_pushnil(L);
+                return 1;
+        }
+        
+        /* push d into registry */
+        lua_pushlightuserdata(L, d);
+        lua_pushcclosure(L, f_dir_files_iter, 1);
+        
+        return 1;
+}
+
+int f_file_isreg(lua_State *L) {
+        struct stat st;
+        int n = lua_gettop(L);
+        
+        if (n != 1) {
+                lua_pushstring(L, "file_isreg: expected one argument");
+                lua_error(L);
+        }
+        
+        if (!lua_isstring(L, 1)) {
+                lua_pushstring(L, "file_isreg: argument has to be a string");
+                lua_error(L);
+        }
+        
+        if (-1 == stat(lua_tostring(L, 1), &st)) {
+                lua_pushnil(L);
+                return 1;
+        }
+        
+        lua_pushnumber(L, S_ISREG(st.st_mode));
+        
+        return 1;
+}
+
 
 #ifdef HAVE_MEMCACHE_H

branches/lighttpd-1.3.x/src/mod_cml_funcs.h

@@ -9 +9 @@
 int f_crypto_md5(lua_State *L);
 int f_file_mtime(lua_State *L);
+int f_file_isreg(lua_State *L);
+int f_dir_files(lua_State *L);
+
 int f_memcache_exists(lua_State *L);
 int f_memcache_get_string(lua_State *L);

branches/lighttpd-1.3.x/src/mod_cml_lua.c

@@ -2 +2 @@
 #include <stdio.h>
 #include <errno.h>
+#include <time.h>
 
 #include "mod_cml.h"
@@ -165 +166 @@
         lua_register(L, "md5", f_crypto_md5);
         lua_register(L, "file_mtime", f_file_mtime);
+        lua_register(L, "file_isreg", f_file_isreg);
+        lua_register(L, "dir_files", f_dir_files);
         
 #ifdef HAVE_MEMCACHE_H
@@ -313 +316 @@
                 if (ret == 0) {
                         con->file_finished = 1;
-
+                        
+                        /* no Last-Modified specified */
+                        if (mtime && NULL == array_get_element(con->response.headers, "Last-Modified")) {
+                                char timebuf[sizeof("Sat, 23 Jul 2005 21:20:01 GMT")];
+                
+                                strftime(timebuf, sizeof(timebuf), "%a, %d %b %Y %H:%M:%S GMT", gmtime(&mtime));
+                                
+                                response_header_overwrite(srv, con, CONST_STR_LEN("Last-Modified"), timebuf, sizeof(timebuf) - 1);
+                        }
+                        
                         if (http_response_handle_cachable(srv, con, mtime)) {
                                 /* ok, the client already has our content,