You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2017/01/06 21:33:00 UTC
svn commit: r1777719 - /httpd/httpd/branches/2.4.x/modules/lua/mod_lua.c
Author: jailletc36
Date: Fri Jan 6 21:32:59 2017
New Revision: 1777719
URL: http://svn.apache.org/viewvc?rev=1777719&view=rev
Log:
Fix some style issue in mod_lua (which is not under RTC)
(r1772490 in trunk)
Modified:
httpd/httpd/branches/2.4.x/modules/lua/mod_lua.c
Modified: httpd/httpd/branches/2.4.x/modules/lua/mod_lua.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/lua/mod_lua.c?rev=1777719&r1=1777718&r2=1777719&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/lua/mod_lua.c (original)
+++ httpd/httpd/branches/2.4.x/modules/lua/mod_lua.c Fri Jan 6 21:32:59 2017
@@ -87,7 +87,8 @@ apr_global_mutex_t *lua_ivm_mutex;
apr_shm_t *lua_ivm_shm;
char *lua_ivm_shmfile;
-static apr_status_t shm_cleanup_wrapper(void *unused) {
+static apr_status_t shm_cleanup_wrapper(void *unused)
+{
if (lua_ivm_shm) {
return apr_shm_destroy(lua_ivm_shm);
}
@@ -149,9 +150,11 @@ static const char *scope_to_string(unsig
}
}
-static void ap_lua_release_state(lua_State* L, ap_lua_vm_spec* spec, request_rec* r) {
+static void ap_lua_release_state(lua_State* L, ap_lua_vm_spec* spec, request_rec* r)
+{
char *hash;
apr_reslist_t* reslist = NULL;
+
if (spec->scope == AP_LUA_SCOPE_SERVER) {
ap_lua_server_spec* sspec = NULL;
lua_settop(L, 0);
@@ -332,7 +335,8 @@ static int lua_handler(request_rec *r)
/* ------------------- Input/output content filters ------------------- */
-static apr_status_t lua_setup_filter_ctx(ap_filter_t* f, request_rec* r, lua_filter_ctx** c) {
+static apr_status_t lua_setup_filter_ctx(ap_filter_t* f, request_rec* r, lua_filter_ctx** c)
+{
apr_pool_t *pool;
ap_lua_vm_spec *spec;
int n, rc;
@@ -422,7 +426,8 @@ static apr_status_t lua_setup_filter_ctx
return APR_ENOENT;
}
-static apr_status_t lua_output_filter_handle(ap_filter_t *f, apr_bucket_brigade *pbbIn) {
+static apr_status_t lua_output_filter_handle(ap_filter_t *f, apr_bucket_brigade *pbbIn)
+{
request_rec *r = f->r;
int rc;
lua_State *L;
@@ -591,7 +596,7 @@ static apr_status_t lua_input_filter_han
/* While the Lua function is still yielding, pass buckets to the coroutine */
if (!ctx->broken) {
lastCall = 0;
- while(!APR_BRIGADE_EMPTY(ctx->tmpBucket)) {
+ while (!APR_BRIGADE_EMPTY(ctx->tmpBucket)) {
apr_bucket *pbktIn = APR_BRIGADE_FIRST(ctx->tmpBucket);
apr_bucket *pbktOut;
const char *data;