php.net |  support |  documentation |  report a bug |  advanced search |  search howto |  statistics |  random bug |  login
Return to Bug #68526
Patch posix-acl.patch revision 2014-11-30 17:34 UTC by remi@php.net
revision 2014-11-30 16:50 UTC by remi@php.net
revision 2014-11-30 10:31 UTC by remi@php.net
revision 2014-11-30 09:56 UTC by remi@php.net
revision 2014-11-30 09:44 UTC by remi@php.net
revision 2014-11-30 09:21 UTC by remi@php.net
revision 2014-11-30 08:35 UTC by remi@php.net

Patch posix-acl.patch for FPM related Bug #68526

Patch version 2014-11-30 09:56 UTC

Return to Bug #68526 | Download this patch
This patch is obsolete

Obsoleted by patches:

This patch renders other patches obsolete

Obsolete patches:

Patch Revisions: 2014-11-30 17:34 UTC | 2014-11-30 16:50 UTC | 2014-11-30 10:31 UTC | 2014-11-30 09:56 UTC | 2014-11-30 09:44 UTC | 2014-11-30 09:21 UTC | 2014-11-30 08:35 UTC

Developer: remi@php.net



   
   struct ini_value_parser_s {
  diff -ru /home/php/php-src/sapi/fpm/fpm/fpm_unix.c sapi/fpm/fpm/fpm_unix.c
  --- /home/php/php-src/sapi/fpm/fpm/fpm_unix.c	2014-11-29 16:52:25.000000000 +0100
 +++ sapi/fpm/fpm/fpm_unix.c	2014-11-30 11:29:02.516308630 +0100
 +++ sapi/fpm/fpm/fpm_unix.c	2014-11-30 10:54:07.380413029 +0100
  @@ -21,6 +21,10 @@
   #include <sys/apparmor.h>
   #endif
   


  +		char *tmp, *p, *end;
  +
  +		acl = acl_init(n);
  +		if (!acl) {
 +			zlog(ZLOG_SYSERROR, "[pool %s] cannot allocate ACL", wp->config->name);
 +			zlog(ZLOG_SYSERROR, "[pool %s] cannot allocated ACL", wp->config->name);
  +			return -1;
  +		}
  +		/* Create USER ACL */
  +		if (c->listen_acl_users && *c->listen_acl_users) {
Line 296 (now 296), was 27 lines, now 8 lines

   int fpm_unix_init_child(struct fpm_worker_pool_s *wp);
   int fpm_unix_init_main();
   
  Les fichiers binaires /home/php/php-src/sapi/fpm/fpm/fpm_unix.o et sapi/fpm/fpm/fpm_unix.o sont différents
 diff -ru /home/php/php-src/sapi/fpm/fpm/fpm_worker_pool.c sapi/fpm/fpm/fpm_worker_pool.c
 --- /home/php/php-src/sapi/fpm/fpm/fpm_worker_pool.c	2014-03-06 11:00:20.000000000 +0100
 +++ sapi/fpm/fpm/fpm_worker_pool.c	2014-11-30 11:30:15.460576401 +0100
 @@ -15,6 +15,7 @@
  #include "fpm_shm.h"
  #include "fpm_scoreboard.h"
  #include "fpm_conf.h"
 +#include "fpm_unix.h"
  
  struct fpm_worker_pool_s *fpm_worker_all_pools;
  
 @@ -29,6 +30,7 @@
  	if (wp->home) {
  		free(wp->home);
  	}
 +	fpm_unix_free_socket_premissions(wp);
  	free(wp);
  }
  /* }}} */
  diff -ru /home/php/php-src/sapi/fpm/fpm/fpm_worker_pool.h sapi/fpm/fpm/fpm_worker_pool.h
  --- /home/php/php-src/sapi/fpm/fpm/fpm_worker_pool.h	2014-03-06 11:00:20.000000000 +0100
  +++ sapi/fpm/fpm/fpm_worker_pool.h	2014-11-30 08:39:44.687175401 +0100
  @@ -42,6 +42,10 @@
 
PHP Copyright © 2001-2024 The PHP Group
All rights reserved.
Last updated: Fri Mar 29 13:01:29 2024 UTC