Author: codemasher

config.m4

@@ -1,23 +1,9 @@
-dnl +----------------------------------------------------------------------+
-dnl | PHP Version 5                                                        |
-dnl +----------------------------------------------------------------------+
-dnl | Copyright (c) 1997-2015 The PHP Group                                |
-dnl +----------------------------------------------------------------------+
-dnl | This source file is subject to version 3.01 of the PHP license,      |
-dnl | that is bundled with this package in the file LICENSE, and is        |
-dnl | available through the world-wide-web at the following url:           |
-dnl | http://www.php.net/license/3_01.txt                                  |
-dnl | If you did not receive a copy of the PHP license and are unable to   |
-dnl | obtain it through the world-wide-web, please send a note to          |
-dnl | [email protected] so we can mail you a copy immediately.               |
-dnl +----------------------------------------------------------------------+
-dnl | Authors: Payden Sutherland <[email protected]>             |
-dnl |          Dan Ungureanu <[email protected]>                          |
-dnl |          authors of the `zlib` extension (for guidance)              |
-dnl +----------------------------------------------------------------------+
+dnl config.m4 for extension xz
 
-PHP_ARG_WITH(xz, for xz support,
-[  --with-xz             Include xz support])
+PHP_ARG_WITH([xz],
+  [for xz support],
+  [AS_HELP_STRING([--with-xz],
+    [Include xz support])])
 
 if test "$PHP_XZ" != "no"; then
 

php_xz.h

@@ -1,30 +1,14 @@
-/*
-	+----------------------------------------------------------------------+
-	| PHP Version 5                                                        |
-	+----------------------------------------------------------------------+
-	| Copyright (c) 1997-2015 The PHP Group                                |
-	+----------------------------------------------------------------------+
-	| This source file is subject to version 3.01 of the PHP license,      |
-	| that is bundled with this package in the file LICENSE, and is        |
-	| available through the world-wide-web at the following url:           |
-	| http://www.php.net/license/3_01.txt                                  |
-	| If you did not receive a copy of the PHP license and are unable to   |
-	| obtain it through the world-wide-web, please send a note to          |
-	| [email protected] so we can mail you a copy immediately.               |
-	+----------------------------------------------------------------------+
-	| Authors: Payden Sutherland <[email protected]>             |
-	|          Dan Ungureanu <[email protected]>                          |
-	|          authors of the `zlib` extension (for guidance)              |
-	+----------------------------------------------------------------------+
-*/
+/* xz extension for PHP */
 
 #ifndef PHP_XZ_H
-#define PHP_XZ_H
+# define PHP_XZ_H
 
 extern zend_module_entry xz_module_entry;
 extern php_stream_wrapper php_stream_xz_wrapper;
 
-#define phpext_xz_ptr &xz_module_entry
+# define phpext_xz_ptr &xz_module_entry
+
+# define PHP_XZ_VERSION "0.1.0"
 
 /* The default size of the buffer used for compression and decompression. */
 #define XZ_BUFFER_SIZE                  4096
@@ -37,6 +21,10 @@ extern php_stream_wrapper php_stream_xz_wrapper;
 #	define PHP_XZ_API
 #endif
 
+# if defined(ZTS) && defined(COMPILE_DL_XZ)
+ZEND_TSRMLS_CACHE_EXTERN()
+# endif
+
 #ifdef ZTS
 #	include "TSRM.h"
 #endif
