[vhffs-dev] [2245] fixed suPHP limits patch

[subversion@xxxxxxxxxxxxx]

Revision: 2245
Author:   gradator
Date:     2014-07-05 22:20:00 +0200 (Sat, 05 Jul 2014)
Log Message:
-----------
fixed suPHP limits patch

Modified Paths:
--------------
    trunk/vhffs-patches/suphp/11_TuxFamily-suphp-0.7.1-3-limits.dpatch

Modified: trunk/vhffs-patches/suphp/11_TuxFamily-suphp-0.7.1-3-limits.dpatch
===================================================================
--- trunk/vhffs-patches/suphp/11_TuxFamily-suphp-0.7.1-3-limits.dpatch	2014-07-05 20:07:13 UTC (rev 2244)
+++ trunk/vhffs-patches/suphp/11_TuxFamily-suphp-0.7.1-3-limits.dpatch	2014-07-05 20:20:00 UTC (rev 2245)
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -Nru a/doc/suphp.conf-example b/doc/suphp.conf-example
---- a/doc/suphp.conf-example	2014-07-05 19:57:49.000000000 +0000
-+++ b/doc/suphp.conf-example	2014-07-05 19:58:12.330579443 +0000
+--- a/doc/suphp.conf-example	2014-07-05 20:12:50.000000000 +0000
++++ b/doc/suphp.conf-example	2014-07-05 20:13:42.781764615 +0000
 @@ -39,6 +39,66 @@
  min_gid=100
  
@@ -76,9 +76,21 @@
  ;Handler for php-scripts
  application/x-httpd-suphp="php:/usr/bin/php-cgi"
 diff -Nru a/src/Application.cpp b/src/Application.cpp
---- a/src/Application.cpp	2014-07-05 19:57:59.786590237 +0000
-+++ b/src/Application.cpp	2014-07-05 19:58:12.330579443 +0000
-@@ -422,6 +422,83 @@
+--- a/src/Application.cpp	2014-07-05 20:18:45.913493703 +0000
++++ b/src/Application.cpp	2014-07-05 20:14:58.973696753 +0000
+@@ -19,6 +19,11 @@
+ */
+ 
+ #include <iostream>
++// BEGIN -- TuxFamily limits patch
++#include <unistd.h>
++#include <sys/time.h>
++#include <sys/resource.h>
++// END -- TuxFamily limits patch
+ 
+ #include "config.h"
+ 
+@@ -422,6 +427,83 @@
      throw (SystemException, SoftException, SecurityException) {
      API& api = API_Helper::getSystemAPI();
  
@@ -164,7 +176,7 @@
      api.setProcessGroup(targetGroup);
 diff -Nru a/src/Configuration.cpp b/src/Configuration.cpp
 --- a/src/Configuration.cpp	2009-08-03 14:38:38.000000000 +0000
-+++ b/src/Configuration.cpp	2014-07-05 19:58:12.330579443 +0000
++++ b/src/Configuration.cpp	2014-07-05 20:13:42.785764611 +0000
 @@ -20,6 +20,9 @@
  
  #include <string>
@@ -438,7 +450,7 @@
 +// END -- TuxFamily limits patch
 diff -Nru a/src/Configuration.hpp b/src/Configuration.hpp
 --- a/src/Configuration.hpp	2009-08-03 14:38:38.000000000 +0000
-+++ b/src/Configuration.hpp	2014-07-05 19:58:12.330579443 +0000
++++ b/src/Configuration.hpp	2014-07-05 20:13:42.785764611 +0000
 @@ -30,6 +30,11 @@
  #include <map>
  #include <vector>