Merge pull request #597 in ZP/z-push from...

Merge pull request #597 in ZP/z-push from bugfix/ZP-1145-support-fpm-in-webserver-config-packages to develop

* commit '09aa8e2b':
  ZP-1145 Remove php_value directives from apache's z-push.conf. Update INSTALL to reflect those changes.

config/apache2/z-push.conf

@@ -8,18 +8,6 @@
     DirectoryIndex index.php
     Options -Indexes +FollowSymLinks
 
-    # Z-push requirements
-    php_value magic_quotes_gpc off
-    php_value magic_quotes_runtime off
-    php_value register_globals off
-    php_value short_open_tag on
-
-    # Optional
-    # php_value display_errors off
-
-    # Setting memory limit higher (larger attachments)
-    php_value memory_limit 128M
-    
     # Security
     # Don't allow .htaccess Overrides, disallow access to files
     AllowOverride none

src/INSTALL

@@ -142,28 +142,6 @@ feel free to contribute configuration steps and file in our wiki.
 Microsoft-Server-ActiveSync. This will cause Apache to send redirects to the
 mobile device, which will definitely break your mobile device synchronisation.
 
-Lastly, make sure that PHP has the following settings:
-
-    php_flag magic_quotes_gpc off
-    php_flag register_globals off
-    php_flag magic_quotes_runtime off
-    php_flag short_open_tag on
-
-You can set this in the httpd.conf, in php.ini or in an .htaccess file in
-the root of z-push.
-
-If you have several php applications on the same system, you could specify the
-z-push directory so these settings are considered only there.
-    <Directory /usr/share/z-push>
-        php_flag magic_quotes_gpc off
-        php_flag register_globals off
-        php_flag magic_quotes_runtime off
-        php_flag short_open_tag on
-    </Directory>
-
-If you don't set this up correctly, you will not be
-able to login correctly via z-push.
-
 Please also set a memory_limit for php to 128M or higher in your php.ini.
 
 Z-Push writes files to your file system like logs or data from the