From: Guenter Knauf <fuankg@apache.org>
Date: Sat, 25 May 2013 00:56:22 +0000 (+0000)
Subject: Changed r.sleep(s) to r.usleep(ms).
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8089e33b10b5232413d9797f834f4b2600bdfbf8;p=thirdparty%2Fapache%2Fhttpd.git

Changed r.sleep(s) to r.usleep(ms).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1486265 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/lua/lua_request.c b/modules/lua/lua_request.c
index 986c09d0466..d544f6a817b 100644
--- a/modules/lua/lua_request.c
+++ b/modules/lua/lua_request.c
@@ -1573,12 +1573,16 @@ static int lua_ap_state_query(lua_State *L)
     return 1;
 }
 
-static int lua_ap_sleep(lua_State *L)
+/*
+ * lua_ap_usleep; r:usleep(microseconds)
+ * - Sleep for the specified number of microseconds.
+ */
+static int lua_ap_usleep(lua_State *L)
 {
 
     apr_interval_time_t msec;
     luaL_checktype(L, 1, LUA_TNUMBER);
-    msec = (apr_interval_time_t)(lua_tonumber(L, 1) * 1000000);
+    msec = (apr_interval_time_t)lua_tonumber(L, 1);
     apr_sleep(msec);
     return 0;
 }
@@ -2037,8 +2041,8 @@ AP_LUA_DECLARE(void) ap_lua_load_request_lmodule(lua_State *L, apr_pool_t *p)
                  makefun(&lua_ap_getdir, APL_REQ_FUNTYPE_LUACFUN, p));
     apr_hash_set(dispatch, "regex", APR_HASH_KEY_STRING,
                  makefun(&lua_ap_regex, APL_REQ_FUNTYPE_LUACFUN, p));
-    apr_hash_set(dispatch, "sleep", APR_HASH_KEY_STRING,
-                 makefun(&lua_ap_sleep, APL_REQ_FUNTYPE_LUACFUN, p));
+    apr_hash_set(dispatch, "usleep", APR_HASH_KEY_STRING,
+                 makefun(&lua_ap_usleep, APL_REQ_FUNTYPE_LUACFUN, p));
     apr_hash_set(dispatch, "base64_encode", APR_HASH_KEY_STRING,
                  makefun(&lua_apr_b64encode, APL_REQ_FUNTYPE_LUACFUN, p));
     apr_hash_set(dispatch, "base64_decode", APR_HASH_KEY_STRING,