Changes of Revision 3
| [-] [+] | Added | php.spec |
| [-] [+] | Added | php-4.3.11-shutdown.patch ^ |
| @@ -0,0 +1,38 @@ +--- 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) | ||
| [-] [+] | Added | php-5.0.4-dlopen.patch ^ |
| @@ -0,0 +1,17 @@ +--- 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) | ||
| [-] [+] | Added | php-5.0.4-tests-wddx.patch ^ |
| @@ -0,0 +1,26 @@ + +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 @@ + <dateTime>1980-06-12T04:32:12+00</dateTime> + </var> + <var name='aDateTime3'> +- <dateTime>2040-06-12T04:32:12+00</dateTime> ++ <dateTime>NotADateTime</dateTime> + </var> + <var name='aBoolean'> + <boolean value='true'/> | ||
| [-] [+] | Added | php-5.2.0-includedir.patch ^ |
| @@ -0,0 +1,11 @@ +--- php-5.2.0/configure.in.includedir ++++ php-5.2.0/configure.in +@@ -1101,7 +1101,7 @@ + EXPANDED_DATADIR=$datadir + EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` + EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` +-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR ++INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR:${EXPANDED_DATADIR}/php + + exec_prefix=$old_exec_prefix + libdir=$old_libdir | ||
| [-] [+] | Added | php-5.2.4-embed.patch ^ |
| @@ -0,0 +1,12 @@ +--- php-5.2.4/sapi/embed/config.m4.embed ++++ php-5.2.4/sapi/embed/config.m4 +@@ -12,7 +12,8 @@ if test "$PHP_EMBED" != "no"; then + case "$PHP_EMBED" in + yes|shared) + PHP_EMBED_TYPE=shared +- INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib" ++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -release \$(PHP_VERSION)" ++ INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(libdir); \$(LIBTOOL) --mode=install \$(INSTALL) -m 0755 \$(OVERALL_TARGET) \$(INSTALL_ROOT)\$(libdir)" + ;; + static) + PHP_EMBED_TYPE=static | ||
| [-] [+] | Added | php-5.2.4-norpath.patch ^ |
| @@ -0,0 +1,18 @@ +--- 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]) | ||
| [-] [+] | Added | php-5.3.0-easter.patch ^ |
| @@ -0,0 +1,689 @@ +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, | ||
| [-] [+] | Added | php-5.3.0-install.patch ^ |
| @@ -0,0 +1,12 @@ +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" | ||
| [-] [+] | Added | php-5.3.0-phpize64.patch ^ |
| @@ -0,0 +1,24 @@ +diff -up php5.3-200812131330/scripts/Makefile.frag.phpize64 php5.3-200812131330/scripts/Makefile.frag +--- php5.3-200812131330/scripts/Makefile.frag.phpize64 2005-11-22 00:08:02.000000000 +0100 ++++ php5.3-200812131330/scripts/Makefile.frag 2008-12-13 16:21:42.000000000 +0100 +@@ -4,7 +4,7 @@ + # + + phpincludedir = $(includedir)/php +-phpbuilddir = $(libdir)/build ++phpbuilddir = $(libdir)/php/build + + BUILD_FILES = \ + scripts/phpize.m4 \ +diff -up php5.3-200812131330/scripts/phpize.in.phpize64 php5.3-200812131330/scripts/phpize.in +--- php5.3-200812131330/scripts/phpize.in.phpize64 2007-06-29 03:10:35.000000000 +0200 ++++ php5.3-200812131330/scripts/phpize.in 2008-12-13 16:24:27.000000000 +0100 +@@ -3,7 +3,7 @@ + # Variable declaration + prefix='@prefix@' + exec_prefix="`eval echo @exec_prefix@`" +-phpdir="`eval echo @libdir@`/build" ++phpdir="@libdir@/php/build" + includedir="`eval echo @includedir@`/php" + builddir="`pwd`" + SED="@SED@" | ||
| [-] [+] | Added | php-5.3.0-recode.patch ^ |
| @@ -0,0 +1,17 @@ +diff -up php-5.3.0beta1/ext/recode/config9.m4.recode php-5.3.0beta1/ext/recode/config9.m4 +--- php-5.3.0beta1/ext/recode/config9.m4.recode 2008-12-02 00:30:21.000000000 +0100 ++++ php-5.3.0beta1/ext/recode/config9.m4 2009-02-28 09:46:50.000000000 +0100 +@@ -4,13 +4,6 @@ dnl + + dnl Check for extensions with which Recode can not work + if test "$PHP_RECODE" != "no"; then +- test "$PHP_IMAP" != "no" && recode_conflict="$recode_conflict imap" +- +- if test -n "$MYSQL_LIBNAME"; then +- PHP_CHECK_LIBRARY($MYSQL_LIBNAME, hash_insert, [ +- recode_conflict="$recode_conflict mysql" +- ]) +- fi + + if test -n "$recode_conflict"; then + AC_MSG_ERROR([recode extension can not be configured together with:$recode_conflict]) | ||
| [-] [+] | Added | php-5.3.1-systzdata-v7.patch ^ |
| @@ -0,0 +1,615 @@ + +Add support for use of the system timezone database, rather +than embedding a copy. Discussed upstream but was not desired. + +History: +r7: improve check for valid timezone id to exclude directories +r6: fix fd leak in r5, fix country code/BC flag use in + timezone_identifiers_list() using system db, + fix use of PECL timezonedb to override system db, +r5: reverts addition of "System/Localtime" fake tzname. + updated for 5.3.0, parses zone.tab to pick up mapping between + timezone name, country code and long/lat coords +r4: added "System/Localtime" tzname which uses /etc/localtime +r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert) +r2: add filesystem trawl to set up name alias index +r1: initial revision + +--- php-5.3.1/ext/date/lib/parse_tz.c.systzdata ++++ php-5.3.1/ext/date/lib/parse_tz.c +@@ -20,6 +20,16 @@ + + #include "timelib.h" + ++#ifdef HAVE_SYSTEM_TZDATA ++#include <sys/mman.h> ++#include <sys/stat.h> ++#include <limits.h> ++#include <fcntl.h> ++#include <unistd.h> ++ ++#include "php_scandir.h" ++#endif ++ + #include <stdio.h> + + #ifdef HAVE_LOCALE_H +@@ -31,7 +41,12 @@ + #else + #include <strings.h> + #endif ++ ++#ifndef HAVE_SYSTEM_TZDATA + #include "timezonedb.h" ++#endif ++ ++#include <ctype.h> + + #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__)) + # if defined(__LITTLE_ENDIAN__) +@@ -51,9 +66,14 @@ + + static void read_preamble(const unsigned char **tzf, timelib_tzinfo *tz) + { +- /* skip ID */ +- *tzf += 4; +- ++ if (memcmp(tzf, "TZif", 4) == 0) { ++ *tzf += 20; ++ return; ++ } ++ ++ /* skip ID */ ++ *tzf += 4; ++ + /* read BC flag */ + tz->bc = (**tzf == '\1'); + *tzf += 1; +@@ -253,7 +273,397 @@ void timelib_dump_tzinfo(timelib_tzinfo + } + } + +-static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb) ++#ifdef HAVE_SYSTEM_TZDATA ++ ++#ifdef HAVE_SYSTEM_TZDATA_PREFIX ++#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX ++#else ++#define ZONEINFO_PREFIX "/usr/share/zoneinfo" ++#endif ++ ++/* System timezone database pointer. */ ++static const timelib_tzdb *timezonedb_system = NULL; ++ ++/* Hash table entry for the cache of the zone.tab mapping table. */ ++struct location_info { ++ char code[2]; ++ double latitude, longitude; ++ char name[64]; ++ char *comment; ++ struct location_info *next; ++}; ++ ++/* Cache of zone.tab. */ ++static struct location_info **system_location_table; ++ ++/* Size of the zone.tab hash table; a random-ish prime big enough to ++ * prevent too many collisions. */ ++#define LOCINFO_HASH_SIZE (1021) ++ ++static uint32_t tz_hash(const char *str) ++{ ++ const unsigned char *p = (const unsigned char *)str; ++ uint32_t hash = 5381; ++ int c; ++ ++ while ((c = *p++) != '\0') { ++ hash = (hash << 5) ^ hash ^ c; ++ } ++ ++ return hash % LOCINFO_HASH_SIZE; ++} ++ ++/* Parse an ISO-6709 date as used in zone.tab. Returns end of the ++ * parsed string on success, or NULL on parse error. On success, ++ * writes the parsed number to *result. */ ++static char *parse_iso6709(char *p, double *result) ++{ ++ double v, sign; ++ char *pend; ++ size_t len; ++ ++ if (*p == '+') ++ sign = 1.0; ++ else if (*p == '-') ++ sign = -1.0; ++ else ++ return NULL; ++ ++ p++; ++ for (pend = p; *pend >= '0' && *pend <= '9'; pend++) ++ ;; ++ ++ /* Annoying encoding used by zone.tab has no decimal point, so use ++ * the length to determine the format: ++ * ++ * 4 = DDMM ++ * 5 = DDDMM ++ * 6 = DDMMSS ++ * 7 = DDDMMSS ++ */ ++ len = pend - p; ++ if (len < 4 || len > 7) { ++ return NULL; ++ } ++ ++ /* p => [D]DD */ ++ v = (p[0] - '0') * 10.0 + (p[1] - '0'); ++ p += 2; ++ if (len == 5 || len == 7) ++ v = v * 10.0 + (*p++ - '0'); ++ /* p => MM[SS] */ ++ v += (10.0 * (p[0] - '0') ++ + p[1] - '0') / 60.0; ++ p += 2; ++ /* p => [SS] */ ++ if (len > 5) { ++ v += (10.0 * (p[0] - '0') ++ + p[1] - '0') / 3600.0; ++ p += 2; ++ } ++ ++ /* Round to five decimal place, not because it's a good idea, ++ * but, because the builtin data uses rounded data, so, match ++ * that. */ ++ *result = round(v * sign * 100000.0) / 100000.0; ++ ++ return p; ++} ++ ++/* This function parses the zone.tab file to build up the mapping of ++ * timezone to country code and geographic location, and returns a ++ * hash table. The hash table is indexed by the function: ++ * ++ * tz_hash(timezone-name) ++ */ ++static struct location_info **create_location_table(void) ++{ ++ struct location_info **li, *i; ++ char zone_tab[PATH_MAX]; ++ char line[512]; ++ FILE *fp; ++ ++ strncpy(zone_tab, ZONEINFO_PREFIX "/zone.tab", sizeof zone_tab); ++ ++ fp = fopen(zone_tab, "r"); ++ if (!fp) { ++ return NULL; ++ } ++ ++ li = calloc(LOCINFO_HASH_SIZE, sizeof *li); ++ ++ while (fgets(line, sizeof line, fp)) { ++ char *p = line, *code, *name, *comment; ++ uint32_t hash; ++ double latitude, longitude; ++ ++ while (isspace(*p)) ++ p++; ++ | ||
| [-] [+] | Added | php-5.3.3-gnusrc.patch ^ |
| @@ -0,0 +1,114 @@ +diff -up php5.3-201004081030/configure.in.gnusrc php5.3-201004081030/configure.in +--- php5.3-201004081030/configure.in.gnusrc 2010-03-19 00:36:53.000000000 +0100 ++++ php5.3-201004081030/configure.in 2010-04-08 14:32:20.000000000 +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 php5.3-201004081030/ext/interbase/interbase.c.gnusrc php5.3-201004081030/ext/interbase/interbase.c +--- php5.3-201004081030/ext/interbase/interbase.c.gnusrc 2010-01-03 10:36:55.000000000 +0100 ++++ php5.3-201004081030/ext/interbase/interbase.c 2010-04-08 14:32:20.000000000 +0200 +@@ -24,7 +24,6 @@ + #include "config.h" + #endif + +-#define _GNU_SOURCE + + #include "php.h" + +diff -up php5.3-201004081030/ext/pdo_firebird/firebird_driver.c.gnusrc php5.3-201004081030/ext/pdo_firebird/firebird_driver.c +--- php5.3-201004081030/ext/pdo_firebird/firebird_driver.c.gnusrc 2010-01-12 14:36:12.000000000 +0100 ++++ php5.3-201004081030/ext/pdo_firebird/firebird_driver.c 2010-04-08 14:32:20.000000000 +0200 +@@ -22,7 +22,6 @@ + #include "config.h" + #endif + +-#define _GNU_SOURCE + + #include "php.h" + #ifdef ZEND_ENGINE_2 +diff -up php5.3-201004081030/ext/standard/file.c.gnusrc php5.3-201004081030/ext/standard/file.c +--- php5.3-201004081030/ext/standard/file.c.gnusrc 2010-03-19 00:36:53.000000000 +0100 ++++ php5.3-201004081030/ext/standard/file.c 2010-04-08 14:32:20.000000000 +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 <fnmatch.h> + #endif + +diff -up php5.3-201004081030/ext/zlib/zlib_fopen_wrapper.c.gnusrc php5.3-201004081030/ext/zlib/zlib_fopen_wrapper.c +--- php5.3-201004081030/ext/zlib/zlib_fopen_wrapper.c.gnusrc 2010-03-12 12:36:27.000000000 +0100 ++++ php5.3-201004081030/ext/zlib/zlib_fopen_wrapper.c 2010-04-08 14:33:46.000000000 +0200 +@@ -19,8 +19,6 @@ + + /* $Id: zlib_fopen_wrapper.c 296107 2010-03-12 10:28:59Z jani $ */ + +-#define _GNU_SOURCE +- + #include "php.h" + #include "php_zlib.h" + #include "fopen_wrappers.h" +diff -up php5.3-201004081030/main/php.h.gnusrc php5.3-201004081030/main/php.h +--- php5.3-201004081030/main/php.h.gnusrc 2010-03-12 12:36:33.000000000 +0100 ++++ php5.3-201004081030/main/php.h 2010-04-08 14:32:20.000000000 +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 php5.3-201004081030/main/streams/cast.c.gnusrc php5.3-201004081030/main/streams/cast.c +--- php5.3-201004081030/main/streams/cast.c.gnusrc 2010-01-19 16:36:23.000000000 +0100 ++++ php5.3-201004081030/main/streams/cast.c 2010-04-08 14:33:15.000000000 +0200 +@@ -18,7 +18,6 @@ + + /* $Id: cast.c 293732 2010-01-19 13:44:08Z jani $ */ + +-#define _GNU_SOURCE + #include "php.h" + #include "php_globals.h" + #include "php_network.h" +diff -up php5.3-201004081030/main/streams/memory.c.gnusrc php5.3-201004081030/main/streams/memory.c +--- php5.3-201004081030/main/streams/memory.c.gnusrc 2010-01-03 10:36:58.000000000 +0100 ++++ php5.3-201004081030/main/streams/memory.c 2010-04-08 14:32:20.000000000 +0200 +@@ -18,7 +18,6 @@ + + /* $Id: memory.c 293036 2010-01-03 09:23:27Z sebastian $ */ + +-#define _GNU_SOURCE + #include "php.h" + + PHPAPI int php_url_decode(char *str, int len); +diff -up php5.3-201004081030/Zend/zend_language_parser.c.gnusrc php5.3-201004081030/Zend/zend_language_parser.c +--- php5.3-201004081030/Zend/zend_language_parser.c.gnusrc 2010-04-08 12:41:33.000000000 +0200 ++++ php5.3-201004081030/Zend/zend_language_parser.c 2010-04-08 14:32:20.000000000 +0200 +@@ -366,6 +366,8 @@ + #include "zend_API.h" + #include "zend_constants.h" + ++#include <string.h> ++ + + #define YYERROR_VERBOSE + #define YYSTYPE znode +--- php5.3-201005241430/main/streams/streams.c.gnusrc 2010-05-18 22:35:37.000000000 +0200 ++++ php5.3-201005241430/main/streams/streams.c 2010-05-24 17:02:08.900419954 +0200 +@@ -21,7 +21,6 @@ + + /* $Id: streams.c 299466 2010-05-18 19:39:39Z pajoye $ */ + +-#define _GNU_SOURCE + #include "php.h" + #include "php_globals.h" + #include "php_network.h" | ||
| [-] [+] | Added | php-5.3.3-macropen.patch ^ |
| @@ -0,0 +1,39 @@ +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; + | ||
| [-] [+] | Added | macros.php ^ |
| @@ -0,0 +1,8 @@ +# +# Interface versions exposed by PHP: +# +%php_core_api @PHP_APIVER@ +%php_zend_api @PHP_ZENDVER@ +%php_pdo_api @PHP_PDOVER@ + +%php_extdir %{_libdir}/php/modules | ||
| Added | php-5.3.6.tar.bz2 ^ | |
| [-] [+] | Added | php-fpm-www.conf ^ |
| @@ -0,0 +1,212 @@ +; Start a new pool named 'www'. +[www] + +; The address on which to accept FastCGI requests. +; Valid syntaxes are: +; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on +; a specific port; +; 'port' - to listen on a TCP socket to all addresses on a +; specific port; +; '/path/to/unix/socket' - to listen on a unix socket. +; Note: This value is mandatory. +listen = 127.0.0.1:9000 + +; Set listen(2) backlog. A value of '-1' means unlimited. +; Default Value: -1 +;listen.backlog = -1 + +; List of ipv4 addresses of FastCGI clients which are allowed to connect. +; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original +; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address +; must be separated by a comma. If this value is left blank, connections will be +; accepted from any ip address. +; Default Value: any +listen.allowed_clients = 127.0.0.1 + +; Set permissions for unix socket, if one is used. In Linux, read/write +; permissions must be set in order to allow connections from a web server. Many +; BSD-derived systems allow connections regardless of permissions. +; Default Values: user and group are set as the running user +; mode is set to 0666 +;listen.owner = nobody +;listen.group = nobody +;listen.mode = 0666 + +; Unix user/group of processes +; Note: The user is mandatory. If the group is not set, the default user's group +; will be used. +; RPM: apache Choosed to be able to access some dir as httpd +user = apache +; RPM: Keep a group allowed to write in log dir. +group = apache + +; Choose how the process manager will control the number of child processes. +; Possible Values: +; static - a fixed number (pm.max_children) of child processes; +; dynamic - the number of child processes are set dynamically based on the +; following directives: +; pm.max_children - the maximum number of children that can +; be alive at the same time. +; pm.start_servers - the number of children created on startup. +; pm.min_spare_servers - the minimum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is less than this +; number then some children will be created. +; pm.max_spare_servers - the maximum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is greater than this +; number then some children will be killed. +; Note: This value is mandatory. +pm = dynamic + +; The number of child processes to be created when pm is set to 'static' and the +; maximum number of child processes to be created when pm is set to 'dynamic'. +; This value sets the limit on the number of simultaneous requests that will be +; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. +; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP +; CGI. +; Note: Used when pm is set to either 'static' or 'dynamic' +; Note: This value is mandatory. +pm.max_children = 50 + +; The number of child processes created on startup. +; Note: Used only when pm is set to 'dynamic' +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +pm.start_servers = 5 + +; The desired minimum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.min_spare_servers = 5 + +; The desired maximum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.max_spare_servers = 35 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. For +; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default Value: 0 +;pm.max_requests = 500 + +; The URI to view the FPM status page. If this value is not set, no URI will be +; recognized as a status page. By default, the status page shows the following +; information: +; accepted conn - the number of request accepted by the pool; +; pool - the name of the pool; +; process manager - static or dynamic; +; idle processes - the number of idle processes; +; active processes - the number of active processes; +; total processes - the number of idle + active processes. +; The values of 'idle processes', 'active processes' and 'total processes' are +; updated each second. The value of 'accepted conn' is updated in real time. +; Example output: +; accepted conn: 12073 +; pool: www +; process manager: static +; idle processes: 35 +; active processes: 65 +; total processes: 100 +; By default the status page output is formatted as text/plain. Passing either +; 'html' or 'json' as a query string will return the corresponding output +; syntax. Example: +; http://www.foo.bar/status +; http://www.foo.bar/status?json +; http://www.foo.bar/status?html +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;pm.status_path = /status + +; The ping URI to call the monitoring page of FPM. If this value is not set, no +; URI will be recognized as a ping page. This could be used to test from outside +; that FPM is alive and responding, or to +; - create a graph of FPM availability (rrd or such); +; - remove a server from a group if it is not responding (load balancing); +; - trigger alerts for the operating team (24/7). +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;ping.path = /ping + +; This directive may be used to customize the response of a ping request. The +; response is formatted as text/plain with a 200 response code. +; Default Value: pong +;ping.response = pong + +; The timeout for serving a single request after which the worker process will +; be killed. This option should be used when the 'max_execution_time' ini option +; does not stop script execution for some reason. A value of '0' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_terminate_timeout = 0 + +; The timeout for serving a single request after which a PHP backtrace will be +; dumped to the 'slowlog' file. A value of '0s' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_slowlog_timeout = 0 + +; The log file for slow requests +; Default Value: /var/log/php-fpm.log.slow +;slowlog = /var/log/php-fpm.log.slow + +; Set open file descriptor rlimit. +; Default Value: system defined value +;rlimit_files = 1024 + +; Set max core size rlimit. +; Possible Values: 'unlimited' or an integer greater or equal to 0 +; Default Value: system defined value +;rlimit_core = 0 + +; Chroot to this directory at the start. This value must be defined as an +; absolute path. When this value is not set, chroot is not used. +; Note: chrooting is a great security feature and should be used whenever +; possible. However, all PHP paths will be relative to the chroot +; (error_log, sessions.save_path, ...). +; Default Value: not set +;chroot = + +; Chdir to this directory at the start. This value must be an absolute path. +; Default Value: current directory or / when chroot +;chdir = /var/www + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Default Value: no +;catch_workers_output = yes + +; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from +; the current environment. +; Default Value: clean env +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /tmp +;env[TMPDIR] = /tmp +;env[TEMP] = /tmp + +; Additional php.ini defines, specific to this pool of workers. These settings +; overwrite the values previously defined in the php.ini. The directives are the +; same as the PHP SAPI: +; php_value/php_flag - you can set classic ini defines which can +; be overwritten from PHP call 'ini_set'. +; php_admin_value/php_admin_flag - these directives won't be overwritten by +; PHP call 'ini_set' +; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. | ||
| Added | php-fpm.conf ^ | |
| [-] [+] | Added | php-fpm.init ^ |
| @@ -0,0 +1,75 @@ +#! /bin/sh +# +# chkconfig: - 84 16 +# description: PHP FastCGI Process Manager +# processname: php-fpm +# config: /etc/php-fpm.conf +# pidfile: /var/run/php-fpm/php-fpm.pid + +# Standard LSB functions +#. /lib/lsb/init-functions + +# Source function library. +. /etc/init.d/functions + +# Check that networking is up. +. /etc/sysconfig/network + +if [ "$NETWORKING" = "no" ] +then + exit 0 +fi + +RETVAL=0 +prog="php-fpm" +pidfile=${PIDFILE-/var/run/php-fpm/php-fpm.pid} +lockfile=${LOCKFILE-/var/lock/subsys/php-fpm} + +start () { + echo -n $"Starting $prog: " + daemon --pidfile ${pidfile} php-fpm + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch ${lockfile} +} +stop () { + echo -n $"Stopping $prog: " + killproc -p ${pidfile} php-fpm + RETVAL=$? + echo + if [ $RETVAL -eq 0 ] ; then + rm -f ${lockfile} ${pidfile} + fi +} + +restart () { + stop + start +} + + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status -p ${pidfile} php-fpm + RETVAL=$? + ;; + restart|reload|force-reload) + restart + ;; + condrestart|try-restart) + [ -f ${lockfile} ] && restart || : + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|try-restart}" + RETVAL=2 + ;; +esac + +exit $RETVAL | ||
| [-] [+] | Added | php-fpm.logrotate ^ |
| @@ -0,0 +1,9 @@ +/var/log/php-fpm/*log { + missingok + notifempty + sharedscripts + delaycompress + postrotate + /bin/kill -SIGUSR1 `cat /var/run/php-fpm/php-fpm.pid 2>/dev/null` 2>/dev/null || true + endscript +} | ||
| [-] [+] | Added | php.conf ^ |
| @@ -0,0 +1,28 @@ +# +# PHP is an HTML-embedded scripting language which attempts to make it +# easy for developers to write dynamically generated webpages. +# +<IfModule !worker.c> + LoadModule php5_module modules/libphp5.so +</IfModule> +<IfModule worker.c> + LoadModule php5_module modules/libphp5-zts.so +</IfModule> + +# +# Cause the PHP interpreter to handle files with a .php extension. +# +AddHandler php5-script .php +AddType text/html .php + +# +# Add index.php to the list of files that will be served as directory +# indexes. +# +DirectoryIndex index.php + +# +# Uncomment the following line to allow PHP to pretty-print .phps +# files as PHP source code: +# +#AddType application/x-httpd-php-source .phps | ||
| [-] [+] | Added | php.ini ^ |
| @@ -0,0 +1,1248 @@ +[PHP] + +;;;;;;;;;;;;;;;;;;; +; About php.ini ; +;;;;;;;;;;;;;;;;;;; +; This file controls many aspects of PHP's behavior. In order for PHP to +; read it, it must be named 'php.ini'. PHP looks for it in the current +; working directory, in the path designated by the environment variable +; PHPRC, and in the path that was defined in compile time (in that order). +; Under Windows, the compile-time path is the Windows directory. The +; path in which the php.ini file is looked for can be overridden using +; the -c argument in command line mode. +; +; 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. +; +; Directives are specified using the following syntax: +; directive = value +; Directive names are *case sensitive* - foo=bar is different from FOO=bar. +; +; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one +; of the INI constants (On, Off, True, False, Yes, No and None) or an expression +; (e.g. E_ALL & ~E_NOTICE), or a quoted string ("foo"). +; +; Expressions in the INI file are limited to bitwise operators and parentheses: +; | bitwise OR +; & bitwise AND +; ~ bitwise NOT +; ! boolean NOT +; +; Boolean flags can be turned on using the values 1, On, True or Yes. +; They can be turned off using the values 0, Off, False or No. +; +; An empty string can be denoted by simply not writing anything after the equal +; sign, or by using the None keyword: +; +; foo = ; sets foo to an empty string +; foo = none ; sets foo to an empty string +; foo = "none" ; sets foo to the string 'none' +; +; If you use constants in your value, and these constants belong to a +; dynamically loaded extension (either a PHP extension or a Zend extension), +; you may only use these constants *after* the line that loads the extension. +; +; +;;;;;;;;;;;;;;;;;;; +; About this file ; +;;;;;;;;;;;;;;;;;;; +; This is the recommended, PHP 5-style version of the php.ini-dist file. It +; sets some non standard settings, that make PHP more efficient, more secure, +; and encourage cleaner coding. +; +; The price is that with these settings, PHP may be incompatible with some +; applications, and sometimes, more difficult to develop with. Using this +; file is warmly recommended for production sites. As all of the changes from +; the standard settings are thoroughly documented, you can go over each one, +; and decide whether you want to use it or not. +; +; For general information about the php.ini file, please consult the php.ini-dist +; file, included in your PHP distribution. +; +; This file is different from the php.ini-dist file in the fact that it features +; different values for several directives, in order to improve performance, while +; possibly breaking compatibility with the standard out-of-the-box behavior of +; PHP. Please make sure you read what's different, and modify your scripts +; accordingly, if you decide to use this file instead. +; +; - register_long_arrays = Off [Performance] +; Disables registration of the older (and deprecated) long predefined array +; variables ($HTTP_*_VARS). Instead, use the superglobals that were +; introduced in PHP 4.1.0 +; - display_errors = Off [Security] +; With this directive set to off, errors that occur during the execution of +; scripts will no longer be displayed as a part of the script output, and thus, +; will no longer be exposed to remote users. With some errors, the error message +; content may expose information about your script, web server, or database +; server that may be exploitable for hacking. Production sites should have this +; directive set to off. +; - log_errors = On [Security] +; This directive complements the above one. Any errors that occur during the +; execution of your script will be logged (typically, to your server's error log, +; but can be configured in several ways). Along with setting display_errors to off, +; this setup gives you the ability to fully understand what may have gone wrong, +; without exposing any sensitive information to remote users. +; - output_buffering = 4096 [Performance] +; Set a 4KB output buffer. Enabling output buffering typically results in less +; writes, and sometimes less packets sent on the wire, which can often lead to +; better performance. The gain this directive actually yields greatly depends +; on which Web server you're working with, and what kind of scripts you're using. +; - register_argc_argv = Off [Performance] +; Disables registration of the somewhat redundant $argv and $argc global +; variables. +; - magic_quotes_gpc = Off [Performance] +; Input data is no longer escaped with slashes so that it can be sent into +; SQL databases without further manipulation. Instead, you should use the +; function addslashes() on each input element you wish to send to a database. +; - variables_order = "GPCS" [Performance] +; The environment variables are not hashed into the $_ENV. To access +; environment variables, you can use getenv() instead. +; - error_reporting = E_ALL [Code Cleanliness, Security(?)] +; By default, PHP suppresses errors of type E_NOTICE. These error messages +; are emitted for non-critical errors, but that could be a symptom of a bigger +; problem. Most notably, this will cause error messages about the use +; of uninitialized variables to be displayed. +; - allow_call_time_pass_reference = Off [Code cleanliness] +; It's not possible to decide to force a variable to be passed by reference +; when calling a function. The PHP 4 style to do this is by making the +; function require the relevant argument by reference. + +;;;;;;;;;;;;;;;;;;;; +; Language Options ; +;;;;;;;;;;;;;;;;;;;; + +; Enable the PHP scripting language engine under Apache. +engine = On + +; Enable compatibility mode with Zend Engine 1 (PHP 4.x) +zend.ze1_compatibility_mode = Off + +; Allow the <? tag. Otherwise, only <?php and <script> tags are recognized. +; NOTE: Using short tags should be avoided when developing applications or +; libraries that are meant for redistribution, or deployment on PHP +; servers which are not under your control, because short tags may not +; be supported on the target server. For portable, redistributable code, +; be sure not to use short tags. +short_open_tag = On + +; Allow ASP-style <% %> tags. +asp_tags = Off + +; The number of significant digits displayed in floating point numbers. +precision = 14 + +; Enforce year 2000 compliance (will cause problems with non-compliant browsers) +y2k_compliance = On + +; Output buffering allows you to send header lines (including cookies) even +; after you send body content, at the price of slowing PHP's output layer a +; bit. You can enable output buffering during runtime by calling the output +; buffering functions. You can also enable output buffering for all files by +; setting this directive to On. If you wish to limit the size of the buffer +; to a certain size - you can use a maximum number of bytes instead of 'On', as +; a value for this directive (e.g., output_buffering=4096). +output_buffering = 4096 + +; You can redirect all of the output of your scripts to a function. For +; example, if you set output_handler to "mb_output_handler", character +; encoding will be transparently converted to the specified encoding. +; Setting any output handler automatically turns on output buffering. +; Note: People who wrote portable scripts should not depend on this ini +; directive. Instead, explicitly set the output handler using ob_start(). +; Using this ini directive may cause problems unless you know what script +; is doing. +; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler" +; 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. +;output_handler = + +; Transparent output compression using the zlib library +; Valid values for this option are 'off', 'on', or a specific buffer size +; to be used for compression (default is 4KB) +; Note: Resulting chunk size may vary due to nature of compression. PHP +; outputs chunks that are few hundreds bytes each as a result of +; compression. If you prefer a larger chunk size for better +; 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. +zlib.output_compression = Off +;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. +;zlib.output_handler = + +; Implicit flush tells PHP to tell the output layer to flush itself +; automatically after every output block. This is equivalent to calling the +; 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. +implicit_flush = Off + +; The unserialize callback function will be called (with the undefined class' +; name as parameter), if the unserializer finds an undefined class +; which should be instantiated. +; A warning appears if the specified function is not defined, or if the +; function doesn't include/implement the missing class. +; So only set this entry, if you really want to implement such a +; callback-function. +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 + | ||