SOURCES: php-ini.patch, php-fpm.patch - updated to 5.2.9

[adamg]

Author: adamg                        Date: Fri Feb 27 09:18:47 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 5.2.9

---- Files affected:
SOURCES:
   php-ini.patch (1.32 -> 1.33) , php-fpm.patch (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SOURCES/php-ini.patch
diff -u SOURCES/php-ini.patch:1.32 SOURCES/php-ini.patch:1.33
--- SOURCES/php-ini.patch:1.32	Mon Jan  5 13:59:33 2009
+++ SOURCES/php-ini.patch	Fri Feb 27 10:18:40 2009
@@ -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 @@

================================================================
Index: SOURCES/php-fpm.patch
diff -u SOURCES/php-fpm.patch:1.12 SOURCES/php-fpm.patch:1.13
--- SOURCES/php-fpm.patch:1.12	Tue Dec 16 19:31:48 2008
+++ SOURCES/php-fpm.patch	Fri Feb 27 10:18:41 2009
@@ -593,40 +593,40 @@
  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);
 -		}
  	}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/php-ini.patch?r1=1.32&r2=1.33&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/php-fpm.patch?r1=1.12&r2=1.13&f=u