Error compiling LSAPI on PHP 5.6.10

[skizzerz]

Litespeed 5.0.1, PHP 5.6.10
Error when compiling with --enable-maintainer-zts

/bin/bash /usr/local/lsws/phpbuild/php-5.6.10/libtool --silent --preserve-dup-deps --mode=compile /usr/local/lsws/phpbuild/php-5.6.10/meta_ccld  -Isapi/litespeed/ -I/usr/local/lsws/phpbuild/php-5.6.10/sapi/litespeed/ -DPHP_ATOM_INC -I/usr/local/lsws/phpbuild/php-5.6.10/include -I/usr/local/lsws/phpbuild/php-5.6.10/main -I/usr/local/lsws/phpbuild/php-5.6.10 -I/usr/local/lsws/phpbuild/php-5.6.10/ext/date/lib -I/usr/local/lsws/phpbuild/php-5.6.10/ext/ereg/regex -I/usr/include/libxml2 -I/usr/local/include -I/usr/X11 -I/usr/include/freetype2 -I/usr/local/lsws/phpbuild/php-5.6.10/ext/mbstring/oniguruma -I/usr/local/lsws/phpbuild/php-5.6.10/ext/mbstring/libmbfl -I/usr/local/lsws/phpbuild/php-5.6.10/ext/mbstring/libmbfl/mbfl -I/usr/local/lsws/phpbuild/php-5.6.10/ext/sqlite3/libsqlite -I/usr/include/tidy -I/usr/local/lsws/phpbuild/php-5.6.10/ext/zip/lib -I/usr/local/lsws/phpbuild/php-5.6.10/TSRM -I/usr/local/lsws/phpbuild/php-5.6.10/Zend  -D_REENTRANT -DTHREAD=1  -I/usr/include -g -O2 -fvisibility=hidden -pthread -DZTS  -c /usr/local/lsws/phpbuild/php-5.6.10/sapi/litespeed/lsapi_main.c -o sapi/litespeed/lsapi_main.lo
/usr/local/lsws/phpbuild/php-5.6.10/sapi/litespeed/lsapi_main.c: In function ‘add_variable’:
/usr/local/lsws/phpbuild/php-5.6.10/sapi/litespeed/lsapi_main.c:220:9: error: too few arguments to function ‘php_register_variable_safe’
         php_register_variable_safe((char *)pKey, new_val, new_val_len, (zval *)arg );
         ^
In file included from /usr/local/lsws/phpbuild/php-5.6.10/sapi/litespeed/lsapi_main.c:23:0:
/usr/local/lsws/phpbuild/php-5.6.10/main/php_variables.h:41:13: note: declared here
 PHPAPI void php_register_variable_safe(char *var, char *val, int val_len, zval *track_vars_array TSRMLS_DC);
             ^
/usr/local/lsws/phpbuild/php-5.6.10/sapi/litespeed/lsapi_main.c: In function ‘litespeed_php_import_environment_variables’:
/usr/local/lsws/phpbuild/php-5.6.10/sapi/litespeed/lsapi_main.c:302:3: error: too many arguments to function ‘add_variable’
   add_variable(t, nlen, p + 1, strlen( p + 1 ), array_ptr TSRMLS_CC);
   ^
/usr/local/lsws/phpbuild/php-5.6.10/sapi/litespeed/lsapi_main.c:205:12: note: declared here
 static int add_variable( const char * pKey, int keyLen, const char * pValue, int valLen,
            ^
/usr/local/lsws/phpbuild/php-5.6.10/sapi/litespeed/lsapi_main.c: At top level:
/usr/local/lsws/phpbuild/php-5.6.10/sapi/litespeed/lsapi_main.c:470:5: warning: initialization from incompatible pointer type [enabled by default]
     sapi_lsapi_flush,               /* flush */
     ^
/usr/local/lsws/phpbuild/php-5.6.10/sapi/litespeed/lsapi_main.c:470:5: warning: (near initialization for ‘lsapi_sapi_module.flush’) [enabled by default]
make: *** [sapi/litespeed/lsapi_main.lo] Error 1
**ERROR** Could not compile PHP

Compilation works without that flag, however I need to have it enabled for runkit sandboxing to work.

 

[skizzerz]

The following patch appears to fix it:

--- lsapi_main.c        2015-07-09 15:40:59.352468944 -0500
+++ lsapi_main.c    2015-07-09 15:40:15.219825672 -0500
@@ -217,7 +217,7 @@
     char * new_val = (char *) pValue;

     if (sapi_module.input_filter(filter_arg, (char *)pKey, &new_val, valLen, &new_val_len TSRMLS_CC)) {
-        php_register_variable_safe((char *)pKey, new_val, new_val_len, (zval *)arg );
+        php_register_variable_safe((char *)pKey, new_val, new_val_len, (zval *)arg TSRMLS_CC );
     }
     return 1;
 }
@@ -299,7 +299,7 @@
                }
                memcpy(t, *env, nlen);
                t[nlen] = '\0';
-               add_variable(t, nlen, p + 1, strlen( p + 1 ), array_ptr TSRMLS_CC);
+               add_variable(t, nlen, p + 1, strlen( p + 1 ), array_ptr);
        }
        if (t != buf && t != NULL) {
                efree(t);