Merge branch 'PHP-5.5' into PHP-5.6

remicollet · remicollet · commit eb1a1d5feb09 · 2015-01-05T17:35:14.000+01:00
* PHP-5.5:
  NEWS
  Fix bug #68751 listen.allowed_clients is broken
diff --git a/sapi/fpm/fpm/fastcgi.c b/sapi/fpm/fpm/fastcgi.c
@@ -258,7 +258,7 @@ void fcgi_set_allowed_clients(char *ip)
 			cur++;
 		}
 		if (allowed_clients) free(allowed_clients);
-		allowed_clients = malloc(sizeof(in_addr_t) * (n+2));
+		allowed_clients = malloc(sizeof(sa_t) * (n+2));
 		n = 0;
 		cur = ip;
 		while (cur) {

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ void fcgi_set_allowed_clients(char *ip)`
`258`	`258`	`cur++;`
`259`	`259`	`}`
`260`	`260`	`if (allowed_clients) free(allowed_clients);`
`261`		`- allowed_clients = malloc(sizeof(in_addr_t) * (n+2));`
	`261`	`+ allowed_clients = malloc(sizeof(sa_t) * (n+2));`
`262`	`262`	`n = 0;`
`263`	`263`	`cur = ip;`
`264`	`264`	`while (cur) {`