Prepareing for 2.0.1

Added tests for bug #71997
Fixed default searching in centOS
2026-03-26 01:52:11 +01:00 · 2016-04-11 10:54:41 +08:00 · 2016-04-11 10:51:15 +08:00 · 2016-04-11 10:50:28 +08:00 · 2016-04-11 10:37:11 +08:00 · 2016-04-07 19:14:59 +08:00
13 changed files with 393 additions and 389 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,7 @@ addons:
      - liblua5.2-dev

 php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
+  - 7.0

 notifications:
  email: false
@@ -23,4 +20,4 @@ before_script:
    - ./travis/compile.sh

 # Run PHPs run-tests.php 
-script: make test
+script: TEST_PHP_ARGS="--show-diff" make test
--- a/1
+++ b/1
@@ -2,3 +2,4 @@ lua
 Johannes Schlueter
 Marcelo  Araujo 
 Xinchen	 Hui
+Helmut Januschka
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-##PHP Lua
+# PHP Lua
 [![Build Status](https://secure.travis-ci.org/laruence/php-lua.png)](https://travis-ci.org/laruence/php-lua)

 This extension embeds the lua interpreter and offers an OO-API to lua variables and functions.
--- a/config.m4
+++ b/config.m4
@@ -1,6 +1,7 @@
 dnl $Id: config.m4 321796 2012-01-05 17:23:48Z laruence $
 PHP_ARG_WITH(lua, for lua support,
 [  --with-lua=[DIR]    Include php lua support])
+PHP_ARG_WITH(lua-version, to specify a custom lua version, [  --with-lua-version=[VERSION]]   Use the specified lua version.)

 PHP_ARG_WITH(lua-version, to specify a custom lua version, [  --with-lua-version=[VERSION]]   Use the specified lua version.)

@@ -16,6 +17,12 @@ if test "$PHP_LUA" != "no"; then
        break
      fi

+      if test -r $i/include/lua.h; then
+        LUA_INCLUDE_DIR=$i/include
+        AC_MSG_RESULT(found in $i)
+        break
+      fi
+
      if test "$PHP_LUA_VERSION" != "yes"; then
        if test -r $i/include/lua$PHP_LUA_VERSION/lua.h; then
          LUA_INCLUDE_DIR=$i/include/lua$PHP_LUA_VERSION
--- a/lua.c
+++ b/lua.c
@@ -13,9 +13,9 @@
   | Author    : Johannes Schlueter  <johannes@php.net>                   |
   |             Xinchen  Hui        <laruence@php.net>                   |
   |             Marcelo  Araujo     <msaraujo@php.net>                   |
+   |             Helmut  Januschka   <helmut@januschka.com>               |
   +----------------------------------------------------------------------+
-   $Id: lua.c 324348 2012-03-19 03:12:15Z laruence $
-   */
+*/

 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -90,7 +90,6 @@ ZEND_GET_MODULE(lua)
 /** {{{ static void php_lua_stack_dump(lua_State* L)
 *  just for debug
 */
-#ifdef PHP_LUA_DEBUG
 static void php_lua_stack_dump(lua_State* L) {
 	int i = 1;
 	int n = lua_gettop(L);
@@ -121,14 +120,12 @@ static void php_lua_stack_dump(lua_State* L) {
 		printf("\n");
 	}
 }
-#endif
 /* }}} */

 /** {{{ static int php_lua_atpanic(lua_State *L)
 */
 static int php_lua_atpanic(lua_State *L) {
-	TSRMLS_FETCH();
-	php_error_docref(NULL TSRMLS_CC, E_ERROR, "lua panic (%s)", lua_tostring(L, 1));
+	php_error_docref(NULL, E_ERROR, "lua panic (%s)", lua_tostring(L, 1));
 	lua_pop(L, 1);
 	zend_bailout();
 	return 0;
@@ -138,13 +135,14 @@ static int php_lua_atpanic(lua_State *L) {
 /** {{{ static int php_lua_print(lua_State *L)
 */
 static int php_lua_print(lua_State *L)  {
+	zval rv;
 	int i = 0;
+    int nargs = lua_gettop(L);

-	TSRMLS_FETCH();
-	for (i = -lua_gettop(L) ; i<0; i++) {
-		zval *tmp = php_lua_get_zval_from_lua(L, i, NULL TSRMLS_CC);
-		zend_print_zval_r(tmp, 1 TSRMLS_CC);
-		zval_ptr_dtor(&tmp);
+    for (i = 1; i <= nargs; ++i) {
+		php_lua_get_zval_from_lua(L, i, NULL, &rv);
+		zend_print_zval_r(&rv, 1);
+		zval_ptr_dtor(&rv);
 	}
 	return 0;
 }
@@ -172,146 +170,102 @@ static void * php_lua_alloc_function(void *ud, void *ptr, size_t osize, size_t n
 }
 /* }}} */

-/** {{{ static void php_lua_dtor_object(void *object, zend_object_handle handle TSRMLS_DC)
- *  the dtor function for lua object
- */
-static void php_lua_dtor_object(void *object, zend_object_handle handle TSRMLS_DC) {
-	php_lua_object *lua_obj = (php_lua_object *)object;
+static void php_lua_dtor_object(zend_object *object) /* {{{ */ {
+	php_lua_object *lua_obj = php_lua_obj_from_obj(object);

-	zend_object_std_dtor(&(lua_obj->obj) TSRMLS_CC);
+	zend_object_std_dtor(&(lua_obj->obj));

 	if (lua_obj->L) {
 		lua_close(lua_obj->L);
 	}
-
-	efree(lua_obj);
 }
 /* }}} */

-/** {{{ static zend_object_value php_lua_create_object(zend_class_entry *ce TSRMLS_DC)
- *
- * the create object handler for lua
+/** {{{ static zend_object_value php_lua_create_object(zend_class_entry *ce)
 */
-static zend_object_value php_lua_create_object(zend_class_entry *ce TSRMLS_DC) {
-	zend_object_value obj 	 = {0};
-	php_lua_object 	*lua_obj = NULL;
-	lua_State 		*L	 	 = NULL;
+zend_object *php_lua_create_object(zend_class_entry *ce)
+{
+	php_lua_object* intern;
+	lua_State *L;

-	L = lua_newstate(php_lua_alloc_function, NULL);
+	L = luaL_newstate();

 	lua_atpanic(L, php_lua_atpanic);

-	lua_obj = emalloc(sizeof(php_lua_object));
+	intern = emalloc(sizeof(php_lua_object) + sizeof(zval) * (ce->default_properties_count - 1));

-	if (!lua_obj) {
-		php_error_docref(NULL TSRMLS_CC, E_ERROR, "alloc memory for lua object failed");
+	if (!intern) {
+		php_error_docref(NULL, E_ERROR, "alloc memory for lua object failed");
 	}

-	lua_obj->L = L;
-	zend_object_std_init(&(lua_obj->obj), ce TSRMLS_CC);
+	intern->L = L;

-#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION < 4)
-	zend_hash_copy(lua_obj->obj.properties, &ce->default_properties,
-#if (PHP_MINOR_VERSION < 4)
-			(copy_ctor_func_t) zval_add_ref,
-#else
-			zval_copy_property_ctor(ce),
-#endif
-		(void *)0, sizeof(zval *));
-#elif (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION > 3)
-	object_properties_init(&(lua_obj->obj), ce);
-#endif
+	zend_object_std_init(&intern->obj, ce);
+	object_properties_init(&intern->obj, ce);

-	obj.handle   = zend_objects_store_put(lua_obj, php_lua_dtor_object, NULL, NULL TSRMLS_CC);
-	obj.handlers = &lua_object_handlers;
+	intern->obj.handlers = &lua_object_handlers;
 	
-	return obj;
+	return &intern->obj;
 }
 /* }}} */

-/** {{{ static zval * php_lua_read_property(zval *object, zval *member, int type TSRMLS_DC)
+/** {{{ static zval * php_lua_read_property(zval *object, zval *member, int type)
 */
-#if ((PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION < 4)) || (PHP_MAJOR_VERSION < 5)
-static zval * php_lua_read_property(zval *object, zval *member, int type TSRMLS_DC) {
-#else
-static zval * php_lua_read_property(zval *object, zval *member, int type, const struct _zend_literal *key TSRMLS_DC) {
-#endif
-	zval *retval 	 = NULL;
-	lua_State *L 	 = NULL;
+zval *php_lua_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv){
+	lua_State *L = NULL;
 	zval *tmp_member = NULL;
-#if ((PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION > 3))
-	(void)key;
-#endif

 	if (type != BP_VAR_R) {
-		MAKE_STD_ZVAL(retval);
-		ZVAL_NULL(retval);
-		return retval;
+		ZVAL_NULL(rv);
+		return rv;
 	}

 	if (Z_TYPE_P(member) != IS_STRING) {
-		ALLOC_ZVAL(tmp_member);
 		*tmp_member = *member;
-		INIT_PZVAL(tmp_member);
 		zval_copy_ctor(tmp_member);
 		convert_to_string(tmp_member);
 		member = tmp_member;
 	}

-	L = Z_LUAVAL_P(object);
+	L = (Z_LUAVAL_P(object))->L;
 #if (LUA_VERSION_NUM < 502)
 	lua_getfield(L, LUA_GLOBALSINDEX, Z_STRVAL_P(member));
 #else
 	lua_getglobal(L, Z_STRVAL_P(member));
 #endif
-	retval = php_lua_get_zval_from_lua(L, -1, object TSRMLS_CC);
-	Z_DELREF_P(retval);
+	php_lua_get_zval_from_lua(L, -1, object, rv);
 	lua_pop(L, 1);
-
-	if (tmp_member) {
-		zval_ptr_dtor(&tmp_member);
-	}
-
-	return retval;
+	return rv;
 }
 /* }}} */

-/** {{{ static void php_lua_write_property(zval *object, zval *member, zval *value TSRMLS_DC)
+/** {{{ static void php_lua_write_property(zval *object, zval *member, zval *value)
 */
-#if ((PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION < 4)) || (PHP_MAJOR_VERSION < 5)
-static void php_lua_write_property(zval *object, zval *member, zval *value TSRMLS_DC) {
-#else
-static void php_lua_write_property(zval *object, zval *member, zval *value, const struct _zend_literal *key TSRMLS_DC) {
-#endif
+static void php_lua_write_property(zval *object, zval *member, zval *value, void ** key) {
 	lua_State *L 	 = NULL;
 	zval *tmp_member = NULL;
-#if ((PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION > 3))
-	(void)key;
-#endif

 	if (Z_TYPE_P(member) != IS_STRING) {
-		ALLOC_ZVAL(tmp_member);
 		*tmp_member = *member;
-		INIT_PZVAL(tmp_member);
 		zval_copy_ctor(tmp_member);
 		convert_to_string(tmp_member);
 		member = tmp_member;
 	}

-	L = Z_LUAVAL_P(object);
+	L = (Z_LUAVAL_P(object))->L;

 #if (LUA_VERSION_NUM < 502)
-	php_lua_send_zval_to_lua(L, member TSRMLS_CC);
-	php_lua_send_zval_to_lua(L, value TSRMLS_CC);
+	php_lua_send_zval_to_lua(L, member);
+	php_lua_send_zval_to_lua(L, value);

 	lua_settable(L, LUA_GLOBALSINDEX);
 #else
-	php_lua_send_zval_to_lua(L, value TSRMLS_CC);
+	php_lua_send_zval_to_lua(L, value);
 	lua_setglobal(L, Z_STRVAL_P(member));
 #endif

 	if (tmp_member) {
-		zval_ptr_dtor(&tmp_member);
+		zval_ptr_dtor(tmp_member);
 	}
 }
 /* }}} */
@@ -320,72 +274,57 @@ static void php_lua_write_property(zval *object, zval *member, zval *value, cons
 */
 static int php_lua_call_callback(lua_State *L) {
 	int  order		 = 0;
-	zval *return_value = NULL;
-	zval **func		 = NULL;
+	zval retval;
+	zval *func		 = NULL;
 	zval *callbacks	 = NULL;
-	TSRMLS_FETCH();

 	order = lua_tonumber(L, lua_upvalueindex(1));

-	callbacks = zend_read_static_property(lua_ce, ZEND_STRL("_callbacks"), 1 TSRMLS_CC);
+	callbacks = zend_read_static_property(lua_ce, ZEND_STRL("_callbacks"), 1);
 	
 	if (ZVAL_IS_NULL(callbacks)) {
 		return 0;
 	}
 	
-	MAKE_STD_ZVAL(return_value);
+	func = zend_hash_index_find(Z_ARRVAL_P(callbacks), order);

-	if (zend_hash_index_find(Z_ARRVAL_P(callbacks), order, (void **)&func) == FAILURE) {
-		return 0;
-	}
-
-	if (!zend_is_callable(*func, 0, NULL TSRMLS_CC)) {
+	if (!zend_is_callable(func, 0, NULL)) {
 		return 0;
 	} else {
-		zval **params = NULL;
-		int  i 		= 0;
-		int  arg_num  = lua_gettop(L);
+		zval *params;
+		int i = 0;
+		int arg_num = lua_gettop(L);

-		params = ecalloc(arg_num, sizeof(zval));
-
-		for (; i<arg_num; i++) {
-			params[i] = php_lua_get_zval_from_lua(L, -(arg_num-i), NULL TSRMLS_CC);
+		params = safe_emalloc(sizeof(zval), arg_num, 0);
+		for (i = 0; i < arg_num; i++) {
+			php_lua_get_zval_from_lua(L, -(arg_num - i), NULL, &params[i]);
 		}

-		call_user_function(EG(function_table), NULL, *func, return_value, arg_num, params TSRMLS_CC);
+		call_user_function(EG(function_table), NULL, func, &retval, arg_num, params);
+		php_lua_send_zval_to_lua(L, &retval);

-		php_lua_send_zval_to_lua(L, return_value TSRMLS_CC);
-
-		for (i=0; i<arg_num; i++) {
+		for (i = 0; i<arg_num; i++) {
 			zval_ptr_dtor(&params[i]);
+			
 		}
-
 		efree(params);
-		zval_ptr_dtor(&return_value);
-
+		zval_ptr_dtor(&retval);
 		return 1;
 	}

 }
 /* }}} */

-/** {{{ zval * php_lua_get_zval_from_lua(lua_State *L, int index, zval *lua_obj TSRMLS_DC)
-*/
-zval * php_lua_get_zval_from_lua(lua_State *L, int index, zval *lua_obj TSRMLS_DC) {
-	zval *retval;
-
-	MAKE_STD_ZVAL(retval);
-	ZVAL_NULL(retval);
-
+zval *php_lua_get_zval_from_lua(lua_State *L, int index, zval *lua_obj, zval *rv) /* {{{ */ {
 	switch (lua_type(L, index)) {
 		case LUA_TNIL:
-			ZVAL_NULL(retval);
+			ZVAL_NULL(rv);
 			break;
 		case LUA_TBOOLEAN:
-			ZVAL_BOOL(retval, lua_toboolean(L, index));
+			ZVAL_BOOL(rv, lua_toboolean(L, index));
 			break;
 		case LUA_TNUMBER:
-			ZVAL_DOUBLE(retval, lua_tonumber(L, index));
+			ZVAL_DOUBLE(rv, lua_tonumber(L, index));
 			break;
 		case LUA_TSTRING:
 			{
@@ -393,32 +332,33 @@ zval * php_lua_get_zval_from_lua(lua_State *L, int index, zval *lua_obj TSRMLS_D
 				size_t len = 0;

 				val = (char *)lua_tolstring(L, index, &len);
-				ZVAL_STRINGL(retval, val, len, 1);
+				ZVAL_STRINGL(rv, val, len);
 			}
 			break;
 		case LUA_TTABLE:
-			array_init(retval);
+			array_init(rv);
 			lua_pushnil(L);  /* first key */
 			while (lua_next(L, index-1) != 0) {
-				zval *key = NULL;
-				zval *val = NULL;
+				zval key, val;

 				/* uses 'key' (at index -2) and 'value' (at index -1) */
-				key = php_lua_get_zval_from_lua(L, -2, lua_obj TSRMLS_CC);
-				val = php_lua_get_zval_from_lua(L, -1, lua_obj TSRMLS_CC);
-
-				if (!key || !val) {
+				if (!php_lua_get_zval_from_lua(L, -2, lua_obj, &key)) {
+					break;
+				}
+				if (!php_lua_get_zval_from_lua(L, -1, lua_obj, &val)) {
+					zval_ptr_dtor(&key);
 					/* there is a warning already in php_lua_get_zval_from_lua */
 					break;
 				}

-				switch(Z_TYPE_P(key)) {
+				switch(Z_TYPE(key)) {
 					case IS_DOUBLE:
 					case IS_LONG:
-						add_index_zval(retval, Z_DVAL_P(key), val);
+						add_index_zval(rv, Z_DVAL(key), &val);
 						break;
 					case IS_STRING:
-						add_assoc_zval(retval, Z_STRVAL_P(key), val);
+						add_assoc_zval(rv, Z_STRVAL(key), &val);
+						zval_ptr_dtor(&key);
 						break;
 					case IS_ARRAY:
 					case IS_OBJECT:
@@ -426,22 +366,23 @@ zval * php_lua_get_zval_from_lua(lua_State *L, int index, zval *lua_obj TSRMLS_D
 						break;
 				}
 				lua_pop(L, 1);
-				zval_ptr_dtor(&key);
 			}
 			break;
 		case LUA_TFUNCTION:
 			{
-				long ref_id   = 0;
+				long ref_id = 0;
 				if (!lua_obj) {
-					php_error_docref(NULL TSRMLS_CC, E_WARNING, "corrupted Lua object");
+					php_error_docref(NULL, E_WARNING, "corrupted Lua object");
 					break;
 				}

 				lua_pushvalue(L, index);
 				ref_id = luaL_ref(L, LUA_REGISTRYINDEX);

-				if (!php_lua_closure_instance(retval, ref_id, lua_obj TSRMLS_CC)) {
-					php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to initialize closure object");
+				if (!php_lua_closure_instance(rv, ref_id, lua_obj)) {
+					php_error_docref(NULL, E_WARNING, "failed to initialize closure object");
+					ZVAL_NULL(rv);
+					return NULL;
 				}
 			}
 			break;
@@ -449,21 +390,21 @@ zval * php_lua_get_zval_from_lua(lua_State *L, int index, zval *lua_obj TSRMLS_D
 		case LUA_TTHREAD:
 		case LUA_TLIGHTUSERDATA:
 		default:
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "unsupported type '%s' for php",
+			php_error_docref(NULL, E_WARNING, "unsupported type '%s' for php",
 					lua_typename(L, lua_type(L, index)));
+			ZVAL_NULL(rv);
+			return NULL;
 	}
-
-	return retval;
+	return rv;
 }
 /* }}} */

-/** {{{ int php_lua_send_zval_to_lua(lua_State *L, zval *val TSRMLS_DC)
-*/
-int php_lua_send_zval_to_lua(lua_State *L, zval *val TSRMLS_DC) {
+int php_lua_send_zval_to_lua(lua_State *L, zval *val) /* {{{ */ {

 	switch (Z_TYPE_P(val)) {
-		case IS_BOOL:
-			lua_pushboolean(L, Z_BVAL_P(val));
+		case IS_TRUE:
+		case IS_FALSE:
+			lua_pushboolean(L, Z_LVAL_P(val));
 			break;
 		case IS_NULL:
 			lua_pushnil(L);
@@ -480,10 +421,10 @@ int php_lua_send_zval_to_lua(lua_State *L, zval *val TSRMLS_DC) {
 		case IS_OBJECT:
 		case IS_ARRAY:
 			{
-				if (zend_is_callable(val, 0, NULL TSRMLS_CC)) {
-					zval* callbacks = NULL;
+				if (zend_is_callable(val, 0, NULL)) {
+					zval *callbacks;

-					callbacks = zend_read_static_property(lua_ce, ZEND_STRL("_callbacks"), 1 TSRMLS_CC);
+					callbacks = zend_read_static_property(lua_ce, ZEND_STRL("_callbacks"), 1);

 					if (ZVAL_IS_NULL(callbacks)) {
 						array_init(callbacks);
@@ -492,57 +433,45 @@ int php_lua_send_zval_to_lua(lua_State *L, zval *val TSRMLS_DC) {
 					lua_pushnumber(L, zend_hash_num_elements(Z_ARRVAL_P(callbacks)));
 					lua_pushcclosure(L, php_lua_call_callback, 1);

-					zval_add_ref(&val);
+					zval_add_ref(val);
 					add_next_index_zval(callbacks, val);
 				} else {
-					HashTable *ht  		= NULL;
-					zval 		**ppzval 	= NULL;
+					zval *v;
+					ulong longkey;
+					zend_string *key;
+					zval zkey;

-					ht = HASH_OF(val);
-
-					if (++ht->nApplyCount > 1) {
-						php_error_docref(NULL TSRMLS_CC, E_ERROR, "recursion found");
-						--ht->nApplyCount;
-						break;
+					HashTable *ht = HASH_OF(val);
+					if (ZEND_HASH_APPLY_PROTECTION(ht)) {
+						ZEND_HASH_INC_APPLY_COUNT(ht);
+						if (ZEND_HASH_GET_APPLY_COUNT(ht) > 1) {
+							php_error_docref(NULL, E_ERROR, "recursion found");
+							ZEND_HASH_DEC_APPLY_COUNT(ht);
+							break;
+						}
 					}

 					lua_newtable(L);
-					for(zend_hash_internal_pointer_reset(ht);
-							zend_hash_get_current_data(ht, (void **)&ppzval) == SUCCESS;
-							zend_hash_move_forward(ht)) {
-						char *key = NULL;
-						uint len  = 0;
-						ulong idx  = 0;
-						zval *zkey= NULL;

-						switch(zend_hash_get_current_key_ex(ht, &key, &len, &idx, 0, NULL)) {
-							case HASH_KEY_IS_STRING :
-								MAKE_STD_ZVAL(zkey);
-								ZVAL_STRINGL(zkey, key, len - 1, 1);
-								break;
-							case HASH_KEY_IS_LONG:
-								if (idx == 0) {
-									php_error_docref(NULL TSRMLS_CC, E_STRICT,
-											"attempt to pass an array index begin with 0 to lua");
-								}
-								MAKE_STD_ZVAL(zkey);
-								ZVAL_LONG(zkey, idx);
-								break;
+					ZEND_HASH_FOREACH_KEY_VAL_IND(ht, longkey, key, v) {
+						if (key) {
+							ZVAL_STR(&zkey, key);
+						} else {
+							ZVAL_LONG(&zkey, longkey);
 						}
-
-						php_lua_send_zval_to_lua(L, zkey TSRMLS_CC);
-						php_lua_send_zval_to_lua(L, *ppzval TSRMLS_CC);
+						php_lua_send_zval_to_lua(L, &zkey);
+						php_lua_send_zval_to_lua(L, v);
 						lua_settable(L, -3);
+					} ZEND_HASH_FOREACH_END();

-						zval_ptr_dtor(&zkey);
+					if (ZEND_HASH_APPLY_PROTECTION(ht)) {
+						ZEND_HASH_DEC_APPLY_COUNT(ht);
 					}
-					--ht->nApplyCount;
 				}
 			}
 			break;
 		default:
-			php_error_docref(NULL TSRMLS_CC, E_ERROR, "unsupported type `%s' for lua"
-					, zend_zval_type_name(val));
+			php_error_docref(NULL, E_ERROR, "unsupported type `%s' for lua", zend_zval_type_name(val));
 			lua_pushnil(L);
 			return 1;
 	}
@@ -551,52 +480,49 @@ int php_lua_send_zval_to_lua(lua_State *L, zval *val TSRMLS_DC) {
 }
 /* }}} */

-/*** {{{ static int php_lua_arg_apply_func(void *data, void *L TSRMLS_DC)
+/*** {{{ static int php_lua_arg_apply_func(void *data, void *L)
 */
-static int php_lua_arg_apply_func(void *data, void *L TSRMLS_DC) {
-	php_lua_send_zval_to_lua((lua_State*)L, *(zval**)data TSRMLS_CC);
+static int php_lua_arg_apply_func(void *data, void *L) {
+	php_lua_send_zval_to_lua((lua_State*)L, (zval*)data);
 	return ZEND_HASH_APPLY_KEEP;
 } /* }}} */

-/** {{{ static zval * php_lua_call_lua_function(zval *lua_obj, zval *func, zval *args, int use_self TSRMLS_DC)
-*/
-static zval * php_lua_call_lua_function(zval *lua_obj, zval *func, zval *args, int use_self TSRMLS_DC) {
-	int bp 		= 0;
-	int sp 		= 0;
+static zval *php_lua_call_lua_function(zval *lua_obj, zval *func, zval *args, int use_self, zval *retval) /* {{{ */ {
+	int bp = 0;
+	int sp = 0;
 	int arg_num = 0;
-	zval *ret   = NULL;
-	lua_State *L = NULL;
+	zval rv;
+	lua_State *L;

-	L = Z_LUAVAL_P(lua_obj);
+	L = (Z_LUAVAL_P(lua_obj))->L;

 	if (IS_ARRAY == Z_TYPE_P(func)) {
-		zval **t = NULL;
-		zval **f = NULL;
-		if (zend_hash_index_find(Z_ARRVAL_P(func), 0, (void **)&t) == FAILURE || Z_TYPE_PP(t) != IS_STRING
-				|| zend_hash_index_find(Z_ARRVAL_P(func), 1, (void **)&f) == FAILURE || Z_TYPE_PP(f) != IS_STRING) {
+		zval *t, *f;
+		if ((t = zend_hash_index_find(Z_ARRVAL_P(func), 0)) == NULL || Z_TYPE_P(t) != IS_STRING
+				|| (f = zend_hash_index_find(Z_ARRVAL_P(func), 1)) == NULL || Z_TYPE_P(f) != IS_STRING) {
 			/* as johannes suggesting use exceptioni to distinguish the error from a lua function return false
-			   php_error_docref(NULL TSRMLS_CC, E_WARNING,
+			   php_error_docref(NULL, E_WARNING,
 			   "invalid lua function, argument must be an array which contain two elements: array('table', 'method')");
 			   */
-			zend_throw_exception_ex(lua_exception_ce, 0 TSRMLS_CC,
+			zend_throw_exception_ex(lua_exception_ce, 0,
 					"invalid lua function, argument must be an array which contain two elements: array('table', 'method')");
 			return NULL;
 		}
 #if (LUA_VERSION_NUM < 502)
-		lua_getfield(L, LUA_GLOBALSINDEX, Z_STRVAL_PP(t));
+		lua_getfield(L, LUA_GLOBALSINDEX, Z_STRVAL_P(t));
 #else
-		lua_getglobal(L, Z_STRVAL_PP(t));
+		lua_getglobal(L, Z_STRVAL_P(t));
 #endif
 		if (LUA_TTABLE != lua_type(L, lua_gettop(L))) {
 			lua_pop(L, -1);
-			zend_throw_exception_ex(lua_exception_ce, 0 TSRMLS_CC, "invalid lua table '%s'", Z_STRVAL_PP(t));
+			zend_throw_exception_ex(lua_exception_ce, 0, "invalid lua table '%s'", Z_STRVAL_P(t));
 			return NULL;
 		}
 		bp = lua_gettop(L);
-		lua_getfield(L, -1, Z_STRVAL_PP(f));
+		lua_getfield(L, -1, Z_STRVAL_P(f));
 		if (LUA_TFUNCTION != lua_type(L, lua_gettop(L))) {
 			lua_pop(L, -2);
-			zend_throw_exception_ex(lua_exception_ce, 0 TSRMLS_CC, "invalid lua table function '%s'.%s", Z_STRVAL_PP(t), Z_STRVAL_PP(f));
+			zend_throw_exception_ex(lua_exception_ce, 0, "invalid lua table function '%s'.%s", Z_STRVAL_P(t), Z_STRVAL_P(f));
 			return NULL;
 		}
 	} else if (IS_STRING == Z_TYPE_P(func)) {
@@ -608,21 +534,21 @@ static zval * php_lua_call_lua_function(zval *lua_obj, zval *func, zval *args, i
 #endif
 		if (LUA_TFUNCTION != lua_type(L, lua_gettop(L))) {
 			lua_pop(L, -1);
-			zend_throw_exception_ex(lua_exception_ce, 0 TSRMLS_CC, "invalid lua function '%s'", Z_STRVAL_P(func));
+			zend_throw_exception_ex(lua_exception_ce, 0, "invalid lua function '%s'", Z_STRVAL_P(func));
 			return NULL;
 		}
 	} else if (IS_OBJECT == Z_TYPE_P(func)
-			&& instanceof_function(Z_OBJCE_P(func), php_lua_get_closure_ce() TSRMLS_CC)) {
-		zval *closure = zend_read_property(php_lua_get_closure_ce(), func, ZEND_STRL("_closure"), 1 TSRMLS_CC);
+			&& instanceof_function(Z_OBJCE_P(func), php_lua_get_closure_ce())) {
+		zval *closure = zend_read_property(php_lua_get_closure_ce(), func, ZEND_STRL("_closure"), 1, &rv);
 		if (!Z_LVAL_P(closure)) {
-			zend_throw_exception_ex(lua_exception_ce, 0 TSRMLS_CC, "invalid lua closure");
+			zend_throw_exception_ex(lua_exception_ce, 0, "invalid lua closure");
 			return NULL;
 		}
 		bp = lua_gettop(L);
 		lua_rawgeti(L, LUA_REGISTRYINDEX, Z_LVAL_P(closure));
 		if (LUA_TFUNCTION != lua_type(L, lua_gettop(L))) {
 			lua_pop(L, -1);
-			zend_throw_exception_ex(lua_exception_ce, 0 TSRMLS_CC, "call to lua closure failed");
+			zend_throw_exception_ex(lua_exception_ce, 0, "call to lua closure failed");
 			return NULL;
 		}
 	}
@@ -635,11 +561,11 @@ static zval * php_lua_call_lua_function(zval *lua_obj, zval *func, zval *args, i

 	if (args) {
 		arg_num += zend_hash_num_elements(Z_ARRVAL_P(args));
-		zend_hash_apply_with_argument(Z_ARRVAL_P(args), php_lua_arg_apply_func, (void *)L TSRMLS_CC);
+		zend_hash_apply_with_argument(Z_ARRVAL_P(args), (apply_func_arg_t)php_lua_arg_apply_func, (void *)L);
 	}

 	if (lua_pcall(L, arg_num, LUA_MULTRET, 0) != LUA_OK) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,
+		php_error_docref(NULL, E_WARNING,
 				"call to lua function %s failed", lua_tostring(L, -1));
 		lua_pop(L, lua_gettop(L) - bp);
 		return NULL;
@@ -648,17 +574,16 @@ static zval * php_lua_call_lua_function(zval *lua_obj, zval *func, zval *args, i
 	sp = lua_gettop(L) - bp;

 	if (!sp) {
-		MAKE_STD_ZVAL(ret);
-		ZVAL_NULL(ret);
+		ZVAL_NULL(retval);
 	} else if (sp == 1) {
-		ret = php_lua_get_zval_from_lua(L, -1, lua_obj TSRMLS_CC);
+		php_lua_get_zval_from_lua(L, -1, lua_obj, retval);
 	} else {
+		zval rv;
 		int  i = 0;
-		MAKE_STD_ZVAL(ret);
-		array_init(ret);
+		array_init(retval);
 		for (i = -sp; i < 0; i++) {
-			zval *tmp = php_lua_get_zval_from_lua(L, i, lua_obj TSRMLS_CC);
-			add_next_index_zval(ret, tmp);
+			php_lua_get_zval_from_lua(L, i, lua_obj, &rv);
+			add_next_index_zval(retval, &rv);
 		}
 	}

@@ -668,43 +593,43 @@ static zval * php_lua_call_lua_function(zval *lua_obj, zval *func, zval *args, i
 		lua_pop(L, -1);
 	}

-	return ret;
+	return retval;
 } /* }}} */

 /** {{{ proto Lua::eval(string $lua_chunk)
 * eval a lua chunk
 */
 PHP_METHOD(lua, eval) {
-	lua_State *L	 = NULL;
-	char *statements = NULL;
-	long bp, len	 = 0;
+	lua_State *L;
+	char *statements;
+	long bp, len;
 	int ret;

-	L = Z_LUAVAL_P(getThis());
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &statements, &len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &statements, &len) == FAILURE) {
 		return;
 	}

+	L = (Z_LUAVAL_P(getThis()))->L;
+
 	bp = lua_gettop(L);
 	if ((ret = luaL_loadbuffer(L, statements, len, "line")) != LUA_OK || (ret = lua_pcall(L, 0, LUA_MULTRET, 0) != LUA_OK)) {
-		zend_throw_exception_ex(lua_exception_ce, ret TSRMLS_CC, "%s", lua_tostring(L, -1));
+		zend_throw_exception_ex(lua_exception_ce, ret, "%s", lua_tostring(L, -1));
 		lua_pop(L, 1);
 		RETURN_FALSE;
 	} else {
-		zval *tmp 		= NULL;
-		int   ret_count	= 0;
-		int   i   		= 0;
+		int ret_count;

 		ret_count = lua_gettop(L) - bp;
 		if (ret_count > 1) {
+			zval rv;
+			int i = 0;
 			array_init(return_value);
 			for (i = -ret_count; i<0; i++) {
-				tmp = php_lua_get_zval_from_lua(L, i, getThis() TSRMLS_CC);
-				add_next_index_zval(return_value, tmp);
+				php_lua_get_zval_from_lua(L, i, getThis(), &rv);
+				add_next_index_zval(return_value, &rv);
 			}
 		} else if (ret_count) {
-			zval *tmp = php_lua_get_zval_from_lua(L, -1, getThis() TSRMLS_CC);
-			RETURN_ZVAL(tmp, 1, 1);
+			php_lua_get_zval_from_lua(L, -1, getThis(), return_value);
 		}
 		lua_pop(L, ret_count);
 	}
@@ -715,50 +640,41 @@ PHP_METHOD(lua, eval) {
 * run a lua script file
 */
 PHP_METHOD(lua, include) {
-	lua_State *L = NULL;
-	char *file   = NULL;
-	long bp, len = 0;
+	lua_State *L;
+	char *file;
+	size_t bp, len;
 	int ret;
 	
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &file, &len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &file, &len) == FAILURE) {
 		return;
 	}

-	if (php_check_open_basedir(file TSRMLS_CC)
-#if ((PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION < 4)) || (PHP_MAJOR_VERSION < 5)
-			|| (PG(safe_mode)
-				&& !php_checkuid(file, "rb+", CHECKUID_CHECK_MODE_PARAM))
-#endif
-	   ) {
+	if (php_check_open_basedir(file)) {
 		RETURN_FALSE;
 	}

-	L = Z_LUAVAL_P(getThis());
+	L = (Z_LUAVAL_P(getThis()))->L;

 	bp = lua_gettop(L);
 	if ((ret = luaL_loadfile(L, file)) != LUA_OK || (ret = lua_pcall(L, 0, LUA_MULTRET, 0) != LUA_OK)) {
-		zend_throw_exception_ex(lua_exception_ce, ret TSRMLS_CC, "%s", lua_tostring(L, -1));
+		zend_throw_exception_ex(lua_exception_ce, ret, "%s", lua_tostring(L, -1));
 		lua_pop(L, 1);
 		RETURN_FALSE;
-	}  else {
-		zval *tmp 		= NULL;
-		int   ret_count	= 0;
-		int   i   		= 0;
+	} else {
+		int ret_count;

 		ret_count = lua_gettop(L) - bp;
 		if (ret_count > 1) {
+			zval rv;
+			int i = 0;
 			array_init(return_value);
-
 			for (i = -ret_count; i<0; i++) {
-				tmp = php_lua_get_zval_from_lua(L, i, getThis() TSRMLS_CC);
-				add_next_index_zval(return_value, tmp);
+				php_lua_get_zval_from_lua(L, i, getThis(), &rv);
+				add_next_index_zval(return_value, &rv);
 			}
-
 		} else if (ret_count) {
-			zval *tmp = php_lua_get_zval_from_lua(L, -1, getThis() TSRMLS_CC);
-			RETURN_ZVAL(tmp, 1, 1);
+			php_lua_get_zval_from_lua(L, -1, getThis(), return_value);
 		}
-
 		lua_pop(L, ret_count);
 	}
 }
@@ -768,41 +684,37 @@ PHP_METHOD(lua, include) {
 */
 PHP_METHOD(lua, call) {
 	long u_self = 0;
+	zval *func;
 	zval *args	= NULL;
-	zval *func  = NULL;
-	zval *ret   = NULL;

-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|al", &func, &args, &u_self) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|al", &func, &args, &u_self) == FAILURE) {
 		return;
 	}

-	if ((ret = php_lua_call_lua_function(getThis(), func, args, u_self TSRMLS_CC))) {
-		RETURN_ZVAL(ret, 1, 1);
+	if (!(php_lua_call_lua_function(getThis(), func, args, u_self, return_value))) {
+		RETURN_FALSE;
 	}
-
-	RETURN_FALSE;
 }
 /* }}} */

 /** {{{ proto Lua::assign(string $name, mix $value)
 */
 PHP_METHOD(lua, assign) {
-	char *name   = NULL;
-	zval *value	 = NULL;
-	lua_State *L = NULL;
-	int  len 	 = 0;
+	zval *name;
+	zval *value;
+	lua_State *L;

-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz", &name, &len, &value) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz", &name,  &value) == FAILURE) {
 		return;
 	}

-	L = Z_LUAVAL_P(getThis());
+	L = (Z_LUAVAL_P(getThis()))->L;

-	php_lua_send_zval_to_lua(L, value TSRMLS_CC);
+	php_lua_send_zval_to_lua(L, value);
 #if (LUA_VERSION_NUM < 502)
-	lua_setfield(L, LUA_GLOBALSINDEX, name);
+	lua_setfield(L, LUA_GLOBALSINDEX, Z_STRVAL_P(name));
 #else
-	lua_setglobal(L, name);
+	lua_setglobal(L, Z_STRVAL_P(name));
 #endif

 	RETURN_ZVAL(getThis(), 1, 0);
@@ -812,33 +724,34 @@ PHP_METHOD(lua, assign) {
 /** {{{ proto Lua::registerCallback(string $name, mix $value)
 */
 PHP_METHOD(lua, registerCallback) {
-	char *name = NULL;
-	long len   = 0;
-	zval *func = NULL;
-	lua_State *L    = NULL;
-	zval* callbacks = NULL;
-	L = Z_LUAVAL_P(getThis());
+	char *name;
+	size_t len;
+	zval *func;
+	lua_State *L;
+	zval* callbacks;

-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,"sz", &name, &len, &func) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(),"sz", &name, &len, &func) == FAILURE) {
 		return;
 	}

-	callbacks = zend_read_static_property(lua_ce, ZEND_STRL("_callbacks"), 1 TSRMLS_CC);
+	L = (Z_LUAVAL_P(getThis()))->L;
+
+	callbacks = zend_read_static_property(lua_ce, ZEND_STRL("_callbacks"), 1);

 	if (ZVAL_IS_NULL(callbacks)) {
 		array_init(callbacks);
 	}

-	if (zend_is_callable(func, 0, NULL TSRMLS_CC)) {
+	if (zend_is_callable(func, 0, NULL)) {
 		lua_pushnumber(L, zend_hash_num_elements(Z_ARRVAL_P(callbacks)));
 		lua_pushcclosure(L, php_lua_call_callback, 1);
 		lua_setglobal(L, name);
 	} else {
-		zend_throw_exception_ex(lua_exception_ce, 0 TSRMLS_CC, "invalid php callback");
+		zend_throw_exception_ex(lua_exception_ce, 0, "invalid php callback");
 		RETURN_FALSE;
 	}

-	zval_add_ref(&func);
+	zval_add_ref(func);
 	add_next_index_zval(callbacks, func);

 	RETURN_ZVAL(getThis(), 1, 0);
@@ -848,14 +761,15 @@ PHP_METHOD(lua, registerCallback) {
 /** {{{ proto Lua::getVersion()
 */
 PHP_METHOD(lua, getVersion) {
-	RETURN_STRING(LUA_RELEASE, 1);
+	RETURN_STRING(LUA_RELEASE);
 }
 /* }}} */

 /** {{{ proto Lua::__construct()
 */
 PHP_METHOD(lua, __construct) {
-	lua_State *L = Z_LUAVAL_P(getThis());
+	lua_State * L = (Z_LUAVAL_P(getThis()))->L;
+	
 	luaL_openlibs(L);
 	lua_register(L, "print", php_lua_print);
 	if (ZEND_NUM_ARGS()) {
@@ -899,28 +813,27 @@ PHP_MINIT_FUNCTION(lua) {
 	REGISTER_LONG_CONSTANT("LUA_ERRFILE", LUA_ERRFILE, CONST_PERSISTENT | CONST_CS);


-	lua_ce = zend_register_internal_class(&ce TSRMLS_CC);
+	lua_ce = zend_register_internal_class(&ce);
+
 	lua_ce->create_object = php_lua_create_object;
 	memcpy(&lua_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
-
+	lua_object_handlers.offset = XtOffsetOf(php_lua_object, obj);
+	lua_object_handlers.dtor_obj = php_lua_dtor_object;
+	lua_object_handlers.free_obj = NULL;
+	lua_object_handlers.clone_obj = NULL;
 	lua_object_handlers.write_property = php_lua_write_property;
 	lua_object_handlers.read_property  = php_lua_read_property;

 	lua_ce->ce_flags |= ZEND_ACC_FINAL;

-	zend_declare_property_null(lua_ce, ZEND_STRL("_callbacks"), ZEND_ACC_STATIC|ZEND_ACC_PRIVATE TSRMLS_CC);
-	zend_declare_class_constant_string(lua_ce, ZEND_STRL("LUA_VERSION"), LUA_RELEASE TSRMLS_CC);
+	zend_declare_property_null(lua_ce, ZEND_STRL("_callbacks"), ZEND_ACC_STATIC|ZEND_ACC_PRIVATE);
+	zend_declare_class_constant_string(lua_ce, ZEND_STRL("LUA_VERSION"), LUA_RELEASE);

-	php_lua_closure_register(TSRMLS_C);
+	php_lua_closure_register();

 	INIT_CLASS_ENTRY(ce, "LuaException", NULL);
-	lua_exception_ce = zend_register_internal_class_ex(&ce,
-#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION < 2)
-			zend_exception_get_default(),
-#else
-			zend_exception_get_default(TSRMLS_C),
-#endif
-			NULL  TSRMLS_CC);
+
+	lua_exception_ce = zend_register_internal_class_ex(&ce, zend_exception_get_default());

 	return SUCCESS;
 }
--- a/lua_closure.c
+++ b/lua_closure.c
@@ -11,10 +11,10 @@
  | license@php.net so we can mail you a copy immediately.               |
  +----------------------------------------------------------------------+
  | Author    : Johannes Schlueter  <johannes@php.net>                   |
-  | 			Xinchen  Hui        <laruence@php.net>                   |
+  |             Xinchen  Hui        <laruence@php.net>                   |
  |             Marcelo  Araujo     <msaraujo@php.net>                   |
+  |             Helmut  Januschka   <helmut@januschka.com>               |
  +----------------------------------------------------------------------+
-   $Id: lua_closure.c 319740 2011-11-24 08:06:48Z laruence $
 */

 #ifdef HAVE_CONFIG_H
@@ -43,12 +43,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_lua_invoke, 0, 0, 1)
 ZEND_END_ARG_INFO()
 /* }}} */

-/** {{{ zval * php_lua_closure_instance(zval *instance, long ref_id, zval *lua_obj TSRMLS_DC)
+/** {{{ zval * php_lua_closure_instance(zval *instance, long ref_id, zval *lua_obj)
 */
-zval * php_lua_closure_instance(zval *instance, long ref_id, zval *lua_obj TSRMLS_DC) {
+zval * php_lua_closure_instance(zval *instance, long ref_id, zval *lua_obj) {
 	object_init_ex(instance, lua_closure_ce);
-	zend_update_property_long(lua_closure_ce, instance, ZEND_STRL("_closure"), ref_id TSRMLS_CC);
-	zend_update_property(lua_closure_ce, instance, ZEND_STRL("_lua_object"), lua_obj TSRMLS_CC);
+	zend_update_property_long(lua_closure_ce, instance, ZEND_STRL("_closure"), ref_id);
+	zend_update_property(lua_closure_ce, instance, ZEND_STRL("_lua_object"), lua_obj);

 	return instance;
 }
@@ -63,21 +63,21 @@ PHP_METHOD(lua_closure, __construct) {
 /** {{{ proto LuaClosure::__destruct()
 */
 PHP_METHOD(lua_closure, __destruct) {
-	zval *lua_obj, *closure;
+	zval *lua_obj, *closure, rv;

-	lua_obj = zend_read_property(lua_closure_ce, getThis(), ZEND_STRL("_lua_object"), 1 TSRMLS_CC);
+	lua_obj = zend_read_property(lua_closure_ce, getThis(), ZEND_STRL("_lua_object"), 1, &rv);
 	if (ZVAL_IS_NULL(lua_obj)
 			|| Z_TYPE_P(lua_obj) != IS_OBJECT
-			|| !instanceof_function(Z_OBJCE_P(lua_obj), lua_ce TSRMLS_CC)) {
+			|| !instanceof_function(Z_OBJCE_P(lua_obj), lua_ce)) {
 		RETURN_FALSE;
 	}

-	closure = zend_read_property(lua_closure_ce, getThis(), ZEND_STRL("_closure"), 1 TSRMLS_CC);
+	closure = zend_read_property(lua_closure_ce, getThis(), ZEND_STRL("_closure"), 1, &rv);
 	if (!Z_LVAL_P(closure)) {
 		RETURN_FALSE;
 	}

-	luaL_unref(Z_LUAVAL_P(lua_obj), LUA_REGISTRYINDEX, Z_LVAL_P(closure));
+	luaL_unref((Z_LUAVAL_P(lua_obj))->L, LUA_REGISTRYINDEX, Z_LVAL_P(closure));
 }
 /* }}} */

@@ -85,49 +85,50 @@ PHP_METHOD(lua_closure, __destruct) {
 */
 PHP_METHOD(lua_closure, invoke) {
 	int bp, sp;
-	zval ***arguments = NULL;
+	zval *arguments = NULL;
 	zval *lua_obj = NULL;
 	lua_State *L  = NULL;
 	zval *closure = NULL;
+	zval rv;

 	if (ZEND_NUM_ARGS()) {
-		arguments = emalloc(sizeof(zval**) * ZEND_NUM_ARGS());
+		arguments = emalloc(sizeof(zval*) * ZEND_NUM_ARGS());
 		if (zend_get_parameters_array_ex(ZEND_NUM_ARGS(), arguments) == FAILURE) {
 			efree(arguments);
-			zend_throw_exception_ex(lua_exception_ce, 0 TSRMLS_CC, "cannot get arguments for calling closure");
+			zend_throw_exception_ex(NULL, 0, "cannot get arguments for calling closure");
 			return;
 		}
 	}

-	lua_obj = zend_read_property(lua_closure_ce, getThis(), ZEND_STRL("_lua_object"), 1 TSRMLS_CC);
+	lua_obj = zend_read_property(lua_closure_ce, getThis(), ZEND_STRL("_lua_object"), 1, &rv);

 	if (ZVAL_IS_NULL(lua_obj)
 			|| Z_TYPE_P(lua_obj) != IS_OBJECT
-			|| !instanceof_function(Z_OBJCE_P(lua_obj), lua_ce TSRMLS_CC)) {
-		zend_throw_exception_ex(lua_exception_ce, 0 TSRMLS_CC, "corrupted Lua object");
+			|| !instanceof_function(Z_OBJCE_P(lua_obj), lua_ce)) {
+		zend_throw_exception_ex(NULL, 0, "corrupted Lua object");
 		return;
 	}

-	closure = zend_read_property(lua_closure_ce, getThis(), ZEND_STRL("_closure"), 1 TSRMLS_CC);
+	closure = zend_read_property(lua_closure_ce, getThis(), ZEND_STRL("_closure"), 1, &rv);
 	if (!Z_LVAL_P(closure)) {
-		zend_throw_exception_ex(lua_exception_ce, 0 TSRMLS_CC, "invalid lua closure");
+		zend_throw_exception_ex(NULL, 0, "invalid lua closure");
 		return;
 	}

-	L = Z_LUAVAL_P(lua_obj);
+	L = (Z_LUAVAL_P(lua_obj))->L;

 	bp = lua_gettop(L);
 	lua_rawgeti(L, LUA_REGISTRYINDEX, Z_LVAL_P(closure));
 	if (LUA_TFUNCTION != lua_type(L, lua_gettop(L))) {
 		lua_pop(L, -1);
-		zend_throw_exception_ex(lua_exception_ce, 0 TSRMLS_CC, "call to lua closure failed");
+		zend_throw_exception_ex(NULL, 0, "call to lua closure failed");
 		return;
 	}

 	if (ZEND_NUM_ARGS()) {
 		int i = 0;
 		for(;i<ZEND_NUM_ARGS();i++) {
-			php_lua_send_zval_to_lua(L, *(arguments[i]) TSRMLS_CC);
+			php_lua_send_zval_to_lua(L, &arguments[i]);
 		}
 	}

@@ -136,7 +137,7 @@ PHP_METHOD(lua_closure, invoke) {
 			efree(arguments);
 		}
 		lua_pop(L, lua_gettop(L) - bp);
-		zend_throw_exception_ex(lua_exception_ce, 0 TSRMLS_CC, 
+		zend_throw_exception_ex(NULL, 0, 
 				"call to lua function %s failed", lua_tostring(L, -1));
 		return;
 	}
@@ -146,14 +147,14 @@ PHP_METHOD(lua_closure, invoke) {
 	if (!sp) {
 		RETURN_NULL();
 	} else if (sp == 1) {
-		zval *tmp = php_lua_get_zval_from_lua(L, -1, lua_obj TSRMLS_CC);
-		RETURN_ZVAL(tmp, 0, 0);
+		php_lua_get_zval_from_lua(L, -1, lua_obj, return_value);
 	} else {
+		zval rv;
 		int  i = 0;
 		array_init(return_value);
 		for (i = -sp; i < 0; i++) {
-			zval *tmp = php_lua_get_zval_from_lua(L, i, lua_obj TSRMLS_CC);
-			add_next_index_zval(return_value, tmp);
+			php_lua_get_zval_from_lua(L, i, lua_obj, &rv);
+			add_next_index_zval(return_value, &rv);
 		}
 	}

@@ -184,52 +185,45 @@ zend_function_entry lua_closure_methods[] = {
 };
 /* }}} */

-static void php_lua_closure_dtor_object(void *object, zend_object_handle handle TSRMLS_DC) /* {{{ */
+static void php_lua_closure_dtor_object(void *object, zend_object_handlers handle) /* {{{ */
 {
 	zend_object *obj = (zend_object*)object;

-	zend_object_std_dtor(obj TSRMLS_CC);
+	zend_object_std_dtor(obj);

 	efree(obj);
 } /* }}} */

-static zend_object_value php_lua_closure_create_object(zend_class_entry *ce TSRMLS_DC) /* {{{ */
+zend_object *php_lua_closure_create_object(zend_class_entry *ce) /* {{{ */
 {
-	zend_object_value obj    = {0};
-	zend_object *lua_closure_obj = NULL;
+	zend_object *intern;
 	
-	lua_closure_obj = emalloc(sizeof(zend_object));
+	intern = emalloc(sizeof(zend_object)+ sizeof(zval) * (ce->default_properties_count - 1));

-	zend_object_std_init(lua_closure_obj, ce TSRMLS_CC);
-#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION < 4)
-	zend_hash_copy(lua_closure_obj->properties, &ce->default_properties, 
-#if (PHP_MINOR_VERSION < 4)
-			(copy_ctor_func_t) zval_add_ref,
-#else
-			zval_copy_property_ctor(ce), 
-#endif
-			(void *)0, sizeof(zval *));
-#elif (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION > 3)
-	object_properties_init(lua_closure_obj, ce);	
-#endif
+	if (!intern) {
+		php_error_docref(NULL, E_ERROR, "alloc memory for lua object failed");
+	}

-	obj.handle   = zend_objects_store_put(lua_closure_obj, php_lua_closure_dtor_object, NULL, NULL TSRMLS_CC);
-	obj.handlers = zend_get_std_object_handlers();
+	zend_object_std_init(intern, ce);
+	object_properties_init(intern, ce);
+
+	intern->handlers = zend_get_std_object_handlers();
+	
+	return intern;
 	
-	return obj;
 } /* }}} */

-void php_lua_closure_register(TSRMLS_D) /* {{{ */
+void php_lua_closure_register() /* {{{ */
 {
 	zend_class_entry ce;

 	INIT_CLASS_ENTRY(ce, "LuaClosure", lua_closure_methods);
-	lua_closure_ce = zend_register_internal_class(&ce TSRMLS_CC);
+	lua_closure_ce = zend_register_internal_class(&ce);
 	lua_closure_ce->create_object = php_lua_closure_create_object;
 	lua_closure_ce->ce_flags |= ZEND_ACC_FINAL;

-	zend_declare_property_long(lua_closure_ce, ZEND_STRL("_closure"), 0, ZEND_ACC_PRIVATE TSRMLS_CC);
-	zend_declare_property_null(lua_closure_ce, ZEND_STRL("_lua_object"), ZEND_ACC_PRIVATE TSRMLS_CC);
+	zend_declare_property_long(lua_closure_ce, ZEND_STRL("_closure"), 0, ZEND_ACC_PRIVATE);
+	zend_declare_property_null(lua_closure_ce, ZEND_STRL("_lua_object"), ZEND_ACC_PRIVATE);


 } /* }}} */
--- a/lua_closure.h
+++ b/lua_closure.h
@@ -11,15 +11,18 @@
  | license@php.net so we can mail you a copy immediately.               |
  +----------------------------------------------------------------------+
  | Author    : Johannes Schlueter  <johannes@php.net>                   |
-  | 			Xinchen  Hui        <laruence@php.net>                   |
+  |             Xinchen  Hui        <laruence@php.net>                   |
  |             Marcelo  Araujo     <msaraujo@php.net>                   |
+  |             Helmut  Januschka   <helmut@januschka.com>               |
  +----------------------------------------------------------------------+
-   $Id: lua_closure.h 319733 2011-11-24 07:13:56Z laruence $
 */

-void php_lua_closure_register(TSRMLS_D);
+#ifndef LUA_CLOSURE_H
+#define LUA_CLOSURE_H
+void php_lua_closure_register();
 zend_class_entry *php_lua_get_closure_ce();
-zval * php_lua_closure_instance(zval *instance, long ref_id, zval *lua_obj TSRMLS_DC);
+zval * php_lua_closure_instance(zval *instance, long ref_id, zval *lua_obj);
+#endif

 /*
 * Local variables:
--- a/package.xml
+++ b/package.xml
@@ -23,11 +23,11 @@
  <email>msaraujo@php.net</email>
  <active>yes</active>
 </developer>
- <date>2013-10-23</date>
- <time>12:04:27</time>
+ <date>2016-04-11</date>
+ <time>10:50:27</time>
 <version>
-  <release>1.1.0</release>
-  <api>1.1.0</api>
+  <release>2.0.1</release>
+  <api>2.0.1</api>
 </version>
 <stability>
  <release>beta</release>
@@ -35,9 +35,7 @@
 </stability>
 <license uri="http://www.php.net/license">PHP</license>
 <notes>
-  - Fixed #65097 (nApplyCount release missing) (emptyhua at gmail dot com)
-  - Trigger E_STRICT when pass an array with index '0' to lua instead of ignoring it
-  - added support for callable functions and closures as values returned injected into lua engine (harald at octris dot org)
+  - Fixed bug #71997 (One-Dimensional arrays cause segmentation faults)
 </notes>
 <contents> 
  <dir name="/"> 
@@ -65,13 +63,14 @@
    <file name="012.phpt" role="test" />
    <file name="013.phpt" role="test" />
    <file name="bug65097.phpt" role="test" />
+    <file name="bug71997.phpt" role="test" />
   </dir>
  </dir> 
 </contents> 
 <dependencies> 
  <required> 
   <php> 
-    <min>5.1.0</min> 
+    <min>7.0.0</min> 
   </php> 
   <pearinstaller> 
    <min>1.4.0</min> 
@@ -81,6 +80,37 @@
 <providesextension>lua</providesextension>
 <extsrcrelease />
 <changelog> 
+  <release> 
+   <date>2016-04-11</date> 
+   <version> 
+    <release>2.0.1</release> 
+    <api>2.0.1</api> 
+   </version> 
+   <stability> 
+    <release>beta</release> 
+    <api>beta</api> 
+   </stability> 
+   <license uri="http://www.php.net/license">PHP License</license> 
+   <notes> 
+    - Fixed bug #71997 (One-Dimensional arrays cause segmentation faults)
+   </notes> 
+  </release> 
+
+  <release> 
+   <date>2015-10-27</date> 
+   <version> 
+    <release>2.0.0</release> 
+    <api>2.0.0</api> 
+   </version> 
+   <stability> 
+    <release>beta</release> 
+    <api>beta</api> 
+   </stability> 
+   <license uri="http://www.php.net/license">PHP License</license> 
+   <notes> 
+    - Release lua for PHP7
+   </notes> 
+  </release> 
  <release> 
   <date>2012-10-23</date> 
   <version> 
@@ -98,7 +128,6 @@
    - added support for callable functions and closures as values returned injected into lua engine (harald at octris dot org)
   </notes> 
  </release> 
-
  <release> 
   <date>2012-06-24</date> 
   <version> 
--- a/php_lua.h
+++ b/php_lua.h
@@ -13,8 +13,8 @@
  | Author    : Johannes Schlueter  <johannes@php.net>                   |
  |             Xinchen  Hui        <laruence@php.net>                   |
  |             Marcelo  Araujo     <msaraujo@php.net>                   |
+  |             Helmut Januschka    <helmut@januschka.com>               |
  +----------------------------------------------------------------------+
-   $Id: php_lua.h 324349 2012-03-19 03:17:15Z laruence $
 */

 #ifndef PHP_LUA_H
@@ -48,24 +48,23 @@ extern zend_module_entry lua_module_entry;
 #define LUA_G(v) (lua_globals.v)
 #endif

-#if ((PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION < 3)) || (PHP_MAJOR_VERSION < 5)
-#define Z_ADDREF_P 	 ZVAL_ADDREF
-#define Z_REFCOUNT_P ZVAL_REFCOUNT
-#define Z_DELREF_P 	 ZVAL_DELREF
-#endif
-
-#define PHP_LUA_VERSION "1.1.1-dev"
-#define Z_LUAVAL_P(obj) ((php_lua_object*)(zend_object_store_get_object(obj TSRMLS_CC)))->L
+#define PHP_LUA_VERSION "2.0.1"

 struct _php_lua_object {
- 	zend_object obj;
-  	lua_State *L;
+  lua_State *L;
+  zend_object obj;
 };

 typedef struct _php_lua_object php_lua_object;

-zval * php_lua_get_zval_from_lua(lua_State *L, int index, zval *lua_obj TSRMLS_DC);
-int php_lua_send_zval_to_lua(lua_State *L, zval *val TSRMLS_DC);
+static inline php_lua_object *php_lua_obj_from_obj(zend_object *obj) {
+  return (php_lua_object*)((char*)(obj)-XtOffsetOf(php_lua_object, obj));
+}
+
+#define Z_LUAVAL_P(obj) php_lua_obj_from_obj(Z_OBJ_P((obj)))
+
+zval *php_lua_get_zval_from_lua(lua_State *L, int index, zval *lua_obj, zval *rv);
+int php_lua_send_zval_to_lua(lua_State *L, zval *val);

 PHP_MINIT_FUNCTION(lua);
 PHP_MSHUTDOWN_FUNCTION(lua);
@@ -74,8 +73,8 @@ PHP_MINFO_FUNCTION(lua);
 PHP_METHOD(lua, __construct);
 PHP_METHOD(lua, eval);
 PHP_METHOD(lua, require);
-#endif	/* PHP_LUA_H */

+#endif	/* PHP_LUA_H */

 /*
 * Local variables:
--- a/tests/001.phpt
+++ b/tests/001.phpt
@@ -15,6 +15,8 @@ try {
    assert($e->getCode() == LUA_ERRSYNTAX);
    echo "\n", $e->getMessage();
 }
+
+?>
 --EXPECTF--
 12
 -0.53657291800043
--- a/tests/0014.phpt
+++ b/tests/0014.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Check for Table Pass vic-a-verse
+--SKIPIF--
+<?php if (!extension_loaded("lua")) print "skip"; ?>
+--FILE--
+<?php 
+$l = new lua();
+$l->eval(<<<CODE
+function test(a)
+    lua_fcn(a)
+end
+CODE
+);
+
+$l->registerCallback("lua_fcn", function($a) {
+    ksort($a);
+    var_dump($a);
+});
+$l->test(array("key1"=>"v1",
+                "key2"=>"v2"));
+
+
+
+--EXPECT--
+array(2) {
+  ["key1"]=>
+  string(2) "v1"
+  ["key2"]=>
+  string(2) "v2"
+}
--- a/tests/bug71997.phpt
+++ b/tests/bug71997.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Bug #71997 (One-Dimensional arrays cause segmentation faults)
+--SKIPIF--
+<?php
+if (!extension_loaded("lua")) print "skip lua extension missing";
+?>
+--FILE--
+<?php
+$mylua = new \lua();
+$mylua->eval(<<<CODE
+    function nicefunction(args)
+        print(args[1])
+        return args[1]
+    end
+CODE
+);
+
+echo $mylua->call("nicefunction", array(array('hello', 'world')));
+?>
+done
+--EXPECT--
+worldworlddone
--- a/travis/build_check.sh
+++ b/travis/build_check.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+
+#exit 1 on error
+echo "all ok ";
+ls ./modules/bartlby.so
+exit $?
Author	SHA1	Message	Date
Xinchen Hui	f3d6dca1a0	Prepareing for 2.0.1	2016-04-11 10:54:41 +08:00
Xinchen Hui	f177b21ff1	Added tests for bug #71997	2016-04-11 10:51:15 +08:00
Xinchen Hui	c7d9844cf1	Fixed default searching in centOS	2016-04-11 10:50:28 +08:00
Xinchen Hui	12c53f28eb	Fixed nApplyCount checking	2016-04-11 10:37:11 +08:00
Xinchen Hui	86cb62e0b8	Merge pull request #19 from tony2001/php7_fixes fix send_zval_to_lua()	2016-04-07 19:14:59 +08:00
Antony Dovgal	dc226c345d	fix send_zval_to_lua()	2016-03-31 12:56:15 +03:00
Xinchen Hui	2d23b565e5	Merge branch 'master' into php7 Conflicts: README.md	2015-10-26 21:11:38 -07:00
Xinchen Hui	230a8af900	Update README	2015-10-26 21:10:51 -07:00
Xinchen Hui	468203ce7c	Merge branch 'master' into php7	2015-10-26 21:05:54 -07:00
Xinchen Hui	1bd4adf039	No valgrind is valiable	2015-10-26 20:59:34 -07:00
Xinchen Hui	18e2bb493d	enable full test	2015-10-26 20:56:56 -07:00
Xinchen Hui	0b28ef4f55	Merge branch 'master' into php7 Conflicts: .travis.yml travis/compile.sh	2015-10-26 20:56:19 -07:00
Xinchen Hui	f6a2f09b19	User hjanuschka doesn't exists?	2015-10-27 11:16:04 +08:00
Xinchen Hui	6c2a37f99c	back to dev	2015-10-27 11:14:10 +08:00
Xinchen Hui	65764e0777	release lua for PHP7	2015-10-27 11:13:39 +08:00
Xinchen Hui	cf3f69b274	Cleanup	2015-02-26 12:10:34 +08:00
Xinchen Hui	49b95a64f3	All tests passed	2015-02-26 12:05:45 +08:00
Xinchen Hui	ca8cf30759	Only for PHP7	2015-02-26 00:16:38 +08:00
Xinchen Hui	8bccbdc5db	clean up (not finish yet)	2015-02-26 00:11:42 +08:00
Xinchen Hui	a55478e449	Merge pull request #17 from tony2001/suffix_fix several config fixes	2015-02-25 20:52:52 +08:00
Antony Dovgal	adb5146954	fix include dir	2015-02-25 15:46:46 +03:00
Antony Dovgal	b95ae16c6f	also fix "no" suffix	2015-02-25 15:44:29 +03:00
Antony Dovgal	c3b50a5645	fix libluaYES suffix	2015-02-25 15:26:31 +03:00
Xinchen Hui	bcc3bb67f8	Merge pull request #16 from hjanuschka/hj Memleaks	2015-02-04 21:56:56 +08:00
Helmut Januschka	5e5fefcdbf	* this fixes memleak in php_lua_call_callback * no more outstanding memory leaks	2015-02-04 12:56:41 +00:00
Xinchen Hui	dea4f594e4	Merge pull request #14 from hjanuschka/hj add me to authors 👍	2015-02-02 23:21:06 +08:00
Helmut Januschka	6205c5c4ff	add me to authors 👍	2015-02-02 15:06:46 +00:00
Xinchen Hui	a2e9c435c4	Merge pull request #13 from hjanuschka/hj fix for latest php7 head	2015-02-02 22:09:42 +08:00
Helmut Januschka	061f22aac0	fix for latest php7 head	2015-02-02 13:27:33 +00:00