- updated to 5.2.9

Changed files:
    php-fpm.patch -> 1.13
    php-ini.patch -> 1.33

diff --git a/php-fpm.patch b/php-fpm.patch
index 5dabeef06bccf051b7c5371e9d75170ef96ad172..de62e94ce017044821308ad020beb8150f19aea4 100644 (file)
--- a/php-fpm.patch
+++ b/php-fpm.patch
@@ -593,40 +593,40 @@ diff -Nru php-5.2.8.vanilla/libevent/strlcpy-internal.h php-5.2.8.fpm/libevent/s
  static int is_port_number(const char *bindpath)
  {
        while (*bindpath) {
-@@ -455,38 +512,6 @@
+@@ -512,38 +512,6 @@
  
        if (!tcp) {
                chmod(path, 0777);
 -      } else {
--          char *ip = getenv("FCGI_WEB_SERVER_ADDRS");
--          char *cur, *end;
--          int n;
--          
--          if (ip) {
--              ip = strdup(ip);
--              cur = ip;
--              n = 0;
--              while (*cur) {
--                      if (*cur == ',') n++;
--                      cur++;
--              }
--              allowed_clients = malloc(sizeof(in_addr_t) * (n+2));
--              n = 0;
--              cur = ip;
--              while (cur) {
--                      end = strchr(cur, ',');
--                      if (end) {
--                              *end = 0;
--                              end++;
--                      }
--                      allowed_clients[n] = inet_addr(cur);
--                      if (allowed_clients[n] == INADDR_NONE) {
+-                      char *ip = getenv("FCGI_WEB_SERVER_ADDRS");
+-                      char *cur, *end;
+-                      int n;
+-                      
+-                      if (ip) {
+-                              ip = strdup(ip);
+-                              cur = ip;
+-                              n = 0;
+-                              while (*cur) {
+-                                      if (*cur == ',') n++;
+-                                      cur++;
+-                              }
+-                              allowed_clients = malloc(sizeof(in_addr_t) * (n+2));
+-                              n = 0;
+-                              cur = ip;
+-                              while (cur) {
+-                                      end = strchr(cur, ',');
+-                                      if (end) {
+-                                              *end = 0;
+-                                              end++;
+-                                      }
+-                                      allowed_clients[n] = inet_addr(cur);
+-                                      if (allowed_clients[n] == INADDR_NONE) {
 -                                      fprintf(stderr, "Wrong IP address '%s' in FCGI_WEB_SERVER_ADDRS\n", cur);
--                      }
--                      n++;
--                      cur = end;
--              }
--              allowed_clients[n] = INADDR_NONE;
+-                                      }
+-                                      n++;
+-                                      cur = end;
+-                              }
+-                              allowed_clients[n] = INADDR_NONE;
 -                      free(ip);
 -              }
        }

diff --git a/php-ini.patch b/php-ini.patch
index 597e21abb673089099c4404ea8b25a9d0f83f604..c04a58d5246a441fa0e35d03dce7230fec08a246 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -124,11 +124,11 @@
  ;
  ;   - Show all errors except for notices and coding standards warnings
  ;
--error_reporting  =  E_ALL & ~E_NOTICE
+-error_reporting = E_ALL & ~E_NOTICE
 +;error_reporting  =  E_ALL & ~E_NOTICE
 +
 +error_reporting  =  E_ALL
- 
+
  ; Print out errors (as a part of the output).  For production web sites,
  ; you're strongly encouraged to turn this feature off, and use error logging
 @@ -319,7 +388,7 @@