diff --git a/.gitignore b/.gitignore
index 7f79b85..b92c258 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
php.spec~
/php-5.3.7.tar.bz2
/php-5.3.8.tar.bz2
+/php-5.4.0RC6.tar.bz2
diff --git a/macros.php b/macros.php
index 9f5e849..4de8639 100644
--- a/macros.php
+++ b/macros.php
@@ -3,6 +3,17 @@
#
%php_core_api @PHP_APIVER@
%php_zend_api @PHP_ZENDVER@
-%php_pdo_api @PHP_PDOVER@
+%php_pdo_api @PHP_PDOVER@
-%php_extdir %{_libdir}/php/modules
+%php_extdir %{_libdir}/php/modules
+%php_ztsextdir %{_libdir}/php-zts/modules
+
+%php_inidir %{_sysconfdir}/php.d
+%php_ztsinidir %{_sysconfdir}/php-zts.d
+
+%php_incldir %{_includedir}/php
+%php_ztsincldir %{_includedir}/php-zts/php
+
+%__php %{_bindir}/php
+%php_bindir %{_bindir}
+%php_ztsbindir %{_bindir}/php-zts
diff --git a/php-4.3.11-shutdown.patch b/php-4.3.11-shutdown.patch
deleted file mode 100644
index a9980ce..0000000
--- a/php-4.3.11-shutdown.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- php-4.3.11/ext/snmp/php_snmp.h.shutdown
-+++ php-4.3.11/ext/snmp/php_snmp.h
-@@ -39,7 +39,6 @@
- #endif
-
- PHP_MINIT_FUNCTION(snmp);
--PHP_MSHUTDOWN_FUNCTION(snmp);
- PHP_MINFO_FUNCTION(snmp);
-
- PHP_FUNCTION(snmpget);
---- php-4.3.11/ext/snmp/snmp.c.shutdown
-+++ php-4.3.11/ext/snmp/snmp.c
-@@ -156,7 +156,7 @@
- "snmp",
- snmp_functions,
- PHP_MINIT(snmp),
-- PHP_MSHUTDOWN(snmp),
-+ NULL,
- NULL,
- NULL,
- PHP_MINFO(snmp),
-@@ -208,16 +208,6 @@
- }
- /* }}} */
-
--/* {{{ PHP_MSHUTDOWN_FUNCTION
-- */
--PHP_MSHUTDOWN_FUNCTION(snmp)
--{
-- snmp_shutdown("snmpapp");
--
-- return SUCCESS;
--}
--/* }}} */
--
- /* {{{ PHP_MINFO_FUNCTION
- */
- PHP_MINFO_FUNCTION(snmp)
diff --git a/php-5.0.4-dlopen.patch b/php-5.0.4-dlopen.patch
deleted file mode 100644
index f1809da..0000000
--- a/php-5.0.4-dlopen.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- php-5.0.4/Zend/zend.h.dlopen
-+++ php-5.0.4/Zend/zend.h
-@@ -102,11 +102,11 @@
- # endif
-
- # if defined(RTLD_GROUP) && defined(RTLD_WORLD) && defined(RTLD_PARENT)
--# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
-+# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
- # elif defined(RTLD_DEEPBIND)
--# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND)
-+# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL | RTLD_DEEPBIND)
- # else
--# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL)
-+# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL)
- # endif
- # define DL_UNLOAD dlclose
- # if defined(DLSYM_NEEDS_UNDERSCORE)
diff --git a/php-5.0.4-tests-wddx.patch b/php-5.0.4-tests-wddx.patch
deleted file mode 100644
index 56d6863..0000000
--- a/php-5.0.4-tests-wddx.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-
-The wddx tests presume that "2040-06-12T04:32:12" cannot be parsed;
-that's only true on platforms with a 32-bit time_t.
-
---- php-5.0.5/ext/wddx/tests/001.phpt.tests-wddx
-+++ php-5.0.5/ext/wddx/tests/001.phpt
-@@ -18,7 +18,7 @@
- ["aDateTime2"]=>
- int(329632332)
- ["aDateTime3"]=>
-- string(22) "2040-06-12T04:32:12+00"
-+ string(12) "NotADateTime"
- ["aBoolean"]=>
- bool(true)
- ["anArray"]=>
---- php-5.0.5/ext/wddx/tests/wddx.xml.tests-wddx
-+++ php-5.0.5/ext/wddx/tests/wddx.xml
-@@ -20,7 +20,7 @@
- 1980-06-12T04:32:12+00
-
-
-- 2040-06-12T04:32:12+00
-+ NotADateTime
-
-
-
diff --git a/php-5.2.4-norpath.patch b/php-5.2.4-norpath.patch
deleted file mode 100644
index 4603ccf..0000000
--- a/php-5.2.4-norpath.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- php-5.2.4/acinclude.m4.norpath
-+++ php-5.2.4/acinclude.m4
-@@ -432,6 +432,7 @@ AC_DEFUN([PHP_EVAL_INCLINE],[
- dnl internal, don't use
- AC_DEFUN([_PHP_ADD_LIBPATH_GLOBAL],[
- PHP_RUN_ONCE(LIBPATH, $1, [
-+ test "x$PHP_RPATH" != "xno" &&
- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$1"
- LDFLAGS="$LDFLAGS -L$1"
- PHP_RPATHS="$PHP_RPATHS $1"
-@@ -451,6 +452,7 @@ AC_DEFUN([PHP_ADD_LIBPATH],[
- ],[
- if test "$ext_shared" = "yes"; then
- $2="-L$ai_p [$]$2"
-+ test "x$PHP_RPATH" != "xno" && \
- test -n "$ld_runpath_switch" && $2="$ld_runpath_switch$ai_p [$]$2"
- else
- _PHP_ADD_LIBPATH_GLOBAL([$ai_p])
diff --git a/php-5.2.7-tests-dashn.patch b/php-5.2.7-tests-dashn.patch
deleted file mode 100644
index 8d70d03..0000000
--- a/php-5.2.7-tests-dashn.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- php-5.2.7/Makefile.global.orig 2008-12-05 07:37:27.000000000 +0100
-+++ php-5.2.7/Makefile.global 2008-12-05 07:37:55.000000000 +0100
-@@ -67,7 +67,7 @@
- done; \
- fi
-
--PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
-+PHP_TEST_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
- PHP_TEST_SHARED_EXTENSIONS = ` \
- if test "x$(PHP_MODULES)" != "x"; then \
- for i in $(PHP_MODULES)""; do \
diff --git a/php-5.3.0-easter.patch b/php-5.3.0-easter.patch
deleted file mode 100644
index 9a2ca72..0000000
--- a/php-5.3.0-easter.patch
+++ /dev/null
@@ -1,689 +0,0 @@
-diff -up php-5.3.0/ext/standard/basic_functions.c.easter php-5.3.0/ext/standard/basic_functions.c
---- php-5.3.0/ext/standard/basic_functions.c.easter 2009-06-20 08:07:35.000000000 +0200
-+++ php-5.3.0/ext/standard/basic_functions.c 2009-07-12 13:46:08.000000000 +0200
-@@ -1547,9 +1547,6 @@ ZEND_END_ARG_INFO()
- ZEND_BEGIN_ARG_INFO(arginfo_php_real_logo_guid, 0)
- ZEND_END_ARG_INFO()
-
--ZEND_BEGIN_ARG_INFO(arginfo_php_egg_logo_guid, 0)
--ZEND_END_ARG_INFO()
--
- ZEND_BEGIN_ARG_INFO(arginfo_zend_logo_guid, 0)
- ZEND_END_ARG_INFO()
-
-@@ -2695,7 +2692,6 @@ const zend_function_entry basic_function
- PHP_FE(phpcredits, arginfo_phpcredits)
- PHP_FE(php_logo_guid, arginfo_php_logo_guid)
- PHP_FE(php_real_logo_guid, arginfo_php_real_logo_guid)
-- PHP_FE(php_egg_logo_guid, arginfo_php_egg_logo_guid)
- PHP_FE(zend_logo_guid, arginfo_zend_logo_guid)
- PHP_FE(php_sapi_name, arginfo_php_sapi_name)
- PHP_FE(php_uname, arginfo_php_uname)
-diff -up php-5.3.0/ext/standard/info.c.easter php-5.3.0/ext/standard/info.c
---- php-5.3.0/ext/standard/info.c.easter 2009-01-17 03:05:13.000000000 +0100
-+++ php-5.3.0/ext/standard/info.c 2009-07-12 13:46:11.000000000 +0200
-@@ -1268,21 +1268,7 @@ PHP_FUNCTION(phpcredits)
- */
- PHPAPI char *php_logo_guid(void)
- {
-- char *logo_guid;
--
-- time_t the_time;
-- struct tm *ta, tmbuf;
--
-- the_time = time(NULL);
-- ta = php_localtime_r(&the_time, &tmbuf);
--
-- if (ta && (ta->tm_mon==3) && (ta->tm_mday==1)) {
-- logo_guid = PHP_EGG_LOGO_GUID;
-- } else {
-- logo_guid = PHP_LOGO_GUID;
-- }
--
-- return estrdup(logo_guid);
-+ return estrdup(PHP_LOGO_GUID);
-
- }
- /* }}} */
-@@ -1313,18 +1299,6 @@ PHP_FUNCTION(php_real_logo_guid)
- }
- /* }}} */
-
--/* {{{ proto string php_egg_logo_guid(void)
-- Return the special ID used to request the PHP logo in phpinfo screens*/
--PHP_FUNCTION(php_egg_logo_guid)
--{
-- if (zend_parse_parameters_none() == FAILURE) {
-- return;
-- }
--
-- RETURN_STRINGL(PHP_EGG_LOGO_GUID, sizeof(PHP_EGG_LOGO_GUID)-1, 1);
--}
--/* }}} */
--
- /* {{{ proto string zend_logo_guid(void)
- Return the special ID used to request the Zend logo in phpinfo screens*/
- PHP_FUNCTION(zend_logo_guid)
-diff -up php-5.3.0/ext/standard/info.h.easter php-5.3.0/ext/standard/info.h
---- php-5.3.0/ext/standard/info.h.easter 2008-12-31 12:15:45.000000000 +0100
-+++ php-5.3.0/ext/standard/info.h 2009-07-12 13:45:34.000000000 +0200
-@@ -51,7 +51,6 @@
- #endif /* HAVE_CREDITS_DEFS */
-
- #define PHP_LOGO_GUID "PHPE9568F34-D428-11d2-A769-00AA001ACF42"
--#define PHP_EGG_LOGO_GUID "PHPE9568F36-D428-11d2-A769-00AA001ACF42"
- #define ZEND_LOGO_GUID "PHPE9568F35-D428-11d2-A769-00AA001ACF42"
- #define PHP_CREDITS_GUID "PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000"
-
-@@ -62,7 +61,6 @@ PHP_FUNCTION(phpcredits);
- PHP_FUNCTION(php_logo_guid);
- PHP_FUNCTION(php_real_logo_guid);
- PHP_FUNCTION(zend_logo_guid);
--PHP_FUNCTION(php_egg_logo_guid);
- PHP_FUNCTION(php_sapi_name);
- PHP_FUNCTION(php_uname);
- PHP_FUNCTION(php_ini_scanned_files);
-diff -up php-5.3.0/main/logos.h.easter php-5.3.0/main/logos.h
---- php-5.3.0/main/logos.h.easter 2008-12-31 12:15:47.000000000 +0100
-+++ php-5.3.0/main/logos.h 2009-07-12 13:46:15.000000000 +0200
-@@ -492,589 +492,3 @@ static const unsigned char php_logo[] =
- 21, 116, 187, 251, 221, 240, 142, 119, 188, 3,
- 1, 0, 59, 0 };
-
--static const unsigned char php_egg_logo[] = {
-- 71, 73, 70, 56, 57, 97, 120, 0, 67, 0,
-- 231, 255, 0, 18, 25, 33, 32, 30, 34, 28,
-- 33, 44, 15, 35, 71, 6, 37, 85, 37, 40,
-- 47, 34, 41, 53, 41, 40, 43, 9, 47, 109,
-- 30, 45, 68, 21, 48, 84, 51, 46, 55, 43,
-- 49, 59, 31, 59, 98, 15, 61, 128, 58, 55,
-- 69, 50, 57, 74, 0, 66, 144, 56, 58, 60,
-- 54, 59, 71, 32, 66, 113, 60, 65, 67, 63,
-- 65, 84, 63, 68, 79, 28, 79, 145, 15, 82,
-- 162, 75, 72, 98, 68, 78, 86, 74, 77, 88,
-- 50, 82, 122, 41, 85, 134, 76, 78, 108, 70,
-- 83, 101, 5, 94, 190, 0, 95, 197, 86, 80,
-- 101, 28, 92, 159, 80, 84, 96, 83, 83, 115,
-- 81, 87, 89, 22, 97, 183, 86, 88, 85, 0,
-- 102, 210, 8, 101, 204, 24, 100, 177, 85, 90,
-- 127, 35, 101, 169, 42, 100, 159, 88, 92, 103,
-- 0, 107, 216, 69, 95, 132, 0, 108, 210, 84,
-- 93, 112, 94, 90, 117, 18, 105, 201, 96, 92,
-- 105, 89, 96, 98, 94, 93, 135, 94, 94, 126,
-- 30, 106, 210, 7, 112, 222, 33, 108, 198, 16,
-- 114, 217, 27, 113, 198, 24, 113, 209, 59, 108,
-- 159, 96, 100, 138, 0, 120, 229, 44, 112, 180,
-- 49, 112, 171, 71, 108, 148, 99, 104, 115, 90,
-- 106, 125, 27, 115, 232, 100, 102, 147, 42, 115,
-- 192, 86, 110, 137, 9, 123, 239, 106, 108, 105,
-- 105, 105, 138, 33, 118, 228, 12, 125, 227, 48,
-- 117, 208, 16, 126, 222, 37, 120, 224, 20, 125,
-- 235, 35, 123, 213, 50, 121, 190, 43, 123, 206,
-- 40, 123, 220, 105, 110, 160, 59, 122, 182, 78,
-- 119, 158, 44, 122, 233, 3, 134, 250, 112, 112,
-- 151, 73, 123, 175, 113, 118, 114, 51, 128, 205,
-- 34, 129, 246, 11, 136, 245, 34, 130, 240, 113,
-- 117, 149, 111, 116, 166, 111, 119, 141, 48, 130,
-- 221, 38, 132, 235, 53, 130, 215, 97, 124, 146,
-- 116, 122, 124, 117, 121, 131, 54, 130, 229, 41,
-- 135, 232, 68, 130, 223, 46, 135, 246, 65, 134,
-- 202, 42, 137, 241, 75, 131, 205, 124, 121, 161,
-- 101, 125, 191, 86, 128, 210, 121, 122, 169, 105,
-- 128, 157, 121, 122, 180, 114, 124, 181, 94, 128,
-- 201, 81, 134, 185, 46, 138, 252, 76, 135, 195,
-- 34, 142, 252, 62, 137, 229, 63, 138, 217, 33,
-- 144, 247, 58, 139, 223, 56, 141, 246, 54, 143,
-- 234, 57, 143, 241, 102, 135, 193, 129, 130, 176,
-- 122, 136, 144, 46, 148, 252, 45, 149, 246, 118,
-- 133, 191, 65, 146, 231, 73, 146, 216, 129, 133,
-- 185, 135, 135, 156, 69, 148, 226, 44, 153, 255,
-- 94, 143, 216, 132, 136, 175, 88, 146, 207, 137,
-- 139, 136, 93, 146, 197, 95, 147, 188, 137, 139,
-- 150, 104, 146, 178, 122, 143, 172, 135, 139, 191,
-- 57, 156, 254, 67, 154, 245, 70, 154, 239, 134,
-- 141, 180, 117, 145, 201, 120, 146, 190, 79, 154,
-- 233, 140, 141, 188, 129, 144, 194, 142, 142, 176,
-- 137, 147, 156, 88, 155, 222, 82, 157, 230, 93,
-- 157, 218, 66, 162, 253, 100, 157, 210, 77, 161,
-- 247, 55, 168, 255, 81, 162, 241, 148, 148, 195,
-- 145, 149, 202, 127, 156, 204, 77, 166, 255, 142,
-- 155, 177, 141, 153, 200, 123, 160, 193, 73, 171,
-- 255, 93, 167, 240, 96, 167, 234, 152, 158, 160,
-- 101, 167, 228, 119, 164, 206, 155, 158, 171, 110,
-- 167, 219, 156, 155, 203, 89, 172, 252, 128, 164,
-- 219, 151, 163, 174, 81, 178, 255, 158, 162, 202,
-- 102, 175, 249, 93, 178, 251, 108, 175, 237, 103,
-- 177, 244, 166, 168, 165, 97, 182, 255, 87, 185,
-- 255, 149, 174, 216, 125, 181, 235, 110, 185, 252,
-- 117, 183, 254, 171, 172, 209, 166, 175, 197, 103,
-- 190, 255, 174, 176, 189, 140, 183, 221, 128, 184,
-- 248, 120, 187, 249, 179, 180, 184, 115, 193, 253,
-- 170, 183, 193, 174, 181, 215, 107, 197, 255, 135,
-- 191, 246, 151, 192, 219, 187, 183, 213, 128, 197,
-- 253, 121, 202, 255, 147, 198, 239, 188, 191, 219,
-- 148, 200, 252, 192, 193, 197, 134, 205, 254, 171,
-- 199, 236, 183, 199, 218, 163, 207, 251, 142, 213,
-- 255, 158, 211, 253, 195, 205, 217, 166, 211, 245,
-- 205, 204, 228, 153, 218, 255, 190, 210, 236, 186,
-- 212, 231, 177, 213, 248, 162, 224, 255, 188, 221,
-- 250, 214, 219, 221, 214, 219, 233, 174, 229, 254,
-- 198, 225, 247, 209, 226, 248, 186, 233, 251, 227,
-- 230, 239, 225, 241, 252, 253, 255, 252, 255, 255,
-- 255, 33, 249, 4, 1, 10, 0, 255, 0, 44,
-- 0, 0, 0, 0, 120, 0, 67, 0, 0, 8,
-- 254, 0, 255, 9, 28, 72, 176, 160, 193, 131,
-- 8, 19, 42, 92, 200, 176, 161, 195, 135, 16,
-- 35, 74, 156, 72, 177, 162, 197, 139, 22, 131,
-- 105, 12, 134, 177, 163, 199, 143, 193, 164, 73,
-- 227, 38, 141, 28, 56, 112, 228, 76, 146, 20,
-- 41, 205, 152, 75, 99, 183, 100, 201, 50, 101,
-- 202, 147, 77, 79, 166, 102, 205, 250, 200, 19,
-- 100, 73, 114, 239, 238, 221, 123, 71, 148, 104,
-- 202, 163, 224, 86, 138, 124, 25, 115, 166, 205,
-- 72, 145, 246, 72, 221, 195, 39, 207, 30, 69,
-- 158, 118, 246, 220, 202, 208, 24, 184, 160, 252,
-- 248, 9, 29, 59, 212, 100, 75, 99, 53, 159,
-- 66, 93, 203, 182, 109, 84, 169, 124, 248, 156,
-- 57, 163, 165, 174, 150, 60, 138, 76, 113, 221,
-- 251, 207, 24, 183, 119, 97, 3, 135, 125, 71,
-- 78, 90, 76, 62, 142, 70, 141, 18, 53, 109,
-- 170, 227, 199, 144, 35, 75, 157, 91, 87, 137,
-- 229, 28, 74, 190, 228, 229, 139, 209, 43, 96,
-- 193, 247, 10, 203, 114, 212, 167, 82, 47, 93,
-- 197, 138, 81, 163, 166, 173, 19, 47, 201, 176,
-- 99, 59, 166, 171, 36, 135, 237, 22, 45, 114,
-- 216, 209, 203, 25, 98, 176, 191, 66, 195, 134,
-- 54, 230, 233, 150, 179, 100, 197, 106, 181, 90,
-- 158, 171, 57, 179, 110, 231, 124, 185, 145, 77,
-- 157, 186, 150, 218, 45, 76, 104, 111, 145, 71,
-- 86, 239, 133, 198, 200, 254, 145, 189, 199, 205,
-- 212, 212, 115, 244, 232, 157, 107, 86, 172, 185,
-- 234, 92, 197, 154, 137, 11, 231, 11, 77, 245,
-- 251, 178, 207, 40, 201, 254, 225, 131, 134, 39,
-- 138, 124, 103, 80, 73, 68, 13, 37, 141, 39,
-- 144, 213, 115, 14, 60, 235, 116, 211, 12, 123,
-- 197, 136, 67, 141, 106, 226, 156, 51, 78, 16,
-- 92, 208, 194, 7, 126, 28, 70, 166, 159, 9,
-- 26, 132, 104, 130, 29, 2, 254, 67, 32, 81,
-- 224, 200, 18, 91, 56, 240, 208, 35, 78, 51,
-- 238, 49, 40, 223, 58, 240, 88, 99, 132, 31,
-- 207, 168, 131, 14, 55, 206, 56, 115, 203, 41,
-- 167, 172, 229, 73, 36, 158, 196, 133, 216, 83,
-- 29, 58, 166, 69, 11, 26, 88, 96, 129, 6,
-- 95, 112, 230, 213, 81, 210, 188, 21, 27, 59,
-- 208, 208, 179, 14, 123, 205, 81, 227, 96, 55,
-- 235, 208, 227, 14, 23, 126, 244, 162, 204, 49,
-- 200, 64, 3, 13, 51, 194, 232, 162, 139, 50,
-- 105, 106, 131, 13, 54, 225, 132, 227, 205, 157,
-- 207, 96, 243, 204, 48, 195, 244, 72, 28, 126,
-- 103, 48, 233, 164, 6, 36, 246, 20, 210, 81,
-- 198, 224, 87, 143, 48, 12, 78, 8, 75, 43,
-- 242, 21, 3, 38, 60, 227, 116, 224, 2, 22,
-- 135, 32, 162, 41, 33, 112, 208, 129, 72, 35,
-- 135, 8, 242, 72, 40, 163, 150, 82, 202, 42,
-- 186, 172, 178, 203, 46, 169, 170, 154, 76, 50,
-- 254, 123, 158, 194, 97, 14, 22, 60, 240, 192,
-- 7, 188, 117, 228, 23, 74, 198, 88, 41, 219,
-- 56, 189, 36, 19, 203, 57, 235, 80, 147, 11,
-- 44, 176, 20, 211, 96, 51, 240, 192, 195, 14,
-- 5, 36, 88, 129, 8, 33, 116, 200, 81, 198,
-- 181, 101, 208, 1, 199, 27, 220, 110, 59, 69,
-- 22, 130, 20, 82, 200, 35, 165, 76, 34, 110,
-- 33, 147, 64, 162, 174, 42, 192, 200, 122, 223,
-- 25, 38, 216, 186, 192, 19, 24, 133, 52, 82,
-- 149, 247, 161, 179, 203, 35, 136, 8, 243, 72,
-- 57, 244, 80, 179, 220, 39, 185, 192, 163, 77,
-- 55, 244, 236, 227, 14, 5, 17, 0, 65, 7,
-- 25, 101, 120, 81, 197, 196, 216, 82, 97, 49,
-- 21, 81, 68, 145, 69, 22, 105, 116, 236, 113,
-- 26, 161, 148, 59, 136, 24, 98, 64, 210, 203,
-- 40, 28, 106, 161, 193, 2, 11, 88, 144, 171,
-- 68, 246, 74, 163, 226, 125, 207, 156, 105, 8,
-- 25, 212, 54, 218, 202, 39, 4, 227, 115, 142,
-- 54, 233, 177, 211, 65, 4, 51, 84, 113, 109,
-- 21, 77, 52, 1, 69, 23, 19, 15, 1, 197,
-- 16, 84, 12, 17, 197, 182, 112, 8, 146, 198,
-- 20, 86, 147, 139, 204, 49, 169, 78, 50, 200,
-- 32, 144, 56, 210, 97, 14, 15, 176, 28, 37,
-- 204, 198, 180, 228, 107, 108, 158, 60, 19, 202,
-- 43, 159, 200, 225, 133, 28, 175, 224, 3, 15,
-- 50, 176, 80, 2, 75, 254, 51, 94, 34, 140,
-- 143, 208, 68, 119, 129, 45, 210, 93, 48, 13,
-- 197, 210, 60, 240, 0, 133, 15, 111, 104, 138,
-- 8, 28, 27, 79, 1, 199, 35, 163, 234, 18,
-- 139, 155, 233, 206, 177, 97, 202, 22, 28, 112,
-- 128, 14, 17, 5, 227, 210, 204, 213, 69, 178,
-- 11, 40, 160, 16, 194, 8, 33, 134, 52, 17,
-- 142, 122, 197, 236, 156, 11, 51, 185, 52, 3,
-- 244, 62, 128, 207, 16, 49, 182, 93, 36, 125,
-- 120, 23, 135, 67, 193, 131, 15, 112, 148, 147,
-- 143, 58, 216, 8, 3, 249, 198, 89, 192, 1,
-- 199, 33, 143, 196, 18, 203, 42, 144, 104, 222,
-- 33, 31, 26, 120, 62, 194, 67, 162, 255, 121,
-- 159, 35, 149, 104, 58, 135, 21, 100, 64, 92,
-- 69, 139, 198, 238, 156, 236, 222, 226, 208, 131,
-- 207, 56, 13, 56, 80, 116, 19, 215, 54, 81,
-- 197, 24, 73, 23, 126, 248, 16, 62, 248, 144,
-- 133, 62, 110, 112, 194, 50, 202, 113, 8, 231,
-- 101, 193, 7, 64, 152, 220, 184, 30, 129, 42,
-- 93, 168, 66, 108, 29, 50, 129, 231, 52, 208,
-- 16, 89, 220, 162, 87, 248, 137, 68, 29, 178,
-- 160, 6, 53, 188, 225, 5, 85, 176, 86, 21,
-- 232, 1, 15, 113, 228, 98, 57, 173, 104, 143,
-- 151, 224, 241, 190, 248, 249, 160, 126, 114, 136,
-- 161, 181, 202, 16, 53, 167, 13, 97, 120, 105,
-- 184, 7, 7, 12, 224, 4, 111, 192, 65, 114,
-- 254, 144, 3, 66, 26, 14, 145, 6, 43, 88,
-- 1, 11, 107, 128, 196, 42, 86, 1, 65, 14,
-- 181, 224, 0, 1, 160, 160, 66, 100, 114, 139,
-- 181, 197, 230, 22, 117, 152, 194, 20, 162, 160,
-- 134, 42, 144, 64, 10, 248, 163, 67, 122, 214,
-- 17, 187, 79, 232, 45, 23, 226, 16, 7, 62,
-- 240, 97, 13, 5, 16, 109, 12, 215, 98, 4,
-- 207, 64, 193, 51, 77, 53, 66, 83, 84, 240,
-- 65, 26, 218, 113, 1, 3, 180, 1, 27, 144,
-- 19, 196, 183, 128, 128, 196, 66, 132, 98, 13,
-- 63, 72, 228, 15, 176, 32, 134, 68, 52, 241,
-- 62, 45, 8, 64, 0, 106, 144, 144, 89, 152,
-- 66, 22, 8, 186, 207, 40, 214, 32, 8, 107,
-- 216, 194, 5, 67, 144, 218, 15, 134, 208, 5,
-- 68, 184, 15, 30, 205, 120, 148, 25, 97, 1,
-- 157, 125, 208, 227, 25, 3, 136, 64, 12, 232,
-- 215, 136, 121, 200, 35, 31, 249, 168, 71, 61,
-- 242, 33, 143, 118, 108, 67, 30, 208, 128, 195,
-- 32, 218, 49, 1, 1, 180, 1, 121, 199, 120,
-- 197, 35, 136, 184, 134, 102, 146, 11, 137, 88,
-- 80, 228, 37, 104, 145, 36, 13, 72, 178, 80,
-- 5, 153, 5, 78, 50, 73, 157, 72, 92, 98,
-- 13, 135, 208, 135, 63, 252, 129, 132, 40, 116,
-- 193, 105, 192, 11, 5, 62, 92, 217, 140, 157,
-- 49, 162, 21, 104, 60, 199, 62, 224, 225, 10,
-- 2, 68, 128, 10, 114, 254, 32, 196, 49, 178,
-- 113, 129, 11, 112, 224, 159, 37, 224, 192, 6,
-- 46, 176, 129, 108, 148, 99, 21, 213, 40, 230,
-- 1, 78, 128, 3, 55, 240, 34, 29, 216, 8,
-- 197, 36, 122, 81, 10, 114, 61, 2, 93, 107,
-- 136, 230, 28, 230, 96, 13, 43, 202, 230, 1,
-- 1, 56, 128, 119, 10, 146, 150, 251, 240, 65,
-- 21, 88, 200, 194, 60, 198, 233, 143, 84, 164,
-- 193, 104, 72, 43, 195, 49, 214, 8, 143, 216,
-- 49, 226, 157, 197, 208, 70, 251, 216, 193, 5,
-- 2, 100, 160, 10, 129, 64, 4, 54, 54, 81,
-- 2, 24, 148, 128, 6, 48, 160, 193, 81, 3,
-- 202, 0, 115, 120, 99, 19, 19, 40, 128, 1,
-- 74, 208, 79, 6, 20, 32, 12, 222, 8, 133,
-- 45, 136, 241, 141, 103, 232, 194, 84, 143, 72,
-- 195, 15, 196, 112, 9, 87, 248, 226, 22, 28,
-- 58, 3, 20, 183, 71, 144, 89, 16, 201, 163,
-- 145, 185, 68, 74, 7, 145, 130, 106, 140, 83,
-- 15, 136, 40, 131, 181, 154, 48, 6, 111, 140,
-- 145, 61, 173, 72, 214, 131, 210, 83, 41, 2,
-- 160, 128, 12, 140, 104, 68, 57, 220, 80, 212,
-- 106, 224, 50, 151, 250, 248, 69, 9, 24, 208,
-- 6, 126, 28, 225, 2, 1, 32, 70, 53, 126,
-- 193, 88, 1, 0, 96, 17, 165, 96, 2, 65,
-- 113, 16, 6, 76, 96, 98, 27, 202, 16, 43,
-- 89, 51, 193, 10, 82, 108, 174, 58, 38, 144,
-- 254, 228, 203, 134, 4, 87, 200, 220, 1, 11,
-- 64, 160, 66, 16, 12, 80, 128, 118, 216, 195,
-- 5, 141, 40, 31, 182, 216, 145, 30, 23, 181,
-- 135, 149, 212, 8, 19, 60, 188, 145, 0, 4,
-- 100, 225, 19, 59, 155, 7, 13, 78, 80, 130,
-- 109, 60, 67, 24, 141, 128, 67, 33, 204, 81,
-- 130, 2, 84, 224, 30, 37, 152, 128, 4, 242,
-- 113, 167, 121, 216, 162, 152, 39, 120, 6, 8,
-- 4, 192, 128, 13, 112, 160, 159, 6, 192, 68,
-- 41, 122, 240, 131, 65, 0, 2, 16, 115, 48,
-- 171, 51, 238, 3, 69, 41, 254, 195, 173, 181,
-- 125, 12, 31, 122, 0, 132, 25, 248, 192, 3,
-- 211, 56, 0, 13, 54, 145, 5, 50, 236, 149,
-- 126, 236, 104, 17, 60, 186, 113, 44, 73, 73,
-- 120, 29, 174, 136, 37, 28, 102, 215, 10, 121,
-- 208, 192, 13, 71, 72, 135, 50, 38, 22, 133,
-- 66, 164, 163, 187, 12, 216, 6, 7, 24, 112,
-- 132, 114, 192, 33, 13, 144, 248, 69, 1, 0,
-- 112, 2, 98, 126, 54, 30, 211, 32, 6, 26,
-- 120, 11, 12, 32, 244, 64, 12, 115, 240, 195,
-- 18, 174, 0, 8, 87, 144, 226, 20, 164, 147,
-- 76, 36, 3, 48, 82, 243, 4, 120, 42, 3,
-- 182, 193, 10, 86, 48, 3, 18, 20, 32, 0,
-- 2, 32, 129, 26, 200, 80, 133, 194, 53, 129,
-- 12, 236, 160, 17, 60, 210, 7, 11, 113, 172,
-- 227, 204, 225, 144, 129, 254, 97, 65, 33, 12,
-- 129, 165, 131, 3, 55, 112, 131, 45, 142, 81,
-- 5, 42, 188, 225, 17, 237, 88, 241, 2, 36,
-- 107, 128, 69, 196, 66, 13, 130, 120, 6, 26,
-- 60, 187, 136, 106, 120, 22, 23, 186, 224, 90,
-- 60, 12, 0, 0, 78, 76, 161, 7, 88, 152,
-- 67, 16, 92, 176, 4, 34, 92, 97, 11, 91,
-- 200, 132, 53, 204, 35, 153, 51, 72, 146, 94,
-- 255, 120, 242, 84, 60, 177, 4, 41, 171, 64,
-- 5, 59, 0, 2, 5, 18, 128, 1, 56, 220,
-- 236, 90, 189, 83, 3, 59, 206, 97, 230, 102,
-- 64, 55, 23, 201, 61, 179, 55, 26, 128, 128,
-- 52, 188, 162, 24, 204, 128, 196, 52, 56, 0,
-- 131, 77, 88, 67, 24, 132, 64, 196, 33, 212,
-- 241, 139, 11, 20, 224, 8, 104, 184, 128, 0,
-- 170, 129, 8, 53, 100, 193, 25, 16, 0, 0,
-- 0, 182, 49, 104, 6, 36, 67, 153, 143, 184,
-- 68, 2, 0, 192, 133, 52, 160, 0, 11, 87,
-- 120, 129, 11, 88, 192, 110, 18, 144, 128, 8,
-- 153, 118, 70, 162, 34, 99, 129, 40, 10, 196,
-- 164, 128, 232, 193, 10, 98, 16, 131, 29, 248,
-- 27, 8, 133, 224, 32, 33, 132, 123, 173, 70,
-- 172, 35, 141, 235, 64, 6, 116, 97, 65, 172,
-- 51, 103, 98, 0, 25, 120, 133, 48, 218, 163,
-- 138, 84, 252, 51, 27, 232, 160, 6, 51, 160,
-- 193, 142, 108, 28, 97, 2, 12, 176, 7, 18,
-- 254, 250, 136, 142, 14, 102, 161, 19, 140, 102,
-- 64, 59, 178, 189, 1, 109, 188, 34, 20, 133,
-- 240, 131, 103, 57, 113, 136, 31, 44, 97, 14,
-- 91, 32, 1, 187, 89, 224, 110, 23, 144, 160,
-- 8, 96, 240, 3, 46, 146, 44, 149, 15, 4,
-- 96, 1, 247, 174, 206, 41, 176, 96, 131, 29,
-- 240, 32, 6, 42, 224, 247, 14, 124, 16, 5,
-- 58, 88, 221, 193, 85, 240, 2, 51, 194, 113,
-- 142, 110, 72, 40, 23, 202, 233, 70, 179, 202,
-- 209, 1, 2, 212, 129, 25, 108, 202, 133, 55,
-- 208, 192, 129, 18, 152, 227, 30, 230, 216, 6,
-- 49, 156, 64, 108, 8, 164, 226, 30, 48, 152,
-- 192, 6, 158, 65, 7, 53, 88, 1, 9, 158,
-- 61, 194, 52, 102, 76, 12, 109, 8, 35, 22,
-- 144, 232, 196, 161, 225, 32, 134, 43, 92, 161,
-- 8, 47, 120, 1, 17, 212, 237, 110, 12, 252,
-- 28, 211, 156, 128, 140, 18, 36, 41, 144, 215,
-- 194, 198, 19, 115, 0, 194, 10, 84, 192, 131,
-- 33, 240, 187, 223, 62, 160, 66, 178, 7, 14,
-- 49, 50, 208, 233, 96, 231, 152, 16, 123, 230,
-- 83, 142, 12, 59, 32, 22, 26, 103, 70, 43,
-- 230, 1, 130, 182, 95, 128, 6, 19, 184, 64,
-- 240, 139, 234, 134, 120, 84, 99, 197, 109, 240,
-- 134, 26, 232, 80, 7, 11, 104, 123, 27, 72,
-- 0, 192, 6, 228, 49, 14, 61, 165, 131, 6,
-- 0, 144, 0, 43, 4, 254, 49, 136, 43, 16,
-- 33, 8, 30, 136, 60, 188, 225, 237, 238, 23,
-- 20, 97, 11, 153, 127, 204, 230, 3, 240, 223,
-- 234, 140, 2, 11, 83, 142, 58, 15, 202, 80,
-- 133, 167, 199, 96, 8, 141, 128, 155, 33, 62,
-- 65, 6, 67, 112, 29, 26, 21, 114, 14, 204,
-- 144, 83, 212, 112, 14, 222, 80, 118, 98, 128,
-- 12, 180, 35, 12, 185, 32, 15, 16, 0, 103,
-- 71, 0, 98, 71, 0, 3, 48, 224, 6, 219,
-- 48, 15, 143, 32, 9, 28, 48, 1, 188, 80,
-- 14, 84, 160, 6, 137, 192, 104, 23, 144, 14,
-- 217, 38, 1, 188, 112, 130, 188, 0, 3, 152,
-- 149, 10, 230, 50, 8, 150, 22, 4, 50, 0,
-- 6, 91, 64, 4, 46, 224, 2, 145, 7, 126,
-- 65, 16, 4, 91, 128, 11, 234, 199, 121, 255,
-- 16, 23, 178, 81, 7, 82, 32, 2, 168, 22,
-- 3, 62, 48, 4, 100, 160, 6, 79, 23, 5,
-- 135, 240, 10, 173, 48, 45, 251, 7, 13, 231,
-- 160, 38, 102, 118, 14, 117, 82, 39, 126, 0,
-- 113, 186, 128, 12, 12, 88, 11, 185, 176, 13,
-- 19, 112, 3, 37, 192, 15, 185, 84, 15, 243,
-- 16, 15, 234, 112, 12, 136, 80, 10, 237, 64,
-- 12, 196, 112, 15, 215, 64, 5, 112, 128, 11,
-- 22, 208, 103, 182, 32, 1, 0, 192, 0, 239,
-- 5, 80, 23, 208, 6, 207, 80, 8, 96, 3,
-- 111, 70, 128, 6, 118, 192, 4, 96, 0, 121,
-- 254, 36, 240, 2, 96, 176, 33, 150, 192, 5,
-- 92, 224, 43, 235, 39, 16, 103, 224, 121, 144,
-- 49, 10, 63, 48, 3, 163, 23, 3, 195, 243,
-- 129, 101, 160, 6, 169, 247, 10, 200, 0, 10,
-- 204, 209, 10, 194, 16, 14, 201, 195, 34, 7,
-- 151, 12, 225, 0, 12, 10, 224, 0, 147, 160,
-- 13, 180, 227, 133, 208, 240, 11, 196, 230, 6,
-- 253, 112, 12, 159, 208, 119, 86, 103, 8, 214,
-- 246, 10, 209, 80, 14, 209, 0, 10, 67, 0,
-- 7, 227, 16, 15, 247, 192, 15, 72, 192, 91,
-- 246, 176, 13, 169, 176, 8, 110, 144, 10, 214,
-- 5, 61, 35, 227, 2, 91, 32, 3, 86, 33,
-- 21, 92, 0, 6, 47, 224, 1, 50, 32, 10,
-- 176, 17, 137, 63, 72, 137, 142, 113, 10, 98,
-- 208, 116, 81, 199, 111, 60, 64, 5, 143, 83,
-- 6, 67, 160, 6, 177, 16, 14, 208, 160, 13,
-- 106, 194, 12, 200, 160, 12, 218, 112, 12, 82,
-- 152, 12, 187, 160, 10, 151, 64, 1, 8, 240,
-- 3, 10, 184, 51, 148, 208, 10, 139, 85, 2,
-- 37, 176, 9, 253, 32, 12, 134, 80, 6, 251,
-- 83, 62, 84, 144, 45, 141, 64, 8, 84, 192,
-- 3, 158, 8, 4, 86, 64, 10, 28, 32, 0,
-- 56, 224, 13, 194, 176, 11, 222, 80, 14, 202,
-- 16, 10, 135, 32, 46, 141, 7, 111, 45, 224,
-- 24, 145, 144, 9, 91, 0, 6, 70, 0, 6,
-- 112, 101, 116, 72, 247, 254, 15, 123, 112, 6,
-- 176, 65, 11, 63, 176, 111, 59, 208, 111, 154,
-- 216, 142, 135, 0, 10, 136, 16, 10, 194, 160,
-- 13, 201, 160, 13, 117, 34, 14, 208, 128, 12,
-- 186, 208, 11, 187, 112, 9, 128, 224, 1, 20,
-- 64, 0, 8, 96, 3, 203, 1, 11, 159, 112,
-- 83, 175, 80, 15, 52, 208, 118, 196, 144, 15,
-- 185, 32, 66, 67, 80, 5, 100, 64, 7, 81,
-- 83, 56, 85, 48, 3, 20, 233, 3, 54, 208,
-- 3, 157, 192, 0, 0, 64, 12, 208, 0, 10,
-- 63, 4, 7, 202, 54, 146, 133, 48, 7, 151,
-- 64, 4, 96, 112, 146, 144, 225, 7, 96, 192,
-- 5, 226, 40, 21, 245, 38, 69, 158, 48, 23,
-- 145, 97, 10, 115, 96, 3, 34, 48, 122, 231,
-- 88, 122, 112, 160, 6, 165, 16, 11, 161, 112,
-- 12, 202, 112, 9, 151, 16, 14, 226, 32, 143,
-- 244, 40, 6, 24, 224, 0, 8, 128, 0, 17,
-- 128, 2, 135, 128, 66, 173, 64, 9, 140, 64,
-- 9, 185, 208, 15, 196, 144, 10, 191, 192, 15,
-- 236, 0, 10, 114, 96, 56, 93, 32, 7, 73,
-- 120, 67, 80, 64, 5, 59, 128, 132, 84, 0,
-- 4, 107, 48, 104, 5, 240, 13, 194, 0, 10,
-- 111, 0, 4, 64, 32, 57, 105, 128, 46, 171,
-- 48, 7, 223, 39, 4, 145, 1, 132, 157, 246,
-- 105, 2, 49, 11, 115, 33, 142, 167, 240, 3,
-- 54, 224, 3, 153, 152, 56, 80, 243, 6, 112,
-- 254, 0, 138, 177, 32, 12, 208, 160, 10, 106,
-- 130, 13, 0, 24, 14, 197, 128, 148, 107, 208,
-- 3, 86, 32, 138, 202, 193, 51, 85, 121, 83,
-- 173, 112, 14, 229, 192, 14, 234, 80, 14, 173,
-- 160, 87, 101, 0, 60, 33, 148, 132, 112, 32,
-- 60, 60, 48, 3, 184, 233, 3, 170, 224, 75,
-- 237, 128, 13, 79, 72, 5, 84, 246, 45, 83,
-- 0, 136, 221, 71, 4, 50, 64, 147, 29, 178,
-- 100, 35, 37, 147, 132, 249, 24, 137, 128, 152,
-- 43, 224, 111, 57, 121, 132, 92, 4, 7, 161,
-- 160, 12, 111, 162, 11, 115, 32, 153, 199, 176,
-- 117, 63, 83, 158, 244, 8, 10, 148, 48, 144,
-- 237, 25, 8, 44, 26, 8, 114, 16, 8, 169,
-- 193, 8, 11, 41, 56, 133, 195, 3, 244, 99,
-- 117, 84, 80, 5, 80, 192, 111, 244, 195, 63,
-- 64, 16, 10, 186, 32, 12, 5, 234, 3, 49,
-- 48, 3, 195, 153, 6, 88, 48, 50, 240, 246,
-- 1, 73, 178, 7, 253, 213, 86, 90, 224, 160,
-- 142, 33, 6, 33, 48, 101, 254, 118, 67, 169,
-- 39, 8, 175, 208, 132, 210, 179, 11, 189, 176,
-- 5, 202, 160, 12, 107, 194, 117, 83, 216, 10,
-- 180, 83, 149, 44, 234, 5, 99, 224, 5, 127,
-- 224, 5, 110, 58, 6, 178, 89, 6, 74, 51,
-- 49, 80, 192, 144, 246, 83, 6, 159, 210, 119,
-- 166, 55, 75, 12, 57, 3, 213, 201, 132, 160,
-- 160, 6, 81, 48, 4, 254, 51, 48, 3, 89,
-- 96, 68, 73, 234, 125, 65, 96, 2, 73, 18,
-- 91, 1, 240, 50, 255, 160, 8, 81, 234, 24,
-- 142, 176, 4, 33, 32, 2, 137, 57, 3, 84,
-- 0, 5, 29, 84, 53, 64, 154, 42, 170, 144,
-- 9, 92, 112, 9, 165, 16, 143, 196, 98, 133,
-- 12, 184, 51, 104, 170, 166, 99, 176, 166, 115,
-- 227, 162, 173, 154, 52, 247, 217, 101, 89, 87,
-- 6, 132, 208, 8, 62, 89, 5, 67, 144, 147,
-- 19, 195, 3, 43, 96, 3, 81, 240, 10, 141,
-- 160, 6, 95, 217, 159, 126, 106, 3, 71, 36,
-- 6, 68, 80, 4, 50, 144, 36, 106, 21, 0,
-- 108, 5, 165, 147, 42, 21, 166, 96, 169, 83,
-- 214, 111, 137, 83, 5, 206, 3, 10, 161, 48,
-- 61, 170, 224, 7, 32, 0, 1, 50, 0, 9,
-- 186, 64, 39, 86, 104, 120, 202, 161, 170, 140,
-- 224, 166, 106, 250, 7, 109, 234, 166, 49, 228,
-- 5, 134, 224, 5, 73, 67, 63, 114, 80, 5,
-- 183, 154, 58, 55, 164, 2, 177, 73, 6, 80,
-- 96, 164, 108, 214, 10, 92, 198, 63, 51, 16,
-- 2, 6, 75, 95, 138, 42, 165, 248, 1, 82,
-- 34, 117, 16, 166, 80, 23, 155, 115, 11, 87,
-- 96, 161, 51, 192, 111, 156, 170, 108, 160, 32,
-- 61, 171, 192, 10, 32, 16, 124, 48, 208, 9,
-- 189, 128, 148, 208, 16, 14, 176, 72, 59, 55,
-- 69, 154, 129, 192, 166, 127, 176, 166, 114, 163,
-- 254, 166, 94, 0, 49, 77, 192, 3, 73, 208,
-- 4, 115, 67, 6, 160, 128, 171, 132, 160, 6,
-- 60, 10, 49, 60, 96, 3, 112, 112, 179, 100,
-- 16, 8, 236, 8, 4, 54, 96, 176, 33, 128,
-- 2, 40, 192, 2, 68, 160, 4, 213, 116, 77,
-- 9, 33, 169, 90, 48, 21, 115, 160, 111, 153,
-- 184, 3, 114, 136, 58, 135, 208, 173, 171, 224,
-- 10, 253, 132, 6, 81, 113, 10, 172, 240, 38,
-- 216, 160, 13, 242, 40, 164, 104, 250, 7, 129,
-- 224, 174, 129, 192, 8, 114, 208, 166, 134, 128,
-- 63, 17, 147, 56, 77, 32, 155, 132, 32, 138,
-- 136, 80, 5, 58, 11, 5, 47, 219, 5, 253,
-- 9, 7, 46, 74, 8, 236, 232, 3, 244, 133,
-- 2, 71, 139, 180, 44, 16, 4, 73, 178, 100,
-- 148, 164, 16, 121, 80, 23, 82, 225, 10, 55,
-- 153, 137, 70, 168, 6, 136, 32, 8, 47, 86,
-- 8, 165, 160, 9, 19, 96, 6, 142, 193, 7,
-- 163, 176, 11, 202, 192, 117, 242, 232, 78, 108,
-- 235, 174, 238, 58, 6, 104, 203, 170, 73, 227,
-- 5, 73, 48, 179, 65, 139, 171, 175, 80, 109,
-- 84, 80, 52, 178, 217, 4, 187, 58, 4, 217,
-- 82, 5, 83, 99, 5, 61, 128, 180, 190, 203,
-- 2, 46, 192, 180, 78, 36, 73, 254, 197, 184,
-- 117, 145, 7, 180, 192, 116, 138, 201, 111, 133,
-- 74, 117, 89, 112, 8, 186, 160, 9, 23, 16,
-- 25, 159, 171, 83, 240, 254, 120, 66, 104, 58,
-- 6, 129, 176, 166, 174, 10, 167, 100, 80, 175,
-- 245, 138, 51, 160, 144, 11, 112, 153, 71, 47,
-- 84, 62, 49, 91, 122, 116, 0, 60, 81, 0,
-- 4, 152, 122, 180, 75, 144, 1, 25, 112, 184,
-- 17, 68, 188, 15, 209, 184, 90, 80, 173, 54,
-- 80, 168, 167, 39, 60, 22, 243, 6, 208, 43,
-- 189, 146, 49, 10, 218, 112, 174, 19, 119, 44,
-- 60, 67, 186, 45, 234, 162, 114, 80, 175, 93,
-- 86, 6, 159, 0, 10, 177, 11, 7, 81, 112,
-- 132, 47, 75, 175, 78, 99, 52, 60, 160, 2,
-- 86, 90, 168, 54, 176, 4, 46, 144, 1, 87,
-- 112, 141, 213, 113, 6, 245, 102, 111, 16, 33,
-- 169, 138, 48, 177, 152, 184, 147, 19, 153, 122,
-- 28, 154, 12, 156, 48, 189, 146, 241, 12, 87,
-- 8, 13, 26, 215, 30, 237, 89, 11, 200, 128,
-- 12, 178, 3, 93, 235, 234, 5, 101, 144, 132,
-- 208, 149, 41, 21, 252, 144, 220, 27, 60, 117,
-- 250, 116, 161, 228, 163, 132, 116, 5, 46, 144,
-- 8, 248, 161, 4, 11, 32, 73, 139, 27, 17,
-- 166, 240, 5, 144, 208, 3, 251, 187, 111, 165,
-- 39, 135, 136, 240, 10, 146, 41, 192, 146, 113,
-- 10, 231, 96, 133, 212, 32, 12, 112, 195, 162,
-- 104, 27, 8, 173, 0, 55, 183, 214, 10, 55,
-- 85, 149, 79, 200, 173, 144, 99, 96, 170, 35,
-- 92, 192, 51, 4, 116, 64, 127, 161, 244, 129,
-- 254, 83, 80, 156, 147, 16, 100, 222, 8, 91,
-- 80, 116, 0, 103, 51, 17, 193, 192, 10, 145,
-- 123, 161, 6, 118, 181, 175, 240, 38, 153, 64,
-- 195, 53, 76, 178, 218, 128, 12, 185, 80, 149,
-- 109, 251, 7, 132, 32, 7, 134, 240, 7, 49,
-- 180, 182, 107, 11, 187, 91, 122, 8, 82, 96,
-- 3, 89, 128, 8, 173, 208, 8, 154, 92, 6,
-- 141, 208, 8, 129, 96, 8, 3, 103, 117, 207,
-- 35, 81, 27, 203, 131, 212, 161, 4, 32, 21,
-- 0, 18, 0, 169, 18, 49, 14, 107, 128, 137,
-- 251, 150, 122, 87, 43, 12, 245, 8, 12, 27,
-- 240, 151, 82, 241, 12, 218, 64, 13, 56, 44,
-- 12, 181, 192, 8, 105, 123, 83, 210, 44, 55,
-- 160, 204, 162, 148, 64, 48, 185, 16, 10, 161,
-- 80, 68, 105, 48, 190, 114, 76, 205, 55, 149,
-- 79, 172, 71, 45, 112, 208, 8, 163, 178, 10,
-- 201, 128, 203, 176, 161, 5, 39, 60, 73, 30,
-- 49, 8, 82, 230, 197, 95, 169, 202, 109, 162,
-- 12, 192, 64, 3, 150, 0, 27, 201, 35, 12,
-- 108, 34, 12, 210, 220, 162, 55, 229, 162, 110,
-- 26, 203, 238, 249, 198, 177, 160, 12, 144, 48,
-- 8, 177, 112, 12, 194, 0, 148, 205, 1, 55,
-- 210, 44, 205, 229, 67, 7, 201, 6, 42, 12,
-- 148, 12, 190, 0, 27, 124, 240, 1, 80, 20,
-- 0, 46, 243, 17, 170, 96, 5, 133, 122, 155,
-- 31, 168, 202, 14, 141, 254, 12, 189, 128, 4,
-- 146, 32, 25, 124, 160, 13, 171, 44, 144, 45,
-- 106, 8, 134, 240, 162, 11, 188, 182, 208, 149,
-- 66, 229, 169, 13, 151, 160, 10, 247, 88, 10,
-- 68, 89, 182, 85, 233, 96, 194, 101, 209, 81,
-- 160, 108, 151, 211, 11, 192, 240, 24, 168, 192,
-- 7, 42, 243, 209, 11, 144, 200, 30, 145, 12,
-- 105, 80, 168, 205, 171, 6, 231, 252, 10, 151,
-- 179, 11, 156, 112, 4, 252, 188, 198, 100, 112,
-- 205, 46, 26, 208, 114, 243, 162, 238, 233, 133,
-- 104, 87, 143, 47, 192, 10, 202, 80, 10, 200,
-- 64, 148, 225, 160, 198, 104, 26, 8, 179, 137,
-- 183, 114, 120, 8, 166, 162, 212, 190, 66, 43,
-- 158, 115, 0, 243, 194, 21, 127, 232, 167, 51,
-- 224, 111, 84, 87, 203, 165, 176, 11, 154, 0,
-- 3, 220, 244, 24, 189, 16, 206, 14, 214, 182,
-- 11, 108, 8, 105, 107, 211, 239, 36, 12, 150,
-- 29, 39, 30, 176, 5, 172, 208, 11, 14, 205,
-- 12, 218, 80, 11, 235, 73, 9, 44, 42, 155,
-- 134, 128, 49, 181, 60, 9, 170, 48, 10, 230,
-- 161, 5, 31, 240, 0, 125, 253, 0, 160, 182,
-- 23, 147, 64, 180, 23, 58, 117, 84, 23, 5,
-- 130, 112, 42, 174, 0, 3, 150, 240, 151, 171,
-- 144, 58, 1, 205, 174, 114, 80, 205, 160, 108,
-- 214, 3, 25, 209, 185, 160, 13, 202, 208, 0,
-- 3, 224, 1, 151, 32, 166, 152, 57, 48, 134,
-- 254, 112, 83, 16, 115, 45, 114, 184, 6, 125,
-- 112, 7, 123, 160, 5, 241, 178, 0, 125, 61,
-- 2, 216, 196, 23, 144, 80, 96, 21, 91, 177,
-- 253, 19, 5, 83, 112, 216, 192, 80, 2, 95,
-- 96, 23, 82, 234, 9, 165, 128, 8, 65, 27,
-- 180, 110, 74, 8, 163, 221, 182, 54, 157, 205,
-- 181, 192, 128, 185, 240, 10, 208, 160, 11, 13,
-- 160, 0, 24, 0, 6, 208, 32, 158, 208, 208,
-- 30, 234, 42, 223, 85, 144, 5, 216, 45, 23,
-- 57, 208, 218, 44, 227, 221, 22, 240, 4, 90,
-- 241, 29, 170, 64, 157, 215, 170, 147, 196, 147,
-- 208, 201, 128, 4, 102, 96, 25, 32, 94, 23,
-- 147, 120, 7, 125, 176, 6, 113, 160, 6, 214,
-- 60, 55, 106, 122, 223, 114, 4, 79, 39, 148,
-- 11, 255, 77, 1, 20, 112, 5, 170, 48, 182,
-- 205, 12, 205, 159, 64, 57, 120, 144, 221, 219,
-- 157, 3, 38, 80, 43, 101, 195, 50, 19, 238,
-- 203, 189, 1, 185, 243, 188, 188, 62, 48, 5,
-- 202, 128, 13, 201, 192, 6, 110, 224, 86, 121,
-- 0, 226, 82, 174, 4, 34, 126, 6, 36, 222,
-- 7, 120, 96, 226, 220, 226, 56, 17, 44, 154,
-- 151, 227, 148, 118, 201, 10, 124, 50, 10, 142,
-- 176, 33, 215, 225, 227, 77, 2, 228, 182, 242,
-- 0, 53, 240, 5, 68, 94, 34, 229, 120, 169,
-- 137, 169, 2, 6, 150, 5, 229, 186, 206, 48,
-- 64, 16, 166, 160, 8, 192, 81, 62, 229, 32,
-- 142, 25, 84, 238, 222, 115, 49, 232, 132, 110,
-- 23, 215, 113, 25, 218, 17, 34, 78, 178, 232,
-- 181, 98, 1, 109, 30, 32, 37, 162, 16, 151,
-- 64, 184, 152, 26, 127, 73, 94, 10, 73, 9,
-- 12, 56, 128, 16, 218, 148, 7, 121, 240, 5,
-- 182, 17, 234, 162, 158, 3, 184, 129, 27, 218,
-- 113, 234, 218, 209, 31, 253, 17, 34, 172, 206,
-- 232, 38, 160, 3, 0, 82, 225, 145, 206, 16,
-- 148, 142, 169, 116, 126, 164, 186, 144, 12, 187,
-- 237, 16, 150, 20, 9, 118, 96, 7, 95, 240,
-- 5, 216, 145, 29, 168, 158, 234, 170, 174, 1,
-- 31, 160, 3, 184, 17, 236, 120, 33, 235, 179,
-- 254, 16, 144, 75, 184, 136, 153, 106, 22, 185,
-- 6, 147, 192, 10, 174, 176, 1, 60, 65, 19,
-- 145, 240, 230, 207, 222, 17, 128, 64, 184, 33,
-- 96, 164, 86, 144, 6, 225, 226, 165, 154, 32,
-- 1, 223, 190, 238, 21, 225, 10, 75, 128, 2,
-- 54, 240, 3, 66, 148, 6, 228, 178, 11, 192,
-- 192, 4, 236, 158, 239, 2, 17, 16, 0, 59};
--
-diff -up php-5.3.0/main/php_logos.c.easter php-5.3.0/main/php_logos.c
---- php-5.3.0/main/php_logos.c.easter 2008-12-31 12:15:47.000000000 +0100
-+++ php-5.3.0/main/php_logos.c 2009-07-12 13:45:50.000000000 +0200
-@@ -56,7 +56,6 @@ int php_init_info_logos(void)
- return FAILURE;
-
- php_register_info_logo(PHP_LOGO_GUID , "image/gif", php_logo , sizeof(php_logo));
-- php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo));
- php_register_info_logo(ZEND_LOGO_GUID , "image/gif", zend_logo , sizeof(zend_logo));
-
- return SUCCESS;
diff --git a/php-5.3.0-install.patch b/php-5.3.0-install.patch
deleted file mode 100644
index 1100ace..0000000
--- a/php-5.3.0-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up php5.3-200812131330/sapi/apache2handler/config.m4.install php5.3-200812131330/sapi/apache2handler/config.m4
---- php5.3-200812131330/sapi/apache2handler/config.m4.install 2008-03-12 00:31:53.000000000 +0100
-+++ php5.3-200812131330/sapi/apache2handler/config.m4 2008-12-13 16:20:06.000000000 +0100
-@@ -68,7 +68,7 @@ if test "$PHP_APXS2" != "no"; then
- fi
-
- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
-- if test -z `$APXS -q SYSCONFDIR`; then
-+ if true; then
- INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
- $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
- -i -n php5"
diff --git a/php-5.3.0-libedit.patch b/php-5.3.0-libedit.patch
deleted file mode 100644
index e70cdc4..0000000
--- a/php-5.3.0-libedit.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -up php-5.3.0/ext/readline/config.m4.BAD php-5.3.0/ext/readline/config.m4
---- php-5.3.0/ext/readline/config.m4.BAD 2009-11-17 16:14:45.289616920 -0500
-+++ php-5.3.0/ext/readline/config.m4 2009-11-17 16:14:59.588616924 -0500
-@@ -55,7 +55,7 @@ if test "$PHP_READLINE" && test "$PHP_RE
- elif test "$PHP_LIBEDIT" != "no"; then
-
- for i in $PHP_LIBEDIT /usr/local /usr; do
-- test -f $i/include/readline/readline.h && LIBEDIT_DIR=$i && break
-+ test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break
- done
-
- if test -z "$LIBEDIT_DIR"; then
-diff -up php-5.3.0/ext/readline/readline.c.BAD php-5.3.0/ext/readline/readline.c
---- php-5.3.0/ext/readline/readline.c.BAD 2009-11-17 16:15:30.151716204 -0500
-+++ php-5.3.0/ext/readline/readline.c 2009-11-17 16:16:27.902715621 -0500
-@@ -33,8 +33,10 @@
- #define rl_completion_matches completion_matches
- #endif
-
-+#ifdef HAVE_LIBEDIT
-+#include
-+#else
- #include
--#ifndef HAVE_LIBEDIT
- #include
- #endif
-
-diff -up php-5.3.0/sapi/cli/php_cli.c.BAD php-5.3.0/sapi/cli/php_cli.c
---- php-5.3.0/sapi/cli/php_cli.c.BAD 2009-11-17 16:16:51.421617342 -0500
-+++ php-5.3.0/sapi/cli/php_cli.c 2009-11-17 16:17:35.026715984 -0500
-@@ -76,8 +76,11 @@
- #endif
-
- #if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
-+
-+#if HAVE_LIBEDIT
-+#include
-+#else
- #include
--#if !HAVE_LIBEDIT
- #include
- #endif
- #include "php_cli_readline.h"
-diff -up php-5.3.0/sapi/cli/php_cli_readline.c.BAD php-5.3.0/sapi/cli/php_cli_readline.c
---- php-5.3.0/sapi/cli/php_cli_readline.c.BAD 2009-11-17 16:17:51.398715697 -0500
-+++ php-5.3.0/sapi/cli/php_cli_readline.c 2009-11-17 16:18:19.241715654 -0500
-@@ -49,8 +49,10 @@
- #include
- #endif
-
-+#if HAVE_LIBEDIT
-+#include
-+#else
- #include
--#if !HAVE_LIBEDIT
- #include
- #endif
-
diff --git a/php-5.3.3-macropen.patch b/php-5.3.3-macropen.patch
deleted file mode 100644
index be409e8..0000000
--- a/php-5.3.3-macropen.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -up php5.3-201006130830/ext/dba/dba.c.macropen php5.3-201006130830/ext/dba/dba.c
---- php5.3-201006130830/ext/dba/dba.c.macropen 2010-03-03 02:35:57.000000000 +0100
-+++ php5.3-201006130830/ext/dba/dba.c 2010-06-13 11:07:54.501185871 +0200
-@@ -912,7 +912,7 @@ static void php_dba_open(INTERNAL_FUNCTI
- }
- }
-
-- if (error || hptr->open(info, &error TSRMLS_CC) != SUCCESS) {
-+ if (error || (hptr->open)(info, &error TSRMLS_CC) != SUCCESS) {
- dba_close(info TSRMLS_CC);
- php_error_docref2(NULL TSRMLS_CC, Z_STRVAL_PP(args[0]), Z_STRVAL_PP(args[1]), E_WARNING, "Driver initialization failed for handler: %s%s%s", hptr->name, error?": ":"", error?error:"");
- FREENOW;
-diff -up php5.3-201006130830/ext/dba/dba_db3.c.macropen php5.3-201006130830/ext/dba/dba_db3.c
---- php5.3-201006130830/ext/dba/dba_db3.c.macropen 2010-01-03 10:36:52.000000000 +0100
-+++ php5.3-201006130830/ext/dba/dba_db3.c 2010-06-13 11:07:54.501185871 +0200
-@@ -91,7 +91,7 @@ DBA_OPEN_FUNC(db3)
-
- if ((err=db_create(&dbp, NULL, 0)) == 0) {
- dbp->set_errcall(dbp, php_dba_db3_errcall_fcn);
-- if ((err=dbp->open(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
-+ if ((err=(dbp->open)(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
- dba_db3_data *data;
-
- data = pemalloc(sizeof(*data), info->flags&DBA_PERSISTENT);
-diff -up php5.3-201006130830/ext/dba/dba_db4.c.macropen php5.3-201006130830/ext/dba/dba_db4.c
---- php5.3-201006130830/ext/dba/dba_db4.c.macropen 2010-06-03 10:35:55.000000000 +0200
-+++ php5.3-201006130830/ext/dba/dba_db4.c 2010-06-13 11:12:11.841435434 +0200
-@@ -125,9 +125,9 @@ DBA_OPEN_FUNC(db4)
- dbp->set_errcall(dbp, php_dba_db4_errcall_fcn);
- if (
- #if (DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1))
-- (err=dbp->open(dbp, 0, info->path, NULL, type, gmode, filemode)) == 0) {
-+ (err=(dbp->open)(dbp, 0, info->path, NULL, type, gmode, filemode)) == 0) {
- #else
-- (err=dbp->open(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
-+ (err=(dbp->open)(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
- #endif
- dba_db4_data *data;
-
diff --git a/php-5.3.4-phpize.patch b/php-5.3.4-phpize.patch
deleted file mode 100644
index e0184af..0000000
--- a/php-5.3.4-phpize.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- scripts/phpize.in.orig 2010-12-01 17:00:27.110013483 +0100
-+++ scripts/phpize.in 2010-12-01 17:02:12.555757906 +0100
-@@ -161,6 +161,15 @@
- $PHP_AUTOHEADER || exit 1
- }
-
-+phpize_check_headers()
-+{
-+ if test ! -f $includedir/main/php.h; then
-+ echo "Can't find PHP headers in $includedir"
-+ echo "The php-devel package is required for use of this command."
-+ exit 1
-+ fi
-+}
-+
- # Main script
-
- case "$1" in
-@@ -179,12 +188,15 @@
-
- # Version
- --version|-v)
-+ phpize_check_headers
- phpize_print_api_numbers
- exit 0
- ;;
-
- # Default
- *)
-+ phpize_check_headers
-+
- phpize_check_configm4 0
-
- phpize_check_build_files
diff --git a/php-5.3.7-gnusrc.patch b/php-5.3.7-gnusrc.patch
deleted file mode 100644
index 41e4d11..0000000
--- a/php-5.3.7-gnusrc.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -up php-5.3.7RC3/configure.in.gnusrc php-5.3.7RC3/configure.in
---- php-5.3.7RC3/configure.in.gnusrc 2011-07-14 14:01:37.000000000 +0200
-+++ php-5.3.7RC3/configure.in 2011-07-15 17:46:36.118082437 +0200
-@@ -58,6 +58,8 @@ AC_DEFUN([PHP_EXT_DIR],[ext/$1])dnl
- AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/ext/$1])dnl
- AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl
-
-+AC_DEFINE([_GNU_SOURCE], 1, [Define to enable GNU C Library extensions])
-+
- dnl Setting up the PHP version based on the information above.
- dnl -------------------------------------------------------------------------
-
-diff -up php-5.3.7RC3/ext/interbase/interbase.c.gnusrc php-5.3.7RC3/ext/interbase/interbase.c
---- php-5.3.7RC3/ext/interbase/interbase.c.gnusrc 2011-02-24 03:42:38.000000000 +0100
-+++ php-5.3.7RC3/ext/interbase/interbase.c 2011-07-15 17:46:36.119082439 +0200
-@@ -24,7 +24,6 @@
- #include "config.h"
- #endif
-
--#define _GNU_SOURCE
-
- #include "php.h"
-
-diff -up php-5.3.7RC3/ext/pdo_firebird/firebird_driver.c.gnusrc php-5.3.7RC3/ext/pdo_firebird/firebird_driver.c
---- php-5.3.7RC3/ext/pdo_firebird/firebird_driver.c.gnusrc 2011-06-17 04:00:20.000000000 +0200
-+++ php-5.3.7RC3/ext/pdo_firebird/firebird_driver.c 2011-07-15 17:46:36.119082439 +0200
-@@ -22,7 +22,6 @@
- #include "config.h"
- #endif
-
--#define _GNU_SOURCE
-
- #include "php.h"
- #ifdef ZEND_ENGINE_2
-diff -up php-5.3.7RC3/ext/standard/file.c.gnusrc php-5.3.7RC3/ext/standard/file.c
---- php-5.3.7RC3/ext/standard/file.c.gnusrc 2011-06-19 16:50:44.000000000 +0200
-+++ php-5.3.7RC3/ext/standard/file.c 2011-07-15 17:46:36.120082441 +0200
-@@ -113,9 +113,6 @@ php_file_globals file_globals;
- #endif
-
- #if defined(HAVE_FNMATCH) && !defined(PHP_WIN32)
--# ifndef _GNU_SOURCE
--# define _GNU_SOURCE
--# endif
- # include
- #endif
-
-diff -up php-5.3.7RC3/ext/zlib/zlib_fopen_wrapper.c.gnusrc php-5.3.7RC3/ext/zlib/zlib_fopen_wrapper.c
---- php-5.3.7RC3/ext/zlib/zlib_fopen_wrapper.c.gnusrc 2011-01-01 03:19:59.000000000 +0100
-+++ php-5.3.7RC3/ext/zlib/zlib_fopen_wrapper.c 2011-07-15 17:46:36.121082444 +0200
-@@ -19,8 +19,6 @@
-
- /* $Id: zlib_fopen_wrapper.c 306939 2011-01-01 02:19:59Z felipe $ */
-
--#define _GNU_SOURCE
--
- #include "php.h"
- #include "php_zlib.h"
- #include "fopen_wrappers.h"
-diff -up php-5.3.7RC3/main/php.h.gnusrc php-5.3.7RC3/main/php.h
---- php-5.3.7RC3/main/php.h.gnusrc 2011-01-01 03:19:59.000000000 +0100
-+++ php-5.3.7RC3/main/php.h 2011-07-15 17:46:36.122082447 +0200
-@@ -30,6 +30,7 @@
- #define PHP_HAVE_STREAMS
- #define YYDEBUG 0
-
-+#include "php_config.h"
- #include "php_version.h"
- #include "zend.h"
- #include "zend_qsort.h"
-diff -up php-5.3.7RC3/main/streams/cast.c.gnusrc php-5.3.7RC3/main/streams/cast.c
---- php-5.3.7RC3/main/streams/cast.c.gnusrc 2011-01-20 07:32:59.000000000 +0100
-+++ php-5.3.7RC3/main/streams/cast.c 2011-07-15 17:46:36.122082447 +0200
-@@ -18,7 +18,6 @@
-
- /* $Id: cast.c 307611 2011-01-20 06:32:59Z pajoye $ */
-
--#define _GNU_SOURCE
- #include "php.h"
- #include "php_globals.h"
- #include "php_network.h"
-diff -up php-5.3.7RC3/main/streams/memory.c.gnusrc php-5.3.7RC3/main/streams/memory.c
---- php-5.3.7RC3/main/streams/memory.c.gnusrc 2011-01-01 03:19:59.000000000 +0100
-+++ php-5.3.7RC3/main/streams/memory.c 2011-07-15 17:46:36.123082450 +0200
-@@ -18,7 +18,6 @@
-
- /* $Id: memory.c 306939 2011-01-01 02:19:59Z felipe $ */
-
--#define _GNU_SOURCE
- #include "php.h"
-
- PHPAPI int php_url_decode(char *str, int len);
-diff -up php-5.3.7RC3/main/streams/streams.c.gnusrc php-5.3.7RC3/main/streams/streams.c
---- php-5.3.7RC3/main/streams/streams.c.gnusrc 2011-07-15 17:47:00.053139110 +0200
-+++ php-5.3.7RC3/main/streams/streams.c 2011-07-15 17:47:03.960148477 +0200
-@@ -21,7 +21,6 @@
-
- /* $Id: streams.c 312937 2011-07-05 16:09:06Z cataphract $ */
-
--#define _GNU_SOURCE
- #include "php.h"
- #include "php_globals.h"
- #include "php_network.h"
-diff -up php-5.3.7RC3/Zend/zend_language_parser.c.gnusrc php-5.3.7RC3/Zend/zend_language_parser.c
---- php-5.3.7RC3/Zend/zend_language_parser.c.gnusrc 2011-07-14 10:39:30.000000000 +0200
-+++ php-5.3.7RC3/Zend/zend_language_parser.c 2011-07-15 17:46:36.126082456 +0200
-@@ -112,6 +112,8 @@
- #include "zend_API.h"
- #include "zend_constants.h"
-
-+#include
-+
-
- #define YYERROR_VERBOSE
- #define YYSTYPE znode
diff --git a/php-5.3.8-aconf259.patch b/php-5.3.8-aconf259.patch
deleted file mode 100644
index 1d9696b..0000000
--- a/php-5.3.8-aconf259.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-diff -up php-5.3.8/build/buildcheck.sh.aconf259 php-5.3.8/build/buildcheck.sh
---- php-5.3.8/build/buildcheck.sh.aconf259 2011-05-18 21:55:34.000000000 +0200
-+++ php-5.3.8/build/buildcheck.sh 2011-09-12 17:42:17.016672712 +0200
-@@ -28,33 +28,23 @@ if test -z "$PHP_AUTOCONF"; then
- PHP_AUTOCONF='autoconf'
- fi
-
--# autoconf 2.13 or newer
-+# autoconf 2.59 or newer
- ac_version=`$PHP_AUTOCONF --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
- if test -z "$ac_version"; then
- echo "buildconf: autoconf not found."
--echo " You need autoconf version 2.13 or newer installed"
-+echo " You need autoconf version 2.59 or newer installed"
- echo " to build PHP from SVN."
- exit 1
- fi
- IFS=.; set $ac_version; IFS=' '
--if test "$1" = "2" -a "$2" -lt "13" || test "$1" -lt "2"; then
-+if test "$1" = "2" -a "$2" -lt "59" || test "$1" -lt "2"; then
- echo "buildconf: autoconf version $ac_version found."
--echo " You need autoconf version 2.13 or newer installed"
-+echo " You need autoconf version 2.59 or newer installed"
- echo " to build PHP from SVN."
- exit 1
- fi
-
--if test "$1" = "2" -a "$2" -gt "59"; then
-- echo "buildconf: You need autoconf 2.59 or lower to build this version of PHP."
-- echo " You are currently trying to use $ac_version"
-- echo " Most distros have separate autoconf 2.13 or 2.59 packages."
-- echo " On Debian/Ubuntu both autoconf2.13 and autoconf2.59 packages exist."
-- echo " Install autoconf2.13 and set the PHP_AUTOCONF env var to "
-- echo " autoconf2.13 and try again."
-- exit 1
--else
-- echo "buildconf: autoconf version $ac_version (ok)"
--fi
-+echo "buildconf: autoconf version $ac_version (ok)"
-
- if test "$1" = "2" -a "$2" -ge "50"; then
- ./vcsclean
-diff -up php-5.3.8/configure.in.aconf259 php-5.3.8/configure.in
---- php-5.3.8/configure.in.aconf259 2011-09-12 17:42:17.008672708 +0200
-+++ php-5.3.8/configure.in 2011-09-12 17:42:17.017672713 +0200
-@@ -1,28 +1,6 @@
- ## $Id: configure.in 315343 2011-08-23 08:56:29Z johannes $ -*- autoconf -*-
- dnl ## Process this file with autoconf to produce a configure script.
-
--divert(1)
--
--dnl ## Diversion 1 is the autoconf + automake setup phase. We also
--dnl ## set the PHP version, deal with platform-specific compile
--dnl ## options and check for the basic compile tools.
--
--dnl ## Diversion 2 is the initial checking of OS features, programs,
--dnl ## libraries and so on.
--
--dnl ## In diversion 3 we check for compile-time options to the PHP
--dnl ## core and how to deal with different system dependencies.
--dnl ## This includes whether debugging or short tags are enabled
--dnl ## and the default behaviour of php.ini options.
--dnl ## This is also where an SAPI interface is selected (choosing between
--dnl ## Apache module, CGI etc.)
--
--dnl ## In diversion 4 we check user-configurable general settings.
--
--dnl ## In diversion 5 we check which extensions should be compiled.
--dnl ## All of these are normally in the extension directories.
--dnl ## Diversion 5 is the last one. Here we generate files and clean up.
--
- dnl include Zend specific macro definitions first
- dnl -------------------------------------------------------------------------
- sinclude(Zend/acinclude.m4)
-@@ -30,8 +8,10 @@ sinclude(Zend/acinclude.m4)
- dnl Basic autoconf + automake initialization, generation of config.nice.
- dnl -------------------------------------------------------------------------
-
--AC_PREREQ(2.13)
-+AC_PREREQ(2.59)
- AC_INIT(README.SVN-RULES)
-+ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], [])
-+
-
- PHP_CONFIG_NICE(config.nice)
-
-@@ -292,14 +272,6 @@ sinclude(TSRM/threads.m4)
- sinclude(TSRM/tsrm.m4)
-
-
--divert(2)
--
--dnl ## Diversion 2 is where we set PHP-specific options and come up
--dnl ## with reasonable default values for them. We check for pthreads here
--dnl ## because the information is needed by the SAPI configuration.
--dnl ## This is also where an SAPI interface is selected (choosing between
--dnl ## Apache module, CGI etc.)
--
- dnl .
- dnl -------------------------------------------------------------------------
-
-@@ -331,13 +303,6 @@ if test "$enable_maintainer_zts" = "yes"
- PTHREADS_FLAGS
- fi
-
--divert(3)
--
--dnl ## In diversion 3 we check for compile-time options to the PHP
--dnl ## core and how to deal with different system dependencies.
--dnl ## This includes whether debugging or short tags are enabled
--dnl ## and the default behaviour of php.ini options.
--
- dnl Starting system checks.
- dnl -------------------------------------------------------------------------
-
-@@ -677,10 +642,6 @@ if test "x$php_crypt_r" = "x1"; then
- PHP_CRYPT_R_STYLE
- fi
-
--divert(4)
--
--dnl ## In diversion 4 we check user-configurable general settings.
--
- dnl General settings.
- dnl -------------------------------------------------------------------------
- PHP_CONFIGURE_PART(General settings)
-@@ -918,11 +879,6 @@ else
- AC_MSG_RESULT([using system default])
- fi
-
--divert(5)
--
--dnl ## In diversion 5 we check which extensions should be compiled.
--dnl ## All of these are normally in the extension directories.
--
- dnl Extension configuration.
- dnl -------------------------------------------------------------------------
-
-diff -up php-5.3.8/ext/standard/config.m4.aconf259 php-5.3.8/ext/standard/config.m4
---- php-5.3.8/ext/standard/config.m4.aconf259 2010-06-17 12:22:03.000000000 +0200
-+++ php-5.3.8/ext/standard/config.m4 2011-09-12 17:42:17.018672714 +0200
-@@ -1,7 +1,5 @@
- dnl $Id: config.m4 300511 2010-06-17 10:22:03Z pajoye $ -*- autoconf -*-
-
--divert(3)dnl
--
- dnl
- dnl Check if flush should be called explicitly after buffered io
- dnl
-@@ -342,8 +340,6 @@ dnl
- AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy)
- AC_FUNC_FNMATCH
-
--divert(5)dnl
--
- dnl
- dnl Check if there is a support means of creating a new process
- dnl and defining which handles it receives
-diff -up php-5.3.8/scripts/php-config.in.aconf259 php-5.3.8/scripts/php-config.in
---- php-5.3.8/scripts/php-config.in.aconf259 2011-04-18 13:13:37.000000000 +0200
-+++ php-5.3.8/scripts/php-config.in 2011-09-12 17:42:17.019672714 +0200
-@@ -2,6 +2,7 @@
-
- SED="@SED@"
- prefix="@prefix@"
-+datarootdir="@datarootdir@"
- exec_prefix="@exec_prefix@"
- version="@PHP_VERSION@"
- vernum="@PHP_VERSION_ID@"
-diff -up php-5.3.8/scripts/phpize.in.aconf259 php-5.3.8/scripts/phpize.in
---- php-5.3.8/scripts/phpize.in.aconf259 2009-06-24 09:42:33.000000000 +0200
-+++ php-5.3.8/scripts/phpize.in 2011-09-12 17:43:12.706714796 +0200
-@@ -2,6 +2,7 @@
-
- # Variable declaration
- prefix='@prefix@'
-+datarootdir='@datarootdir@'
- exec_prefix="`eval echo @exec_prefix@`"
- phpdir="`eval echo @libdir@`/build"
- includedir="`eval echo @includedir@`/php"
-diff -up php-5.3.8/scripts/phpize.m4.aconf259 php-5.3.8/scripts/phpize.m4
---- php-5.3.8/scripts/phpize.m4.aconf259 2010-11-02 10:58:08.000000000 +0100
-+++ php-5.3.8/scripts/phpize.m4 2011-09-12 17:42:17.020672715 +0200
-@@ -1,9 +1,8 @@
- dnl This file becomes configure.in for self-contained extensions.
-
--divert(1)
--
--AC_PREREQ(2.13)
-+AC_PREREQ(2.59)
- AC_INIT(config.m4)
-+ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], [])
-
- PHP_CONFIG_NICE(config.nice)
-
diff --git a/php-5.3.8-isa.patch b/php-5.3.8-isa.patch
deleted file mode 100644
index 93de48c..0000000
--- a/php-5.3.8-isa.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- php/php-src/branches/PHP_5_3/Zend/zend_builtin_functions.c 2011/09/23 09:29:27 317182
-+++ php/php-src/branches/PHP_5_3/Zend/zend_builtin_functions.c 2011/09/23 09:52:09 317183
-@@ -816,13 +816,19 @@
- int class_name_len;
- zend_class_entry *instance_ce;
- zend_class_entry **ce;
-+ zend_bool allow_string = only_subclass;
- zend_bool retval;
-
-- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zs", &obj, &class_name, &class_name_len) == FAILURE) {
-+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zs|b", &obj, &class_name, &class_name_len, &allow_string) == FAILURE) {
- return;
- }
--
-- if (Z_TYPE_P(obj) == IS_STRING) {
-+ /*
-+ allow_string - is_a default is no, is_subclass_of is yes.
-+ if it's allowed, then the autoloader will be called if the class does not exist.
-+ default behaviour is different, as 'is_a' usage is normally to test mixed return values
-+ */
-+
-+ if (allow_string && Z_TYPE_P(obj) == IS_STRING) {
- zend_class_entry **the_ce;
- if (zend_lookup_class(Z_STRVAL_P(obj), Z_STRLEN_P(obj), &the_ce TSRMLS_CC) == FAILURE) {
- RETURN_FALSE;
-@@ -848,7 +854,7 @@
- }
-
-
--/* {{{ proto bool is_subclass_of(object object, string class_name)
-+/* {{{ proto bool is_subclass_of(mixed object_or_string, string class_name [, bool allow_string=true])
- Returns true if the object has this class as one of its parents */
- ZEND_FUNCTION(is_subclass_of)
- {
-@@ -857,8 +863,8 @@
- /* }}} */
-
-
--/* {{{ proto bool is_a(object object, string class_name)
-- Returns true if the object is of this class or has this class as one of its parents */
-+/* {{{ proto bool is_a(mixed object_or_string, string class_name [, bool allow_string=false])
-+ Returns true if the first argument is an object and is this class or has this class as one of its parents, */
- ZEND_FUNCTION(is_a)
- {
- is_a_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
diff --git a/php-5.3.8-mysqlnd.patch b/php-5.3.8-mysqlnd.patch
deleted file mode 100644
index 7849784..0000000
--- a/php-5.3.8-mysqlnd.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -up php-5.3.8/ext/mysqlnd/config9.m4.mysqlnd php-5.3.8/ext/mysqlnd/config9.m4
---- php-5.3.8/ext/mysqlnd/config9.m4.mysqlnd 2011-03-23 18:14:28.000000000 +0100
-+++ php-5.3.8/ext/mysqlnd/config9.m4 2011-09-12 17:44:54.403846592 +0200
-@@ -3,6 +3,10 @@ dnl $Id: config9.m4 309609 2011-03-23 17
- dnl config.m4 for mysqlnd driver
-
-
-+PHP_ARG_ENABLE(mysqlnd, whether to enable mysqlnd,
-+ [ --enable-mysqlnd Enable mysqlnd expliciely, will be done implicitly
-+ when required by other extensions], no, yes)
-+
- PHP_ARG_ENABLE(mysqlnd_compression_support, whether to enable compressed protocol support in mysqlnd,
- [ --disable-mysqlnd-compression-support
- Disable support for the MySQL compressed protocol in mysqlnd], yes, no)
-@@ -13,7 +17,7 @@ if test -z "$PHP_ZLIB_DIR"; then
- fi
-
- dnl If some extension uses mysqlnd it will get compiled in PHP core
--if test "$PHP_MYSQLND_ENABLED" = "yes"; then
-+if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
- mysqlnd_ps_sources="mysqlnd_ps.c mysqlnd_ps_codec.c"
- mysqlnd_base_sources="mysqlnd.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
- mysqlnd_loaddata.c mysqlnd_net.c mysqlnd_statistics.c \
-@@ -27,12 +31,12 @@ if test "$PHP_MYSQLND_ENABLED" = "yes";
- AC_DEFINE([MYSQLND_SSL_SUPPORTED], 1, [Enable SSL support])
-
- mysqlnd_sources="$mysqlnd_base_sources $mysqlnd_ps_sources"
-- PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, no)
-+ PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, $ext_shared)
- PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
- PHP_INSTALL_HEADERS([ext/mysqlnd/])
- fi
-
--if test "$PHP_MYSQLND_ENABLED" = "yes" || test "$PHP_MYSQLI" != "no"; then
-+if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes" || test "$PHP_MYSQLI" != "no"; then
- PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
-
- dnl This creates a file so it has to be after above macros
-diff -up php-5.3.8/ext/mysqlnd/mysqlnd.c.mysqlnd php-5.3.8/ext/mysqlnd/mysqlnd.c
---- php-5.3.8/ext/mysqlnd/mysqlnd.c.mysqlnd 2011-09-12 17:50:37.676119503 +0200
-+++ php-5.3.8/ext/mysqlnd/mysqlnd.c 2011-09-12 17:50:41.695136669 +0200
-@@ -620,7 +620,7 @@ MYSQLND_METHOD(mysqlnd_conn, connect)(MY
- if (host_len == sizeof("localhost") - 1 && !strncasecmp(host, "localhost", host_len)) {
- DBG_INF_FMT("socket=%s", socket_or_pipe? socket_or_pipe:"n/a");
- if (!socket_or_pipe) {
-- socket_or_pipe = "/tmp/mysql.sock";
-+ socket_or_pipe = "/var/lib/mysql/mysql.sock";
- }
- transport_len = spprintf(&transport, 0, "unix://%s", socket_or_pipe);
- unix_socket = TRUE;
-diff -up php-5.3.8/ext/mysqlnd/php_mysqlnd.c.mysqlnd php-5.3.8/ext/mysqlnd/php_mysqlnd.c
---- php-5.3.8/ext/mysqlnd/php_mysqlnd.c.mysqlnd 2011-08-06 16:47:44.000000000 +0200
-+++ php-5.3.8/ext/mysqlnd/php_mysqlnd.c 2011-09-12 17:44:54.404846593 +0200
-@@ -299,6 +299,11 @@ zend_module_entry mysqlnd_module_entry =
- };
- /* }}} */
-
-+/* {{{ COMPILE_DL_MYSQLND */
-+#ifdef COMPILE_DL_MYSQLND
-+ZEND_GET_MODULE(mysqlnd)
-+#endif
-+/* }}} */
-
- /*
- * Local variables:
-diff -up php-5.3.8/ext/pdo_mysql/pdo_mysql.c.mysqlnd php-5.3.8/ext/pdo_mysql/pdo_mysql.c
---- php-5.3.8/ext/pdo_mysql/pdo_mysql.c.mysqlnd 2011-09-12 17:49:24.769799256 +0200
-+++ php-5.3.8/ext/pdo_mysql/pdo_mysql.c 2011-09-12 17:49:31.216828314 +0200
-@@ -42,7 +42,7 @@ ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql);
- # ifdef PHP_MYSQL_UNIX_SOCK_ADDR
- # define PDO_MYSQL_UNIX_ADDR PHP_MYSQL_UNIX_SOCK_ADDR
- # else
--# define PDO_MYSQL_UNIX_ADDR "/tmp/mysql.sock"
-+# define PDO_MYSQL_UNIX_ADDR "/var/lib/mysql/mysql.sock"
- # endif
- # endif
- #endif
diff --git a/php-5.4.0-dlopen.patch b/php-5.4.0-dlopen.patch
new file mode 100644
index 0000000..c2b0e40
--- /dev/null
+++ b/php-5.4.0-dlopen.patch
@@ -0,0 +1,17 @@
+--- php-5.4.0RC5/Zend/zend.h.dlopen 2012-01-18 17:10:33.972013835 +0100
++++ php-5.4.0RC5/Zend/zend.h 2012-01-18 17:12:39.175019492 +0100
+@@ -90,11 +90,11 @@
+ # endif
+
+ # if defined(RTLD_GROUP) && defined(RTLD_WORLD) && defined(RTLD_PARENT)
+-# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
++# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
+ # elif defined(RTLD_DEEPBIND)
+-# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND)
++# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL | RTLD_DEEPBIND)
+ # else
+-# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL)
++# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL)
+ # endif
+ # define DL_UNLOAD dlclose
+ # if defined(DLSYM_NEEDS_UNDERSCORE)
diff --git a/php-5.4.0-easter.patch b/php-5.4.0-easter.patch
new file mode 100644
index 0000000..6ca8f92
--- /dev/null
+++ b/php-5.4.0-easter.patch
@@ -0,0 +1,689 @@
+diff -up php-5.4.0RC5/ext/standard/basic_functions.c.easter php-5.4.0RC5/ext/standard/basic_functions.c
+--- php-5.4.0RC5/ext/standard/basic_functions.c.easter 2012-01-18 17:17:54.016033939 +0100
++++ php-5.4.0RC5/ext/standard/basic_functions.c 2012-01-18 17:18:54.022036314 +0100
+@@ -1554,9 +1554,6 @@ ZEND_END_ARG_INFO()
+ ZEND_BEGIN_ARG_INFO(arginfo_php_real_logo_guid, 0)
+ ZEND_END_ARG_INFO()
+
+-ZEND_BEGIN_ARG_INFO(arginfo_php_egg_logo_guid, 0)
+-ZEND_END_ARG_INFO()
+-
+ ZEND_BEGIN_ARG_INFO(arginfo_zend_logo_guid, 0)
+ ZEND_END_ARG_INFO()
+
+@@ -2719,7 +2716,6 @@ const zend_function_entry basic_function
+ PHP_FE(phpcredits, arginfo_phpcredits)
+ PHP_FE(php_logo_guid, arginfo_php_logo_guid)
+ PHP_FE(php_real_logo_guid, arginfo_php_real_logo_guid)
+- PHP_FE(php_egg_logo_guid, arginfo_php_egg_logo_guid)
+ PHP_FE(zend_logo_guid, arginfo_zend_logo_guid)
+ PHP_FE(php_sapi_name, arginfo_php_sapi_name)
+ PHP_FE(php_uname, arginfo_php_uname)
+diff -up php-5.4.0RC5/ext/standard/info.c.easter php-5.4.0RC5/ext/standard/info.c
+--- php-5.4.0RC5/ext/standard/info.c.easter 2012-01-18 17:17:44.712033203 +0100
++++ php-5.4.0RC5/ext/standard/info.c 2012-01-18 17:19:58.097039189 +0100
+@@ -1195,21 +1195,7 @@ PHP_FUNCTION(phpcredits)
+ */
+ PHPAPI char *php_logo_guid(void)
+ {
+- char *logo_guid;
+-
+- time_t the_time;
+- struct tm *ta, tmbuf;
+-
+- the_time = time(NULL);
+- ta = php_localtime_r(&the_time, &tmbuf);
+-
+- if (ta && (ta->tm_mon==3) && (ta->tm_mday==1)) {
+- logo_guid = PHP_EGG_LOGO_GUID;
+- } else {
+- logo_guid = PHP_LOGO_GUID;
+- }
+-
+- return estrdup(logo_guid);
++ return estrdup(PHP_LOGO_GUID);
+
+ }
+ /* }}} */
+@@ -1238,18 +1224,6 @@ PHP_FUNCTION(php_real_logo_guid)
+ }
+ /* }}} */
+
+-/* {{{ proto string php_egg_logo_guid(void)
+- Return the special ID used to request the PHP logo in phpinfo screens*/
+-PHP_FUNCTION(php_egg_logo_guid)
+-{
+- if (zend_parse_parameters_none() == FAILURE) {
+- return;
+- }
+-
+- RETURN_STRINGL(PHP_EGG_LOGO_GUID, sizeof(PHP_EGG_LOGO_GUID)-1, 1);
+-}
+-/* }}} */
+-
+ /* {{{ proto string zend_logo_guid(void)
+ Return the special ID used to request the Zend logo in phpinfo screens*/
+ PHP_FUNCTION(zend_logo_guid)
+diff -up php-5.4.0RC5/ext/standard/info.h.easter php-5.4.0RC5/ext/standard/info.h
+--- php-5.4.0RC5/ext/standard/info.h.easter 2012-01-18 17:17:37.245032832 +0100
++++ php-5.4.0RC5/ext/standard/info.h 2012-01-18 17:20:17.160040044 +0100
+@@ -51,7 +51,6 @@
+ #endif /* HAVE_CREDITS_DEFS */
+
+ #define PHP_LOGO_GUID "PHPE9568F34-D428-11d2-A769-00AA001ACF42"
+-#define PHP_EGG_LOGO_GUID "PHPE9568F36-D428-11d2-A769-00AA001ACF42"
+ #define ZEND_LOGO_GUID "PHPE9568F35-D428-11d2-A769-00AA001ACF42"
+ #define PHP_CREDITS_GUID "PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000"
+
+@@ -62,7 +61,6 @@ PHP_FUNCTION(phpcredits);
+ PHP_FUNCTION(php_logo_guid);
+ PHP_FUNCTION(php_real_logo_guid);
+ PHP_FUNCTION(zend_logo_guid);
+-PHP_FUNCTION(php_egg_logo_guid);
+ PHP_FUNCTION(php_sapi_name);
+ PHP_FUNCTION(php_uname);
+ PHP_FUNCTION(php_ini_scanned_files);
+diff -up php-5.4.0RC5/main/logos.h.easter php-5.4.0RC5/main/logos.h
+--- php-5.4.0RC5/main/logos.h.easter 2012-01-18 17:17:27.975032470 +0100
++++ php-5.4.0RC5/main/logos.h 2012-01-18 17:21:27.036043180 +0100
+@@ -492,589 +492,3 @@ static const unsigned char php_logo[] =
+ 21, 116, 187, 251, 221, 240, 142, 119, 188, 3,
+ 1, 0, 59, 0 };
+
+-static const unsigned char php_egg_logo[] = {
+- 71, 73, 70, 56, 57, 97, 120, 0, 67, 0,
+- 231, 255, 0, 18, 25, 33, 32, 30, 34, 28,
+- 33, 44, 15, 35, 71, 6, 37, 85, 37, 40,
+- 47, 34, 41, 53, 41, 40, 43, 9, 47, 109,
+- 30, 45, 68, 21, 48, 84, 51, 46, 55, 43,
+- 49, 59, 31, 59, 98, 15, 61, 128, 58, 55,
+- 69, 50, 57, 74, 0, 66, 144, 56, 58, 60,
+- 54, 59, 71, 32, 66, 113, 60, 65, 67, 63,
+- 65, 84, 63, 68, 79, 28, 79, 145, 15, 82,
+- 162, 75, 72, 98, 68, 78, 86, 74, 77, 88,
+- 50, 82, 122, 41, 85, 134, 76, 78, 108, 70,
+- 83, 101, 5, 94, 190, 0, 95, 197, 86, 80,
+- 101, 28, 92, 159, 80, 84, 96, 83, 83, 115,
+- 81, 87, 89, 22, 97, 183, 86, 88, 85, 0,
+- 102, 210, 8, 101, 204, 24, 100, 177, 85, 90,
+- 127, 35, 101, 169, 42, 100, 159, 88, 92, 103,
+- 0, 107, 216, 69, 95, 132, 0, 108, 210, 84,
+- 93, 112, 94, 90, 117, 18, 105, 201, 96, 92,
+- 105, 89, 96, 98, 94, 93, 135, 94, 94, 126,
+- 30, 106, 210, 7, 112, 222, 33, 108, 198, 16,
+- 114, 217, 27, 113, 198, 24, 113, 209, 59, 108,
+- 159, 96, 100, 138, 0, 120, 229, 44, 112, 180,
+- 49, 112, 171, 71, 108, 148, 99, 104, 115, 90,
+- 106, 125, 27, 115, 232, 100, 102, 147, 42, 115,
+- 192, 86, 110, 137, 9, 123, 239, 106, 108, 105,
+- 105, 105, 138, 33, 118, 228, 12, 125, 227, 48,
+- 117, 208, 16, 126, 222, 37, 120, 224, 20, 125,
+- 235, 35, 123, 213, 50, 121, 190, 43, 123, 206,
+- 40, 123, 220, 105, 110, 160, 59, 122, 182, 78,
+- 119, 158, 44, 122, 233, 3, 134, 250, 112, 112,
+- 151, 73, 123, 175, 113, 118, 114, 51, 128, 205,
+- 34, 129, 246, 11, 136, 245, 34, 130, 240, 113,
+- 117, 149, 111, 116, 166, 111, 119, 141, 48, 130,
+- 221, 38, 132, 235, 53, 130, 215, 97, 124, 146,
+- 116, 122, 124, 117, 121, 131, 54, 130, 229, 41,
+- 135, 232, 68, 130, 223, 46, 135, 246, 65, 134,
+- 202, 42, 137, 241, 75, 131, 205, 124, 121, 161,
+- 101, 125, 191, 86, 128, 210, 121, 122, 169, 105,
+- 128, 157, 121, 122, 180, 114, 124, 181, 94, 128,
+- 201, 81, 134, 185, 46, 138, 252, 76, 135, 195,
+- 34, 142, 252, 62, 137, 229, 63, 138, 217, 33,
+- 144, 247, 58, 139, 223, 56, 141, 246, 54, 143,
+- 234, 57, 143, 241, 102, 135, 193, 129, 130, 176,
+- 122, 136, 144, 46, 148, 252, 45, 149, 246, 118,
+- 133, 191, 65, 146, 231, 73, 146, 216, 129, 133,
+- 185, 135, 135, 156, 69, 148, 226, 44, 153, 255,
+- 94, 143, 216, 132, 136, 175, 88, 146, 207, 137,
+- 139, 136, 93, 146, 197, 95, 147, 188, 137, 139,
+- 150, 104, 146, 178, 122, 143, 172, 135, 139, 191,
+- 57, 156, 254, 67, 154, 245, 70, 154, 239, 134,
+- 141, 180, 117, 145, 201, 120, 146, 190, 79, 154,
+- 233, 140, 141, 188, 129, 144, 194, 142, 142, 176,
+- 137, 147, 156, 88, 155, 222, 82, 157, 230, 93,
+- 157, 218, 66, 162, 253, 100, 157, 210, 77, 161,
+- 247, 55, 168, 255, 81, 162, 241, 148, 148, 195,
+- 145, 149, 202, 127, 156, 204, 77, 166, 255, 142,
+- 155, 177, 141, 153, 200, 123, 160, 193, 73, 171,
+- 255, 93, 167, 240, 96, 167, 234, 152, 158, 160,
+- 101, 167, 228, 119, 164, 206, 155, 158, 171, 110,
+- 167, 219, 156, 155, 203, 89, 172, 252, 128, 164,
+- 219, 151, 163, 174, 81, 178, 255, 158, 162, 202,
+- 102, 175, 249, 93, 178, 251, 108, 175, 237, 103,
+- 177, 244, 166, 168, 165, 97, 182, 255, 87, 185,
+- 255, 149, 174, 216, 125, 181, 235, 110, 185, 252,
+- 117, 183, 254, 171, 172, 209, 166, 175, 197, 103,
+- 190, 255, 174, 176, 189, 140, 183, 221, 128, 184,
+- 248, 120, 187, 249, 179, 180, 184, 115, 193, 253,
+- 170, 183, 193, 174, 181, 215, 107, 197, 255, 135,
+- 191, 246, 151, 192, 219, 187, 183, 213, 128, 197,
+- 253, 121, 202, 255, 147, 198, 239, 188, 191, 219,
+- 148, 200, 252, 192, 193, 197, 134, 205, 254, 171,
+- 199, 236, 183, 199, 218, 163, 207, 251, 142, 213,
+- 255, 158, 211, 253, 195, 205, 217, 166, 211, 245,
+- 205, 204, 228, 153, 218, 255, 190, 210, 236, 186,
+- 212, 231, 177, 213, 248, 162, 224, 255, 188, 221,
+- 250, 214, 219, 221, 214, 219, 233, 174, 229, 254,
+- 198, 225, 247, 209, 226, 248, 186, 233, 251, 227,
+- 230, 239, 225, 241, 252, 253, 255, 252, 255, 255,
+- 255, 33, 249, 4, 1, 10, 0, 255, 0, 44,
+- 0, 0, 0, 0, 120, 0, 67, 0, 0, 8,
+- 254, 0, 255, 9, 28, 72, 176, 160, 193, 131,
+- 8, 19, 42, 92, 200, 176, 161, 195, 135, 16,
+- 35, 74, 156, 72, 177, 162, 197, 139, 22, 131,
+- 105, 12, 134, 177, 163, 199, 143, 193, 164, 73,
+- 227, 38, 141, 28, 56, 112, 228, 76, 146, 20,
+- 41, 205, 152, 75, 99, 183, 100, 201, 50, 101,
+- 202, 147, 77, 79, 166, 102, 205, 250, 200, 19,
+- 100, 73, 114, 239, 238, 221, 123, 71, 148, 104,
+- 202, 163, 224, 86, 138, 124, 25, 115, 166, 205,
+- 72, 145, 246, 72, 221, 195, 39, 207, 30, 69,
+- 158, 118, 246, 220, 202, 208, 24, 184, 160, 252,
+- 248, 9, 29, 59, 212, 100, 75, 99, 53, 159,
+- 66, 93, 203, 182, 109, 84, 169, 124, 248, 156,
+- 57, 163, 165, 174, 150, 60, 138, 76, 113, 221,
+- 251, 207, 24, 183, 119, 97, 3, 135, 125, 71,
+- 78, 90, 76, 62, 142, 70, 141, 18, 53, 109,
+- 170, 227, 199, 144, 35, 75, 157, 91, 87, 137,
+- 229, 28, 74, 190, 228, 229, 139, 209, 43, 96,
+- 193, 247, 10, 203, 114, 212, 167, 82, 47, 93,
+- 197, 138, 81, 163, 166, 173, 19, 47, 201, 176,
+- 99, 59, 166, 171, 36, 135, 237, 22, 45, 114,
+- 216, 209, 203, 25, 98, 176, 191, 66, 195, 134,
+- 54, 230, 233, 150, 179, 100, 197, 106, 181, 90,
+- 158, 171, 57, 179, 110, 231, 124, 185, 145, 77,
+- 157, 186, 150, 218, 45, 76, 104, 111, 145, 71,
+- 86, 239, 133, 198, 200, 254, 145, 189, 199, 205,
+- 212, 212, 115, 244, 232, 157, 107, 86, 172, 185,
+- 234, 92, 197, 154, 137, 11, 231, 11, 77, 245,
+- 251, 178, 207, 40, 201, 254, 225, 131, 134, 39,
+- 138, 124, 103, 80, 73, 68, 13, 37, 141, 39,
+- 144, 213, 115, 14, 60, 235, 116, 211, 12, 123,
+- 197, 136, 67, 141, 106, 226, 156, 51, 78, 16,
+- 92, 208, 194, 7, 126, 28, 70, 166, 159, 9,
+- 26, 132, 104, 130, 29, 2, 254, 67, 32, 81,
+- 224, 200, 18, 91, 56, 240, 208, 35, 78, 51,
+- 238, 49, 40, 223, 58, 240, 88, 99, 132, 31,
+- 207, 168, 131, 14, 55, 206, 56, 115, 203, 41,
+- 167, 172, 229, 73, 36, 158, 196, 133, 216, 83,
+- 29, 58, 166, 69, 11, 26, 88, 96, 129, 6,
+- 95, 112, 230, 213, 81, 210, 188, 21, 27, 59,
+- 208, 208, 179, 14, 123, 205, 81, 227, 96, 55,
+- 235, 208, 227, 14, 23, 126, 244, 162, 204, 49,
+- 200, 64, 3, 13, 51, 194, 232, 162, 139, 50,
+- 105, 106, 131, 13, 54, 225, 132, 227, 205, 157,
+- 207, 96, 243, 204, 48, 195, 244, 72, 28, 126,
+- 103, 48, 233, 164, 6, 36, 246, 20, 210, 81,
+- 198, 224, 87, 143, 48, 12, 78, 8, 75, 43,
+- 242, 21, 3, 38, 60, 227, 116, 224, 2, 22,
+- 135, 32, 162, 41, 33, 112, 208, 129, 72, 35,
+- 135, 8, 242, 72, 40, 163, 150, 82, 202, 42,
+- 186, 172, 178, 203, 46, 169, 170, 154, 76, 50,
+- 254, 123, 158, 194, 97, 14, 22, 60, 240, 192,
+- 7, 188, 117, 228, 23, 74, 198, 88, 41, 219,
+- 56, 189, 36, 19, 203, 57, 235, 80, 147, 11,
+- 44, 176, 20, 211, 96, 51, 240, 192, 195, 14,
+- 5, 36, 88, 129, 8, 33, 116, 200, 81, 198,
+- 181, 101, 208, 1, 199, 27, 220, 110, 59, 69,
+- 22, 130, 20, 82, 200, 35, 165, 76, 34, 110,
+- 33, 147, 64, 162, 174, 42, 192, 200, 122, 223,
+- 25, 38, 216, 186, 192, 19, 24, 133, 52, 82,
+- 149, 247, 161, 179, 203, 35, 136, 8, 243, 72,
+- 57, 244, 80, 179, 220, 39, 185, 192, 163, 77,
+- 55, 244, 236, 227, 14, 5, 17, 0, 65, 7,
+- 25, 101, 120, 81, 197, 196, 216, 82, 97, 49,
+- 21, 81, 68, 145, 69, 22, 105, 116, 236, 113,
+- 26, 161, 148, 59, 136, 24, 98, 64, 210, 203,
+- 40, 28, 106, 161, 193, 2, 11, 88, 144, 171,
+- 68, 246, 74, 163, 226, 125, 207, 156, 105, 8,
+- 25, 212, 54, 218, 202, 39, 4, 227, 115, 142,
+- 54, 233, 177, 211, 65, 4, 51, 84, 113, 109,
+- 21, 77, 52, 1, 69, 23, 19, 15, 1, 197,
+- 16, 84, 12, 17, 197, 182, 112, 8, 146, 198,
+- 20, 86, 147, 139, 204, 49, 169, 78, 50, 200,
+- 32, 144, 56, 210, 97, 14, 15, 176, 28, 37,
+- 204, 198, 180, 228, 107, 108, 158, 60, 19, 202,
+- 43, 159, 200, 225, 133, 28, 175, 224, 3, 15,
+- 50, 176, 80, 2, 75, 254, 51, 94, 34, 140,
+- 143, 208, 68, 119, 129, 45, 210, 93, 48, 13,
+- 197, 210, 60, 240, 0, 133, 15, 111, 104, 138,
+- 8, 28, 27, 79, 1, 199, 35, 163, 234, 18,
+- 139, 155, 233, 206, 177, 97, 202, 22, 28, 112,
+- 128, 14, 17, 5, 227, 210, 204, 213, 69, 178,
+- 11, 40, 160, 16, 194, 8, 33, 134, 52, 17,
+- 142, 122, 197, 236, 156, 11, 51, 185, 52, 3,
+- 244, 62, 128, 207, 16, 49, 182, 93, 36, 125,
+- 120, 23, 135, 67, 193, 131, 15, 112, 148, 147,
+- 143, 58, 216, 8, 3, 249, 198, 89, 192, 1,
+- 199, 33, 143, 196, 18, 203, 42, 144, 104, 222,
+- 33, 31, 26, 120, 62, 194, 67, 162, 255, 121,
+- 159, 35, 149, 104, 58, 135, 21, 100, 64, 92,
+- 69, 139, 198, 238, 156, 236, 222, 226, 208, 131,
+- 207, 56, 13, 56, 80, 116, 19, 215, 54, 81,
+- 197, 24, 73, 23, 126, 248, 16, 62, 248, 144,
+- 133, 62, 110, 112, 194, 50, 202, 113, 8, 231,
+- 101, 193, 7, 64, 152, 220, 184, 30, 129, 42,
+- 93, 168, 66, 108, 29, 50, 129, 231, 52, 208,
+- 16, 89, 220, 162, 87, 248, 137, 68, 29, 178,
+- 160, 6, 53, 188, 225, 5, 85, 176, 86, 21,
+- 232, 1, 15, 113, 228, 98, 57, 173, 104, 143,
+- 151, 224, 241, 190, 248, 249, 160, 126, 114, 136,
+- 161, 181, 202, 16, 53, 167, 13, 97, 120, 105,
+- 184, 7, 7, 12, 224, 4, 111, 192, 65, 114,
+- 254, 144, 3, 66, 26, 14, 145, 6, 43, 88,
+- 1, 11, 107, 128, 196, 42, 86, 1, 65, 14,
+- 181, 224, 0, 1, 160, 160, 66, 100, 114, 139,
+- 181, 197, 230, 22, 117, 152, 194, 20, 162, 160,
+- 134, 42, 144, 64, 10, 248, 163, 67, 122, 214,
+- 17, 187, 79, 232, 45, 23, 226, 16, 7, 62,
+- 240, 97, 13, 5, 16, 109, 12, 215, 98, 4,
+- 207, 64, 193, 51, 77, 53, 66, 83, 84, 240,
+- 65, 26, 218, 113, 1, 3, 180, 1, 27, 144,
+- 19, 196, 183, 128, 128, 196, 66, 132, 98, 13,
+- 63, 72, 228, 15, 176, 32, 134, 68, 52, 241,
+- 62, 45, 8, 64, 0, 106, 144, 144, 89, 152,
+- 66, 22, 8, 186, 207, 40, 214, 32, 8, 107,
+- 216, 194, 5, 67, 144, 218, 15, 134, 208, 5,
+- 68, 184, 15, 30, 205, 120, 148, 25, 97, 1,
+- 157, 125, 208, 227, 25, 3, 136, 64, 12, 232,
+- 215, 136, 121, 200, 35, 31, 249, 168, 71, 61,
+- 242, 33, 143, 118, 108, 67, 30, 208, 128, 195,
+- 32, 218, 49, 1, 1, 180, 1, 121, 199, 120,
+- 197, 35, 136, 184, 134, 102, 146, 11, 137, 88,
+- 80, 228, 37, 104, 145, 36, 13, 72, 178, 80,
+- 5, 153, 5, 78, 50, 73, 157, 72, 92, 98,
+- 13, 135, 208, 135, 63, 252, 129, 132, 40, 116,
+- 193, 105, 192, 11, 5, 62, 92, 217, 140, 157,
+- 49, 162, 21, 104, 60, 199, 62, 224, 225, 10,
+- 2, 68, 128, 10, 114, 254, 32, 196, 49, 178,
+- 113, 129, 11, 112, 224, 159, 37, 224, 192, 6,
+- 46, 176, 129, 108, 148, 99, 21, 213, 40, 230,
+- 1, 78, 128, 3, 55, 240, 34, 29, 216, 8,
+- 197, 36, 122, 81, 10, 114, 61, 2, 93, 107,
+- 136, 230, 28, 230, 96, 13, 43, 202, 230, 1,
+- 1, 56, 128, 119, 10, 146, 150, 251, 240, 65,
+- 21, 88, 200, 194, 60, 198, 233, 143, 84, 164,
+- 193, 104, 72, 43, 195, 49, 214, 8, 143, 216,
+- 49, 226, 157, 197, 208, 70, 251, 216, 193, 5,
+- 2, 100, 160, 10, 129, 64, 4, 54, 54, 81,
+- 2, 24, 148, 128, 6, 48, 160, 193, 81, 3,
+- 202, 0, 115, 120, 99, 19, 19, 40, 128, 1,
+- 74, 208, 79, 6, 20, 32, 12, 222, 8, 133,
+- 45, 136, 241, 141, 103, 232, 194, 84, 143, 72,
+- 195, 15, 196, 112, 9, 87, 248, 226, 22, 28,
+- 58, 3, 20, 183, 71, 144, 89, 16, 201, 163,
+- 145, 185, 68, 74, 7, 145, 130, 106, 140, 83,
+- 15, 136, 40, 131, 181, 154, 48, 6, 111, 140,
+- 145, 61, 173, 72, 214, 131, 210, 83, 41, 2,
+- 160, 128, 12, 140, 104, 68, 57, 220, 80, 212,
+- 106, 224, 50, 151, 250, 248, 69, 9, 24, 208,
+- 6, 126, 28, 225, 2, 1, 32, 70, 53, 126,
+- 193, 88, 1, 0, 96, 17, 165, 96, 2, 65,
+- 113, 16, 6, 76, 96, 98, 27, 202, 16, 43,
+- 89, 51, 193, 10, 82, 108, 174, 58, 38, 144,
+- 254, 228, 203, 134, 4, 87, 200, 220, 1, 11,
+- 64, 160, 66, 16, 12, 80, 128, 118, 216, 195,
+- 5, 141, 40, 31, 182, 216, 145, 30, 23, 181,
+- 135, 149, 212, 8, 19, 60, 188, 145, 0, 4,
+- 100, 225, 19, 59, 155, 7, 13, 78, 80, 130,
+- 109, 60, 67, 24, 141, 128, 67, 33, 204, 81,
+- 130, 2, 84, 224, 30, 37, 152, 128, 4, 242,
+- 113, 167, 121, 216, 162, 152, 39, 120, 6, 8,
+- 4, 192, 128, 13, 112, 160, 159, 6, 192, 68,
+- 41, 122, 240, 131, 65, 0, 2, 16, 115, 48,
+- 171, 51, 238, 3, 69, 41, 254, 195, 173, 181,
+- 125, 12, 31, 122, 0, 132, 25, 248, 192, 3,
+- 211, 56, 0, 13, 54, 145, 5, 50, 236, 149,
+- 126, 236, 104, 17, 60, 186, 113, 44, 73, 73,
+- 120, 29, 174, 136, 37, 28, 102, 215, 10, 121,
+- 208, 192, 13, 71, 72, 135, 50, 38, 22, 133,
+- 66, 164, 163, 187, 12, 216, 6, 7, 24, 112,
+- 132, 114, 192, 33, 13, 144, 248, 69, 1, 0,
+- 112, 2, 98, 126, 54, 30, 211, 32, 6, 26,
+- 120, 11, 12, 32, 244, 64, 12, 115, 240, 195,
+- 18, 174, 0, 8, 87, 144, 226, 20, 164, 147,
+- 76, 36, 3, 48, 82, 243, 4, 120, 42, 3,
+- 182, 193, 10, 86, 48, 3, 18, 20, 32, 0,
+- 2, 32, 129, 26, 200, 80, 133, 194, 53, 129,
+- 12, 236, 160, 17, 60, 210, 7, 11, 113, 172,
+- 227, 204, 225, 144, 129, 254, 97, 65, 33, 12,
+- 129, 165, 131, 3, 55, 112, 131, 45, 142, 81,
+- 5, 42, 188, 225, 17, 237, 88, 241, 2, 36,
+- 107, 128, 69, 196, 66, 13, 130, 120, 6, 26,
+- 60, 187, 136, 106, 120, 22, 23, 186, 224, 90,
+- 60, 12, 0, 0, 78, 76, 161, 7, 88, 152,
+- 67, 16, 92, 176, 4, 34, 92, 97, 11, 91,
+- 200, 132, 53, 204, 35, 153, 51, 72, 146, 94,
+- 255, 120, 242, 84, 60, 177, 4, 41, 171, 64,
+- 5, 59, 0, 2, 5, 18, 128, 1, 56, 220,
+- 236, 90, 189, 83, 3, 59, 206, 97, 230, 102,
+- 64, 55, 23, 201, 61, 179, 55, 26, 128, 128,
+- 52, 188, 162, 24, 204, 128, 196, 52, 56, 0,
+- 131, 77, 88, 67, 24, 132, 64, 196, 33, 212,
+- 241, 139, 11, 20, 224, 8, 104, 184, 128, 0,
+- 170, 129, 8, 53, 100, 193, 25, 16, 0, 0,
+- 0, 182, 49, 104, 6, 36, 67, 153, 143, 184,
+- 68, 2, 0, 192, 133, 52, 160, 0, 11, 87,
+- 120, 129, 11, 88, 192, 110, 18, 144, 128, 8,
+- 153, 118, 70, 162, 34, 99, 129, 40, 10, 196,
+- 164, 128, 232, 193, 10, 98, 16, 131, 29, 248,
+- 27, 8, 133, 224, 32, 33, 132, 123, 173, 70,
+- 172, 35, 141, 235, 64, 6, 116, 97, 65, 172,
+- 51, 103, 98, 0, 25, 120, 133, 48, 218, 163,
+- 138, 84, 252, 51, 27, 232, 160, 6, 51, 160,
+- 193, 142, 108, 28, 97, 2, 12, 176, 7, 18,
+- 254, 250, 136, 142, 14, 102, 161, 19, 140, 102,
+- 64, 59, 178, 189, 1, 109, 188, 34, 20, 133,
+- 240, 131, 103, 57, 113, 136, 31, 44, 97, 14,
+- 91, 32, 1, 187, 89, 224, 110, 23, 144, 160,
+- 8, 96, 240, 3, 46, 146, 44, 149, 15, 4,
+- 96, 1, 247, 174, 206, 41, 176, 96, 131, 29,
+- 240, 32, 6, 42, 224, 247, 14, 124, 16, 5,
+- 58, 88, 221, 193, 85, 240, 2, 51, 194, 113,
+- 142, 110, 72, 40, 23, 202, 233, 70, 179, 202,
+- 209, 1, 2, 212, 129, 25, 108, 202, 133, 55,
+- 208, 192, 129, 18, 152, 227, 30, 230, 216, 6,
+- 49, 156, 64, 108, 8, 164, 226, 30, 48, 152,
+- 192, 6, 158, 65, 7, 53, 88, 1, 9, 158,
+- 61, 194, 52, 102, 76, 12, 109, 8, 35, 22,
+- 144, 232, 196, 161, 225, 32, 134, 43, 92, 161,
+- 8, 47, 120, 1, 17, 212, 237, 110, 12, 252,
+- 28, 211, 156, 128, 140, 18, 36, 41, 144, 215,
+- 194, 198, 19, 115, 0, 194, 10, 84, 192, 131,
+- 33, 240, 187, 223, 62, 160, 66, 178, 7, 14,
+- 49, 50, 208, 233, 96, 231, 152, 16, 123, 230,
+- 83, 142, 12, 59, 32, 22, 26, 103, 70, 43,
+- 230, 1, 130, 182, 95, 128, 6, 19, 184, 64,
+- 240, 139, 234, 134, 120, 84, 99, 197, 109, 240,
+- 134, 26, 232, 80, 7, 11, 104, 123, 27, 72,
+- 0, 192, 6, 228, 49, 14, 61, 165, 131, 6,
+- 0, 144, 0, 43, 4, 254, 49, 136, 43, 16,
+- 33, 8, 30, 136, 60, 188, 225, 237, 238, 23,
+- 20, 97, 11, 153, 127, 204, 230, 3, 240, 223,
+- 234, 140, 2, 11, 83, 142, 58, 15, 202, 80,
+- 133, 167, 199, 96, 8, 141, 128, 155, 33, 62,
+- 65, 6, 67, 112, 29, 26, 21, 114, 14, 204,
+- 144, 83, 212, 112, 14, 222, 80, 118, 98, 128,
+- 12, 180, 35, 12, 185, 32, 15, 16, 0, 103,
+- 71, 0, 98, 71, 0, 3, 48, 224, 6, 219,
+- 48, 15, 143, 32, 9, 28, 48, 1, 188, 80,
+- 14, 84, 160, 6, 137, 192, 104, 23, 144, 14,
+- 217, 38, 1, 188, 112, 130, 188, 0, 3, 152,
+- 149, 10, 230, 50, 8, 150, 22, 4, 50, 0,
+- 6, 91, 64, 4, 46, 224, 2, 145, 7, 126,
+- 65, 16, 4, 91, 128, 11, 234, 199, 121, 255,
+- 16, 23, 178, 81, 7, 82, 32, 2, 168, 22,
+- 3, 62, 48, 4, 100, 160, 6, 79, 23, 5,
+- 135, 240, 10, 173, 48, 45, 251, 7, 13, 231,
+- 160, 38, 102, 118, 14, 117, 82, 39, 126, 0,
+- 113, 186, 128, 12, 12, 88, 11, 185, 176, 13,
+- 19, 112, 3, 37, 192, 15, 185, 84, 15, 243,
+- 16, 15, 234, 112, 12, 136, 80, 10, 237, 64,
+- 12, 196, 112, 15, 215, 64, 5, 112, 128, 11,
+- 22, 208, 103, 182, 32, 1, 0, 192, 0, 239,
+- 5, 80, 23, 208, 6, 207, 80, 8, 96, 3,
+- 111, 70, 128, 6, 118, 192, 4, 96, 0, 121,
+- 254, 36, 240, 2, 96, 176, 33, 150, 192, 5,
+- 92, 224, 43, 235, 39, 16, 103, 224, 121, 144,
+- 49, 10, 63, 48, 3, 163, 23, 3, 195, 243,
+- 129, 101, 160, 6, 169, 247, 10, 200, 0, 10,
+- 204, 209, 10, 194, 16, 14, 201, 195, 34, 7,
+- 151, 12, 225, 0, 12, 10, 224, 0, 147, 160,
+- 13, 180, 227, 133, 208, 240, 11, 196, 230, 6,
+- 253, 112, 12, 159, 208, 119, 86, 103, 8, 214,
+- 246, 10, 209, 80, 14, 209, 0, 10, 67, 0,
+- 7, 227, 16, 15, 247, 192, 15, 72, 192, 91,
+- 246, 176, 13, 169, 176, 8, 110, 144, 10, 214,
+- 5, 61, 35, 227, 2, 91, 32, 3, 86, 33,
+- 21, 92, 0, 6, 47, 224, 1, 50, 32, 10,
+- 176, 17, 137, 63, 72, 137, 142, 113, 10, 98,
+- 208, 116, 81, 199, 111, 60, 64, 5, 143, 83,
+- 6, 67, 160, 6, 177, 16, 14, 208, 160, 13,
+- 106, 194, 12, 200, 160, 12, 218, 112, 12, 82,
+- 152, 12, 187, 160, 10, 151, 64, 1, 8, 240,
+- 3, 10, 184, 51, 148, 208, 10, 139, 85, 2,
+- 37, 176, 9, 253, 32, 12, 134, 80, 6, 251,
+- 83, 62, 84, 144, 45, 141, 64, 8, 84, 192,
+- 3, 158, 8, 4, 86, 64, 10, 28, 32, 0,
+- 56, 224, 13, 194, 176, 11, 222, 80, 14, 202,
+- 16, 10, 135, 32, 46, 141, 7, 111, 45, 224,
+- 24, 145, 144, 9, 91, 0, 6, 70, 0, 6,
+- 112, 101, 116, 72, 247, 254, 15, 123, 112, 6,
+- 176, 65, 11, 63, 176, 111, 59, 208, 111, 154,
+- 216, 142, 135, 0, 10, 136, 16, 10, 194, 160,
+- 13, 201, 160, 13, 117, 34, 14, 208, 128, 12,
+- 186, 208, 11, 187, 112, 9, 128, 224, 1, 20,
+- 64, 0, 8, 96, 3, 203, 1, 11, 159, 112,
+- 83, 175, 80, 15, 52, 208, 118, 196, 144, 15,
+- 185, 32, 66, 67, 80, 5, 100, 64, 7, 81,
+- 83, 56, 85, 48, 3, 20, 233, 3, 54, 208,
+- 3, 157, 192, 0, 0, 64, 12, 208, 0, 10,
+- 63, 4, 7, 202, 54, 146, 133, 48, 7, 151,
+- 64, 4, 96, 112, 146, 144, 225, 7, 96, 192,
+- 5, 226, 40, 21, 245, 38, 69, 158, 48, 23,
+- 145, 97, 10, 115, 96, 3, 34, 48, 122, 231,
+- 88, 122, 112, 160, 6, 165, 16, 11, 161, 112,
+- 12, 202, 112, 9, 151, 16, 14, 226, 32, 143,
+- 244, 40, 6, 24, 224, 0, 8, 128, 0, 17,
+- 128, 2, 135, 128, 66, 173, 64, 9, 140, 64,
+- 9, 185, 208, 15, 196, 144, 10, 191, 192, 15,
+- 236, 0, 10, 114, 96, 56, 93, 32, 7, 73,
+- 120, 67, 80, 64, 5, 59, 128, 132, 84, 0,
+- 4, 107, 48, 104, 5, 240, 13, 194, 0, 10,
+- 111, 0, 4, 64, 32, 57, 105, 128, 46, 171,
+- 48, 7, 223, 39, 4, 145, 1, 132, 157, 246,
+- 105, 2, 49, 11, 115, 33, 142, 167, 240, 3,
+- 54, 224, 3, 153, 152, 56, 80, 243, 6, 112,
+- 254, 0, 138, 177, 32, 12, 208, 160, 10, 106,
+- 130, 13, 0, 24, 14, 197, 128, 148, 107, 208,
+- 3, 86, 32, 138, 202, 193, 51, 85, 121, 83,
+- 173, 112, 14, 229, 192, 14, 234, 80, 14, 173,
+- 160, 87, 101, 0, 60, 33, 148, 132, 112, 32,
+- 60, 60, 48, 3, 184, 233, 3, 170, 224, 75,
+- 237, 128, 13, 79, 72, 5, 84, 246, 45, 83,
+- 0, 136, 221, 71, 4, 50, 64, 147, 29, 178,
+- 100, 35, 37, 147, 132, 249, 24, 137, 128, 152,
+- 43, 224, 111, 57, 121, 132, 92, 4, 7, 161,
+- 160, 12, 111, 162, 11, 115, 32, 153, 199, 176,
+- 117, 63, 83, 158, 244, 8, 10, 148, 48, 144,
+- 237, 25, 8, 44, 26, 8, 114, 16, 8, 169,
+- 193, 8, 11, 41, 56, 133, 195, 3, 244, 99,
+- 117, 84, 80, 5, 80, 192, 111, 244, 195, 63,
+- 64, 16, 10, 186, 32, 12, 5, 234, 3, 49,
+- 48, 3, 195, 153, 6, 88, 48, 50, 240, 246,
+- 1, 73, 178, 7, 253, 213, 86, 90, 224, 160,
+- 142, 33, 6, 33, 48, 101, 254, 118, 67, 169,
+- 39, 8, 175, 208, 132, 210, 179, 11, 189, 176,
+- 5, 202, 160, 12, 107, 194, 117, 83, 216, 10,
+- 180, 83, 149, 44, 234, 5, 99, 224, 5, 127,
+- 224, 5, 110, 58, 6, 178, 89, 6, 74, 51,
+- 49, 80, 192, 144, 246, 83, 6, 159, 210, 119,
+- 166, 55, 75, 12, 57, 3, 213, 201, 132, 160,
+- 160, 6, 81, 48, 4, 254, 51, 48, 3, 89,
+- 96, 68, 73, 234, 125, 65, 96, 2, 73, 18,
+- 91, 1, 240, 50, 255, 160, 8, 81, 234, 24,
+- 142, 176, 4, 33, 32, 2, 137, 57, 3, 84,
+- 0, 5, 29, 84, 53, 64, 154, 42, 170, 144,
+- 9, 92, 112, 9, 165, 16, 143, 196, 98, 133,
+- 12, 184, 51, 104, 170, 166, 99, 176, 166, 115,
+- 227, 162, 173, 154, 52, 247, 217, 101, 89, 87,
+- 6, 132, 208, 8, 62, 89, 5, 67, 144, 147,
+- 19, 195, 3, 43, 96, 3, 81, 240, 10, 141,
+- 160, 6, 95, 217, 159, 126, 106, 3, 71, 36,
+- 6, 68, 80, 4, 50, 144, 36, 106, 21, 0,
+- 108, 5, 165, 147, 42, 21, 166, 96, 169, 83,
+- 214, 111, 137, 83, 5, 206, 3, 10, 161, 48,
+- 61, 170, 224, 7, 32, 0, 1, 50, 0, 9,
+- 186, 64, 39, 86, 104, 120, 202, 161, 170, 140,
+- 224, 166, 106, 250, 7, 109, 234, 166, 49, 228,
+- 5, 134, 224, 5, 73, 67, 63, 114, 80, 5,
+- 183, 154, 58, 55, 164, 2, 177, 73, 6, 80,
+- 96, 164, 108, 214, 10, 92, 198, 63, 51, 16,
+- 2, 6, 75, 95, 138, 42, 165, 248, 1, 82,
+- 34, 117, 16, 166, 80, 23, 155, 115, 11, 87,
+- 96, 161, 51, 192, 111, 156, 170, 108, 160, 32,
+- 61, 171, 192, 10, 32, 16, 124, 48, 208, 9,
+- 189, 128, 148, 208, 16, 14, 176, 72, 59, 55,
+- 69, 154, 129, 192, 166, 127, 176, 166, 114, 163,
+- 254, 166, 94, 0, 49, 77, 192, 3, 73, 208,
+- 4, 115, 67, 6, 160, 128, 171, 132, 160, 6,
+- 60, 10, 49, 60, 96, 3, 112, 112, 179, 100,
+- 16, 8, 236, 8, 4, 54, 96, 176, 33, 128,
+- 2, 40, 192, 2, 68, 160, 4, 213, 116, 77,
+- 9, 33, 169, 90, 48, 21, 115, 160, 111, 153,
+- 184, 3, 114, 136, 58, 135, 208, 173, 171, 224,
+- 10, 253, 132, 6, 81, 113, 10, 172, 240, 38,
+- 216, 160, 13, 242, 40, 164, 104, 250, 7, 129,
+- 224, 174, 129, 192, 8, 114, 208, 166, 134, 128,
+- 63, 17, 147, 56, 77, 32, 155, 132, 32, 138,
+- 136, 80, 5, 58, 11, 5, 47, 219, 5, 253,
+- 9, 7, 46, 74, 8, 236, 232, 3, 244, 133,
+- 2, 71, 139, 180, 44, 16, 4, 73, 178, 100,
+- 148, 164, 16, 121, 80, 23, 82, 225, 10, 55,
+- 153, 137, 70, 168, 6, 136, 32, 8, 47, 86,
+- 8, 165, 160, 9, 19, 96, 6, 142, 193, 7,
+- 163, 176, 11, 202, 192, 117, 242, 232, 78, 108,
+- 235, 174, 238, 58, 6, 104, 203, 170, 73, 227,
+- 5, 73, 48, 179, 65, 139, 171, 175, 80, 109,
+- 84, 80, 52, 178, 217, 4, 187, 58, 4, 217,
+- 82, 5, 83, 99, 5, 61, 128, 180, 190, 203,
+- 2, 46, 192, 180, 78, 36, 73, 254, 197, 184,
+- 117, 145, 7, 180, 192, 116, 138, 201, 111, 133,
+- 74, 117, 89, 112, 8, 186, 160, 9, 23, 16,
+- 25, 159, 171, 83, 240, 254, 120, 66, 104, 58,
+- 6, 129, 176, 166, 174, 10, 167, 100, 80, 175,
+- 245, 138, 51, 160, 144, 11, 112, 153, 71, 47,
+- 84, 62, 49, 91, 122, 116, 0, 60, 81, 0,
+- 4, 152, 122, 180, 75, 144, 1, 25, 112, 184,
+- 17, 68, 188, 15, 209, 184, 90, 80, 173, 54,
+- 80, 168, 167, 39, 60, 22, 243, 6, 208, 43,
+- 189, 146, 49, 10, 218, 112, 174, 19, 119, 44,
+- 60, 67, 186, 45, 234, 162, 114, 80, 175, 93,
+- 86, 6, 159, 0, 10, 177, 11, 7, 81, 112,
+- 132, 47, 75, 175, 78, 99, 52, 60, 160, 2,
+- 86, 90, 168, 54, 176, 4, 46, 144, 1, 87,
+- 112, 141, 213, 113, 6, 245, 102, 111, 16, 33,
+- 169, 138, 48, 177, 152, 184, 147, 19, 153, 122,
+- 28, 154, 12, 156, 48, 189, 146, 241, 12, 87,
+- 8, 13, 26, 215, 30, 237, 89, 11, 200, 128,
+- 12, 178, 3, 93, 235, 234, 5, 101, 144, 132,
+- 208, 149, 41, 21, 252, 144, 220, 27, 60, 117,
+- 250, 116, 161, 228, 163, 132, 116, 5, 46, 144,
+- 8, 248, 161, 4, 11, 32, 73, 139, 27, 17,
+- 166, 240, 5, 144, 208, 3, 251, 187, 111, 165,
+- 39, 135, 136, 240, 10, 146, 41, 192, 146, 113,
+- 10, 231, 96, 133, 212, 32, 12, 112, 195, 162,
+- 104, 27, 8, 173, 0, 55, 183, 214, 10, 55,
+- 85, 149, 79, 200, 173, 144, 99, 96, 170, 35,
+- 92, 192, 51, 4, 116, 64, 127, 161, 244, 129,
+- 254, 83, 80, 156, 147, 16, 100, 222, 8, 91,
+- 80, 116, 0, 103, 51, 17, 193, 192, 10, 145,
+- 123, 161, 6, 118, 181, 175, 240, 38, 153, 64,
+- 195, 53, 76, 178, 218, 128, 12, 185, 80, 149,
+- 109, 251, 7, 132, 32, 7, 134, 240, 7, 49,
+- 180, 182, 107, 11, 187, 91, 122, 8, 82, 96,
+- 3, 89, 128, 8, 173, 208, 8, 154, 92, 6,
+- 141, 208, 8, 129, 96, 8, 3, 103, 117, 207,
+- 35, 81, 27, 203, 131, 212, 161, 4, 32, 21,
+- 0, 18, 0, 169, 18, 49, 14, 107, 128, 137,
+- 251, 150, 122, 87, 43, 12, 245, 8, 12, 27,
+- 240, 151, 82, 241, 12, 218, 64, 13, 56, 44,
+- 12, 181, 192, 8, 105, 123, 83, 210, 44, 55,
+- 160, 204, 162, 148, 64, 48, 185, 16, 10, 161,
+- 80, 68, 105, 48, 190, 114, 76, 205, 55, 149,
+- 79, 172, 71, 45, 112, 208, 8, 163, 178, 10,
+- 201, 128, 203, 176, 161, 5, 39, 60, 73, 30,
+- 49, 8, 82, 230, 197, 95, 169, 202, 109, 162,
+- 12, 192, 64, 3, 150, 0, 27, 201, 35, 12,
+- 108, 34, 12, 210, 220, 162, 55, 229, 162, 110,
+- 26, 203, 238, 249, 198, 177, 160, 12, 144, 48,
+- 8, 177, 112, 12, 194, 0, 148, 205, 1, 55,
+- 210, 44, 205, 229, 67, 7, 201, 6, 42, 12,
+- 148, 12, 190, 0, 27, 124, 240, 1, 80, 20,
+- 0, 46, 243, 17, 170, 96, 5, 133, 122, 155,
+- 31, 168, 202, 14, 141, 254, 12, 189, 128, 4,
+- 146, 32, 25, 124, 160, 13, 171, 44, 144, 45,
+- 106, 8, 134, 240, 162, 11, 188, 182, 208, 149,
+- 66, 229, 169, 13, 151, 160, 10, 247, 88, 10,
+- 68, 89, 182, 85, 233, 96, 194, 101, 209, 81,
+- 160, 108, 151, 211, 11, 192, 240, 24, 168, 192,
+- 7, 42, 243, 209, 11, 144, 200, 30, 145, 12,
+- 105, 80, 168, 205, 171, 6, 231, 252, 10, 151,
+- 179, 11, 156, 112, 4, 252, 188, 198, 100, 112,
+- 205, 46, 26, 208, 114, 243, 162, 238, 233, 133,
+- 104, 87, 143, 47, 192, 10, 202, 80, 10, 200,
+- 64, 148, 225, 160, 198, 104, 26, 8, 179, 137,
+- 183, 114, 120, 8, 166, 162, 212, 190, 66, 43,
+- 158, 115, 0, 243, 194, 21, 127, 232, 167, 51,
+- 224, 111, 84, 87, 203, 165, 176, 11, 154, 0,
+- 3, 220, 244, 24, 189, 16, 206, 14, 214, 182,
+- 11, 108, 8, 105, 107, 211, 239, 36, 12, 150,
+- 29, 39, 30, 176, 5, 172, 208, 11, 14, 205,
+- 12, 218, 80, 11, 235, 73, 9, 44, 42, 155,
+- 134, 128, 49, 181, 60, 9, 170, 48, 10, 230,
+- 161, 5, 31, 240, 0, 125, 253, 0, 160, 182,
+- 23, 147, 64, 180, 23, 58, 117, 84, 23, 5,
+- 130, 112, 42, 174, 0, 3, 150, 240, 151, 171,
+- 144, 58, 1, 205, 174, 114, 80, 205, 160, 108,
+- 214, 3, 25, 209, 185, 160, 13, 202, 208, 0,
+- 3, 224, 1, 151, 32, 166, 152, 57, 48, 134,
+- 254, 112, 83, 16, 115, 45, 114, 184, 6, 125,
+- 112, 7, 123, 160, 5, 241, 178, 0, 125, 61,
+- 2, 216, 196, 23, 144, 80, 96, 21, 91, 177,
+- 253, 19, 5, 83, 112, 216, 192, 80, 2, 95,
+- 96, 23, 82, 234, 9, 165, 128, 8, 65, 27,
+- 180, 110, 74, 8, 163, 221, 182, 54, 157, 205,
+- 181, 192, 128, 185, 240, 10, 208, 160, 11, 13,
+- 160, 0, 24, 0, 6, 208, 32, 158, 208, 208,
+- 30, 234, 42, 223, 85, 144, 5, 216, 45, 23,
+- 57, 208, 218, 44, 227, 221, 22, 240, 4, 90,
+- 241, 29, 170, 64, 157, 215, 170, 147, 196, 147,
+- 208, 201, 128, 4, 102, 96, 25, 32, 94, 23,
+- 147, 120, 7, 125, 176, 6, 113, 160, 6, 214,
+- 60, 55, 106, 122, 223, 114, 4, 79, 39, 148,
+- 11, 255, 77, 1, 20, 112, 5, 170, 48, 182,
+- 205, 12, 205, 159, 64, 57, 120, 144, 221, 219,
+- 157, 3, 38, 80, 43, 101, 195, 50, 19, 238,
+- 203, 189, 1, 185, 243, 188, 188, 62, 48, 5,
+- 202, 128, 13, 201, 192, 6, 110, 224, 86, 121,
+- 0, 226, 82, 174, 4, 34, 126, 6, 36, 222,
+- 7, 120, 96, 226, 220, 226, 56, 17, 44, 154,
+- 151, 227, 148, 118, 201, 10, 124, 50, 10, 142,
+- 176, 33, 215, 225, 227, 77, 2, 228, 182, 242,
+- 0, 53, 240, 5, 68, 94, 34, 229, 120, 169,
+- 137, 169, 2, 6, 150, 5, 229, 186, 206, 48,
+- 64, 16, 166, 160, 8, 192, 81, 62, 229, 32,
+- 142, 25, 84, 238, 222, 115, 49, 232, 132, 110,
+- 23, 215, 113, 25, 218, 17, 34, 78, 178, 232,
+- 181, 98, 1, 109, 30, 32, 37, 162, 16, 151,
+- 64, 184, 152, 26, 127, 73, 94, 10, 73, 9,
+- 12, 56, 128, 16, 218, 148, 7, 121, 240, 5,
+- 182, 17, 234, 162, 158, 3, 184, 129, 27, 218,
+- 113, 234, 218, 209, 31, 253, 17, 34, 172, 206,
+- 232, 38, 160, 3, 0, 82, 225, 145, 206, 16,
+- 148, 142, 169, 116, 126, 164, 186, 144, 12, 187,
+- 237, 16, 150, 20, 9, 118, 96, 7, 95, 240,
+- 5, 216, 145, 29, 168, 158, 234, 170, 174, 1,
+- 31, 160, 3, 184, 17, 236, 120, 33, 235, 179,
+- 254, 16, 144, 75, 184, 136, 153, 106, 22, 185,
+- 6, 147, 192, 10, 174, 176, 1, 60, 65, 19,
+- 145, 240, 230, 207, 222, 17, 128, 64, 184, 33,
+- 96, 164, 86, 144, 6, 225, 226, 165, 154, 32,
+- 1, 223, 190, 238, 21, 225, 10, 75, 128, 2,
+- 54, 240, 3, 66, 148, 6, 228, 178, 11, 192,
+- 192, 4, 236, 158, 239, 2, 17, 16, 0, 59};
+-
+diff -up php-5.4.0RC5/main/php_logos.c.easter php-5.4.0RC5/main/php_logos.c
+--- php-5.4.0RC5/main/php_logos.c.easter 2012-01-18 17:17:17.895031787 +0100
++++ php-5.4.0RC5/main/php_logos.c 2012-01-18 17:21:46.877044070 +0100
+@@ -56,7 +56,6 @@ int php_init_info_logos(void)
+ return FAILURE;
+
+ php_register_info_logo(PHP_LOGO_GUID , "image/gif", php_logo , sizeof(php_logo));
+- php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo));
+ php_register_info_logo(ZEND_LOGO_GUID , "image/gif", zend_logo , sizeof(zend_logo));
+
+ return SUCCESS;
diff --git a/php-5.4.0-phpize.patch b/php-5.4.0-phpize.patch
new file mode 100644
index 0000000..e666e45
--- /dev/null
+++ b/php-5.4.0-phpize.patch
@@ -0,0 +1,34 @@
+--- php-5.4.0RC5/scripts/phpize.in.orig 2012-01-18 17:13:54.018022983 +0100
++++ php-5.4.0RC5/scripts/phpize.in 2012-01-18 17:14:40.614024941 +0100
+@@ -162,6 +162,15 @@
+ $PHP_AUTOHEADER || exit 1
+ }
+
++phpize_check_headers()
++{
++ if test ! -f $includedir/main/php.h; then
++ echo "Can't find PHP headers in $includedir"
++ echo "The php-devel package is required for use of this command."
++ exit 1
++ fi
++}
++
+ # Main script
+
+ case "$1" in
+@@ -180,12 +189,15 @@
+
+ # Version
+ --version|-v)
++ phpize_check_headers
+ phpize_print_api_numbers
+ exit 0
+ ;;
+
+ # Default
+ *)
++ phpize_check_headers
++
+ phpize_check_configm4 0
+
+ phpize_check_build_files
diff --git a/php-fpm-www.conf b/php-fpm-www.conf
index 81fca85..22a810e 100644
--- a/php-fpm-www.conf
+++ b/php-fpm-www.conf
@@ -209,5 +209,6 @@ slowlog = /var/log/php-fpm/www-slow.log
;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
;php_flag[display_errors] = off
php_admin_value[error_log] = /var/log/php-fpm/www-error.log
+php_admin_value[session.save_path] = /var/lib/php/session
php_admin_flag[log_errors] = on
-;php_admin_value[memory_limit] = 32M
+;php_admin_value[memory_limit] = 128M
diff --git a/php.ini b/php.ini
index 929adf2..ce36925 100644
--- a/php.ini
+++ b/php.ini
@@ -17,12 +17,12 @@
; 6. The directory from the --with-config-file-path compile time option, or the
; Windows directory (C:\windows or C:\winnt)
; See the PHP docs for more specific information.
-; http://www.php.net/manual/en/configuration.file.php
+; http://php.net/configuration.file
; The syntax of the file is extremely simple. Whitespace and Lines
; beginning with a semicolon are silently ignored (as you probably guessed).
; Section headers (e.g. [Foo]) are also silently ignored, even though
-; they might mean something in the future.
+; they might mean something in the future.
; Directives following the section heading [PATH=/www/mysite] only
; apply to PHP files in the /www/mysite directory. Directives
@@ -31,7 +31,7 @@
; special sections cannot be overridden by user-defined INI files or
; at runtime. Currently, [PATH=] and [HOST=] sections only work under
; CGI/FastCGI.
-; http://www.php.net/manual/en/ini.sections.php
+; http://php.net/ini.sections
; Directives are specified using the following syntax:
; directive = value
@@ -83,9 +83,6 @@
; development version only in development environments as errors shown to
; application users can inadvertently leak otherwise secure information.
-; This 2 files are provided, by RPM, in /usr/share/doc/php-common-*/
-; File used by RPM (the /etc/php.ini) is mainly the php.ini-production
-
;;;;;;;;;;;;;;;;;;;
; Quick Reference ;
;;;;;;;;;;;;;;;;;;;
@@ -94,11 +91,6 @@
; Please see the actual settings later in the document for more details as to why
; we recommend these changes in PHP's behavior.
-; allow_call_time_pass_reference
-; Default Value: On
-; Development Value: Off
-; Production Value: Off
-
; display_errors
; Default Value: On
; Development Value: On
@@ -110,25 +102,20 @@
; Production Value: Off
; error_reporting
-; Default Value: E_ALL & ~E_NOTICE
-; Development Value: E_ALL | E_STRICT
-; Production Value: E_ALL & ~E_DEPRECATED
+; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
+; Development Value: E_ALL
+; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
; html_errors
; Default Value: On
; Development Value: On
-; Production value: Off
+; Production value: On
; log_errors
; Default Value: Off
; Development Value: On
; Production Value: On
-; magic_quotes_gpc
-; Default Value: On
-; Development Value: Off
-; Production Value: Off
-
; max_input_time
; Default Value: -1 (Unlimited)
; Development Value: 60 (60 seconds)
@@ -144,11 +131,6 @@
; Development Value: Off
; Production Value: Off
-; register_long_arrays
-; Default Value: On
-; Development Value: Off
-; Production Value: Off
-
; request_order
; Default Value: None
; Development Value: "GP"
@@ -211,7 +193,7 @@
;;;;;;;;;;;;;;;;;;;;
; Enable the PHP scripting language engine under Apache.
-; http://www.php.net/manual/en/apache.configuration.php#ini.engine
+; http://php.net/engine
engine = On
; This directive determines whether or not PHP will recognize code between
@@ -225,21 +207,17 @@ engine = On
; Default Value: On
; Development Value: Off
; Production Value: Off
-; http://www.php.net/manual/en/ini.core.php#ini.short-open-tag
+; http://php.net/short-open-tag
short_open_tag = Off
; Allow ASP-style <% %> tags.
-; http://www.php.net/manual/en/ini.core.php#ini.asp-tags
+; http://php.net/asp-tags
asp_tags = Off
; The number of significant digits displayed in floating point numbers.
-; http://www.php.net/manual/en/ini.core.php#ini.precision
+; http://php.net/precision
precision = 14
-; Enforce year 2000 compliance (will cause problems with non-compliant browsers)
-; http://www.php.net/manual/en/ini.core.php#ini.y2k-compliance
-y2k_compliance = On
-
; Output buffering is a mechanism for controlling how much output data
; (excluding headers and cookies) PHP should keep internally before pushing that
; data to the client. If your application's output exceeds this setting, PHP
@@ -257,10 +235,11 @@ y2k_compliance = On
; On = Enabled and buffer is unlimited. (Use with caution)
; Off = Disabled
; Integer = Enables the buffer and sets its maximum size in bytes.
+; Note: This directive is hardcoded to Off for the CLI SAPI
; Default Value: Off
; Development Value: 4096
; Production Value: 4096
-; http://www.php.net/manual/en/outcontrol.configuration.php#ini.output-buffering
+; http://php.net/output-buffering
output_buffering = 4096
; You can redirect all of the output of your scripts to a function. For
@@ -275,7 +254,7 @@ output_buffering = 4096
; and you cannot use both "ob_gzhandler" and "zlib.output_compression".
; Note: output_handler must be empty if this is set 'On' !!!!
; Instead you must use zlib.output_handler.
-; http://www.php.net/manual/en/outcontrol.configuration.php#ini.output-handler
+; http://php.net/output-handler
;output_handler =
; Transparent output compression using the zlib library
@@ -287,16 +266,16 @@ output_buffering = 4096
; performance, enable output_buffering in addition.
; Note: You need to use zlib.output_handler instead of the standard
; output_handler, or otherwise the output will be corrupted.
-; http://www.php.net/manual/en/zlib.configuration.php#ini.zlib.output-compression
+; http://php.net/zlib.output-compression
zlib.output_compression = Off
-; http://www.php.net/manual/en/zlib.configuration.php#ini.zlib.output-compression-level
+; http://php.net/zlib.output-compression-level
;zlib.output_compression_level = -1
; You cannot specify additional output handlers if zlib.output_compression
; is activated here. This setting does the same as output_handler but in
; a different order.
-; http://www.php.net/manual/en/zlib.configuration.php#ini.zlib.output-handler
+; http://php.net/zlib.output-handler
;zlib.output_handler =
; Implicit flush tells PHP to tell the output layer to flush itself
@@ -304,7 +283,8 @@ zlib.output_compression = Off
; PHP function flush() after each and every call to print() or echo() and each
; and every HTML block. Turning this option on has serious performance
; implications and is generally recommended for debugging purposes only.
-; http://www.php.net/manual/en/outcontrol.configuration.php#ini.implicit-flush
+; http://php.net/implicit-flush
+; Note: This directive is hardcoded to On for the CLI SAPI
implicit_flush = Off
; The unserialize callback function will be called (with the undefined class'
@@ -318,86 +298,33 @@ unserialize_callback_func =
; When floats & doubles are serialized store serialize_precision significant
; digits after the floating point. The default value ensures that when floats
; are decoded with unserialize, the data will remain the same.
-serialize_precision = 100
-
-; This directive allows you to enable and disable warnings which PHP will issue
-; if you pass a value by reference at function call time. Passing values by
-; reference at function call time is a deprecated feature which will be removed
-; from PHP at some point in the near future. The acceptable method for passing a
-; value by reference to a function is by declaring the reference in the functions
-; definition, not at call time. This directive does not disable this feature, it
-; only determines whether PHP will warn you about it or not. These warnings
-; should enabled in development environments only.
-; Default Value: On (Suppress warnings)
-; Development Value: Off (Issue warnings)
-; Production Value: Off (Issue warnings)
-; http://www.php.net/manual/en/ini.core.php#ini.allow-call-time-pass-reference
-allow_call_time_pass_reference = Off
-
-; Safe Mode
-; http://www.php.net/manual/en/ini.sect.safe-mode.php#ini.safe-mode
-safe_mode = Off
-
-; By default, Safe Mode does a UID compare check when
-; opening files. If you want to relax this to a GID compare,
-; then turn on safe_mode_gid.
-; http://www.php.net/manual/en/ini.sect.safe-mode.php#ini.safe-mode-gid
-safe_mode_gid = Off
-
-; When safe_mode is on, UID/GID checks are bypassed when
-; including files from this directory and its subdirectories.
-; (directory must also be in include_path or full path must
-; be used when including)
-; http://www.php.net/manual/en/ini.sect.safe-mode.php#ini.safe-mode-include-dir
-safe_mode_include_dir =
-
-; When safe_mode is on, only executables located in the safe_mode_exec_dir
-; will be allowed to be executed via the exec family of functions.
-; http://www.php.net/manual/en/ini.sect.safe-mode.php#ini.safe-mode-exec-dir
-safe_mode_exec_dir =
-
-; Setting certain environment variables may be a potential security breach.
-; This directive contains a comma-delimited list of prefixes. In Safe Mode,
-; the user may only alter environment variables whose names begin with the
-; prefixes supplied here. By default, users will only be able to set
-; environment variables that begin with PHP_ (e.g. PHP_FOO=BAR).
-; Note: If this directive is empty, PHP will let the user modify ANY
-; environment variable!
-; http://www.php.net/manual/en/ini.sect.safe-mode.php#ini.safe-mode-allowed-env-vars
-safe_mode_allowed_env_vars = PHP_
-
-; This directive contains a comma-delimited list of environment variables that
-; the end user won't be able to change using putenv(). These variables will be
-; protected even if safe_mode_allowed_env_vars is set to allow to change them.
-; http://www.php.net/manual/en/ini.sect.safe-mode.php#ini.safe-mode-protected-env-vars
-safe_mode_protected_env_vars = LD_LIBRARY_PATH
+serialize_precision = 17
; open_basedir, if set, limits all file operations to the defined directory
; and below. This directive makes most sense if used in a per-directory
; or per-virtualhost web server configuration file. This directive is
; *NOT* affected by whether Safe Mode is turned On or Off.
-; http://www.php.net/manual/en/ini.sect.safe-mode.php#ini.open-basedir
+; http://php.net/open-basedir
;open_basedir =
; This directive allows you to disable certain functions for security reasons.
; It receives a comma-delimited list of function names. This directive is
; *NOT* affected by whether Safe Mode is turned On or Off.
-; http://www.php.net/manual/en/ini.sect.safe-mode.php#ini.disable-functions
+; http://php.net/disable-functions
disable_functions =
; This directive allows you to disable certain classes for security reasons.
; It receives a comma-delimited list of class names. This directive is
; *NOT* affected by whether Safe Mode is turned On or Off.
-; http://www.php.net/manual/en/ini.sect.safe-mode.php#ini.disable-classes
+; http://php.net/disable-classes
disable_classes =
; Colors for Syntax Highlighting mode. Anything that's acceptable in
; would work.
-; http://www.php.net/manual/en/misc.configuration.php#ini.syntax-highlighting
+; http://php.net/syntax-highlighting
;highlight.string = #DD0000
;highlight.comment = #FF9900
;highlight.keyword = #007700
-;highlight.bg = #FFFFFF
;highlight.default = #0000BB
;highlight.html = #000000
@@ -405,21 +332,37 @@ disable_classes =
; the request. Consider enabling it if executing long requests, which may end up
; being interrupted by the user or a browser timing out. PHP's default behavior
; is to disable this feature.
-; http://www.php.net/manual/en/misc.configuration.php#ini.ignore-user-abort
+; http://php.net/ignore-user-abort
;ignore_user_abort = On
; Determines the size of the realpath cache to be used by PHP. This value should
; be increased on systems where PHP opens many files to reflect the quantity of
; the file operations performed.
-; http://www.php.net/manual/en/ini.core.php#ini.realpath-cache-size
+; http://php.net/realpath-cache-size
;realpath_cache_size = 16k
; Duration of time, in seconds for which to cache realpath information for a given
; file or directory. For systems with rarely changing files, consider increasing this
; value.
-; http://www.php.net/manual/en/ini.core.php#ini.realpath-cache-ttl
+; http://php.net/realpath-cache-ttl
;realpath_cache_ttl = 120
+; Enables or disables the circular reference collector.
+; http://php.net/zend.enable-gc
+zend.enable_gc = On
+
+; If enabled, scripts may be written in encodings that are incompatible with
+; the scanner. CP936, Big5, CP949 and Shift_JIS are the examples of such
+; encodings. To use this feature, mbstring extension must be enabled.
+; Default: Off
+;zend.multibyte = Off
+
+; Allows to set the default encoding for the scripts. This value will be used
+; unless "declare(encoding=...)" directive appears at the top of the script.
+; Only affects if zend.multibyte is set.
+; Default: ""
+;zend.script_encoding =
+
;;;;;;;;;;;;;;;;;
; Miscellaneous ;
;;;;;;;;;;;;;;;;;
@@ -428,7 +371,7 @@ disable_classes =
; (e.g. by adding its signature to the Web server header). It is no security
; threat in any way, but it makes it possible to determine whether you use PHP
; on your server or not.
-; http://www.php.net/manual/en/ini.core.php#ini.expose-php
+; http://php.net/expose-php
expose_php = On
;;;;;;;;;;;;;;;;;;;
@@ -436,24 +379,29 @@ expose_php = On
;;;;;;;;;;;;;;;;;;;
; Maximum execution time of each script, in seconds
-; http://www.php.net/manual/en/info.configuration.php#ini.max-execution-time
-max_execution_time = 30
+; http://php.net/max-execution-time
+; Note: This directive is hardcoded to 0 for the CLI SAPI
+max_execution_time = 30
; Maximum amount of time each script may spend parsing request data. It's a good
; idea to limit this time on productions servers in order to eliminate unexpectedly
-; long running scripts.
+; long running scripts.
+; Note: This directive is hardcoded to -1 for the CLI SAPI
; Default Value: -1 (Unlimited)
; Development Value: 60 (60 seconds)
; Production Value: 60 (60 seconds)
-; http://www.php.net/manual/en/info.configuration.php#ini.max-input-time
+; http://php.net/max-input-time
max_input_time = 60
; Maximum input variable nesting level
-; http://www.php.net/manual/en/info.configuration.php#ini.max-input-nesting-level
+; http://php.net/max-input-nesting-level
;max_input_nesting_level = 64
+; How many GET/POST/COOKIE input variables may be accepted
+; max_input_vars = 1000
+
; Maximum amount of memory a script may consume (128MB)
-; http://www.php.net/manual/en/ini.core.php#ini.memory-limit
+; http://php.net/memory-limit
memory_limit = 128M
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -471,7 +419,7 @@ memory_limit = 128M
; recommend error reporting setting. Your production server shouldn't be wasting
; resources complaining about best practices and coding standards. That's what
; development servers and development settings are for.
-; Note: The php.ini-development file has this setting as E_ALL | E_STRICT. This
+; Note: The php.ini-development file has this setting as E_ALL. This
; means it pretty much reports everything which is exactly what you want during
; development and early testing.
;
@@ -502,15 +450,15 @@ memory_limit = 128M
; E_USER_DEPRECATED - user-generated deprecation warnings
;
; Common Values:
-; E_ALL & ~E_NOTICE (Show all errors, except for notices and coding standards warnings.)
-; E_ALL & ~E_NOTICE | E_STRICT (Show all errors, except for notices)
+; E_ALL (Show all errors, warnings and notices including coding standards.)
+; E_ALL & ~E_NOTICE (Show all errors, except for notices)
+; E_ALL & ~E_NOTICE & ~E_STRICT (Show all errors, except for notices and coding standards warnings.)
; E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR (Show only errors)
-; E_ALL | E_STRICT (Show all errors, warnings and notices including coding standards.)
-; Default Value: E_ALL & ~E_NOTICE
-; Development Value: E_ALL | E_STRICT
-; Production Value: E_ALL & ~E_DEPRECATED
-; http://www.php.net/manual/en/errorfunc.configuration.php#ini.error-reporting
-error_reporting = E_ALL & ~E_DEPRECATED
+; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
+; Development Value: E_ALL
+; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
+; http://php.net/error-reporting
+error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
; This directive controls whether or not and where PHP will output errors,
; notices and warnings too. Error output is very useful during development, but
@@ -520,13 +468,13 @@ error_reporting = E_ALL & ~E_DEPRECATED
; It's recommended that errors be logged on production servers rather than
; having the errors sent to STDOUT.
; Possible Values:
-; Off = Do not display any errors
-; stderr = Display errors to STDERR (affects only CGI/CLI binaries!)
+; Off = Do not display any errors
+; stderr = Display errors to STDERR (affects only CGI/CLI binaries!)
; On or stdout = Display errors to STDOUT
; Default Value: On
; Development Value: On
; Production Value: Off
-; http://www.php.net/manual/en/errorfunc.configuration.php#ini.display-errors
+; http://php.net/display-errors
display_errors = Off
; The display of errors which occur during PHP's startup sequence are handled
@@ -537,7 +485,7 @@ display_errors = Off
; Default Value: Off
; Development Value: On
; Production Value: Off
-; http://www.php.net/manual/en/errorfunc.configuration.php#ini.display-startup-errors
+; http://php.net/display-startup-errors
display_startup_errors = Off
; Besides displaying errors, PHP can also log errors to locations such as a
@@ -547,29 +495,29 @@ display_startup_errors = Off
; Default Value: Off
; Development Value: On
; Production Value: On
-; http://www.php.net/manual/en/errorfunc.configuration.php#ini.log-errors
+; http://php.net/log-errors
log_errors = On
; Set maximum length of log_errors. In error_log information about the source is
; added. The default is 1024 and 0 allows to not apply any maximum length at all.
-; http://www.php.net/manual/en/errorfunc.configuration.php#ini.log-errors-max-len
+; http://php.net/log-errors-max-len
log_errors_max_len = 1024
; Do not log repeated messages. Repeated errors must occur in same file on same
; line unless ignore_repeated_source is set true.
-; http://www.php.net/manual/en/errorfunc.configuration.php#ini.ignore-repeated-errors
+; http://php.net/ignore-repeated-errors
ignore_repeated_errors = Off
; Ignore source of message when ignoring repeated messages. When this setting
; is On you will not log errors with repeated messages from different files or
; source lines.
-; http://www.php.net/manual/en/errorfunc.configuration.php#ini.ignore-repeated-source
+; http://php.net/ignore-repeated-source
ignore_repeated_source = Off
; If this parameter is set to Off, then memory leaks will not be shown (on
; stdout or in the log). This has only effect in a debug compile, and if
; error reporting includes E_WARNING in the allowed list
-; http://www.php.net/manual/en/errorfunc.configuration.php#ini.report-memleaks
+; http://php.net/report-memleaks
report_memleaks = On
; This setting is on by default.
@@ -581,127 +529,110 @@ report_memleaks = On
; Default Value: Off
; Development Value: On
; Production Value: Off
-; http://www.php.net/manual/en/errorfunc.configuration.php#ini.track-errors
+; http://php.net/track-errors
track_errors = Off
; Turn off normal error reporting and emit XML-RPC error XML
-; http://www.php.net/manual/en/errorfunc.configuration.php#ini.xmlrpc-errors
+; http://php.net/xmlrpc-errors
;xmlrpc_errors = 0
; An XML-RPC faultCode
;xmlrpc_error_number = 0
-; When PHP displays or logs an error, it has the capability of inserting html
-; links to documentation related to that error. This directive controls whether
-; those HTML links appear in error messages or not. For performance and security
-; reasons, it's recommended you disable this on production servers.
+; When PHP displays or logs an error, it has the capability of formatting the
+; error message as HTML for easier reading. This directive controls whether
+; the error message is formatted as HTML or not.
+; Note: This directive is hardcoded to Off for the CLI SAPI
; Default Value: On
; Development Value: On
-; Production value: Off
-; http://www.php.net/manual/en/errorfunc.configuration.php#ini.html-errors
-html_errors = Off
-
-; If html_errors is set On PHP produces clickable error messages that direct
-; to a page describing the error or function causing the error in detail.
-; You can download a copy of the PHP manual from http://www.php.net/docs.php
+; Production value: On
+; http://php.net/html-errors
+html_errors = On
+
+; If html_errors is set to On *and* docref_root is not empty, then PHP
+; produces clickable error messages that direct to a page describing the error
+; or function causing the error in detail.
+; You can download a copy of the PHP manual from http://php.net/docs
; and change docref_root to the base URL of your local copy including the
; leading '/'. You must also specify the file extension being used including
-; the dot. PHP's default behavior is to leave these settings empty.
+; the dot. PHP's default behavior is to leave these settings empty, in which
+; case no links to documentation are generated.
; Note: Never use this feature for production boxes.
-; http://www.php.net/manual/en/errorfunc.configuration.php#ini.docref-root
+; http://php.net/docref-root
; Examples
;docref_root = "/phpmanual/"
-; http://www.php.net/manual/en/errorfunc.configuration.php#ini.docref-ext
+; http://php.net/docref-ext
;docref_ext = .html
; String to output before an error message. PHP's default behavior is to leave
; this setting blank.
-; http://www.php.net/manual/en/errorfunc.configuration.php#ini.error-prepend-string
+; http://php.net/error-prepend-string
; Example:
-;error_prepend_string = ""
+;error_prepend_string = ""
; String to output after an error message. PHP's default behavior is to leave
; this setting blank.
-; http://www.php.net/manual/en/errorfunc.configuration.php#ini.error-append-string
+; http://php.net/error-append-string
; Example:
-;error_append_string = ""
+;error_append_string = ""
; Log errors to specified file. PHP's default behavior is to leave this value
; empty.
-; http://www.php.net/manual/en/errorfunc.configuration.php#ini.error-log
+; http://php.net/error-log
; Example:
;error_log = php_errors.log
; Log errors to syslog (Event Log on NT, not valid in Windows 95).
;error_log = syslog
+;windows.show_crt_warning
+; Default value: 0
+; Development value: 0
+; Production value: 0
+
;;;;;;;;;;;;;;;;;
; Data Handling ;
;;;;;;;;;;;;;;;;;
-; Note - track_vars is ALWAYS enabled as of PHP 4.0.3
-
; The separator used in PHP generated URLs to separate arguments.
; PHP's default setting is "&".
-; http://www.php.net/manual/en/ini.core.php#ini.arg-separator.output
+; http://php.net/arg-separator.output
; Example:
;arg_separator.output = "&"
; List of separator(s) used by PHP to parse input URLs into variables.
; PHP's default setting is "&".
; NOTE: Every character in this directive is considered as separator!
-; http://www.php.net/manual/en/ini.core.php#ini.arg-separator.input
+; http://php.net/arg-separator.input
; Example:
;arg_separator.input = ";&"
; This directive determines which super global arrays are registered when PHP
-; starts up. If the register_globals directive is enabled, it also determines
-; what order variables are populated into the global space. G,P,C,E & S are
-; abbreviations for the following respective super globals: GET, POST, COOKIE,
-; ENV and SERVER. There is a performance penalty paid for the registration of
-; these arrays and because ENV is not as commonly used as the others, ENV is
-; is not recommended on productions servers. You can still get access to
-; the environment variables through getenv() should you need to.
+; starts up. G,P,C,E & S are abbreviations for the following respective super
+; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty
+; paid for the registration of these arrays and because ENV is not as commonly
+; used as the others, ENV is not recommended on productions servers. You
+; can still get access to the environment variables through getenv() should you
+; need to.
; Default Value: "EGPCS"
; Development Value: "GPCS"
; Production Value: "GPCS";
-; http://www.php.net/manual/en/ini.core.php#ini.variables-order
+; http://php.net/variables-order
variables_order = "GPCS"
; This directive determines which super global data (G,P,C,E & S) should
; be registered into the super global array REQUEST. If so, it also determines
; the order in which that data is registered. The values for this directive are
; specified in the same manner as the variables_order directive, EXCEPT one.
-; Leaving this value empty will cause PHP to use the value set in the
+; Leaving this value empty will cause PHP to use the value set in the
; variables_order directive. It does not mean it will leave the super globals
; array REQUEST empty.
; Default Value: None
; Development Value: "GP"
; Production Value: "GP"
-; http://www.php.net/manual/en/ini.core.php#ini.request-order
+; http://php.net/request-order
request_order = "GP"
-; Whether or not to register the EGPCS variables as global variables. You may
-; want to turn this off if you don't want to clutter your scripts' global scope
-; with user data. This makes most sense when coupled with track_vars - in which
-; case you can access all of the GPC variables through the $HTTP_*_VARS[],
-; variables.
-; You should do your best to write your scripts so that they do not require
-; register_globals to be on; Using form variables as globals can easily lead
-; to possible security problems, if the code is not very well thought of.
-; http://www.php.net/manual/en/ini.core.php#ini.register-globals
-register_globals = Off
-
-; Determines whether the deprecated long $HTTP_*_VARS type predefined variables
-; are registered by PHP or not. As they are deprecated, we obviously don't
-; recommend you use them. They are on by default for compatibility reasons but
-; they are not recommended on production servers.
-; Default Value: On
-; Development Value: Off
-; Production Value: Off
-; http://www.php.net/manual/en/ini.core.php#ini.register-long-arrays
-register_long_arrays = Off
-
; This directive determines whether PHP registers $argv & $argc each time it
; runs. $argv contains an array of all the arguments passed to PHP when a script
; is invoked. $argc contains an integer representing the number of arguments
@@ -710,71 +641,60 @@ register_long_arrays = Off
; enabled, registering these variables consumes CPU cycles and memory each time
; a script is executed. For performance reasons, this feature should be disabled
; on production servers.
+; Note: This directive is hardcoded to On for the CLI SAPI
; Default Value: On
; Development Value: Off
; Production Value: Off
-; http://www.php.net/manual/en/ini.core.php#ini.register-argc-argv
+; http://php.net/register-argc-argv
register_argc_argv = Off
-; When enabled, the SERVER and ENV variables are created when they're first
-; used (Just In Time) instead of when the script starts. If these variables
-; are not used within a script, having this directive on will result in a
-; performance gain. The PHP directives register_globals, register_long_arrays,
-; and register_argc_argv must be disabled for this directive to have any affect.
-; http://www.php.net/manual/en/ini.core.php#ini.auto-globals-jit
+; When enabled, the ENV, REQUEST and SERVER variables are created when they're
+; first used (Just In Time) instead of when the script starts. If these
+; variables are not used within a script, having this directive on will result
+; in a performance gain. The PHP directive register_argc_argv must be disabled
+; for this directive to have any affect.
+; http://php.net/auto-globals-jit
auto_globals_jit = On
+; Whether PHP will read the POST data.
+; This option is enabled by default.
+; Most likely, you won't want to disable this option globally. It causes $_POST
+; and $_FILES to always be empty; the only way you will be able to read the
+; POST data will be through the php://input stream wrapper. This can be useful
+; to proxy requests or to process the POST data in a memory efficient fashion.
+; http://php.net/enable-post-data-reading
+;enable_post_data_reading = Off
+
; Maximum size of POST data that PHP will accept.
-; http://www.php.net/manual/en/ini.core.php#ini.post-max-size
+; Its value may be 0 to disable the limit. It is ignored if POST data reading
+; is disabled through enable_post_data_reading.
+; http://php.net/post-max-size
post_max_size = 8M
-; Magic quotes are a preprocessing feature of PHP where PHP will attempt to
-; escape any character sequences in GET, POST, COOKIE and ENV data which might
-; otherwise corrupt data being placed in resources such as databases before
-; making that data available to you. Because of character encoding issues and
-; non-standard SQL implementations across many databases, it's not currently
-; possible for this feature to be 100% accurate. PHP's default behavior is to
-; enable the feature. We strongly recommend you use the escaping mechanisms
-; designed specifically for the database your using instead of relying on this
-; feature. Also note, this feature has been deprecated as of PHP 5.3.0 and is
-; scheduled for removal in PHP 6.
-; Default Value: On
-; Development Value: Off
-; Production Value: Off
-; http://www.php.net/manual/en/info.configuration.php#ini.magic-quotes-gpc
-magic_quotes_gpc = Off
-
-; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc.
-; http://www.php.net/manual/en/info.configuration.php#ini.magic-quotes-runtime
-magic_quotes_runtime = Off
-
-; Use Sybase-style magic quotes (escape ' with '' instead of \').
-; http://www.php.net/manual/en/sybase.configuration.php#ini.magic-quotes-sybase
-magic_quotes_sybase = Off
-
; Automatically add files before PHP document.
-; http://www.php.net/manual/en/ini.core.php#ini.auto-prepend-file
+; http://php.net/auto-prepend-file
auto_prepend_file =
; Automatically add files after PHP document.
-; http://www.php.net/manual/en/ini.core.php#ini.auto-append-file
+; http://php.net/auto-append-file
auto_append_file =
-; As of 4.0b4, PHP always outputs a character encoding by default in
+; By default, PHP will output a character encoding using
; the Content-type: header. To disable sending of the charset, simply
; set it to be empty.
;
; PHP's built-in default is text/html
-; http://www.php.net/manual/en/ini.core.php#ini.default-mimetype
+; http://php.net/default-mimetype
default_mimetype = "text/html"
; PHP's default character set is set to empty.
-; http://www.php.net/manual/en/ini.core.php#ini.default-charset
-;default_charset = "iso-8859-1"
+; http://php.net/default-charset
+;default_charset = "UTF-8"
; Always populate the $HTTP_RAW_POST_DATA variable. PHP's default behavior is
-; to disable this feature.
-; http://www.php.net/manual/en/ini.core.php#ini.always-populate-raw-post-data
+; to disable this feature. If post reading is disabled through
+; enable_post_data_reading, $HTTP_RAW_POST_DATA is *NOT* populated.
+; http://php.net/always-populate-raw-post-data
;always_populate_raw_post_data = On
;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -788,36 +708,38 @@ default_mimetype = "text/html"
;include_path = ".;c:\php\includes"
;
; PHP's default setting for include_path is ".;/path/to/php/pear"
-; http://www.php.net/manual/en/ini.core.php#ini.include-path
+; http://php.net/include-path
; The root of the PHP pages, used only if nonempty.
; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
; if you are running php as a CGI under any web server (other than IIS)
; see documentation for security issues. The alternate is to use the
; cgi.force_redirect configuration below
-; http://www.php.net/manual/en/ini.core.php#ini.doc-root
+; http://php.net/doc-root
doc_root =
; The directory under which PHP opens the script using /~username used only
; if nonempty.
-; http://www.php.net/manual/en/ini.core.php#ini.user-dir
+; http://php.net/user-dir
user_dir =
; Directory in which the loadable extensions (modules) reside.
-; http://www.php.net/manual/en/ini.core.php#ini.extension-dir
+; http://php.net/extension-dir
; extension_dir = "./"
+; On windows:
+; extension_dir = "ext"
; Whether or not to enable the dl() function. The dl() function does NOT work
; properly in multithreaded servers, such as IIS or Zeus, and is automatically
; disabled on them.
-; http://www.php.net/manual/en/info.configuration.php#ini.enable-dl
+; http://php.net/enable-dl
enable_dl = Off
; cgi.force_redirect is necessary to provide security running PHP as a CGI under
; most web servers. Left undefined, PHP turns this on by default. You can
; turn it off here AT YOUR OWN RISK
; **You CAN safely turn this off for IIS, in fact, you MUST.**
-; http://www.php.net/manual/en/ini.core.php#ini.cgi.force-redirect
+; http://php.net/cgi.force-redirect
;cgi.force_redirect = 1
; if cgi.nph is enabled it will force cgi to always sent Status: 200 with
@@ -828,7 +750,7 @@ enable_dl = Off
; (iPlanet) web servers, you MAY need to set an environment variable name that PHP
; will look for to know it is OK to continue execution. Setting this variable MAY
; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
-; http://www.php.net/manual/en/ini.core.php#ini.cgi.redirect-status-env
+; http://php.net/cgi.redirect-status-env
;cgi.redirect_status_env = ;
; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's
@@ -837,7 +759,7 @@ enable_dl = Off
; this to 1 will cause PHP CGI to fix its paths to conform to the spec. A setting
; of zero causes PHP to behave as before. Default is 1. You should fix your scripts
; to use SCRIPT_FILENAME rather than PATH_TRANSLATED.
-; http://www.php.net/manual/en/ini.core.php#ini.cgi.fix-pathinfo
+; http://php.net/cgi.fix-pathinfo
;cgi.fix_pathinfo=1
; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
@@ -845,7 +767,7 @@ enable_dl = Off
; security context that the request runs under. mod_fastcgi under Apache
; does not currently support this feature (03/17/2002)
; Set to 1 if running under IIS. Default is zero.
-; http://www.php.net/manual/en/ini.core.php#ini.fastcgi.impersonate
+; http://php.net/fastcgi.impersonate
;fastcgi.impersonate = 1;
; Disable logging through FastCGI connection. PHP's default behavior is to enable
@@ -857,7 +779,7 @@ enable_dl = Off
; is supported by Apache. When this option is set to 1 PHP will send
; RFC2616 compliant header.
; Default is zero.
-; http://www.php.net/manual/en/ini.core.php#ini.cgi.rfc2616-headers
+; http://php.net/cgi.rfc2616-headers
;cgi.rfc2616_headers = 0
;;;;;;;;;;;;;;;;
@@ -865,41 +787,44 @@ enable_dl = Off
;;;;;;;;;;;;;;;;
; Whether to allow HTTP file uploads.
-; http://www.php.net/manual/en/ini.core.php#ini.file-uploads
+; http://php.net/file-uploads
file_uploads = On
; Temporary directory for HTTP uploaded files (will use system default if not
; specified).
-; http://www.php.net/manual/en/ini.core.php#ini.upload-tmp-dir
+; http://php.net/upload-tmp-dir
;upload_tmp_dir =
; Maximum allowed size for uploaded files.
-; http://www.php.net/manual/en/ini.core.php#ini.upload-max-filesize
+; http://php.net/upload-max-filesize
upload_max_filesize = 2M
+; Maximum number of files that can be uploaded via a single request
+max_file_uploads = 20
+
;;;;;;;;;;;;;;;;;;
; Fopen wrappers ;
;;;;;;;;;;;;;;;;;;
; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
-; http://www.php.net/manual/en/filesystem.configuration.php#ini.allow-url-fopen
+; http://php.net/allow-url-fopen
allow_url_fopen = On
; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
-; http://www.php.net/manual/en/filesystem.configuration.php#ini.allow-url-include
+; http://php.net/allow-url-include
allow_url_include = Off
; Define the anonymous ftp password (your email address). PHP's default setting
; for this is empty.
-; http://www.php.net/manual/en/filesystem.configuration.php#ini.from
+; http://php.net/from
;from="john@doe.com"
; Define the User-Agent string. PHP's default setting for this is empty.
-; http://www.php.net/manual/en/filesystem.configuration.php#ini.user-agent
+; http://php.net/user-agent
;user_agent="PHP"
; Default timeout for socket based streams (seconds)
-; http://www.php.net/manual/en/filesystem.configuration.php#ini.default-socket-timeout
+; http://php.net/default-socket-timeout
default_socket_timeout = 60
; If your scripts have to deal with files from Macintosh systems,
@@ -907,7 +832,7 @@ default_socket_timeout = 60
; unix or win32 systems, setting this flag will cause PHP to
; automatically detect the EOL character in those files so that
; fgets() and file() will work regardless of the source of the file.
-; http://www.php.net/manual/en/filesystem.configuration.php#ini.auto-detect-line-endings
+; http://php.net/auto-detect-line-endings
;auto_detect_line_endings = Off
;;;;;;;;;;;;;;;;;;;;;;
@@ -919,7 +844,11 @@ default_socket_timeout = 60
;
; extension=modulename.extension
;
-; For example
+; For example, on Windows:
+;
+; extension=msql.dll
+;
+; ... or under UNIX:
;
; extension=msql.so
;
@@ -935,33 +864,36 @@ default_socket_timeout = 60
; found in the directory /etc/php.d; these are loaded by default.
;;;;
-
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
+[CLI Server]
+; Whether the CLI web server uses ANSI color coding in its terminal output.
+cli_server.color = On
+
[Date]
; Defines the default timezone used by the date functions
-; http://www.php.net/manual/en/datetime.configuration.php#ini.date.timezone
+; http://php.net/date.timezone
;date.timezone =
-; http://www.php.net/manual/en/datetime.configuration.php#ini.date.default-latitude
+; http://php.net/date.default-latitude
;date.default_latitude = 31.7667
-; http://www.php.net/manual/en/datetime.configuration.php#ini.date.default-longitude
+; http://php.net/date.default-longitude
;date.default_longitude = 35.2333
-; http://www.php.net/manual/en/datetime.configuration.php#ini.date.sunrise-zenith
+; http://php.net/date.sunrise-zenith
;date.sunrise_zenith = 90.583333
-; http://www.php.net/manual/en/datetime.configuration.php#ini.date.sunset-zenith
+; http://php.net/date.sunset-zenith
;date.sunset_zenith = 90.583333
[filter]
-; http://www.php.net/manual/en/filter.configuration.php#ini.filter.default
+; http://php.net/filter.default
;filter.default = unsafe_raw
-; http://www.php.net/manual/en/filter.configuration.php#ini.filter.default-flags
+; http://php.net/filter.default-flags
;filter.default_flags =
[iconv]
@@ -970,10 +902,14 @@ default_socket_timeout = 60
;iconv.output_encoding = ISO-8859-1
[intl]
-;intl.default_locale =
+;intl.default_locale =
+; This directive allows you to produce PHP errors when some error
+; happens within intl functions. The value is the level of the error produced.
+; Default is 0, which does not produce any errors.
+;intl.error_level = E_WARNING
[sqlite]
-; http://www.php.net/manual/en/sqlite.configuration.php#ini.sqlite.assoc-case
+; http://php.net/sqlite.assoc-case
;sqlite.assoc_case = 0
[sqlite3]
@@ -981,50 +917,55 @@ default_socket_timeout = 60
[Pcre]
;PCRE library backtracking limit.
-; http://www.php.net/manual/en/pcre.configuration.php#ini.pcre.backtrack-limit
+; http://php.net/pcre.backtrack-limit
;pcre.backtrack_limit=100000
-;PCRE library recursion limit.
-;Please note that if you set this value to a high number you may consume all
-;the available process stack and eventually crash PHP (due to reaching the
+;PCRE library recursion limit.
+;Please note that if you set this value to a high number you may consume all
+;the available process stack and eventually crash PHP (due to reaching the
;stack size limit imposed by the Operating System).
-; http://www.php.net/manual/en/pcre.configuration.php#ini.pcre.recursion-limit
+; http://php.net/pcre.recursion-limit
;pcre.recursion_limit=100000
[Pdo]
; Whether to pool ODBC connections. Can be one of "strict", "relaxed" or "off"
-; http://www.php.net/manual/en/ref.pdo-odbc.php#ini.pdo-odbc.connection-pooling
+; http://php.net/pdo-odbc.connection-pooling
;pdo_odbc.connection_pooling=strict
+;pdo_odbc.db2_instance_name
+
+[Pdo_mysql]
+; If mysqlnd is used: Number of cache slots for the internal result set cache
+; http://php.net/pdo_mysql.cache_size
+pdo_mysql.cache_size = 2000
+
+; Default socket name for local MySQL connects. If empty, uses the built-in
+; MySQL defaults.
+; http://php.net/pdo_mysql.default-socket
+pdo_mysql.default_socket=
+
[Phar]
-; http://www.php.net/manual/en/phar.configuration.php#ini.phar.readonly
+; http://php.net/phar.readonly
;phar.readonly = On
-; http://www.php.net/manual/en/phar.configuration.php#ini.phar.require-hash
+; http://php.net/phar.require-hash
;phar.require_hash = On
;phar.cache_list =
-[Syslog]
-; Whether or not to define the various syslog variables (e.g. $LOG_PID,
-; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In
-; runtime, you can define these variables by calling define_syslog_variables().
-; http://www.php.net/manual/en/network.configuration.php#ini.define-syslog-variables
-define_syslog_variables = Off
-
[mail function]
; For Win32 only.
-; http://www.php.net/manual/en/mail.configuration.php#ini.smtp
+; http://php.net/smtp
SMTP = localhost
-; http://www.php.net/manual/en/mail.configuration.php#ini.smtp-port
+; http://php.net/smtp-port
smtp_port = 25
; For Win32 only.
-; http://www.php.net/manual/en/mail.configuration.php#ini.sendmail-from
+; http://php.net/sendmail-from
;sendmail_from = me@example.com
; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
-; http://www.php.net/manual/en/mail.configuration.php#ini.sendmail-path
+; http://php.net/sendmail-path
sendmail_path = /usr/sbin/sendmail -t -i
; Force the addition of the specified parameters to be passed as extra parameters
@@ -1032,86 +973,130 @@ sendmail_path = /usr/sbin/sendmail -t -i
; the 5th parameter to mail(), even in safe mode.
;mail.force_extra_parameters =
-; Add X-PHP-Originaiting-Script: that will include uid of the script followed by the filename
+; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
mail.add_x_header = On
-; Log all mail() calls including the full path of the script, line #, to address and headers
+; The path to a log file that will log all mail() calls. Log entries include
+; the full path of the script, line number, To address and headers.
;mail.log =
[SQL]
-; http://www.php.net/manual/en/ini.core.php#ini.sql.safe-mode
+; http://php.net/sql.safe-mode
sql.safe_mode = Off
[ODBC]
-; http://www.php.net/manual/en/odbc.configuration.php#ini.uodbc.default-db
+; http://php.net/odbc.default-db
;odbc.default_db = Not yet implemented
-; http://www.php.net/manual/en/odbc.configuration.php#ini.uodbc.default-user
+; http://php.net/odbc.default-user
;odbc.default_user = Not yet implemented
-; http://www.php.net/manual/en/odbc.configuration.php#ini.uodbc.default-pw
+; http://php.net/odbc.default-pw
;odbc.default_pw = Not yet implemented
+; Controls the ODBC cursor model.
+; Default: SQL_CURSOR_STATIC (default).
+;odbc.default_cursortype
+
; Allow or prevent persistent links.
-; http://www.php.net/manual/en/odbc.configuration.php#ini.uodbc.allow-persistent
+; http://php.net/odbc.allow-persistent
odbc.allow_persistent = On
; Check that a connection is still valid before reuse.
-; http://www.php.net/manual/en/odbc.configuration.php#ini.uodbc.check-persistent
+; http://php.net/odbc.check-persistent
odbc.check_persistent = On
; Maximum number of persistent links. -1 means no limit.
-; http://www.php.net/manual/en/odbc.configuration.php#ini.uodbc.max-persistent
+; http://php.net/odbc.max-persistent
odbc.max_persistent = -1
; Maximum number of links (persistent + non-persistent). -1 means no limit.
-; http://www.php.net/manual/en/odbc.configuration.php#ini.uodbc.max-links
+; http://php.net/odbc.max-links
odbc.max_links = -1
; Handling of LONG fields. Returns number of bytes to variables. 0 means
; passthru.
-; http://www.php.net/manual/en/odbc.configuration.php#ini.uodbc.defaultlrl
+; http://php.net/odbc.defaultlrl
odbc.defaultlrl = 4096
; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char.
; See the documentation on odbc_binmode and odbc_longreadlen for an explanation
-; of uodbc.defaultlrl and uodbc.defaultbinmode
-; http://www.php.net/manual/en/odbc.configuration.php#ini.uodbc.defaultbinmode
+; of odbc.defaultlrl and odbc.defaultbinmode
+; http://php.net/odbc.defaultbinmode
odbc.defaultbinmode = 1
;birdstep.max_links = -1
+[Interbase]
+; Allow or prevent persistent links.
+ibase.allow_persistent = 1
+
+; Maximum number of persistent links. -1 means no limit.
+ibase.max_persistent = -1
+
+; Maximum number of links (persistent + non-persistent). -1 means no limit.
+ibase.max_links = -1
+
+; Default database name for ibase_connect().
+;ibase.default_db =
+
+; Default username for ibase_connect().
+;ibase.default_user =
+
+; Default password for ibase_connect().
+;ibase.default_password =
+
+; Default charset for ibase_connect().
+;ibase.default_charset =
+
+; Default timestamp format.
+ibase.timestampformat = "%Y-%m-%d %H:%M:%S"
+
+; Default date format.
+ibase.dateformat = "%Y-%m-%d"
+
+; Default time format.
+ibase.timeformat = "%H:%M:%S"
+
[MySQL]
+; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
+; http://php.net/mysql.allow_local_infile
+mysql.allow_local_infile = On
+
; Allow or prevent persistent links.
-; http://www.php.net/manual/en/mysql.configuration.php#ini.mysql.allow-persistent
+; http://php.net/mysql.allow-persistent
mysql.allow_persistent = On
+; If mysqlnd is used: Number of cache slots for the internal result set cache
+; http://php.net/mysql.cache_size
+mysql.cache_size = 2000
+
; Maximum number of persistent links. -1 means no limit.
-; http://www.php.net/manual/en/mysql.configuration.php#ini.mysql.max-persistent
+; http://php.net/mysql.max-persistent
mysql.max_persistent = -1
; Maximum number of links (persistent + non-persistent). -1 means no limit.
-; http://www.php.net/manual/en/mysql.configuration.php#ini.mysql.max-links
+; http://php.net/mysql.max-links
mysql.max_links = -1
; Default port number for mysql_connect(). If unset, mysql_connect() will use
; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
; compile-time value defined MYSQL_PORT (in that order). Win32 will only look
; at MYSQL_PORT.
-; http://www.php.net/manual/en/mysql.configuration.php#ini.mysql.default-port
+; http://php.net/mysql.default-port
mysql.default_port =
; Default socket name for local MySQL connects. If empty, uses the built-in
; MySQL defaults.
-; http://www.php.net/manual/en/mysql.configuration.php#ini.mysql.default-socket
+; http://php.net/mysql.default-socket
mysql.default_socket =
; Default host for mysql_connect() (doesn't apply in safe mode).
-; http://www.php.net/manual/en/mysql.configuration.php#ini.mysql.default-host
+; http://php.net/mysql.default-host
mysql.default_host =
; Default user for mysql_connect() (doesn't apply in safe mode).
-; http://www.php.net/manual/en/mysql.configuration.php#ini.mysql.default-user
+; http://php.net/mysql.default-user
mysql.default_user =
; Default password for mysql_connect() (doesn't apply in safe mode).
@@ -1119,42 +1104,58 @@ mysql.default_user =
; *Any* user with PHP access can run 'echo get_cfg_var("mysql.default_password")
; and reveal this password! And of course, any users with read access to this
; file will be able to reveal the password as well.
-; http://www.php.net/manual/en/mysql.configuration.php#ini.mysql.default-password
+; http://php.net/mysql.default-password
mysql.default_password =
; Maximum time (in seconds) for connect timeout. -1 means no limit
-; http://www.php.net/manual/en/mysql.configuration.php#ini.mysql.connect-timeout
+; http://php.net/mysql.connect-timeout
mysql.connect_timeout = 60
; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
; SQL-Errors will be displayed.
-; http://www.php.net/manual/en/mysql.configuration.php#ini.mysql.trace-mode
+; http://php.net/mysql.trace-mode
mysql.trace_mode = Off
[MySQLi]
+; Maximum number of persistent links. -1 means no limit.
+; http://php.net/mysqli.max-persistent
+mysqli.max_persistent = -1
+
+; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
+; http://php.net/mysqli.allow_local_infile
+;mysqli.allow_local_infile = On
+
+; Allow or prevent persistent links.
+; http://php.net/mysqli.allow-persistent
+mysqli.allow_persistent = On
+
; Maximum number of links. -1 means no limit.
-; http://www.php.net/manual/en/mysqli.configuration.php#ini.mysqli.max-links
+; http://php.net/mysqli.max-links
mysqli.max_links = -1
+; If mysqlnd is used: Number of cache slots for the internal result set cache
+; http://php.net/mysqli.cache_size
+mysqli.cache_size = 2000
+
; Default port number for mysqli_connect(). If unset, mysqli_connect() will use
; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
; compile-time value defined MYSQL_PORT (in that order). Win32 will only look
; at MYSQL_PORT.
-; http://www.php.net/manual/en/mysqli.configuration.php#ini.mysqli.default-port
+; http://php.net/mysqli.default-port
mysqli.default_port = 3306
; Default socket name for local MySQL connects. If empty, uses the built-in
; MySQL defaults.
-; http://www.php.net/manual/en/mysqli.configuration.php#ini.mysqli.default-socket
+; http://php.net/mysqli.default-socket
mysqli.default_socket =
; Default host for mysql_connect() (doesn't apply in safe mode).
-; http://www.php.net/manual/en/mysqli.configuration.php#ini.mysqli.default-host
+; http://php.net/mysqli.default-host
mysqli.default_host =
; Default user for mysql_connect() (doesn't apply in safe mode).
-; http://www.php.net/manual/en/mysqli.configuration.php#ini.mysqli.default-user
+; http://php.net/mysqli.default-user
mysqli.default_user =
; Default password for mysqli_connect() (doesn't apply in safe mode).
@@ -1162,86 +1163,171 @@ mysqli.default_user =
; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw")
; and reveal this password! And of course, any users with read access to this
; file will be able to reveal the password as well.
-; http://www.php.net/manual/en/mysqli.configuration.php#ini.mysqli.default-pw
+; http://php.net/mysqli.default-pw
mysqli.default_pw =
; Allow or prevent reconnect
mysqli.reconnect = Off
-[PostgresSQL]
+[mysqlnd]
+; Enable / Disable collection of general statistics by mysqlnd which can be
+; used to tune and monitor MySQL operations.
+; http://php.net/mysqlnd.collect_statistics
+mysqlnd.collect_statistics = On
+
+; Enable / Disable collection of memory usage statistics by mysqlnd which can be
+; used to tune and monitor MySQL operations.
+; http://php.net/mysqlnd.collect_memory_statistics
+mysqlnd.collect_memory_statistics = Off
+
+; Size of a pre-allocated buffer used when sending commands to MySQL in bytes.
+; http://php.net/mysqlnd.net_cmd_buffer_size
+;mysqlnd.net_cmd_buffer_size = 2048
+
+; Size of a pre-allocated buffer used for reading data sent by the server in
+; bytes.
+; http://php.net/mysqlnd.net_read_buffer_size
+;mysqlnd.net_read_buffer_size = 32768
+
+[OCI8]
+
+; Connection: Enables privileged connections using external
+; credentials (OCI_SYSOPER, OCI_SYSDBA)
+; http://php.net/oci8.privileged-connect
+;oci8.privileged_connect = Off
+
+; Connection: The maximum number of persistent OCI8 connections per
+; process. Using -1 means no limit.
+; http://php.net/oci8.max-persistent
+;oci8.max_persistent = -1
+
+; Connection: The maximum number of seconds a process is allowed to
+; maintain an idle persistent connection. Using -1 means idle
+; persistent connections will be maintained forever.
+; http://php.net/oci8.persistent-timeout
+;oci8.persistent_timeout = -1
+
+; Connection: The number of seconds that must pass before issuing a
+; ping during oci_pconnect() to check the connection validity. When
+; set to 0, each oci_pconnect() will cause a ping. Using -1 disables
+; pings completely.
+; http://php.net/oci8.ping-interval
+;oci8.ping_interval = 60
+
+; Connection: Set this to a user chosen connection class to be used
+; for all pooled server requests with Oracle 11g Database Resident
+; Connection Pooling (DRCP). To use DRCP, this value should be set to
+; the same string for all web servers running the same application,
+; the database pool must be configured, and the connection string must
+; specify to use a pooled server.
+;oci8.connection_class =
+
+; High Availability: Using On lets PHP receive Fast Application
+; Notification (FAN) events generated when a database node fails. The
+; database must also be configured to post FAN events.
+;oci8.events = Off
+
+; Tuning: This option enables statement caching, and specifies how
+; many statements to cache. Using 0 disables statement caching.
+; http://php.net/oci8.statement-cache-size
+;oci8.statement_cache_size = 20
+
+; Tuning: Enables statement prefetching and sets the default number of
+; rows that will be fetched automatically after statement execution.
+; http://php.net/oci8.default-prefetch
+;oci8.default_prefetch = 100
+
+; Compatibility. Using On means oci_close() will not close
+; oci_connect() and oci_new_connect() connections.
+; http://php.net/oci8.old-oci-close-semantics
+;oci8.old_oci_close_semantics = Off
+
+[PostgreSQL]
; Allow or prevent persistent links.
-; http://www.php.net/manual/en/pgsql.configuration.php#ini.pgsql.allow-persistent
+; http://php.net/pgsql.allow-persistent
pgsql.allow_persistent = On
; Detect broken persistent links always with pg_pconnect().
; Auto reset feature requires a little overheads.
-; http://www.php.net/manual/en/pgsql.configuration.php#ini.pgsql.auto-reset-persistent
+; http://php.net/pgsql.auto-reset-persistent
pgsql.auto_reset_persistent = Off
; Maximum number of persistent links. -1 means no limit.
-; http://www.php.net/manual/en/pgsql.configuration.php#ini.pgsql.max-persistent
+; http://php.net/pgsql.max-persistent
pgsql.max_persistent = -1
; Maximum number of links (persistent+non persistent). -1 means no limit.
-; http://www.php.net/manual/en/pgsql.configuration.php#ini.pgsql.max-links
+; http://php.net/pgsql.max-links
pgsql.max_links = -1
; Ignore PostgreSQL backends Notice message or not.
; Notice message logging require a little overheads.
-; http://www.php.net/manual/en/pgsql.configuration.php#ini.pgsql.ignore-notice
+; http://php.net/pgsql.ignore-notice
pgsql.ignore_notice = 0
-; Log PostgreSQL backends Noitce message or not.
+; Log PostgreSQL backends Notice message or not.
; Unless pgsql.ignore_notice=0, module cannot log notice message.
-; http://www.php.net/manual/en/pgsql.configuration.php#ini.pgsql.log-notice
+; http://php.net/pgsql.log-notice
pgsql.log_notice = 0
[Sybase-CT]
; Allow or prevent persistent links.
-; http://www.php.net/manual/en/sybase.configuration.php#ini.sybct.allow-persistent
+; http://php.net/sybct.allow-persistent
sybct.allow_persistent = On
; Maximum number of persistent links. -1 means no limit.
-; http://www.php.net/manual/en/sybase.configuration.php#ini.sybct.max-persistent
+; http://php.net/sybct.max-persistent
sybct.max_persistent = -1
; Maximum number of links (persistent + non-persistent). -1 means no limit.
-; http://www.php.net/manual/en/sybase.configuration.php#ini.sybct.max-links
+; http://php.net/sybct.max-links
sybct.max_links = -1
; Minimum server message severity to display.
-; http://www.php.net/manual/en/sybase.configuration.php#ini.sybct.min-server-severity
+; http://php.net/sybct.min-server-severity
sybct.min_server_severity = 10
; Minimum client message severity to display.
-; http://www.php.net/manual/en/sybase.configuration.php#ini.sybct.min-client-severity
+; http://php.net/sybct.min-client-severity
sybct.min_client_severity = 10
; Set per-context timeout
-; http://www.php.net/manual/en/sybase.configuration.php#ini.sybct.timeout
+; http://php.net/sybct.timeout
;sybct.timeout=
;sybct.packet_size
+; The maximum time in seconds to wait for a connection attempt to succeed before returning failure.
+; Default: one minute
+;sybct.login_timeout=
+
+; The name of the host you claim to be connecting from, for display by sp_who.
+; Default: none
+;sybct.hostname=
+
+; Allows you to define how often deadlocks are to be retried. -1 means "forever".
+; Default: 0
+;sybct.deadlock_retry_count=
+
[bcmath]
; Number of decimal digits for all bcmath functions.
-; http://www.php.net/manual/en/bc.configuration.php#ini.bcmath.scale
+; http://php.net/bcmath.scale
bcmath.scale = 0
[browscap]
-; http://www.php.net/manual/en/misc.configuration.php#ini.browscap
+; http://php.net/browscap
;browscap = extra/browscap.ini
[Session]
; Handler used to store/retrieve data.
-; http://www.php.net/manual/en/session.configuration.php#ini.session.save-handler
+; http://php.net/session.save-handler
session.save_handler = files
; Argument passed to save_handler. In the case of files, this is the path
; where data files are stored. Note: Windows users have to change this
; variable in order to use PHP's session functions.
;
-; As of PHP 4.0.1, you can define the path as:
+; The path can be defined as:
;
; session.save_path = "N;/path"
;
@@ -1263,49 +1349,49 @@ session.save_handler = files
;
; where MODE is the octal representation of the mode. Note that this
; does not overwrite the process's umask.
-; http://www.php.net/manual/en/session.configuration.php#ini.session.save-path
+; http://php.net/session.save-path
session.save_path = "/var/lib/php/session"
; Whether to use cookies.
-; http://www.php.net/manual/en/session.configuration.php#ini.session.use-cookies
+; http://php.net/session.use-cookies
session.use_cookies = 1
-; http://www.php.net/manual/en/session.configuration.php#ini.session.cookie-secure
+; http://php.net/session.cookie-secure
;session.cookie_secure =
; This option forces PHP to fetch and use a cookie for storing and maintaining
-; the session id. We encourage this operation as it's very helpful in combatting
+; the session id. We encourage this operation as it's very helpful in combating
; session hijacking when not specifying and managing your own session id. It is
; not the end all be all of session hijacking defense, but it's a good start.
-; http://www.php.net/manual/en/session.configuration.php#ini.session.use-only-cookies
+; http://php.net/session.use-only-cookies
session.use_only_cookies = 1
; Name of the session (used as cookie name).
-; http://www.php.net/manual/en/session.configuration.php#ini.session.name
+; http://php.net/session.name
session.name = PHPSESSID
; Initialize session on request startup.
-; http://www.php.net/manual/en/session.configuration.php#ini.session.auto-start
+; http://php.net/session.auto-start
session.auto_start = 0
; Lifetime in seconds of cookie or, if 0, until browser is restarted.
-; http://www.php.net/manual/en/session.configuration.php#ini.session.cookie-lifetime
+; http://php.net/session.cookie-lifetime
session.cookie_lifetime = 0
; The path for which the cookie is valid.
-; http://www.php.net/manual/en/session.configuration.php#ini.session.cookie-path
+; http://php.net/session.cookie-path
session.cookie_path = /
; The domain for which the cookie is valid.
-; http://www.php.net/manual/en/session.configuration.php#ini.session.cookie-domain
+; http://php.net/session.cookie-domain
session.cookie_domain =
; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript.
-; http://www.php.net/manual/en/session.configuration.php#ini.session.cookie-httponly
-session.cookie_httponly =
+; http://php.net/session.cookie-httponly
+session.cookie_httponly =
; Handler used to serialize data. php is the standard serializer of PHP.
-; http://www.php.net/manual/en/session.configuration.php#ini.session.serialize-handler
+; http://php.net/session.serialize-handler
session.serialize_handler = php
; Defines the probability that the 'garbage collection' process is started
@@ -1317,11 +1403,11 @@ session.serialize_handler = php
; Default Value: 1
; Development Value: 1
; Production Value: 1
-; http://www.php.net/manual/en/session.configuration.php#ini.session.gc-probability
+; http://php.net/session.gc-probability
session.gc_probability = 1
; Defines the probability that the 'garbage collection' process is started on every
-; session initialization. The probability is calculated by using the following equation:
+; session initialization. The probability is calculated by using the following equation:
; gc_probability/gc_divisor. Where session.gc_probability is the numerator and
; session.gc_divisor is the denominator in the equation. Setting this value to 1
; when the session.gc_divisor value is 100 will give you approximately a 1% chance
@@ -1331,12 +1417,12 @@ session.gc_probability = 1
; Default Value: 100
; Development Value: 1000
; Production Value: 1000
-; http://www.php.net/manual/en/session.configuration.php#ini.session.gc-divisor
+; http://php.net/session.gc-divisor
session.gc_divisor = 1000
; After this number of seconds, stored data will be seen as 'garbage' and
; cleaned up by the garbage collection process.
-; http://www.php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime
+; http://php.net/session.gc-maxlifetime
session.gc_maxlifetime = 1440
; NOTE: If you are using the subdirectory option for storing session files
@@ -1345,11 +1431,11 @@ session.gc_maxlifetime = 1440
; collection through a shell script, cron entry, or some other method.
; For example, the following script would is the equivalent of
; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
-; cd /path/to/sessions; find -cmin +24 | xargs rm
+; find /path/to/sessions -cmin +24 | xargs rm
; PHP 4.2 and less have an undocumented feature/bug that allows you to
-; to initialize a session variable in the global scope, even when register_globals
-; is disabled. PHP 4.3 and later will warn you, if this feature is used.
+; to initialize a session variable in the global scope.
+; PHP 4.3 and later will warn you, if this feature is used.
; You can disable the feature and the warning separately. At this time,
; the warning is only displayed, if bug_compat_42 is enabled. This feature
; introduces some serious security problems if not handled correctly. It's
@@ -1360,7 +1446,7 @@ session.gc_maxlifetime = 1440
; Default Value: On
; Development Value: On
; Production Value: Off
-; http://www.php.net/manual/en/session.configuration.php#ini.session.bug-compat-42
+; http://php.net/session.bug-compat-42
session.bug_compat_42 = Off
; This setting controls whether or not you are warned by PHP when initializing a
@@ -1369,34 +1455,35 @@ session.bug_compat_42 = Off
; Default Value: On
; Development Value: On
; Production Value: Off
-; http://www.php.net/manual/en/session.configuration.php#ini.session.bug-compat-warn
+; http://php.net/session.bug-compat-warn
session.bug_compat_warn = Off
; Check HTTP Referer to invalidate externally stored URLs containing ids.
; HTTP_REFERER has to contain this substring for the session to be
; considered as valid.
-; http://www.php.net/manual/en/session.configuration.php#ini.session.referer-check
+; http://php.net/session.referer-check
session.referer_check =
; How many bytes to read from the file.
-; http://www.php.net/manual/en/session.configuration.php#ini.session.entropy-length
-session.entropy_length = 0
+; http://php.net/session.entropy-length
+;session.entropy_length = 32
; Specified here to create the session id.
-; http://www.php.net/manual/en/session.configuration.php#ini.session.entropy-file
+; http://php.net/session.entropy-file
+; Defaults to /dev/urandom
+; On systems that don't have /dev/urandom but do have /dev/arandom, this will default to /dev/arandom
+; If neither are found at compile time, the default is no entropy file.
+; On windows, setting the entropy_length setting will activate the
+; Windows random source (using the CryptoAPI)
;session.entropy_file = /dev/urandom
-session.entropy_file =
-
-; http://www.php.net/manual/en/session.configuration.php#ini.session.entropy-length
-;session.entropy_length = 16
; Set to {nocache,private,public,} to determine HTTP caching aspects
; or leave this empty to avoid sending anti-caching headers.
-; http://www.php.net/manual/en/session.configuration.php#ini.session.cache-limiter
+; http://php.net/session.cache-limiter
session.cache_limiter = nocache
; Document expires after n minutes.
-; http://www.php.net/manual/en/session.configuration.php#ini.session.cache-expire
+; http://php.net/session.cache-expire
session.cache_expire = 180
; trans sid support is disabled by default.
@@ -1405,17 +1492,20 @@ session.cache_expire = 180
; - User may send URL contains active session ID
; to other person via. email/irc/etc.
; - URL that contains active session ID may be stored
-; in publically accessible computer.
+; in publicly accessible computer.
; - User may access your site with the same session ID
; always using URL stored in browser's history or bookmarks.
-; http://www.php.net/manual/en/session.configuration.php#ini.session.use-trans-sid
+; http://php.net/session.use-trans-sid
session.use_trans_sid = 0
; Select a hash function for use in generating session ids.
-; Possible Values
+; Possible Values
; 0 (MD5 128 bits)
; 1 (SHA-1 160 bits)
-; http://www.php.net/manual/en/session.configuration.php#ini.session.hash-function
+; This option may also be set to the name of any hash function supported by
+; the hash extension. A list of available hashes is returned by the hash_algos()
+; function.
+; http://php.net/session.hash-function
session.hash_function = 0
; Define how many bits are stored in each character when converting
@@ -1427,7 +1517,7 @@ session.hash_function = 0
; Default Value: 4
; Development Value: 5
; Production Value: 5
-; http://www.php.net/manual/en/session.configuration.php#ini.session.hash-bits-per-character
+; http://php.net/session.hash-bits-per-character
session.hash_bits_per_character = 5
; The URL rewriter will look for URLs in a defined set of HTML tags.
@@ -1438,9 +1528,54 @@ session.hash_bits_per_character = 5
; Default Value: "a=href,area=href,frame=src,form=,fieldset="
; Development Value: "a=href,area=href,frame=src,input=src,form=fakeentry"
; Production Value: "a=href,area=href,frame=src,input=src,form=fakeentry"
-; http://www.php.net/manual/en/session.configuration.php#ini.url-rewriter.tags
+; http://php.net/url-rewriter.tags
url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry"
+; Enable upload progress tracking in $_SESSION
+; Default Value: On
+; Development Value: On
+; Production Value: On
+; http://php.net/session.upload-progress.enabled
+;session.upload_progress.enabled = On
+
+; Cleanup the progress information as soon as all POST data has been read
+; (i.e. upload completed).
+; Default Value: On
+; Development Value: On
+; Production Value: On
+; http://php.net/session.upload-progress.cleanup
+;session.upload_progress.cleanup = On
+
+; A prefix used for the upload progress key in $_SESSION
+; Default Value: "upload_progress_"
+; Development Value: "upload_progress_"
+; Production Value: "upload_progress_"
+; http://php.net/session.upload-progress.prefix
+;session.upload_progress.prefix = "upload_progress_"
+
+; The index name (concatenated with the prefix) in $_SESSION
+; containing the upload progress information
+; Default Value: "PHP_SESSION_UPLOAD_PROGRESS"
+; Development Value: "PHP_SESSION_UPLOAD_PROGRESS"
+; Production Value: "PHP_SESSION_UPLOAD_PROGRESS"
+; http://php.net/session.upload-progress.name
+;session.upload_progress.name = "PHP_SESSION_UPLOAD_PROGRESS"
+
+; How frequently the upload progress should be updated.
+; Given either in percentages (per-file), or in bytes
+; Default Value: "1%"
+; Development Value: "1%"
+; Production Value: "1%"
+; http://php.net/session.upload-progress.freq
+;session.upload_progress.freq = "1%"
+
+; The minimum delay between updates, in seconds
+; Default Value: 1
+; Development Value: 1
+; Production Value: 1
+; http://php.net/session.upload-progress.min-freq
+;session.upload_progress.min_freq = "1"
+
[MSSQL]
; Allow or prevent persistent links.
mssql.allow_persistent = On
@@ -1488,72 +1623,76 @@ mssql.secure_connection = Off
; FreeTDS defaults to 4096
;mssql.max_procs = -1
-; Specify client character set.
-; If empty or not set the client charset from freetds.comf is used
+; Specify client character set.
+; If empty or not set the client charset from freetds.conf is used
; This is only used when compiled with FreeTDS
;mssql.charset = "ISO-8859-1"
[Assertion]
; Assert(expr); active by default.
-; http://www.php.net/manual/en/info.configuration.php#ini.assert.active
+; http://php.net/assert.active
;assert.active = On
; Issue a PHP warning for each failed assertion.
-; http://www.php.net/manual/en/info.configuration.php#ini.assert.warning
+; http://php.net/assert.warning
;assert.warning = On
; Don't bail out by default.
-; http://www.php.net/manual/en/info.configuration.php#ini.assert.bail
+; http://php.net/assert.bail
;assert.bail = Off
; User-function to be called if an assertion fails.
-; http://www.php.net/manual/en/info.configuration.php#ini.assert.callback
+; http://php.net/assert.callback
;assert.callback = 0
; Eval the expression with current error_reporting(). Set to true if you want
; error_reporting(0) around the eval().
-; http://www.php.net/manual/en/info.configuration.php#ini.assert.quiet-eval
+; http://php.net/assert.quiet-eval
;assert.quiet_eval = 0
[COM]
; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
-; http://www.php.net/manual/en/com.configuration.php#ini.com.typelib-file
+; http://php.net/com.typelib-file
;com.typelib_file =
; allow Distributed-COM calls
-; http://www.php.net/manual/en/com.configuration.php#ini.com.allow-dcom
+; http://php.net/com.allow-dcom
;com.allow_dcom = true
; autoregister constants of a components typlib on com_load()
-; http://www.php.net/manual/en/com.configuration.php#ini.com.autoregister-typelib
+; http://php.net/com.autoregister-typelib
;com.autoregister_typelib = true
; register constants casesensitive
-; http://www.php.net/manual/en/com.configuration.php#ini.com.autoregister-casesensitive
+; http://php.net/com.autoregister-casesensitive
;com.autoregister_casesensitive = false
; show warnings on duplicate constant registrations
-; http://www.php.net/manual/en/com.configuration.php#ini.com.autoregister-verbose
+; http://php.net/com.autoregister-verbose
;com.autoregister_verbose = true
+; The default character set code-page to use when passing strings to and from COM objects.
+; Default: system ANSI code page
+;com.code_page=
+
[mbstring]
; language for internal character representation.
-; http://www.php.net/manual/en/mbstring.configuration.php#ini.mbstring.language
+; http://php.net/mbstring.language
;mbstring.language = Japanese
; internal/script encoding.
; Some encoding cannot work as internal encoding.
; (e.g. SJIS, BIG5, ISO-2022-*)
-; http://www.php.net/manual/en/mbstring.configuration.php#ini.mbstring.internal-encoding
+; http://php.net/mbstring.internal-encoding
;mbstring.internal_encoding = EUC-JP
; http input encoding.
-; http://www.php.net/manual/en/mbstring.configuration.php#ini.mbstring.http-input
+; http://php.net/mbstring.http-input
;mbstring.http_input = auto
; http output encoding. mb_output_handler must be
; registered as output buffer to function
-; http://www.php.net/manual/en/mbstring.configuration.php#ini.mbstring.http-output
+; http://php.net/mbstring.http-output
;mbstring.http_output = SJIS
; enable automatic encoding translation according to
@@ -1561,17 +1700,17 @@ mssql.secure_connection = Off
; converted to internal encoding by setting this to On.
; Note: Do _not_ use automatic encoding translation for
; portable libs/applications.
-; http://www.php.net/manual/en/mbstring.configuration.php#ini.mbstring.encoding-translation
+; http://php.net/mbstring.encoding-translation
;mbstring.encoding_translation = Off
; automatic encoding detection order.
; auto means
-; http://www.php.net/manual/en/mbstring.configuration.php#ini.mbstring.detect-order
+; http://php.net/mbstring.detect-order
;mbstring.detect_order = auto
; substitute_character used when character cannot be converted
; one from another
-; http://www.php.net/manual/en/mbstring.configuration.php#ini.mbstring.substitute-character
+; http://php.net/mbstring.substitute-character
;mbstring.substitute_character = none;
; overload(replace) single byte functions by mbstring functions.
@@ -1582,7 +1721,7 @@ mssql.secure_connection = Off
; 1: Overload mail() function
; 2: Overload str*() functions
; 4: Overload ereg*() functions
-; http://www.php.net/manual/en/mbstring.configuration.php#ini.mbstring.func-overload
+; http://php.net/mbstring.func-overload
;mbstring.func_overload = 0
; enable strict encoding detection.
@@ -1597,7 +1736,7 @@ mssql.secure_connection = Off
; Tell the jpeg decode to ignore warnings and try to create
; a gd image. The warning will then be displayed as notices
; disabled by default
-; http://www.php.net/manual/en/image.configuration.php#ini.image.jpeg-ignore-warning
+; http://php.net/gd.jpeg-ignore-warning
;gd.jpeg_ignore_warning = 0
[exif]
@@ -1606,53 +1745,73 @@ mssql.secure_connection = Off
; given by corresponding encode setting. When empty mbstring.internal_encoding
; is used. For the decode settings you can distinguish between motorola and
; intel byte order. A decode setting cannot be empty.
-; http://www.php.net/manual/en/exif.configuration.php#ini.exif.encode-unicode
+; http://php.net/exif.encode-unicode
;exif.encode_unicode = ISO-8859-15
-; http://www.php.net/manual/en/exif.configuration.php#ini.exif.decode-unicode-motorola
+; http://php.net/exif.decode-unicode-motorola
;exif.decode_unicode_motorola = UCS-2BE
-; http://www.php.net/manual/en/exif.configuration.php#ini.exif.decode-unicode-intel
+; http://php.net/exif.decode-unicode-intel
;exif.decode_unicode_intel = UCS-2LE
-; http://www.php.net/manual/en/exif.configuration.php#ini.exif.encode-jis
+; http://php.net/exif.encode-jis
;exif.encode_jis =
-; http://www.php.net/manual/en/exif.configuration.php#ini.exif.decode-jis-motorola
+; http://php.net/exif.decode-jis-motorola
;exif.decode_jis_motorola = JIS
-; http://www.php.net/manual/en/exif.configuration.php#ini.exif.decode-jis-intel
+; http://php.net/exif.decode-jis-intel
;exif.decode_jis_intel = JIS
[Tidy]
; The path to a default tidy configuration file to use when using tidy
-; http://www.php.net/manual/en/tidy.configuration.php#ini.tidy.default-config
+; http://php.net/tidy.default-config
;tidy.default_config = /usr/local/lib/php/default.tcfg
; Should tidy clean and repair output automatically?
; WARNING: Do not use this option if you are generating non-html content
; such as dynamic images
-; http://www.php.net/manual/en/tidy.configuration.php#ini.tidy.clean-output
+; http://php.net/tidy.clean-output
tidy.clean_output = Off
[soap]
; Enables or disables WSDL caching feature.
-; http://www.php.net/manual/en/soap.configuration.php#ini.soap.wsdl-cache-enabled
+; http://php.net/soap.wsdl-cache-enabled
soap.wsdl_cache_enabled=1
; Sets the directory name where SOAP extension will put cache files.
-; http://www.php.net/manual/en/soap.configuration.php#ini.soap.wsdl-cache-dir
+; http://php.net/soap.wsdl-cache-dir
soap.wsdl_cache_dir="/tmp"
-; (time to live) Sets the number of second while cached file will be used
+; (time to live) Sets the number of second while cached file will be used
; instead of original one.
-; http://www.php.net/manual/en/soap.configuration.php#ini.soap.wsdl-cache-ttl
+; http://php.net/soap.wsdl-cache-ttl
soap.wsdl_cache_ttl=86400
+; Sets the size of the cache limit. (Max. number of WSDL files to cache)
+soap.wsdl_cache_limit = 5
+
[sysvshm]
; A default size of the shared memory segment
;sysvshm.init_mem = 10000
+[ldap]
+; Sets the maximum number of open links or -1 for unlimited.
+ldap.max_links = -1
+
+[mcrypt]
+; For more information about mcrypt settings see http://php.net/mcrypt-module-open
+
+; Directory where to load mcrypt algorithms
+; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt)
+;mcrypt.algorithms_dir=
+
+; Directory where to load mcrypt modes
+; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt)
+;mcrypt.modes_dir=
+
+[dba]
+;dba.default_handler=
; Local Variables:
; tab-width: 4
diff --git a/php.spec b/php.spec
index bd2bea4..c2718b4 100644
--- a/php.spec
+++ b/php.spec
@@ -1,15 +1,18 @@
%global contentdir /var/www
# API/ABI check
-%global apiver 20090626
-%global zendver 20090626
+%global apiver 20100412
+%global zendver 20100525
%global pdover 20080721
# Extension version
%global fileinfover 1.0.5-dev
%global pharver 2.0.1
%global zipver 1.9.1
%global jsonver 1.2.1
+# For PHP Release Candidate version
+%global rcver RC6
%global httpd_mmn %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)
+%global mysql_sock %(mysql_config --socket || echo /var/lib/mysql/mysql.sock)
# Regression tests take a long time, you can skip 'em with this
%{!?runselftest: %{expand: %%global runselftest 1}}
@@ -36,13 +39,13 @@
Summary: PHP scripting language for creating dynamic web sites
Name: php
-Version: 5.3.8
-Release: 4%{?dist}.4
+Version: 5.4.0
+Release: 0.1.%{rcver}%{?dist}
License: PHP
Group: Development/Languages
URL: http://www.php.net/
-Source0: http://www.php.net/distributions/php-%{version}.tar.bz2
+Source0: http://www.php.net/distributions/php-%{version}%{?rcver}.tar.bz2
Source1: php.conf
Source2: php.ini
Source3: macros.php
@@ -52,43 +55,33 @@ Source6: php-fpm.service
Source7: php-fpm.logrotate
# Build fixes
-Patch1: php-5.3.7-gnusrc.patch
-Patch2: php-5.3.0-install.patch
-Patch3: php-5.2.4-norpath.patch
Patch5: php-5.2.0-includedir.patch
Patch6: php-5.2.4-embed.patch
Patch7: php-5.3.0-recode.patch
-# from http://svn.php.net/viewvc?view=revision&revision=311042
-# and http://svn.php.net/viewvc?view=revision&revision=311908
-Patch8: php-5.3.8-aconf259.patch
-# from http://svn.php.net/viewvc?view=revision&revision=316281
-# + fix harcoded mysql.sock path
-Patch9: php-5.3.8-mysqlnd.patch
# Fixes for extension modules
-Patch20: php-4.3.11-shutdown.patch
-Patch21: php-5.3.3-macropen.patch
# Functional changes
-Patch40: php-5.0.4-dlopen.patch
-Patch41: php-5.3.0-easter.patch
+Patch40: php-5.4.0-dlopen.patch
+Patch41: php-5.4.0-easter.patch
Patch42: php-5.3.1-systzdata-v7.patch
# See http://bugs.php.net/53436
-Patch43: php-5.3.4-phpize.patch
-# http://svn.php.net/viewvc?view=revision&revision=317183
-Patch44: php-5.3.8-isa.patch
+Patch43: php-5.4.0-phpize.patch
# Fixes for tests
-Patch61: php-5.0.4-tests-wddx.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, gmp-devel
BuildRequires: httpd-devel >= 2.0.46-1, pam-devel
-BuildRequires: libstdc++-devel, openssl-devel, sqlite-devel >= 3.6.0
-BuildRequires: zlib-devel, pcre-devel >= 6.6, smtpdaemon, libedit-devel
+BuildRequires: libstdc++-devel, openssl-devel
+BuildRequires: sqlite-devel >= 3.6.0
+BuildRequires: zlib-devel, smtpdaemon, libedit-devel
+BuildRequires: pcre-devel >= 6.6
BuildRequires: bzip2, perl, libtool >= 1.4.3, gcc-c++
BuildRequires: libtool-ltdl-devel
+BuildRequires: bison
Obsoletes: php-dbg, php3, phpfi, stronghold-php, php-zts < 5.3.7
Provides: php-zts = %{version}-%{release}
@@ -106,9 +99,11 @@ Requires(pre): httpd
# Don't provides extensions, which are not shared library, as .so
# RPM 4.8
%{?filter_provides_in: %filter_provides_in %{_libdir}/php/modules/.*\.so$}
+%{?filter_provides_in: %filter_provides_in %{_libdir}/php-zts/modules/.*\.so$}
%{?filter_setup}
# RPM 4.9
%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{_libdir}/php/modules/.*\\.so$
+%global __provides_exclude_from %{__provides_exclude_from}|%{_libdir}/php-zts/modules/.*\\.so$
%description
@@ -134,6 +129,7 @@ Provides: php-readline, php-readline%{?_isa}
The php-cli package contains the command-line interface
executing PHP scripts, /usr/bin/php, and the CGI interface.
+
%if %{with_fpm}
%package fpm
Group: Development/Languages
@@ -159,10 +155,7 @@ any size, especially busier sites.
%package common
Group: Development/Languages
Summary: Common files for PHP
-# Remove this when value change
-Provides: php-api = %{apiver}, php-zend-abi = %{zendver}
-Provides: php(api) = %{apiver}, php(zend-abi) = %{zendver}
-# New ABI/API check - Arch specific
+# ABI/API check - Arch specific
Provides: php-api = %{apiver}%{isasuffix}, php-zend-abi = %{zendver}%{isasuffix}
Provides: php(api) = %{apiver}%{isasuffix}, php(zend-abi) = %{zendver}%{isasuffix}
# Provides for all builtin/shared modules:
@@ -215,6 +208,8 @@ Group: Development/Libraries
Summary: Files needed for building PHP extensions
Requires: php%{?_isa} = %{version}-%{release}, autoconf, automake
Obsoletes: php-pecl-pdo-devel
+Provides: php-zts-devel = %{version}-%{release}
+Provides: php-zts-devel%{?_isa} = %{version}-%{release}
%description devel
The php-devel package contains the files needed for building PHP
@@ -257,9 +252,7 @@ Summary: A database access abstraction module for PHP applications
Group: Development/Languages
Requires: php-common%{?_isa} = %{version}-%{release}
Obsoletes: php-pecl-pdo-sqlite, php-pecl-pdo
-# Remove this when value change
-Provides: php-pdo-abi = %{pdover}
-# New ABI/API check - Arch specific
+# ABI/API check - Arch specific
Provides: php-pdo-abi = %{pdover}%{isasuffix}
Provides: php-sqlite3, php-sqlite3%{?_isa}
Provides: php-pdo_sqlite, php-pdo_sqlite%{?_isa}
@@ -554,26 +547,16 @@ support for using the enchant library to PHP.
%prep
-%setup -q
-%patch1 -p1 -b .gnusrc
-%patch2 -p1 -b .install
-%patch3 -p1 -b .norpath
+%setup -q -n php-%{version}%{?rcver}
+
%patch5 -p1 -b .includedir
%patch6 -p1 -b .embed
%patch7 -p1 -b .recode
-%patch8 -p1 -b .aconf26x
-%patch9 -p1 -b .mysqlnd
-
-%patch20 -p1 -b .shutdown
-%patch21 -p1 -b .macropen
%patch40 -p1 -b .dlopen
%patch41 -p1 -b .easter
%patch42 -p1 -b .systzdata
-%patch43 -p0 -b .headers
-%patch44 -p4 -b .isa
-
-%patch61 -p1 -b .tests-wddx
+%patch43 -p1 -b .headers
# Prevent %%doc confusion over LICENSE files
cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -582,7 +565,7 @@ cp ext/ereg/regex/COPYRIGHT regex_COPYRIGHT
cp ext/gd/libgd/README gd_README
# Multiple builds for multiple SAPIs
-mkdir build-cgi build-apache build-embedded build-zts \
+mkdir build-cgi build-apache build-embedded build-zts build-ztscli \
%if %{with_fpm}
build-fpm
%endif
@@ -598,6 +581,13 @@ rm -f ext/standard/tests/file/bug22414.phpt \
ext/iconv/tests/bug16069.phpt
# Safety check for API version change.
+pver=$(sed -n '/#define PHP_VERSION /{s/.* "//;s/".*$//;p}' main/php_version.h)
+if test "x${pver}" != "x%{version}%{?rcver}"; then
+ : Error: Upstream PHP version is now ${pver}, expecting %{version}%{?rcver}.
+ : Update the version/rcver macros and rebuild.
+ exit 1
+fi
+
vapi=`sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h`
if test "x${vapi}" != "x%{apiver}"; then
: Error: Upstream API version is now ${vapi}, expecting %{apiver}.
@@ -680,7 +670,7 @@ PEAR_INSTALLDIR=%{_datadir}/pear; export PEAR_INSTALLDIR
# Shell function to configure and build a PHP tree.
build() {
# bison-1.875-2 seems to produce a broken parser; workaround.
-mkdir Zend && cp ../Zend/zend_{language,ini}_{parser,scanner}.[ch] Zend
+# mkdir Zend && cp ../Zend/zend_{language,ini}_{parser,scanner}.[ch] Zend
ln -sf ../configure
%configure \
--cache-file=../config.cache \
@@ -715,11 +705,10 @@ ln -sf ../configure
--enable-ucd-snmp-hack \
--enable-shmop \
--enable-calendar \
- --without-sqlite \
--with-libxml-dir=%{_prefix} \
--enable-xml \
--with-system-tzdata \
- --with-mhash \
+ --with-mhash \
$*
if test $? != 0; then
tail -500 config.log
@@ -732,6 +721,7 @@ make %{?_smp_mflags}
# Build /usr/bin/php-cgi with the CGI SAPI, and all the shared extensions
pushd build-cgi
+
build --enable-force-cgi-redirect \
--libdir=%{_libdir}/php \
--enable-pcntl \
@@ -746,6 +736,7 @@ build --enable-force-cgi-redirect \
--enable-mysqlnd=shared \
--with-mysql=shared,mysqlnd \
--with-mysqli=shared,mysqlnd \
+ --with-mysql-sock=%{mysql_sock} \
--with-interbase=shared,%{_libdir}/firebird \
--with-pdo-firebird=shared,%{_libdir}/firebird \
--enable-dom=shared \
@@ -823,14 +814,83 @@ build --enable-embed \
${without_shared}
popd
+# Build a special thread-safe (mainly for modules)
+pushd build-ztscli
+
+EXTENSION_DIR=%{_libdir}/php-zts/modules
+build --enable-force-cgi-redirect \
+ --bindir=%{_bindir}/php-zts \
+ --includedir=%{_includedir}/php-zts \
+ --libdir=%{_libdir}/php-zts \
+ --enable-maintainer-zts \
+ --with-config-file-scan-dir=%{_sysconfdir}/php-zts.d \
+ --enable-pcntl \
+ --with-imap=shared --with-imap-ssl \
+ --enable-mbstring=shared \
+ --enable-mbregex \
+ --with-gd=shared \
+ --enable-bcmath=shared \
+ --enable-dba=shared --with-db4=%{_prefix} \
+ --with-xmlrpc=shared \
+ --with-ldap=shared --with-ldap-sasl \
+ --enable-mysqlnd=shared \
+ --with-mysql=shared,mysqlnd \
+ --with-mysqli=shared,mysqlnd \
+ --with-mysql-sock=%{mysql_sock} \
+ --enable-mysqlnd-threading \
+ --with-interbase=shared,%{_libdir}/firebird \
+ --with-pdo-firebird=shared,%{_libdir}/firebird \
+ --enable-dom=shared \
+ --with-pgsql=shared \
+ --enable-wddx=shared \
+ --with-snmp=shared,%{_prefix} \
+ --enable-soap=shared \
+ --with-xsl=shared,%{_prefix} \
+ --enable-xmlreader=shared --enable-xmlwriter=shared \
+ --with-curl=shared,%{_prefix} \
+ --enable-fastcgi \
+ --enable-pdo=shared \
+ --with-pdo-odbc=shared,unixODBC,%{_prefix} \
+ --with-pdo-mysql=shared,mysqlnd \
+ --with-pdo-pgsql=shared,%{_prefix} \
+ --with-pdo-sqlite=shared,%{_prefix} \
+ --with-pdo-dblib=shared,%{_prefix} \
+ --with-sqlite3=shared,%{_prefix} \
+ --enable-json=shared \
+%if %{with_zip}
+ --enable-zip=shared \
+%endif
+ --without-readline \
+ --with-libedit \
+ --with-pspell=shared \
+ --enable-phar=shared \
+ --with-mcrypt=shared,%{_prefix} \
+ --with-tidy=shared,%{_prefix} \
+ --with-mssql=shared,%{_prefix} \
+ --enable-sysvmsg=shared --enable-sysvshm=shared --enable-sysvsem=shared \
+ --enable-posix=shared \
+ --with-unixODBC=shared,%{_prefix} \
+ --enable-fileinfo=shared \
+ --enable-intl=shared \
+ --with-icu-dir=%{_prefix} \
+ --with-enchant=shared,%{_prefix} \
+ --with-recode=shared,%{_prefix}
+popd
+
# Build a special thread-safe Apache SAPI
pushd build-zts
-EXTENSION_DIR=%{_libdir}/php-zts/modules
-build --with-apxs2=%{_sbindir}/apxs ${without_shared} \
+build --with-apxs2=%{_sbindir}/apxs \
+ --bindir=%{_bindir}/php-zts \
+ --includedir=%{_includedir}/php-zts \
--libdir=%{_libdir}/php-zts \
- --without-mysql --disable-pdo \
--enable-maintainer-zts \
- --with-config-file-scan-dir=%{_sysconfdir}/php-zts.d
+ --with-config-file-scan-dir=%{_sysconfdir}/php-zts.d \
+ --enable-pdo=shared \
+ --with-mysql=shared,%{_prefix} \
+ --with-mysqli=shared,%{mysql_config} \
+ --with-pdo-mysql=shared,%{mysql_config} \
+ --with-pdo-sqlite=shared,%{_prefix} \
+ ${without_shared}
popd
### NOTE!!! EXTENSION_DIR was changed for the -zts build, so it must remain
@@ -858,8 +918,25 @@ unset NO_INTERACTION REPORT_EXIT_STATUS MALLOC_CHECK_
%install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+# Install the extensions for the ZTS version
+make -C build-ztscli install \
+ INSTALL_ROOT=$RPM_BUILD_ROOT
+
+# rename extensions build with mysqlnd
+mv $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/mysql.so \
+ $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/mysqlnd_mysql.so
+mv $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/mysqli.so \
+ $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/mysqlnd_mysqli.so
+mv $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/pdo_mysql.so \
+ $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/pdo_mysqlnd.so
+
+# Install the extensions for the ZTS version modules for libmysql
+make -C build-zts install-modules \
+ INSTALL_ROOT=$RPM_BUILD_ROOT
+
# Install the version for embedded script language in applications + php_embed.h
-make -C build-embedded install-sapi install-headers INSTALL_ROOT=$RPM_BUILD_ROOT
+make -C build-embedded install-sapi install-headers \
+ INSTALL_ROOT=$RPM_BUILD_ROOT
%if %{with_fpm}
# Install the php-fpm binary
@@ -887,11 +964,10 @@ make -C build-apache install-modules \
install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
install -m 755 -d $RPM_BUILD_ROOT%{contentdir}/icons
-install -m 644 *.gif $RPM_BUILD_ROOT%{contentdir}/icons/
+install -m 644 php.gif $RPM_BUILD_ROOT%{contentdir}/icons/php.gif
# For third-party packaging:
-install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/php/pear \
- $RPM_BUILD_ROOT%{_datadir}/php
+install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/php
# install the DSO
install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/httpd/modules
@@ -901,11 +977,11 @@ install -m 755 build-apache/libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/httpd/modu
install -m 755 build-zts/libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules/libphp5-zts.so
# Apache config fragment
-install -m 755 -d $RPM_BUILD_ROOT/etc/httpd/conf.d
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/conf.d
+install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d
-#install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d
+install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d
install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php
install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/session
@@ -919,15 +995,15 @@ install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d
install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d/www.conf
mv $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf.default .
+# tmpfiles.d
+install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
+install -m 644 php-fpm.tmpfiles $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/php-fpm.conf
# install systemd unit files and scripts for handling server startup
install -m 755 -d $RPM_BUILD_ROOT%{_unitdir}
install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/
# LogRotate
install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/php-fpm
-# tmpfiles.d
-install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
-install -m 644 php-fpm.tmpfiles $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/php-fpm.conf
%endif
# Fix the link
@@ -938,16 +1014,23 @@ for mod in pgsql mysql mysqli odbc ldap snmp xmlrpc imap \
mysqlnd mysqlnd_mysql mysqlnd_mysqli pdo_mysqlnd \
mbstring gd dom xsl soap bcmath dba xmlreader xmlwriter \
pdo pdo_mysql pdo_pgsql pdo_odbc pdo_sqlite json %{zipmod} \
- sqlite3 enchant phar fileinfo intl \
+ sqlite3 interbase pdo_firebird \
+ enchant phar fileinfo intl \
mcrypt tidy pdo_dblib mssql pspell curl wddx \
- posix sysvshm sysvsem sysvmsg recode interbase pdo_firebird; do
+ posix sysvshm sysvsem sysvmsg recode; do
cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${mod}.ini < $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d/${mod}.ini < files.${mod} < 5.4.0-0.1.RC6
+- update to PHP 5.4.0RC6
+ https://fedoraproject.org/wiki/Features/Php54
+
* Sun Jan 08 2012 Remi Collet 5.3.8-4.4
- fix systemd unit
diff --git a/sources b/sources
index 1281f44..16382cb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-704cd414a0565d905e1074ffdc1fadfb php-5.3.8.tar.bz2
+57ebb13b37bdce10ce2e2a2327873555 php-5.4.0RC6.tar.bz2