diff options
Diffstat (limited to 'sapi')
79 files changed, 5 insertions, 121 deletions
diff --git a/sapi/apache2handler/README b/sapi/apache2handler/README index d624141c9f..15ef022d24 100644 --- a/sapi/apache2handler/README +++ b/sapi/apache2handler/README @@ -73,4 +73,3 @@ TODO PHP functions like apache_sub_req (see php_functions.c) Source Code Highlighting Protocol handlers - diff --git a/sapi/apache2handler/config.w32 b/sapi/apache2handler/config.w32 index 8ea1305d4f..20a801ff9e 100644 --- a/sapi/apache2handler/config.w32 +++ b/sapi/apache2handler/config.w32 @@ -55,4 +55,3 @@ if (PHP_APACHE2_4HANDLER != "no") { WARNING("Could not find apache 2.4 libraries/headers"); } } - diff --git a/sapi/cgi/Makefile.frag b/sapi/cgi/Makefile.frag index 75c72bf8b7..79e2afec25 100644 --- a/sapi/cgi/Makefile.frag +++ b/sapi/cgi/Makefile.frag @@ -10,4 +10,3 @@ install-cgi: $(SAPI_CGI_PATH) @echo "Installing PHP CGI man page: $(INSTALL_ROOT)$(mandir)/man1/" @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 @$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1 - diff --git a/sapi/cli/Makefile.frag b/sapi/cli/Makefile.frag index 8f4f400401..aa1d642b9c 100644 --- a/sapi/cli/Makefile.frag +++ b/sapi/cli/Makefile.frag @@ -10,4 +10,3 @@ install-cli: $(SAPI_CLI_PATH) @echo "Installing PHP CLI man page: $(INSTALL_ROOT)$(mandir)/man1/" @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 @$(INSTALL_DATA) sapi/cli/php.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1 - diff --git a/sapi/cli/config.w32 b/sapi/cli/config.w32 index 7d0e5954ff..c510e231d1 100644 --- a/sapi/cli/config.w32 +++ b/sapi/cli/config.w32 @@ -24,4 +24,3 @@ if (PHP_CLI_WIN32 == "yes") { SAPI('cli_win32', 'cli_win32.c php_cli_process_title.c ps_title.c', 'php-win.exe', '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1'); ADD_FLAG("LDFLAGS_CLI_WIN32", "/stack:67108864"); } - diff --git a/sapi/cli/tests/php_cli_server.inc b/sapi/cli/tests/php_cli_server.inc index 2a21ba35d0..ff4eef0e12 100644 --- a/sapi/cli/tests/php_cli_server.inc +++ b/sapi/cli/tests/php_cli_server.inc @@ -97,4 +97,3 @@ function php_cli_server_stop($handle) { return $success; } ?> - diff --git a/sapi/embed/config.m4 b/sapi/embed/config.m4 index 5be7af48f4..dcdb4d68aa 100644 --- a/sapi/embed/config.m4 +++ b/sapi/embed/config.m4 @@ -30,4 +30,3 @@ if test "$PHP_EMBED" != "no"; then else AC_MSG_RESULT(no) fi - diff --git a/sapi/fpm/fpm/fpm.c b/sapi/fpm/fpm/fpm.c index e43eb5a86d..2bd890b224 100644 --- a/sapi/fpm/fpm/fpm.c +++ b/sapi/fpm/fpm/fpm.c @@ -1,4 +1,3 @@ - /* $Id: fpm.c,v 1.23 2008/07/20 16:38:31 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -122,4 +121,3 @@ run_child: /* only workers reach this point */ return fpm_globals.listening_socket; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm.h b/sapi/fpm/fpm/fpm.h index 4916140e17..5ac3ea9106 100644 --- a/sapi/fpm/fpm/fpm.h +++ b/sapi/fpm/fpm/fpm.h @@ -1,4 +1,3 @@ - /* $Id: fpm.h,v 1.13 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_arrays.h b/sapi/fpm/fpm/fpm_arrays.h index 02846b7c01..6975ab21af 100644 --- a/sapi/fpm/fpm/fpm_arrays.h +++ b/sapi/fpm/fpm/fpm_arrays.h @@ -1,4 +1,3 @@ - /* $Id: fpm_arrays.h,v 1.2 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_atomic.h b/sapi/fpm/fpm/fpm_atomic.h index 662dd4726d..7b17df6bc1 100644 --- a/sapi/fpm/fpm/fpm_atomic.h +++ b/sapi/fpm/fpm/fpm_atomic.h @@ -1,4 +1,3 @@ - /* $Id: fpm_atomic.h,v 1.3 2008/09/18 23:34:11 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -165,4 +164,3 @@ static inline int fpm_spinlock(atomic_t *lock, int try_once) /* {{{ */ #define fpm_unlock(lock) lock = 0 #endif - diff --git a/sapi/fpm/fpm/fpm_children.c b/sapi/fpm/fpm/fpm_children.c index 4ee316ba1b..bda85ef5a8 100644 --- a/sapi/fpm/fpm/fpm_children.c +++ b/sapi/fpm/fpm/fpm_children.c @@ -1,4 +1,3 @@ - /* $Id: fpm_children.c,v 1.32.2.2 2008/12/13 03:21:18 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -478,4 +477,3 @@ int fpm_children_init_main() /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_children.h b/sapi/fpm/fpm/fpm_children.h index 9c79f234e8..a488b544fd 100644 --- a/sapi/fpm/fpm/fpm_children.h +++ b/sapi/fpm/fpm/fpm_children.h @@ -1,4 +1,3 @@ - /* $Id: fpm_children.h,v 1.9 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_cleanup.c b/sapi/fpm/fpm/fpm_cleanup.c index 260ddb32e7..dbab8ed786 100644 --- a/sapi/fpm/fpm/fpm_cleanup.c +++ b/sapi/fpm/fpm/fpm_cleanup.c @@ -1,4 +1,3 @@ - /* $Id: fpm_cleanup.c,v 1.8 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -49,4 +48,3 @@ void fpm_cleanups_run(int type) /* {{{ */ fpm_array_free(&cleanups); } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_cleanup.h b/sapi/fpm/fpm/fpm_cleanup.h index 4d7cf391cb..71639afe94 100644 --- a/sapi/fpm/fpm/fpm_cleanup.h +++ b/sapi/fpm/fpm/fpm_cleanup.h @@ -1,4 +1,3 @@ - /* $Id: fpm_cleanup.h,v 1.5 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -18,4 +17,3 @@ enum { }; #endif - diff --git a/sapi/fpm/fpm/fpm_clock.c b/sapi/fpm/fpm/fpm_clock.c index 66751b81bb..b03531ff24 100644 --- a/sapi/fpm/fpm/fpm_clock.c +++ b/sapi/fpm/fpm/fpm_clock.c @@ -1,4 +1,3 @@ - /* $Id: fpm_clock.c,v 1.4 2008/09/18 23:19:59 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_clock.h b/sapi/fpm/fpm/fpm_clock.h index 6aab959e16..7f62d0055f 100644 --- a/sapi/fpm/fpm/fpm_clock.h +++ b/sapi/fpm/fpm/fpm_clock.h @@ -1,4 +1,3 @@ - /* $Id: fpm_clock.h,v 1.2 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index b93cd15fe7..42ee60b36c 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -1,4 +1,3 @@ - /* $Id: fpm_conf.c,v 1.33.2.3 2008/12/13 03:50:29 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_conf.h b/sapi/fpm/fpm/fpm_conf.h index a0434b694d..2f11953367 100644 --- a/sapi/fpm/fpm/fpm_conf.h +++ b/sapi/fpm/fpm/fpm_conf.h @@ -1,4 +1,3 @@ - /* $Id: fpm_conf.h,v 1.12.2.2 2008/12/13 03:46:49 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -119,4 +118,3 @@ int fpm_conf_write_pid(); int fpm_conf_unlink_pid(); #endif - diff --git a/sapi/fpm/fpm/fpm_config.h b/sapi/fpm/fpm/fpm_config.h index 856414a920..78768ed214 100644 --- a/sapi/fpm/fpm/fpm_config.h +++ b/sapi/fpm/fpm/fpm_config.h @@ -76,4 +76,3 @@ #else # define HAVE_FPM_LQ 0 #endif - diff --git a/sapi/fpm/fpm/fpm_env.c b/sapi/fpm/fpm/fpm_env.c index 73affab236..0581577115 100644 --- a/sapi/fpm/fpm/fpm_env.c +++ b/sapi/fpm/fpm/fpm_env.c @@ -1,4 +1,3 @@ - /* $Id: fpm_env.c,v 1.15 2008/09/18 23:19:59 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -275,4 +274,3 @@ int fpm_env_init_main() /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_env.h b/sapi/fpm/fpm/fpm_env.h index bf472368da..24ff84b6f0 100644 --- a/sapi/fpm/fpm/fpm_env.h +++ b/sapi/fpm/fpm/fpm_env.h @@ -1,4 +1,3 @@ - /* $Id: fpm_env.h,v 1.9 2008/09/18 23:19:59 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -24,4 +23,3 @@ void clearenv(); #endif #endif - diff --git a/sapi/fpm/fpm/fpm_events.c b/sapi/fpm/fpm/fpm_events.c index 2b8e8cf13a..3917a9658c 100644 --- a/sapi/fpm/fpm/fpm_events.c +++ b/sapi/fpm/fpm/fpm_events.c @@ -1,4 +1,3 @@ - /* $Id: fpm_events.c,v 1.21.2.2 2008/12/13 03:21:18 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -537,4 +536,3 @@ int fpm_event_del(struct fpm_event_s *ev) /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_events.h b/sapi/fpm/fpm/fpm_events.h index 416ec6e728..7e2c925345 100644 --- a/sapi/fpm/fpm/fpm_events.h +++ b/sapi/fpm/fpm/fpm_events.h @@ -1,4 +1,3 @@ - /* $Id: fpm_events.h,v 1.9 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_log.c b/sapi/fpm/fpm/fpm_log.c index 02f8868142..cdfec8c5e0 100644 --- a/sapi/fpm/fpm/fpm_log.c +++ b/sapi/fpm/fpm/fpm_log.c @@ -1,4 +1,3 @@ - /* $Id: fpm_status.c 312262 2011-06-18 17:41:56Z felipe $ */ /* (c) 2009 Jerome Loyet */ diff --git a/sapi/fpm/fpm/fpm_log.h b/sapi/fpm/fpm/fpm_log.h index d85d368da5..e3121777f0 100644 --- a/sapi/fpm/fpm/fpm_log.h +++ b/sapi/fpm/fpm/fpm_log.h @@ -1,4 +1,3 @@ - /* $Id: fpm_status.h 312263 2011-06-18 17:46:16Z felipe $ */ /* (c) 2009 Jerome Loyet */ diff --git a/sapi/fpm/fpm/fpm_php.c b/sapi/fpm/fpm/fpm_php.c index 11a5e25f24..dc81b702ce 100644 --- a/sapi/fpm/fpm/fpm_php.c +++ b/sapi/fpm/fpm/fpm_php.c @@ -1,4 +1,3 @@ - /* $Id: fpm_php.c,v 1.22.2.4 2008/12/13 03:21:18 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -286,4 +285,3 @@ char* fpm_php_get_string_from_table(zend_string *table, char *key) /* {{{ */ return NULL; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_php.h b/sapi/fpm/fpm/fpm_php.h index a2f2138d23..d0577e22f3 100644 --- a/sapi/fpm/fpm/fpm_php.h +++ b/sapi/fpm/fpm/fpm_php.h @@ -1,4 +1,3 @@ - /* $Id: fpm_php.h,v 1.10.2.1 2008/11/15 00:57:24 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -47,4 +46,3 @@ int fpm_php_limit_extensions(char *path); char* fpm_php_get_string_from_table(zend_string *table, char *key); #endif - diff --git a/sapi/fpm/fpm/fpm_php_trace.c b/sapi/fpm/fpm/fpm_php_trace.c index 26583881af..7480bd7648 100644 --- a/sapi/fpm/fpm/fpm_php_trace.c +++ b/sapi/fpm/fpm/fpm_php_trace.c @@ -1,4 +1,3 @@ - /* $Id: fpm_php_trace.c,v 1.27.2.1 2008/11/15 00:57:24 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -232,4 +231,3 @@ done0: /* }}} */ #endif - diff --git a/sapi/fpm/fpm/fpm_php_trace.h b/sapi/fpm/fpm/fpm_php_trace.h index af5e456acb..3d9c81e472 100644 --- a/sapi/fpm/fpm/fpm_php_trace.h +++ b/sapi/fpm/fpm/fpm_php_trace.h @@ -1,4 +1,3 @@ - /* $Id: fpm_php_trace.h,v 1.2 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -10,4 +9,3 @@ struct fpm_child_s; void fpm_php_trace(struct fpm_child_s *); #endif - diff --git a/sapi/fpm/fpm/fpm_process_ctl.c b/sapi/fpm/fpm/fpm_process_ctl.c index ca5a6f2e40..f99ec241c7 100644 --- a/sapi/fpm/fpm/fpm_process_ctl.c +++ b/sapi/fpm/fpm/fpm_process_ctl.c @@ -1,4 +1,3 @@ - /* $Id: fpm_process_ctl.c,v 1.19.2.2 2008/12/13 03:21:18 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -536,4 +535,3 @@ void fpm_pctl_on_socket_accept(struct fpm_event_s *ev, short which, void *arg) / zlog(ZLOG_DEBUG, "[pool %s] got accept without idle child available .... I forked", wp->config->name); } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_process_ctl.h b/sapi/fpm/fpm/fpm_process_ctl.h index 86a6ef0dfb..8888f738a0 100644 --- a/sapi/fpm/fpm/fpm_process_ctl.h +++ b/sapi/fpm/fpm/fpm_process_ctl.h @@ -1,4 +1,3 @@ - /* $Id: fpm_process_ctl.h,v 1.6 2008/07/20 21:33:10 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -50,4 +49,3 @@ enum { }; #endif - diff --git a/sapi/fpm/fpm/fpm_request.c b/sapi/fpm/fpm/fpm_request.c index 3f82a7d4f7..a4ace85310 100644 --- a/sapi/fpm/fpm/fpm_request.c +++ b/sapi/fpm/fpm/fpm_request.c @@ -1,4 +1,3 @@ - /* $Id: fpm_request.c,v 1.9.2.1 2008/11/15 00:57:24 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ #ifdef HAVE_TIMES diff --git a/sapi/fpm/fpm/fpm_request.h b/sapi/fpm/fpm/fpm_request.h index d9e831d100..1328b5de4e 100644 --- a/sapi/fpm/fpm/fpm_request.h +++ b/sapi/fpm/fpm/fpm_request.h @@ -1,4 +1,3 @@ - /* $Id: fpm_request.h,v 1.4 2008/07/20 01:47:16 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_scoreboard.c b/sapi/fpm/fpm/fpm_scoreboard.c index b2ce46356f..7a65fcbeb7 100644 --- a/sapi/fpm/fpm/fpm_scoreboard.c +++ b/sapi/fpm/fpm/fpm_scoreboard.c @@ -1,4 +1,3 @@ - /* $Id: fpm_status.c 312399 2011-06-23 08:03:52Z fat $ */ /* (c) 2009 Jerome Loyet */ @@ -336,4 +335,3 @@ float fpm_scoreboard_get_tick() /* {{{ */ } /* }}} */ #endif - diff --git a/sapi/fpm/fpm/fpm_scoreboard.h b/sapi/fpm/fpm/fpm_scoreboard.h index f58a28737d..abce616d76 100644 --- a/sapi/fpm/fpm/fpm_scoreboard.h +++ b/sapi/fpm/fpm/fpm_scoreboard.h @@ -1,4 +1,3 @@ - /* $Id: fpm_status.h 312263 2011-06-18 17:46:16Z felipe $ */ /* (c) 2009 Jerome Loyet */ diff --git a/sapi/fpm/fpm/fpm_shm.c b/sapi/fpm/fpm/fpm_shm.c index 7986056793..9a58e9d006 100644 --- a/sapi/fpm/fpm/fpm_shm.c +++ b/sapi/fpm/fpm/fpm_shm.c @@ -1,4 +1,3 @@ - /* $Id: fpm_shm.c,v 1.3 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin, Jerome Loyet */ diff --git a/sapi/fpm/fpm/fpm_shm.h b/sapi/fpm/fpm/fpm_shm.h index bcb6099814..c9bfb4ee72 100644 --- a/sapi/fpm/fpm/fpm_shm.h +++ b/sapi/fpm/fpm/fpm_shm.h @@ -1,4 +1,3 @@ - /* $Id: fpm_shm.h,v 1.3 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -10,4 +9,3 @@ int fpm_shm_free(void *mem, size_t size); size_t fpm_shm_get_size_allocated(); #endif - diff --git a/sapi/fpm/fpm/fpm_signals.c b/sapi/fpm/fpm/fpm_signals.c index 68cb15379b..0df119be38 100644 --- a/sapi/fpm/fpm/fpm_signals.c +++ b/sapi/fpm/fpm/fpm_signals.c @@ -1,4 +1,3 @@ - /* $Id: fpm_signals.c,v 1.24 2008/08/26 15:09:15 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -252,4 +251,3 @@ int fpm_signals_get_fd() /* {{{ */ return sp[0]; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_signals.h b/sapi/fpm/fpm/fpm_signals.h index eb80faecfd..759a4e316c 100644 --- a/sapi/fpm/fpm/fpm_signals.h +++ b/sapi/fpm/fpm/fpm_signals.h @@ -1,4 +1,3 @@ - /* $Id: fpm_signals.h,v 1.5 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_sockets.c b/sapi/fpm/fpm/fpm_sockets.c index 36a66544d7..727e2eb132 100644 --- a/sapi/fpm/fpm/fpm_sockets.c +++ b/sapi/fpm/fpm/fpm_sockets.c @@ -1,4 +1,3 @@ - /* $Id: fpm_sockets.c,v 1.20.2.1 2008/12/13 03:21:18 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_sockets.h b/sapi/fpm/fpm/fpm_sockets.h index 98b40ff206..020bb50134 100644 --- a/sapi/fpm/fpm/fpm_sockets.h +++ b/sapi/fpm/fpm/fpm_sockets.h @@ -1,4 +1,3 @@ - /* $Id: fpm_sockets.h,v 1.12 2008/08/26 15:09:15 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_status.c b/sapi/fpm/fpm/fpm_status.c index 42d7d7bae0..1d78ebf849 100644 --- a/sapi/fpm/fpm/fpm_status.c +++ b/sapi/fpm/fpm/fpm_status.c @@ -1,4 +1,3 @@ - /* $Id$ */ /* (c) 2009 Jerome Loyet */ @@ -479,4 +478,3 @@ int fpm_status_handle_request(void) /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_status.h b/sapi/fpm/fpm/fpm_status.h index c6c27cd031..37b2eed8f9 100644 --- a/sapi/fpm/fpm/fpm_status.h +++ b/sapi/fpm/fpm/fpm_status.h @@ -1,4 +1,3 @@ - /* $Id$ */ /* (c) 2009 Jerome Loyet */ diff --git a/sapi/fpm/fpm/fpm_stdio.c b/sapi/fpm/fpm/fpm_stdio.c index 76e8b324df..7abd5b43a2 100644 --- a/sapi/fpm/fpm/fpm_stdio.c +++ b/sapi/fpm/fpm/fpm_stdio.c @@ -1,4 +1,3 @@ - /* $Id: fpm_stdio.c,v 1.22.2.2 2008/12/13 03:32:24 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -325,4 +324,3 @@ int fpm_stdio_open_error_log(int reopen) /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_stdio.h b/sapi/fpm/fpm/fpm_stdio.h index d3d61e46be..f5c45e1f6f 100644 --- a/sapi/fpm/fpm/fpm_stdio.h +++ b/sapi/fpm/fpm/fpm_stdio.h @@ -1,4 +1,3 @@ - /* $Id: fpm_stdio.h,v 1.9 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -17,4 +16,3 @@ int fpm_stdio_discard_pipes(struct fpm_child_s *child); int fpm_stdio_open_error_log(int reopen); #endif - diff --git a/sapi/fpm/fpm/fpm_str.h b/sapi/fpm/fpm/fpm_str.h index 65db5455a0..90250ffe3c 100644 --- a/sapi/fpm/fpm/fpm_str.h +++ b/sapi/fpm/fpm/fpm_str.h @@ -1,4 +1,3 @@ - /* $Id: fpm_str.h,v 1.3 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_systemd.c b/sapi/fpm/fpm/fpm_systemd.c index 95d12c97f2..31b6a3d27a 100644 --- a/sapi/fpm/fpm/fpm_systemd.c +++ b/sapi/fpm/fpm/fpm_systemd.c @@ -110,4 +110,3 @@ int fpm_systemd_conf() /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_systemd.h b/sapi/fpm/fpm/fpm_systemd.h index 3ee6217717..e978a7c7be 100644 --- a/sapi/fpm/fpm/fpm_systemd.h +++ b/sapi/fpm/fpm/fpm_systemd.h @@ -10,4 +10,3 @@ void fpm_systemd_heartbeat(struct fpm_event_s *ev, short which, void *arg); int fpm_systemd_conf(); #endif - diff --git a/sapi/fpm/fpm/fpm_trace.c b/sapi/fpm/fpm/fpm_trace.c index eae7fe9bbf..6fc24d544d 100644 --- a/sapi/fpm/fpm/fpm_trace.c +++ b/sapi/fpm/fpm/fpm_trace.c @@ -1,4 +1,3 @@ - /* $Id: fpm_trace.c,v 1.1 2008/07/20 20:59:00 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -33,5 +32,3 @@ int fpm_trace_get_strz(char *buf, size_t sz, long addr) /* {{{ */ } } /* }}} */ - - diff --git a/sapi/fpm/fpm/fpm_trace.h b/sapi/fpm/fpm/fpm_trace.h index b421172207..94cfafe213 100644 --- a/sapi/fpm/fpm/fpm_trace.h +++ b/sapi/fpm/fpm/fpm_trace.h @@ -1,4 +1,3 @@ - /* $Id: fpm_trace.h,v 1.3 2008/07/20 22:43:39 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -14,4 +13,3 @@ int fpm_trace_get_long(long addr, long *data); int fpm_trace_get_strz(char *buf, size_t sz, long addr); #endif - diff --git a/sapi/fpm/fpm/fpm_trace_mach.c b/sapi/fpm/fpm/fpm_trace_mach.c index 3b85e6a343..ee4e33469e 100644 --- a/sapi/fpm/fpm/fpm_trace_mach.c +++ b/sapi/fpm/fpm/fpm_trace_mach.c @@ -1,4 +1,3 @@ - /* $Id: fpm_trace_mach.c,v 1.4 2008/08/26 15:09:15 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -95,5 +94,3 @@ int fpm_trace_get_long(long addr, long *data) /* {{{ */ return 0; } /* }}} */ - - diff --git a/sapi/fpm/fpm/fpm_trace_pread.c b/sapi/fpm/fpm/fpm_trace_pread.c index 6a6155740b..2f1fb5618f 100644 --- a/sapi/fpm/fpm/fpm_trace_pread.c +++ b/sapi/fpm/fpm/fpm_trace_pread.c @@ -1,4 +1,3 @@ - /* $Id: fpm_trace_pread.c,v 1.7 2008/08/26 15:09:15 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -64,4 +63,3 @@ int fpm_trace_get_long(long addr, long *data) /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_trace_ptrace.c b/sapi/fpm/fpm/fpm_trace_ptrace.c index 838c61867c..37d340bbc3 100644 --- a/sapi/fpm/fpm/fpm_trace_ptrace.c +++ b/sapi/fpm/fpm/fpm_trace_ptrace.c @@ -1,4 +1,3 @@ - /* $Id: fpm_trace_ptrace.c,v 1.7 2008/09/18 23:34:11 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -79,4 +78,3 @@ int fpm_trace_get_long(long addr, long *data) /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_unix.c b/sapi/fpm/fpm/fpm_unix.c index 44f8df3111..1539c07ba2 100644 --- a/sapi/fpm/fpm/fpm_unix.c +++ b/sapi/fpm/fpm/fpm_unix.c @@ -1,4 +1,3 @@ - /* $Id: fpm_unix.c,v 1.25.2.1 2008/12/13 03:18:23 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -579,4 +578,3 @@ int fpm_unix_init_main() /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_unix.h b/sapi/fpm/fpm/fpm_unix.h index a79559f9e6..1e30fc09c3 100644 --- a/sapi/fpm/fpm/fpm_unix.h +++ b/sapi/fpm/fpm/fpm_unix.h @@ -1,4 +1,3 @@ - /* $Id: fpm_unix.h,v 1.8 2008/05/25 13:21:13 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -17,4 +16,3 @@ int fpm_unix_init_main(); extern size_t fpm_pagesize; #endif - diff --git a/sapi/fpm/fpm/fpm_worker_pool.c b/sapi/fpm/fpm/fpm_worker_pool.c index a0022915cd..90e155975e 100644 --- a/sapi/fpm/fpm/fpm_worker_pool.c +++ b/sapi/fpm/fpm/fpm_worker_pool.c @@ -1,4 +1,3 @@ - /* $Id: fpm_worker_pool.c,v 1.15.2.1 2008/12/13 03:21:18 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_worker_pool.h b/sapi/fpm/fpm/fpm_worker_pool.h index 6b2bc908dc..68179d283d 100644 --- a/sapi/fpm/fpm/fpm_worker_pool.h +++ b/sapi/fpm/fpm/fpm_worker_pool.h @@ -1,4 +1,3 @@ - /* $Id: fpm_worker_pool.h,v 1.13 2008/08/26 15:09:15 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -55,4 +54,3 @@ int fpm_worker_pool_init_main(); extern struct fpm_worker_pool_s *fpm_worker_all_pools; #endif - diff --git a/sapi/fpm/fpm/zlog.c b/sapi/fpm/fpm/zlog.c index 4884dca856..27ab6e4d14 100644 --- a/sapi/fpm/fpm/zlog.c +++ b/sapi/fpm/fpm/zlog.c @@ -1,4 +1,3 @@ - /* $Id: zlog.c,v 1.7 2008/05/22 21:08:32 anight Exp $ */ /* (c) 2004-2007 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/zlog.h b/sapi/fpm/fpm/zlog.h index c2bf752b93..31a16fb88d 100644 --- a/sapi/fpm/fpm/zlog.h +++ b/sapi/fpm/fpm/zlog.h @@ -1,4 +1,3 @@ - /* $Id: zlog.h,v 1.7 2008/05/22 21:08:32 anight Exp $ */ /* (c) 2004-2007 Andrei Nigmatulin */ diff --git a/sapi/fpm/php-fpm.service.in b/sapi/fpm/php-fpm.service.in index a4d533c197..8a541c0865 100644 --- a/sapi/fpm/php-fpm.service.in +++ b/sapi/fpm/php-fpm.service.in @@ -15,4 +15,3 @@ PrivateTmp=true [Install] WantedBy=multi-user.target - diff --git a/sapi/fpm/tests/response.inc b/sapi/fpm/tests/response.inc index 9888ec1b83..24285bf560 100644 --- a/sapi/fpm/tests/response.inc +++ b/sapi/fpm/tests/response.inc @@ -278,4 +278,4 @@ class Response return false; } -}
\ No newline at end of file +} diff --git a/sapi/fpm/tests/skipif.inc b/sapi/fpm/tests/skipif.inc index 25910a8e05..eec65a4112 100644 --- a/sapi/fpm/tests/skipif.inc +++ b/sapi/fpm/tests/skipif.inc @@ -12,4 +12,4 @@ require_once "tester.inc"; if (!FPM\Tester::findExecutable()) { die("skip php-fpm binary not found"); -}
\ No newline at end of file +} diff --git a/sapi/fpm/tests/status.inc b/sapi/fpm/tests/status.inc index 5965f130eb..39005de568 100644 --- a/sapi/fpm/tests/status.inc +++ b/sapi/fpm/tests/status.inc @@ -196,4 +196,4 @@ class Status true ); } -}
\ No newline at end of file +} diff --git a/sapi/fpm/tests/tester.inc b/sapi/fpm/tests/tester.inc index c3b6c83e59..70c03ad70f 100644 --- a/sapi/fpm/tests/tester.inc +++ b/sapi/fpm/tests/tester.inc @@ -1180,4 +1180,4 @@ class Tester print file_get_contents($accessLog); } } -}
\ No newline at end of file +} diff --git a/sapi/litespeed/README.md b/sapi/litespeed/README.md index e744030de7..3f5b7ad14f 100644 --- a/sapi/litespeed/README.md +++ b/sapi/litespeed/README.md @@ -219,7 +219,3 @@ For support questions, please post to our free support forum, at: https://www.litespeedtech.com/support/forum/ For bug report, please send bug report to bug [at] litespeedtech.com. - - - - diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index 1cfd45ebbf..b3c5f9fd3a 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -1538,5 +1538,3 @@ PHP_FUNCTION(apache_get_modules) * vim600: sw=4 ts=4 fdm=marker * vim<600: sw=4 ts=4 */ - - diff --git a/sapi/litespeed/lsapidef.h b/sapi/litespeed/lsapidef.h index 4db8ff562d..f6c0cb0231 100644 --- a/sapi/litespeed/lsapidef.h +++ b/sapi/litespeed/lsapidef.h @@ -193,4 +193,3 @@ struct lsapi_resp_header #endif - diff --git a/sapi/litespeed/lsapilib.c b/sapi/litespeed/lsapilib.c index 685892e708..a93cdc345d 100644 --- a/sapi/litespeed/lsapilib.c +++ b/sapi/litespeed/lsapilib.c @@ -3962,5 +3962,3 @@ int LSAPI_Inc_Req_Processed(int cnt) { return __sync_add_and_fetch(s_global_counter, cnt); } - - diff --git a/sapi/litespeed/lsapilib.h b/sapi/litespeed/lsapilib.h index 1fd3f56176..ff27c9cd94 100644 --- a/sapi/litespeed/lsapilib.h +++ b/sapi/litespeed/lsapilib.h @@ -418,10 +418,3 @@ void LSAPI_Log(int flag, const char * fmt, ...) #endif - - - - - - - diff --git a/sapi/litespeed/lscriu.c b/sapi/litespeed/lscriu.c index 6ceed3fb8b..1db123cc6d 100644 --- a/sapi/litespeed/lscriu.c +++ b/sapi/litespeed/lscriu.c @@ -739,4 +739,3 @@ int LSCRIU_Init(void) } return s_initial_start_reqs > 0; } - diff --git a/sapi/litespeed/lscriu.h b/sapi/litespeed/lscriu.h index cc0186ef79..02fc9b880a 100644 --- a/sapi/litespeed/lscriu.h +++ b/sapi/litespeed/lscriu.h @@ -64,4 +64,4 @@ void LSCRIU_inc_req_procssed(void); } #endif -#endif // LSCRIU_
\ No newline at end of file +#endif // LSCRIU_ diff --git a/sapi/phpdbg/Makefile.frag b/sapi/phpdbg/Makefile.frag index 091b1e831c..65377e608a 100644 --- a/sapi/phpdbg/Makefile.frag +++ b/sapi/phpdbg/Makefile.frag @@ -39,4 +39,3 @@ test-phpdbg: @$(top_builddir)/sapi/cli/php sapi/phpdbg/tests/run-tests.php --phpdbg sapi/phpdbg/phpdbg .PHONY: clean-phpdbg test-phpdbg - diff --git a/sapi/phpdbg/config.w32 b/sapi/phpdbg/config.w32 index e69ca455f7..9aca03dff6 100644 --- a/sapi/phpdbg/config.w32 +++ b/sapi/phpdbg/config.w32 @@ -31,4 +31,3 @@ if (PHP_PHPDBGS == "yes") { ADD_FLAG("LIBS_PHPDBGS", "ws2_32.lib user32.lib"); ADD_FLAG("CFLAGS_PHPDBGS", "/D YY_NO_UNISTD_H"); } - diff --git a/sapi/phpdbg/phpdbg_eol.h b/sapi/phpdbg/phpdbg_eol.h index afc31a906e..8d6ee8278e 100644 --- a/sapi/phpdbg/phpdbg_eol.h +++ b/sapi/phpdbg/phpdbg_eol.h @@ -43,4 +43,3 @@ char *phpdbg_eol_rep(int id); void phpdbg_eol_convert(char **str, int *len); #endif /* PHPDBG_EOL_H */ - diff --git a/sapi/phpdbg/phpdbg_io.c b/sapi/phpdbg/phpdbg_io.c index 150647aa7e..1f26f7983b 100644 --- a/sapi/phpdbg/phpdbg_io.c +++ b/sapi/phpdbg/phpdbg_io.c @@ -353,4 +353,3 @@ PHPDBG_API void phpdbg_close_socket(int sock) { #endif } } - diff --git a/sapi/phpdbg/phpdbg_io.h b/sapi/phpdbg/phpdbg_io.h index d0b69d9b41..deda272da2 100644 --- a/sapi/phpdbg/phpdbg_io.h +++ b/sapi/phpdbg/phpdbg_io.h @@ -38,4 +38,3 @@ PHPDBG_API int phpdbg_open_socket(const char *interface, unsigned short port); PHPDBG_API void phpdbg_close_socket(int sock); #endif /* PHPDBG_IO_H */ - diff --git a/sapi/phpdbg/phpdbg_sigio_win32.c b/sapi/phpdbg/phpdbg_sigio_win32.c index b86ea05da2..3ca0ad8d37 100644 --- a/sapi/phpdbg/phpdbg_sigio_win32.c +++ b/sapi/phpdbg/phpdbg_sigio_win32.c @@ -109,4 +109,3 @@ sigio_watcher_stop(void) PHPDBG_G(swd).fd = -1; PHPDBG_G(sigio_watcher_thread) = INVALID_HANDLE_VALUE; } - diff --git a/sapi/phpdbg/phpdbg_sigsafe.c b/sapi/phpdbg/phpdbg_sigsafe.c index 081d864c5c..dab0d27d85 100644 --- a/sapi/phpdbg/phpdbg_sigsafe.c +++ b/sapi/phpdbg/phpdbg_sigsafe.c @@ -56,4 +56,3 @@ void phpdbg_clear_sigsafe_mem(void) { zend_bool phpdbg_active_sigsafe_mem(void) { return !!PHPDBG_G(sigsafe_mem).mem; } - |