SOURCES: php-fpm.patch, php-no_pear_install.patch, php-sapi-ini-file.patch, ...
arekm
arekm at pld-linux.org
Sat Dec 6 00:09:29 CET 2008
Author: arekm Date: Fri Dec 5 23:09:29 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
php-fpm.patch (1.8 -> 1.9) , php-no_pear_install.patch (1.6 -> 1.7) , php-sapi-ini-file.patch (1.7 -> 1.8) , php-tds.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/php-fpm.patch
diff -u SOURCES/php-fpm.patch:1.8 SOURCES/php-fpm.patch:1.9
--- SOURCES/php-fpm.patch:1.8 Mon Nov 3 20:14:40 2008
+++ SOURCES/php-fpm.patch Sat Dec 6 00:09:22 2008
@@ -358,7 +358,7 @@
max_requests = atoi(getenv("PHP_FCGI_MAX_REQUESTS"));
if (max_requests < 0) {
fprintf(stderr, "PHP_FCGI_MAX_REQUESTS is not valid\n");
-@@ -1642,7 +1646,11 @@
+@@ -1677,7 +1677,11 @@
#ifndef PHP_WIN32
/* Pre-fork, if required */
@@ -368,9 +368,9 @@
+ !fpm &&
+#endif
+ getenv("PHP_FCGI_CHILDREN")) {
- children = atoi(getenv("PHP_FCGI_CHILDREN"));
+ char * children_str = getenv("PHP_FCGI_CHILDREN");
+ children = atoi(children_str);
if (children < 0) {
- fprintf(stderr, "PHP_FCGI_CHILDREN is not valid\n");
@@ -1616,6 +1729,8 @@
#endif
@@ -531,7 +531,7 @@
#endif
}
return is_fastcgi;
-@@ -255,9 +262,24 @@
+@@ -256,11 +256,27 @@
}
}
@@ -547,15 +547,18 @@
+
void fcgi_shutdown(void)
{
- is_fastcgi = 0;
-+
+ if (is_initialized) {
+ zend_hash_destroy(&fcgi_mgmt_vars);
+ }
++
+ if (allowed_clients) {
+ free(allowed_clients);
+ allowed_clients = 0;
+ }
++
+ is_fastcgi = 0;
}
- #ifdef _WIN32
@@ -330,6 +352,41 @@
}
#endif
================================================================
Index: SOURCES/php-no_pear_install.patch
diff -u SOURCES/php-no_pear_install.patch:1.6 SOURCES/php-no_pear_install.patch:1.7
--- SOURCES/php-no_pear_install.patch:1.6 Tue Jan 3 14:57:12 2006
+++ SOURCES/php-no_pear_install.patch Sat Dec 6 00:09:23 2008
@@ -1,11 +1,11 @@
--- php-5.0.0b3.orig/configure.in 2003-12-24 17:30:44.000000000 +0100
+++ php-5.0.0b3/configure.in 2003-12-24 17:31:45.000000000 +0100
-@@ -1149,7 +1149,7 @@
+@@ -1343,7 +1343,7 @@
CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
- all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_CLI_TARGET)"
+ all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET)"
-install_targets="$install_modules install-build install-headers install-programs $install_pear"
+install_targets="$install_modules install-build install-headers install-programs"
case $PHP_SAPI in
- cgi)
+ cli)
================================================================
Index: SOURCES/php-sapi-ini-file.patch
diff -u SOURCES/php-sapi-ini-file.patch:1.7 SOURCES/php-sapi-ini-file.patch:1.8
--- SOURCES/php-sapi-ini-file.patch:1.7 Tue Oct 30 20:50:35 2007
+++ SOURCES/php-sapi-ini-file.patch Sat Dec 6 00:09:23 2008
@@ -1,14 +1,20 @@
---- php5.2-200710301730/main/php_ini.c 2007-08-31 11:31:28.000000000 +0300
-+++ php5.2-200710301730-sapi-ini-file/main/php_ini.c 2007-10-30 21:28:48.493329368 +0200
-@@ -463,6 +463,24 @@
- }
+--- php-5.2.7/main/php_ini.c.org 2008-12-05 23:30:07.843241117 +0100
++++ php-5.2.7/main/php_ini.c 2008-12-05 23:36:18.096968965 +0100
+@@ -475,21 +475,32 @@
}
}
+
+- /* Otherwise search for php-%sapi-module-name%.ini file in search path */
+ /* Search (global) php.ini file in search path */
-+ if (!fh.handle.fp) {
+ if (!fh.handle.fp) {
+- const char *fmt = "php-%s.ini";
+- char *ini_fname;
+- spprintf(&ini_fname, 0, fmt, sapi_module.name);
+- fh.handle.fp = php_fopen_with_path(ini_fname, "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
+- efree(ini_fname);
+ fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
-+ if (fh.handle.fp) {
-+ fh.filename = php_ini_opened_path;
+ if (fh.handle.fp) {
+ fh.filename = php_ini_opened_path;
+ PG(safe_mode) = safe_mode_state;
+ PG(open_basedir) = open_basedir;
+ fh.type = ZEND_HANDLE_FP;
@@ -20,28 +26,24 @@
+ fh.handle.fp = NULL;
+ efree(php_ini_opened_path);
+ fh.filename = php_ini_opened_path = NULL;
-+ }
-+ }
- /* Search php-%sapi-module-name%.ini file in search path */
- if (!fh.handle.fp) {
- const char *fmt = "php-%s.ini";
-@@ -474,13 +492,6 @@
- fh.filename = php_ini_opened_path;
}
}
-- /* Search php.ini file in search path */
-- if (!fh.handle.fp) {
-- fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
-- if (fh.handle.fp) {
-- fh.filename = php_ini_opened_path;
-- }
-- }
- }
- if (free_ini_search_path) {
-@@ -513,9 +524,13 @@
- * parse any .ini files found in this directory. */
- if (!sapi_module.php_ini_ignore && strlen(PHP_CONFIG_FILE_SCAN_DIR)) {
+- /* If still no ini file found, search for php.ini file in search path */
++ /* Otherwise search for php-%sapi-module-name%.ini file in search path */
+ if (!fh.handle.fp) {
+- fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
++ const char *fmt = "php-%s.ini";
++ char *ini_fname;
++ spprintf(&ini_fname, 0, fmt, sapi_module.name);
++ fh.handle.fp = php_fopen_with_path(ini_fname, "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
++ efree(ini_fname);
+ if (fh.handle.fp) {
+ fh.filename = php_ini_opened_path;
+ }
+@@ -533,9 +544,13 @@
+ /* Scan and parse any .ini files found in scan path if path not empty. */
+ if (!sapi_module.php_ini_ignore && php_ini_scanned_path_len) {
struct dirent **namelist;
- int ndir, i;
+ int ndir, i, found = 0;
@@ -49,28 +51,19 @@
+ char *sapi_scan_dir = emalloc(strlen(fmt) + strlen(sapi_module.name));
+ sprintf(sapi_scan_dir, fmt, sapi_module.name);
- if ((ndir = php_scandir(PHP_CONFIG_FILE_SCAN_DIR, &namelist, 0, php_alphasort)) > 0) {
+ if ((ndir = php_scandir(php_ini_scanned_path, &namelist, 0, php_alphasort)) > 0) {
+ found += ndir;
for (i = 0; i < ndir; i++) {
/* check for a .ini extension */
if (!(p = strrchr(namelist[i]->d_name, '.')) || (p && strcmp(p, ".ini"))) {
-@@ -532,6 +547,35 @@
- /* Here, add it to the list of ini files read */
- l = strlen(ini_file);
- total_l += l + 2;
-+ p = estrndup(ini_file, l);
-+ zend_llist_add_element(&scanned_ini_list, &p);
-+ }
-+ }
-+ }
-+ free(namelist[i]);
-+ }
-+ free(namelist);
+@@ -564,6 +579,38 @@
+ free(namelist[i]);
+ }
+ free(namelist);
+ }
-+
++
+ if ((ndir = php_scandir(sapi_scan_dir, &namelist, 0, php_alphasort)) > 0) {
+ found += ndir;
-+
+ for (i = 0; i < ndir; i++) {
+ /* check for a .ini extension */
+ if (!(p = strrchr(namelist[i]->d_name, '.')) || (p && strcmp(p, ".ini"))) {
@@ -87,19 +80,18 @@
+ /* Here, add it to the list of ini files read */
+ l = strlen(ini_file);
+ total_l += l + 2;
- p = estrndup(ini_file, l);
- zend_llist_add_element(&scanned_ini_list, &p);
- }
-@@ -540,8 +584,11 @@
- free(namelist[i]);
- }
- free(namelist);
++ p = estrndup(ini_file, l);
++ zend_llist_add_element(&scanned_ini_list, &p);
++ }
++ }
++ }
++ free(namelist[i]);
++ }
++ free(namelist);
+ }
+ efree(sapi_scan_dir);
-
-- /*
++
+ if (found) {
-+ /*
+
+ /*
* Don't need an extra byte for the \0 in this malloc as the last
- * element will not get a trailing , which gives us the byte for the \0
- */
================================================================
Index: SOURCES/php-tds.patch
diff -u SOURCES/php-tds.patch:1.2 SOURCES/php-tds.patch:1.3
--- SOURCES/php-tds.patch:1.2 Mon Jun 16 10:44:01 2008
+++ SOURCES/php-tds.patch Sat Dec 6 00:09:24 2008
@@ -1,83 +1,3 @@
---- php/ext/mssql/config.m4~ 2007-07-03 19:25:34.000000000 +0200
-+++ php/ext/mssql/config.m4 2008-06-16 10:28:41.960540536 +0200
-@@ -10,11 +10,11 @@
-
- if test "$PHP_MSSQL" = "yes"; then
- for i in /usr/local /usr; do
-- if test -f $i/include/tds.h; then
-+ if test -f $i/include/sybdb.h; then
- FREETDS_INSTALLATION_DIR=$i
- FREETDS_INCLUDE_DIR=$i/include
- break
-- elif test -f $i/include/freetds/tds.h; then
-+ elif test -f $i/include/freetds/sybdb.h; then
- FREETDS_INSTALLATION_DIR=$i
- FREETDS_INCLUDE_DIR=$i/include/freetds
- break
-@@ -27,10 +27,10 @@
-
- elif test "$PHP_MSSQL" != "no"; then
-
-- if test -f $PHP_MSSQL/include/tds.h; then
-+ if test -f $PHP_MSSQL/include/sybdb.h; then
- FREETDS_INSTALLATION_DIR=$PHP_MSSQL
- FREETDS_INCLUDE_DIR=$PHP_MSSQL/include
-- elif test -f $PHP_MSSQL/include/freetds/tds.h; then
-+ elif test -f $PHP_MSSQL/include/freetds/sybdb.h; then
- FREETDS_INSTALLATION_DIR=$PHP_MSSQL
- FREETDS_INCLUDE_DIR=$PHP_MSSQL/include/freetds
- else
-@@ -38,8 +38,8 @@
- fi
- fi
-
-- if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then
-- AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so])
-+ if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
-+ AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so])
- fi
-
- PHP_ADD_INCLUDE($FREETDS_INCLUDE_DIR)
---- php/ext/pdo_dblib/config.m4~ 2007-07-03 19:25:34.000000000 +0200
-+++ php/ext/pdo_dblib/config.m4 2008-06-16 10:31:41.526355657 +0200
-@@ -13,11 +13,11 @@
- if test "$PHP_PDO_DBLIB" = "yes"; then
-
- for i in /usr/local /usr; do
-- if test -f $i/include/tds.h; then
-+ if test -f $i/include/sybdb.h; then
- PDO_FREETDS_INSTALLATION_DIR=$i
- PDO_FREETDS_INCLUDE_DIR=$i/include
- break
-- elif test -f $i/include/freetds/tds.h; then
-+ elif test -f $i/include/freetds/sybdb.h; then
- PDO_FREETDS_INSTALLATION_DIR=$i
- PDO_FREETDS_INCLUDE_DIR=$i/include/freetds
- break;
-@@ -30,10 +30,10 @@
-
- elif test "$PHP_PDO_DBLIB" != "no"; then
-
-- if test -f $PHP_PDO_DBLIB/include/tds.h; then
-+ if test -f $PHP_PDO_DBLIB/include/sybdb.h; then
- PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
- PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include
-- elif test -f $PHP_PDO_DBLIB/include/freetds/tds.h; then
-+ elif test -f $PHP_PDO_DBLIB/include/freetds/sybdb.h; then
- PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
- PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds
- else
-@@ -45,8 +45,8 @@
- PHP_LIBDIR=lib
- fi
-
-- if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then
-- AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so])
-+ if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
-+ AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so])
- fi
-
- PHP_ADD_INCLUDE($PDO_FREETDS_INCLUDE_DIR)
--- php/ext/sybase_ct/config.m4~ 2007-07-03 19:25:35.000000000 +0200
+++ php/ext/sybase_ct/config.m4 2008-06-16 10:42:20.463792334 +0200
@@ -31,7 +31,7 @@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/php-fpm.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/php-no_pear_install.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/php-sapi-ini-file.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/php-tds.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list