Skip to content

Various fix for 1.1.0 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laruence merged 9 commits into from
Oct 24, 2013
Merged

Various fix for 1.1.0 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b56130d
drop package2.xml, no more supported
remicollet Oct 24, 2013
c4f51f3
fix role for doc
remicollet Oct 24, 2013
5489007
missing test
remicollet Oct 24, 2013
bef3b82
quick fix to allow build against shared system library
remicollet Oct 24, 2013
4c8fff9
LUA_OK is 5.2
remicollet Oct 24, 2013
22d5b50
LUA_ERRGCMM is 5.2 only
remicollet Oct 24, 2013
561f632
fix test for 5.1, error string have changed
remicollet Oct 24, 2013
10b0cf5
skip test if json not enabled (or build as shared and so not loaded d…
remicollet Oct 24, 2013
99e95d1
fix [-Wpointer-sign]
remicollet Oct 24, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ if test "$PHP_LUA" != "no"; then
AC_MSG_ERROR(Please reinstall the lua distribution - lua.h should be in <lua-dir>/include/)
fi

LUA_LIB_NAME=liblua.a
LUA_LIB_NAME=liblua

if test -r $PHP_LUA/$PHP_LIBDIR/${LUA_LIB_NAME}; then
if test -r $PHP_LUA/$PHP_LIBDIR/${LUA_LIB_NAME}.${SHLIB_SUFFIX_NAME} -o -r $PHP_LUA/$PHP_LIBDIR/${LUA_LIB_NAME}.a; then
LUA_LIB_DIR=$PHP_LUA/$PHP_LIBDIR
else
AC_MSG_CHECKING(for lua library in default path)
for i in /usr/lib /usr/lib64; do
if test -r $i/${LUA_LIB_NAME}; then
for i in /usr/$PHP_LIBDIR /usr/lib /usr/lib64; do
if test -r $i/${LUA_LIB_NAME}.${SHLIB_SUFFIX_NAME} -o -r $i/${LUA_LIB_NAME}.a; then
LUA_LIB_DIR=$i
AC_MSG_RESULT(found in $i)
break
Expand Down
6 changes: 4 additions & 2 deletions lua.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,8 +511,8 @@ int php_lua_send_zval_to_lua(lua_State *L, zval *val TSRMLS_DC) {
zend_hash_get_current_data(ht, (void **)&ppzval) == SUCCESS;
zend_hash_move_forward(ht)) {
char *key = NULL;
int len = 0;
long idx = 0;
uint len = 0;
ulong idx = 0;
zval *zkey= NULL;

switch(zend_hash_get_current_key_ex(ht, &key, &len, &idx, 0, NULL)) {
Expand Down Expand Up @@ -892,7 +892,9 @@ PHP_MINIT_FUNCTION(lua) {
REGISTER_LONG_CONSTANT("LUA_ERRRUN", LUA_ERRRUN, CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT("LUA_ERRSYNTAX", LUA_ERRSYNTAX, CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT("LUA_ERRMEM", LUA_ERRMEM, CONST_PERSISTENT | CONST_CS);
#ifdef LUA_ERRGCMM
REGISTER_LONG_CONSTANT("LUA_ERRGCMM", LUA_ERRGCMM, CONST_PERSISTENT | CONST_CS);
#endif
REGISTER_LONG_CONSTANT("LUA_ERRERR", LUA_ERRERR, CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT("LUA_ERRFILE", LUA_ERRFILE, CONST_PERSISTENT | CONST_CS);

Expand Down
263 changes: 198 additions & 65 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,68 +1,201 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE package SYSTEM "http://pear.php.net/dtd/package-1.0">
<package version="1.0" packagerversion="1.9.4">
<?xml version="1.0" encoding="UTF-8"?>
<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.4.7" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
<name>lua</name>
<channel>pecl.php.net</channel>
<summary>Embedded lua interpreter</summary>
<description>&quot;Lua is a powerful, fast, light-weight, embeddable scripting language.&quot;
This extension embeds the lua interpreter and offers an OO-API to lua variables and functions.
</description>
<maintainers>
<maintainer>
<user>johannes</user>
<name>Johannes Schlüter</name>
<email>johannes@php.net</email>
<role>lead</role>
</maintainer>
<maintainer>
<user>laruence</user>
<name>Xinchen Hui</name>
<email>laruence@php.net</email>
<role>lead</role>
</maintainer>
<maintainer>
<user>msaraujo</user>
<name>Marcelo Araujo</name>
<email>msaraujo@php.net</email>
<role>developer</role>
</maintainer>
</maintainers>
<release>
<version>1.1.0</version>
<date>2013-10-23</date>
<license>PHP</license>
<state>beta</state>
<notes>- Fixed #65097 (nApplyCount release missing) (emptyhua at gmail dot com)
- Trigger E_STRICT when pass an array with index &apos;0&apos; 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)
</notes>
<deps>
<dep type="php" rel="ge" version="5.1.0"/>
</deps>
<filelist>
<description>"Lua is a powerful, fast, light-weight, embeddable scripting language."
This extension embeds the lua interpreter and offers an OO-API to lua variables and functions.</description>
<lead>
<name>Johannes Schlüter</name>
<user>johannes</user>
<email>johannes@php.net</email>
<active>yes</active>
</lead>
<lead>
<name>Xinchen Hui</name>
<user>laruence</user>
<email>laruence@php.net</email>
<active>yes</active>
</lead>
<developer>
<name>Marcelo Araujo</name>
<user>msaraujo</user>
<email>msaraujo@php.net</email>
<active>yes</active>
</developer>
<date>2013-10-23</date>
<time>12:04:27</time>
<version>
<release>1.1.0</release>
<api>1.1.0</api>
</version>
<stability>
<release>beta</release>
<api>beta</api>
</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)
</notes>
<contents>
<dir name="/">
<file name="config.m4" role="src" />
<file name="php_lua.h" role="src" />
<file name="lua.c" role="src" />
<file name="lua_closure.h" role="src" />
<file name="lua_closure.c" role="src" />
<file name="config.w32" role="src" />
<file name="CREDITS" role="doc" />
<file name="EXPERIMENTAL" role="doc" />
<file name="LICENSE" role="doc" />
<dir name="tests">
<file role="test" name="001.phpt"/>
<file role="test" name="002.phpt"/>
<file role="test" name="003.phpt"/>
<file role="test" name="004.phpt"/>
<file role="test" name="005.phpt"/>
<file role="test" name="006.phpt"/>
<file role="test" name="007.phpt"/>
<file role="test" name="008.phpt"/>
<file role="test" name="009.phpt"/>
<file role="test" name="010.phpt"/>
<file role="test" name="011.phpt"/>
<file role="test" name="012.phpt"/>
<file role="test" name="013.phpt"/>
</dir> <!-- /tests -->
<file role="src" name="config.m4"/>
<file role="src" name="config.w32"/>
<file role="src" name="CREDITS"/>
<file role="src" name="EXPERIMENTAL"/>
<file role="src" name="LICENSE"/>
<file role="src" name="lua.c"/>
<file role="src" name="lua_closure.c"/>
<file role="src" name="lua_closure.h"/>
<file role="src" name="php_lua.h"/>
</filelist>
</release>
</package>
<file name="001.phpt" role="test" />
<file name="002.phpt" role="test" />
<file name="003.phpt" role="test" />
<file name="004.phpt" role="test" />
<file name="005.phpt" role="test" />
<file name="006.phpt" role="test" />
<file name="007.phpt" role="test" />
<file name="008.phpt" role="test" />
<file name="009.phpt" role="test" />
<file name="010.phpt" role="test" />
<file name="011.phpt" role="test" />
<file name="012.phpt" role="test" />
<file name="013.phpt" role="test" />
<file name="bug65097.phpt" role="test" />
</dir>
</dir>
</contents>
<dependencies>
<required>
<php>
<min>5.1.0</min>
</php>
<pearinstaller>
<min>1.4.0</min>
</pearinstaller>
</required>
</dependencies>
<providesextension>lua</providesextension>
<extsrcrelease />
<changelog>
<release>
<date>2012-10-23</date>
<version>
<release>1.1.0</release>
<api>1.1.0</api>
</version>
<stability>
<release>beta</release>
<api>beta</api>
</stability>
<license uri="http://www.php.net/license">PHP License</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)
</notes>
</release>

<release>
<date>2012-06-24</date>
<version>
<release>1.0.0</release>
<api>1.0.0</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
- Release stable version
</notes>
</release>
<release>
<date>2012-03-19</date>
<version>
<release>0.9.4</release>
<api>0.9.4</api>
</version>
<stability>
<release>beta</release>
<api>beta</api>
</stability>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
- Compatible with lua 5.2
</notes>
</release>
<release>
<date>2012-01-12</date>
<version>
<release>0.9.3</release>
<api>0.9.3</api>
</version>
<stability>
<release>beta</release>
<api>beta</api>
</stability>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
- Fix build on windows
- Fix build when building lua with static
</notes>
</release>
<release>
<date>2012-01-06</date>
<version>
<release>0.9.2</release>
<api>0.9.2</api>
</version>
<stability>
<release>beta</release>
<api>beta</api>
</stability>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
- Fixed bug #60641 PECL install lua with lua5.1 packages
</notes>
</release>
<release>
<date>2011-11-24</date>
<version>
<release>0.9.1</release>
<api>0.9.1</api>
</version>
<stability>
<release>beta</release>
<api>beta</api>
</stability>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
- Compatible with PHP5.3+
- Fix ZTS build
- Fix mem leak when get value from lua
</notes>
</release>
<release>
<date>2011-08-03</date>
<version>
<release>0.9.0</release>
<api>0.9.0</api>
</version>
<stability>
<release>beta</release>
<api>beta</api>
</stability>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
- Merge Plua into Lua
- Api changes
- Add supporting for LUA_TFUNCTION
</notes>
</release>
</changelog>
</package>
<!--
vim:et:ts=1:sw=1
-->
Loading