@@ -60,7 +48,7 @@ php_stream *php_stream_xzopen(php_stream_wrapper *wrapper, const char *path,
 #	define XZ_G(v) (xz_globals.v)
 #endif
 
-#endif
+#endif	/* PHP_XZ_H */
 
 /*
  * Local variables:
@@ -69,4 +57,4 @@ php_stream *php_stream_xzopen(php_stream_wrapper *wrapper, const char *path,
  * End:
  * vim600: sw=4 ts=4 fdm=marker
  * vim<600: sw=4 ts=4
- */
+ */

xz.c

@@ -1,39 +1,26 @@
-/*
-	+----------------------------------------------------------------------+
-	| PHP Version 5                                                        |
-	+----------------------------------------------------------------------+
-	| Copyright (c) 1997-2015 The PHP Group                                |
-	+----------------------------------------------------------------------+
-	| This source file is subject to version 3.01 of the PHP license,      |
-	| that is bundled with this package in the file LICENSE, and is        |
-	| available through the world-wide-web at the following url:           |
-	| http://www.php.net/license/3_01.txt                                  |
-	| If you did not receive a copy of the PHP license and are unable to   |
-	| obtain it through the world-wide-web, please send a note to          |
-	| [email protected] so we can mail you a copy immediately.               |
-	+----------------------------------------------------------------------+
-	| Authors: Payden Sutherland <[email protected]>             |
-	|          Dan Ungureanu <[email protected]>                          |
-	|          authors of the `zlib` extension (for guidance)              |
-	+----------------------------------------------------------------------+
-*/
-
-#include <lzma.h>
+/* xz extension for PHP */
+
+//#include <lzma.h>
+#include "./xz-5.2.4/src/liblzma/api/lzma.h"
 
 #ifdef HAVE_CONFIG_H
-#	include "config.h"
+# include "config.h"
 #endif
 
 #include "php.h"
 #include "php_ini.h"
-
 #include "ext/standard/file.h"
 #include "ext/standard/info.h"
-
 #include "utils.h"
-
 #include "php_xz.h"
 
+/* For compatibility with older PHP versions */
+#ifndef ZEND_PARSE_PARAMETERS_NONE
+#define ZEND_PARSE_PARAMETERS_NONE() \
+	ZEND_PARSE_PARAMETERS_START(0, 0) \
+	ZEND_PARSE_PARAMETERS_END()
+#endif
+
 /* {{{ arginfo */
 ZEND_BEGIN_ARG_INFO(arginfo_xzread, 0)
 	ZEND_ARG_INFO(0, fp)
@@ -63,46 +50,39 @@ ZEND_BEGIN_ARG_INFO(arginfo_xzdecode, 0)
 ZEND_END_ARG_INFO()
 /* }}} */
 
-/* {{{ xz_functions[]
-   Table containing functions exported by this module. */
-const zend_function_entry xz_functions[] = {
+/* {{{ xz_functions[] */
+static const zend_function_entry xz_functions[] = {
 	PHP_FE(xzdecode, NULL)
 	PHP_FE(xzopen, NULL)
 	PHP_FE(xzencode, NULL)
 	PHP_FALIAS(xzread, fread, arginfo_xzread)
 	PHP_FALIAS(xzwrite, fwrite, arginfo_xzwrite)
 	PHP_FALIAS(xzclose, fclose, arginfo_xzclose)
 	PHP_FALIAS(xzpassthru, fpassthru, arginfo_xzpassthru)
-#ifndef PHP_FE_END
-	{ NULL, NULL, NULL, 0, 0 }
-#else
 	PHP_FE_END
-#endif
 };
 /* }}} */
 
-/* {{{ xz_module_entry
-   Table describing module. */
+/* {{{ xz_module_entry */
 zend_module_entry xz_module_entry = {
-#if ZEND_MODULE_API_NO >= 20010901
 	STANDARD_MODULE_HEADER,
-#endif
 	"xz",
 	xz_functions,
 	PHP_MINIT(xz),
 	PHP_MSHUTDOWN(xz),
 	NULL, /* PHP_RINIT */
 	NULL, /* PHP_RSHUTDOWN */
 	PHP_MINFO(xz),
-#if ZEND_MODULE_API_NO >= 20010901
-	"0.1.1",
-#endif
+	PHP_XZ_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
 
 #ifdef COMPILE_DL_XZ
-	ZEND_GET_MODULE(xz)
+# ifdef ZTS
+ZEND_TSRMLS_CACHE_DEFINE()
+# endif
+ZEND_GET_MODULE(xz)
 #endif
 
 /* {{{ INI entries. */