[PATCH] Update: To version Apache-2.4.18 and PHP-5.6-17.

29 Feb 2016

Please DO NOT merge this, this version needs to be tested and optimized.
- Apache update to 2.4.18 requires PCRE with version 8.38 which has been also updated.
- PCRE-8.38 should have included all seurity patches from 8.37 --> http://www.pcre.org/original/changelog.txt .
- Changed bzip2 position cause new pcre version neededs bzlib.h.
- Added Apr-Util-1.5.4 which is required by new Apache version.
- Apr-Util uses currently sqlite3 since compiling with BDB support without the new BDB-6* version needs long compilation time cause Apr-Util searches for every version from 6.8 backwards until the current available 4.4 version.
- Added Apr-1.5.2 which is required by Apr-Util.
- Added both Apr-*version into Apache LFS and ROOTFILE.
- Added new mpm.conf for Apache Multi-Processing Modules and deleted old entries from httpd.conf.
- Added "--enable-mpms-shared=all" in Apache LFS so MPM mode should be changeable on the fly by editing loadmodule.conf.
- Enabled '--enable-mods-shared="all cgi' so fastcgi should be available too.
- Disable server and version signatur sending in httpd.conf.
- Added Modsecurity as an Addon, with outcommented Apache config parameters under loadmodules.conf and httpd.conf.
- Modsecurities install.sh will activate the entries in Apache configs, uninstall.sh will also deactivate them.
- Modsecurity default configuration from the source package are used.
- Added ICU support for PHP. Positioned ICU before boost cause newer boost versions might become also ICU support?
- Added new PHP module intl and deleted idn cause it has been merged into intl --> http://php.net/manual/de/ref.intl.idn.php, new modul will also be build like log in PHP LFS and ROOTFILE.
- Added PHP Patch for BerkleyDB-6.x.
- Added new php.ini.
- Added zend optimizer extension into PHP.
- FPM switch is activated in php.ini and should use nobody privileges per default.
- Disabled 'allow_url_fopen' and 'expose_php' in php.ini.
Signed-off-by: Erik Kapfer erik.kapfer@ipfire.org
---
 config/httpd/httpd.conf                            |   15 +-
 config/httpd/loadmodule.conf                       |  124 +-
 config/httpd/server-tuning.conf                    |    7 +-
 config/httpd/ssl-global.conf                       |    3 +-
 config/php/php.ini                                 | 1674 ++++++++++++++------
 config/rootfiles/common/apache2                    |  646 ++++++--
 config/rootfiles/common/pcre                       |  145 +-
 config/rootfiles/common/php                        |  158 +-
 lfs/apache2                                        |  105 +-
 lfs/pcre                                           |   33 +-
 lfs/php                                            |  131 +-
 make.sh                                            |    4 +-
 .../pcre-8.37-Fix-another-buffer-overflow.patch    |  110 --
 ...overflow-for-forward-reference-within-bac.patch |   68 -
 ...overflow-for-named-recursive-back-referen.patch |   87 -
 ...overflow-for-named-references-in-situatio.patch |  190 ---
 ...orward-reference-to-duplicate-group-numbe.patch |   98 --
 17 files changed, 2123 insertions(+), 1475 deletions(-)
 delete mode 100644 src/patches/pcre-8.37-Fix-another-buffer-overflow.patch
 delete mode 100644 src/patches/pcre-8.37-Fix-buffer-overflow-for-forward-reference-within-bac.patch
 delete mode 100644 src/patches/pcre-8.37-Fix-buffer-overflow-for-named-recursive-back-referen.patch
 delete mode 100644 src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch
 delete mode 100644 src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch

diff --git a/config/httpd/httpd.conf b/config/httpd/httpd.conf
index 9c1fb2b..dd8b76d 100644
--- a/config/httpd/httpd.conf
+++ b/config/httpd/httpd.conf
@@ -21,6 +21,7 @@
 #  |-- mod_mime-defaults.conf  . . . . . . .  defaults for mod_mime configuration
 #  |-- errors.conf . . . . . . . . . . . . .  customize error responses
 #  |-- ssl-global.conf . . . . . . . . . . .  SSL conf that applies to default server _and all_ virtual hosts
+#  |-- mpm.conf  . . . . . . . . . . . . . .  Server pool management for Multi-Processing Modules (MPMs)
 #  |
 #  |-- default-server.conf . . . . . . . . .  set up the default server that replies to non-virtual-host requests
 #  |
@@ -40,6 +41,9 @@ Include /etc/httpd/conf/uid.conf
 # - usage of KeepAlive
 Include /etc/httpd/conf/server-tuning.conf
+# Server-pool management (MPM specific)
+Include /etc/httpd/conf/mpm.conf
+
 # ErrorLog: The location of the error log file.
 # If you do not specify an ErrorLog directive within a <VirtualHost>
 # container, error messages relating to that virtual host will be
@@ -65,7 +69,6 @@ Include /etc/httpd/conf/global.conf
# associate MIME types with filename extensions
 TypesConfig /etc/mime.types
-DefaultType text/plain
# global (server-wide) SSL configuration, that is not specific to 
 # any virtual host
@@ -119,3 +122,13 @@ Include /etc/httpd/conf/vhosts.d/*.conf
# Dummy LoadModule directive to aid module installations
 #LoadModule dummy_module /usr/lib/apache2/modules/mod_dummy.so
+
+# Enable ModSecurity, attaching it to every transactio.
+# Modescurity is available as an Addon and needs to be loaded via Pakfire.
+#<IfModule security2_module>
+#    Include /etc/httpd/conf/modsecurity.conf
+#</IfModule>
+
+# Disable sending the server signatur
+ServerTokens Prod
+ServerSignature Off
diff --git a/config/httpd/loadmodule.conf b/config/httpd/loadmodule.conf
index e30f79b..3c72281 100644
--- a/config/httpd/loadmodule.conf
+++ b/config/httpd/loadmodule.conf
@@ -1,51 +1,103 @@
-LoadModule authn_file_module /usr/lib/apache/mod_authn_file.so
-#LoadModule authn_dbm_module /usr/lib/apache/mod_authn_dbm.so
+LoadModule php5_module /usr/lib/apache/libphp5.so
+LoadModule access_compat_module /usr/lib/apache/mod_access_compat.so
+#LoadModule actions_module /usr/lib/apache/mod_actions.so
+LoadModule alias_module /usr/lib/apache/mod_alias.so
+#LoadModule allowmethods_module /usr/lib/apache/mod_allowmethods.so
+#LoadModule asis_module /usr/lib/apache/mod_asis.so
+LoadModule auth_basic_module /usr/lib/apache/mod_auth_basic.so
+LoadModule auth_digest_module /usr/lib/apache/mod_auth_digest.so
+#LoadModule auth_form_module /usr/lib/apache/mod_auth_form.so
 #LoadModule authn_anon_module /usr/lib/apache/mod_authn_anon.so
+LoadModule authn_core_module /usr/lib/apache/mod_authn_core.so
 #LoadModule authn_dbd_module /usr/lib/apache/mod_authn_dbd.so
-#LoadModule authn_default_module /usr/lib/apache/mod_authn_default.so
-LoadModule authz_host_module /usr/lib/apache/mod_authz_host.so
-#LoadModule authz_groupfile_module /usr/lib/apache/mod_authz_groupfile.so
-LoadModule authz_user_module /usr/lib/apache/mod_authz_user.so
+#LoadModule authn_dbm_module /usr/lib/apache/mod_authn_dbm.so
+LoadModule authn_file_module /usr/lib/apache/mod_authn_file.so
+#LoadModule authn_socache_module /usr/lib/apache/mod_authn_socache.so
+#LoadModule authnz_fcgi_module /usr/lib/apache/mod_authnz_fcgi.so
+LoadModule authz_core_module /usr/lib/apache/mod_authz_core.so
+#LoadModule authz_dbd_module /usr/lib/apache/mod_authz_dbd.so
 #LoadModule authz_dbm_module /usr/lib/apache/mod_authz_dbm.so
+#LoadModule authz_groupfile_module /usr/lib/apache/mod_authz_groupfile.so
+LoadModule authz_host_module /usr/lib/apache/mod_authz_host.so
 #LoadModule authz_owner_module /usr/lib/apache/mod_authz_owner.so
-#LoadModule authz_default_module /usr/lib/apache/mod_authz_default.so
-LoadModule auth_basic_module /usr/lib/apache/mod_auth_basic.so
-LoadModule auth_digest_module /usr/lib/apache/mod_auth_digest.so
+LoadModule authz_user_module /usr/lib/apache/mod_authz_user.so
+LoadModule autoindex_module /usr/lib/apache/mod_autoindex.so
+#LoadModule buffer_module /usr/lib/apache/mod_buffer.so
+#LoadModule disk_module /usr/lib/apache/mod_cache_disk.so
+#LoadModule cache_module /usr/lib/apache/mod_cache.so
+#LoadModule cache_socache_module /usr/lib/apache/mod_cache_socache.so
+#LoadModule cgid_module /usr/lib/apache/mod_cgid.so
+LoadModule cgi_module /usr/lib/apache/mod_cgi.so
+#LoadModule charset_lite_module /usr/lib/apache/mod_charset_lite.so
+#LoadModule data_module /usr/lib/apache/mod_data.so
 #LoadModule dbd_module /usr/lib/apache/mod_dbd.so
+#LoadModule deflate_module /usr/lib/apache/mod_deflate.so
+#LoadModule dialup_module /usr/lib/apache/mod_dialup.so
+LoadModule dir_module /usr/lib/apache/mod_dir.so
 #LoadModule dumpio_module /usr/lib/apache/mod_dumpio.so
+#LoadModule mod_echo_module /usr/lib/apache/mod_echo.so
+LoadModule env_module /usr/lib/apache/mod_env.so
+#LoadModule expires_module /usr/lib/apache/mod_expires.so
 #LoadModule ext_filter_module /usr/lib/apache/mod_ext_filter.so
-#LoadModule include_module /usr/lib/apache/mod_include.so
+#LoadModule file_cache_module /usr/lib/apache/mod_file_cache.so
 #LoadModule filter_module /usr/lib/apache/mod_filter.so
-#LoadModule deflate_module /usr/lib/apache/mod_deflate.so
+LoadModule headers_module /usr/lib/apache/mod_headers.so
+#LoadModule heartbeat_module /usr/lib/apache/mod_heartbeat.so
+#LoadModule heartmonitor_module /usr/lib/apache/mod_heartmonitor.so
+#LoadModule include_module /usr/lib/apache/mod_include.so
+#LoadModule info_module /usr/lib/apache/mod_info.so
 LoadModule log_config_module /usr/lib/apache/mod_log_config.so
+#LoadModule log_debug_module /usr/lib/apache/mod_log_debug.so
 #LoadModule log_forensic_module /usr/lib/apache/mod_log_forensic.so
 #LoadModule logio_module /usr/lib/apache/mod_logio.so
-LoadModule env_module /usr/lib/apache/mod_env.so
+#LoadModule macro_module /usr/lib/apache/mod_macro.so
 #LoadModule mime_magic_module /usr/lib/apache/mod_mime_magic.so
-#LoadModule cern_meta_module /usr/lib/apache/mod_cern_meta.so
-#LoadModule expires_module /usr/lib/apache/mod_expires.so
-LoadModule headers_module /usr/lib/apache/mod_headers.so
-#LoadModule ident_module /usr/lib/apache/mod_ident.so
-#LoadModule usertrack_module /usr/lib/apache/mod_usertrack.so
-#LoadModule unique_id_module /usr/lib/apache/mod_unique_id.so
-LoadModule setenvif_module /usr/lib/apache/mod_setenvif.so
-#LoadModule version_module /usr/lib/apache/mod_version.so
 LoadModule mime_module /usr/lib/apache/mod_mime.so
-#LoadModule dav_module /usr/lib/apache/mod_dav.so
-#LoadModule status_module /usr/lib/apache/mod_status.so
-LoadModule autoindex_module /usr/lib/apache/mod_autoindex.so
-#LoadModule asis_module /usr/lib/apache/mod_asis.so
-#LoadModule info_module /usr/lib/apache/mod_info.so
-LoadModule cgi_module /usr/lib/apache/mod_cgi.so
-#LoadModule dav_fs_module /usr/lib/apache/mod_dav_fs.so
-#LoadModule vhost_alias_module /usr/lib/apache/mod_vhost_alias.so
-#LoadModule negotiation_module /usr/lib/apache/mod_negotiation.so
-LoadModule dir_module /usr/lib/apache/mod_dir.so
-#LoadModule imagemap_module /usr/lib/apache/mod_imagemap.so
-#LoadModule actions_module /usr/lib/apache/mod_actions.so
-#LoadModule speling_module /usr/lib/apache/mod_speling.so
-#LoadModule userdir_module /usr/lib/apache/mod_userdir.so
-LoadModule alias_module /usr/lib/apache/mod_alias.so
+#LoadModule mpm_event_module /usr/lib/apache/mod_mpm_event.so
+#LoadModule mpm_prefork_module /usr/lib/apache/mod_mpm_prefork.so
+LoadModule mpm_worker_module /usr/lib/apache/mod_mpm_worker.so
+#LoadModule mod_negotiation_module /usr/lib/apache/mod_negotiation.so
+#LoadModule proxy_ajp_module /usr/lib/apache/mod_proxy_ajp.so
+#LoadModule proxy_balancer_module /usr/lib/apache/mod_proxy_balancer.so
+#LoadModule proxy_connect_module /usr/lib/apache/mod_proxy_connect.so
+#LoadModule proxy_express_module /usr/lib/apache/mod_proxy_express.so
+#LoadModule proxy_fcgi_module /usr/lib/apache/mod_proxy_fcgi.so
+#LoadModule proxy_fdpass_module /usr/lib/apache/mod_proxy_fdpass.so
+#LoadModule proxy_ftp_module /usr/lib/apache/mod_proxy_ftp.so
+#LoadModule proxy_html_module /usr/lib/apache/mod_proxy_html.so
+#LoadModule proxy_http_module /usr/lib/apache/mod_proxy_http.so
+#LoadModule proxy_scgi_module /usr/lib/apache/mod_proxy_scgi.so
+#LoadModule proxy_module /usr/lib/apache/mod_proxy.so
+#LoadModule proxy_wstunnel_module /usr/lib/apache/mod_proxy_wstunnel.so
+#LoadModule ratelimit_module /usr/lib/apache/mod_ratelimit.so
+#LoadModule reflector_module /usr/lib/apache/mod_reflector.so
+#LoadModule remoteip_module /usr/lib/apache/mod_remoteip.so
+#LoadModule reqtimeout_module /usr/lib/apache/mod_reqtimeout.so
+#LoadModule request_module /usr/lib/apache/mod_request.so
 LoadModule rewrite_module /usr/lib/apache/mod_rewrite.so
+#LoadModule sed_module /usr/lib/apache/mod_sed.so
+#LoadModule session_cookie_module /usr/lib/apache/mod_session_cookie.so
+#LoadModule session_crypto_module /usr/lib/apache/mod_session_crypto.so
+#LoadModule session_dbd_module /usr/lib/apache/mod_session_dbd.so
+#LoadModule session_module /usr/lib/apache/mod_session.so
+#LoadModule security2_module /usr/lib/apache//mod_security2.so
+LoadModule setenvif_module /usr/lib/apache/mod_setenvif.so
+#LoadModule slotmem_plain_module /usr/lib/apache/mod_slotmem_plain.so
+#LoadModule slotmem_shm_module /usr/lib/apache/mod_slotmem_shm.so
+#LoadModule socache_dbm_module /usr/lib/apache/mod_socache_dbm.so
+#LoadModule socache_memcache_module /usr/lib/apache/mod_socache_memcache.so
+LoadModule socache_shmcb_module /usr/lib/apache/mod_socache_shmcb.so
+#LoadModule speling_module /usr/lib/apache/mod_speling.so
 LoadModule ssl_module /usr/lib/apache/mod_ssl.so
-LoadModule php5_module /usr/lib/apache/libphp5.so
+#LoadModule status_module /usr/lib/apache/mod_status.so
+#LoadModule substitute_module /usr/lib/apache/mod_substitute.so
+#LoadModule suexec_module /usr/lib/apache/mod_suexec.so
+#LoadModule unique_id_module /usr/lib/apache/mod_unique_id.so
+LoadModule unixd_module /usr/lib/apache/mod_unixd.so
+#LoadModule userdir_module /usr/lib/apache/mod_userdir.so
+#LoadModule usertrack_module /usr/lib/apache/mod_usertrack.so
+#LoadModule version_module /usr/lib/apache/mod_version.so
+#LoadModule vhost_alias_module /usr/lib/apache/mod_vhost_alias.so
+#LoadModule watchdog_module /usr/lib/apache/mod_watchdog.so
+#LoadModule xml2enc_module /usr/lib/apache/mod_xml2enc.so
+
diff --git a/config/httpd/server-tuning.conf b/config/httpd/server-tuning.conf
index 183ce80..81acb02 100644
--- a/config/httpd/server-tuning.conf
+++ b/config/httpd/server-tuning.conf
@@ -17,12 +17,6 @@ MaxKeepAliveRequests 100
 #
 KeepAliveTimeout 15
-MinSpareServers 1
-MaxSpareServers 10
-StartServers 1
-MaxClients 10
-MaxRequestsPerChild 100
-
 #
 # The following directives modify normal HTTP response behavior to
 # handle known problems with browser implementations.
@@ -32,3 +26,4 @@ BrowserMatch "MSIE 4.0b2;" nokeepalive downgrade-1.0 force-response-1.0
 BrowserMatch "RealPlayer 4.0" force-response-1.0
 BrowserMatch "Java/1.0" force-response-1.0
 BrowserMatch "JDK/1.0" force-response-1.0
+
diff --git a/config/httpd/ssl-global.conf b/config/httpd/ssl-global.conf
index 9cf4f81..10d61d0 100644
--- a/config/httpd/ssl-global.conf
+++ b/config/httpd/ssl-global.conf
@@ -42,7 +42,7 @@
    #   Semaphore:
    #   Configure the path to the mutual exclusion semaphore the
    #   SSL engine uses internally for inter-process synchronization. 
-	SSLMutex  file:/var/log/httpd/ssl_mutex
+	Mutex  file:/var/log/httpd/ default
#   Pseudo Random Number Generator (PRNG):
    #   Configure one or more sources to seed the PRNG of the 
@@ -58,3 +58,4 @@
    SSLRandomSeed connect builtin
</IfModule>
+
diff --git a/config/php/php.ini b/config/php/php.ini
index 6e82094..928fd8f 100644
--- a/config/php/php.ini
+++ b/config/php/php.ini
@@ -3,149 +3,234 @@
 ;;;;;;;;;;;;;;;;;;;
 ; About php.ini   ;
 ;;;;;;;;;;;;;;;;;;;
-; This file controls many aspects of PHP's behavior.  In order for PHP to
-; read it, it must be named 'php.ini'.  PHP looks for it in the current
-; working directory, in the path designated by the environment variable
-; PHPRC, and in the path that was defined in compile time (in that order).
-; Under Windows, the compile-time path is the Windows directory.  The
-; path in which the php.ini file is looked for can be overridden using
-; the -c argument in command line mode.
-;
-; The syntax of the file is extremely simple.  Whitespace and Lines
+; PHP's initialization file, generally called php.ini, is responsible for
+; configuring many of the aspects of PHP's behavior.
+
+; PHP attempts to find and load this configuration from a number of locations.
+; The following is a summary of its search order:
+; 1. SAPI module specific location.
+; 2. The PHPRC environment variable. (As of PHP 5.2.0)
+; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0)
+; 4. Current working directory (except CLI)
+; 5. The web server's directory (for SAPI modules), or directory of PHP
+; (otherwise in Windows)
+; 6. The directory from the --with-config-file-path compile time option, or the
+; Windows directory (C:\windows or C:\winnt)
+; See the PHP docs for more specific information.
+; http://php.net/configuration.file
+
+; The syntax of the file is extremely simple.  Whitespace and lines
 ; beginning with a semicolon are silently ignored (as you probably guessed).
 ; Section headers (e.g. [Foo]) are also silently ignored, even though
 ; they might mean something in the future.
-;
+
+; Directives following the section heading [PATH=/www/mysite] only
+; apply to PHP files in the /www/mysite directory.  Directives
+; following the section heading [HOST=www.example.com] only apply to
+; PHP files served from www.example.com.  Directives set in these
+; special sections cannot be overridden by user-defined INI files or
+; at runtime. Currently, [PATH=] and [HOST=] sections only work under
+; CGI/FastCGI.
+; http://php.net/ini.sections
+
 ; Directives are specified using the following syntax:
 ; directive = value
 ; Directive names are *case sensitive* - foo=bar is different from FOO=bar.
-;
+; Directives are variables used to configure PHP or PHP extensions.
+; There is no name validation.  If PHP can't find an expected
+; directive because it is not set or is mistyped, a default value will be used.
+
 ; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one
 ; of the INI constants (On, Off, True, False, Yes, No and None) or an expression
-; (e.g. E_ALL & ~E_NOTICE), or a quoted string ("foo").
-;
+; (e.g. E_ALL & ~E_NOTICE), a quoted string ("bar"), or a reference to a
+; previously set variable or directive (e.g. ${foo})
+
 ; Expressions in the INI file are limited to bitwise operators and parentheses:
-; |        bitwise OR
-; &        bitwise AND
-; ~        bitwise NOT
-; !        boolean NOT
-;
+; |  bitwise OR
+; ^  bitwise XOR
+; &  bitwise AND
+; ~  bitwise NOT
+; !  boolean NOT
+
 ; Boolean flags can be turned on using the values 1, On, True or Yes.
 ; They can be turned off using the values 0, Off, False or No.
-;
+
 ; An empty string can be denoted by simply not writing anything after the equal
 ; sign, or by using the None keyword:
-;
+
 ;  foo =         ; sets foo to an empty string
-;  foo = none    ; sets foo to an empty string
-;  foo = "none"  ; sets foo to the string 'none'
-;
+;  foo = None    ; sets foo to an empty string
+;  foo = "None"  ; sets foo to the string 'None'
+
 ; If you use constants in your value, and these constants belong to a
 ; dynamically loaded extension (either a PHP extension or a Zend extension),
 ; you may only use these constants *after* the line that loads the extension.
-; 
-;
+
 ;;;;;;;;;;;;;;;;;;;
 ; About this file ;
 ;;;;;;;;;;;;;;;;;;;
-; This is the recommended, PHP 5-style version of the php.ini-dist file.  It
-; sets some non standard settings, that make PHP more efficient, more secure,
-; and encourage cleaner coding.
-;
-; The price is that with these settings, PHP may be incompatible with some
-; applications, and sometimes, more difficult to develop with.  Using this
-; file is warmly recommended for production sites.  As all of the changes from
-; the standard settings are thoroughly documented, you can go over each one,
-; and decide whether you want to use it or not.
-;
-; For general information about the php.ini file, please consult the php.ini-dist
-; file, included in your PHP distribution.
-;
-; This file is different from the php.ini-dist file in the fact that it features
-; different values for several directives, in order to improve performance, while
-; possibly breaking compatibility with the standard out-of-the-box behavior of
-; PHP.  Please make sure you read what's different, and modify your scripts
-; accordingly, if you decide to use this file instead.
-;
-; - register_long_arrays = Off     [Performance]
-;     Disables registration of the older (and deprecated) long predefined array
-;     variables ($HTTP_*_VARS).  Instead, use the superglobals that were
-;     introduced in PHP 4.1.0
-; - display_errors = Off           [Security]
-;     With this directive set to off, errors that occur during the execution of
-;     scripts will no longer be displayed as a part of the script output, and thus,
-;     will no longer be exposed to remote users.  With some errors, the error message
-;     content may expose information about your script, web server, or database
-;     server that may be exploitable for hacking.  Production sites should have this
-;     directive set to off.
-; - log_errors = On                [Security]
-;     This directive complements the above one.  Any errors that occur during the
-;     execution of your script will be logged (typically, to your server's error log,
-;     but can be configured in several ways).  Along with setting display_errors to off,
-;     this setup gives you the ability to fully understand what may have gone wrong,
-;     without exposing any sensitive information to remote users.
-; - output_buffering = 4096        [Performance]
-;     Set a 4KB output buffer.  Enabling output buffering typically results in less
-;     writes, and sometimes less packets sent on the wire, which can often lead to
-;     better performance.  The gain this directive actually yields greatly depends
-;     on which Web server you're working with, and what kind of scripts you're using.
-; - register_argc_argv = Off       [Performance]
-;     Disables registration of the somewhat redundant $argv and $argc global
-;     variables.
-; - magic_quotes_gpc = Off         [Performance]
-;     Input data is no longer escaped with slashes so that it can be sent into
-;     SQL databases without further manipulation.  Instead, you should use the
-;     function addslashes() on each input element you wish to send to a database.
-; - variables_order = "GPCS"       [Performance]
-;     The environment variables are not hashed into the $_ENV.  To access
-;     environment variables, you can use getenv() instead.
-; - error_reporting = E_ALL        [Code Cleanliness, Security(?)]
-;     By default, PHP suppresses errors of type E_NOTICE.  These error messages
-;     are emitted for non-critical errors, but that could be a symptom of a bigger
-;     problem.  Most notably, this will cause error messages about the use
-;     of uninitialized variables to be displayed.
-; - allow_call_time_pass_reference = Off     [Code cleanliness]
-;     It's not possible to decide to force a variable to be passed by reference
-;     when calling a function.  The PHP 4 style to do this is by making the
-;     function require the relevant argument by reference.
-; - short_open_tag = Off           [Portability]
-;     Using short tags is discouraged when developing code meant for redistribution
-;     since short tags may not be supported on the target server.
+; PHP comes packaged with two INI files. One that is recommended to be used
+; in production environments and one that is recommended to be used in
+; development environments.
+
+; php.ini-production contains settings which hold security, performance and
+; best practices at its core. But please be aware, these settings may break
+; compatibility with older or less security conscience applications. We
+; recommending using the production ini in production and testing environments.
+
+; php.ini-development is very similar to its production variant, except it is
+; much more verbose when it comes to errors. We recommend using the
+; development version only in development environments, as errors shown to
+; application users can inadvertently leak otherwise secure information.
+
+; This is php.ini-production INI file.
+
+;;;;;;;;;;;;;;;;;;;
+; Quick Reference ;
+;;;;;;;;;;;;;;;;;;;
+; The following are all the settings which are different in either the production
+; or development versions of the INIs with respect to PHP's default behavior.
+; Please see the actual settings later in the document for more details as to why
+; we recommend these changes in PHP's behavior.
+
+; display_errors
+;   Default Value: On
+;   Development Value: On
+;   Production Value: Off
+
+; display_startup_errors
+;   Default Value: Off
+;   Development Value: On
+;   Production Value: Off
+
+; error_reporting
+;   Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
+;   Development Value: E_ALL
+;   Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
+
+; html_errors
+;   Default Value: On
+;   Development Value: On
+;   Production value: On
+
+; log_errors
+;   Default Value: Off
+;   Development Value: On
+;   Production Value: On
+
+; max_input_time
+;   Default Value: -1 (Unlimited)
+;   Development Value: 60 (60 seconds)
+;   Production Value: 60 (60 seconds)
+
+; output_buffering
+;   Default Value: Off
+;   Development Value: 4096
+;   Production Value: 4096
+
+; register_argc_argv
+;   Default Value: On
+;   Development Value: Off
+;   Production Value: Off
+
+; request_order
+;   Default Value: None
+;   Development Value: "GP"
+;   Production Value: "GP"
+
+; session.gc_divisor
+;   Default Value: 100
+;   Development Value: 1000
+;   Production Value: 1000
+
+; session.hash_bits_per_character
+;   Default Value: 4
+;   Development Value: 5
+;   Production Value: 5
+
+; short_open_tag
+;   Default Value: On
+;   Development Value: Off
+;   Production Value: Off
+
+; track_errors
+;   Default Value: Off
+;   Development Value: On
+;   Production Value: Off
+
+; url_rewriter.tags
+;   Default Value: "a=href,area=href,frame=src,form=,fieldset="
+;   Development Value: "a=href,area=href,frame=src,input=src,form=fakeentry"
+;   Production Value: "a=href,area=href,frame=src,input=src,form=fakeentry"
+
+; variables_order
+;   Default Value: "EGPCS"
+;   Development Value: "GPCS"
+;   Production Value: "GPCS"
+
+;;;;;;;;;;;;;;;;;;;;
+; php.ini Options  ;
+;;;;;;;;;;;;;;;;;;;;
+; Name for user-defined php.ini (.htaccess) files. Default is ".user.ini"
+;user_ini.filename = ".user.ini"
+
+; To disable this feature set this option to empty value
+;user_ini.filename =
+
+; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes)
+;user_ini.cache_ttl = 300
;;;;;;;;;;;;;;;;;;;;
 ; Language Options ;
 ;;;;;;;;;;;;;;;;;;;;
; Enable the PHP scripting language engine under Apache.
+; http://php.net/engine
 engine = On
-; Enable compatibility mode with Zend Engine 1 (PHP 4.x)
-zend.ze1_compatibility_mode = Off
-
-; Allow the <? tag.  Otherwise, only <?php and <script> tags are recognized.
-; NOTE: Using short tags should be avoided when developing applications or
-; libraries that are meant for redistribution, or deployment on PHP
-; servers which are not under your control, because short tags may not
-; be supported on the target server. For portable, redistributable code,
-; be sure not to use short tags.
+; This directive determines whether or not PHP will recognize code between
+; <? and ?> tags as PHP source which should be processed as such. It is
+; generally recommended that <?php and ?> should be used and that this feature
+; should be disabled, as enabling it may result in issues when generating XML
+; documents, however this remains supported for backward compatibility reasons.
+; Note that this directive does not control the <?= shorthand tag, which can be
+; used regardless of this directive.
+; Default Value: On
+; Development Value: Off
+; Production Value: Off
+; http://php.net/short-open-tag
 short_open_tag = On
; Allow ASP-style <% %> tags.
+; http://php.net/asp-tags
 asp_tags = Off
; The number of significant digits displayed in floating point numbers.
-precision    =  14
-
-; Enforce year 2000 compliance (will cause problems with non-compliant browsers)
-y2k_compliance = On
-
-; Output buffering allows you to send header lines (including cookies) even
-; after you send body content, at the price of slowing PHP's output layer a
-; bit.  You can enable output buffering during runtime by calling the output
-; buffering functions.  You can also enable output buffering for all files by
-; setting this directive to On.  If you wish to limit the size of the buffer
-; to a certain size - you can use a maximum number of bytes instead of 'On', as
-; a value for this directive (e.g., output_buffering=4096).
+; http://php.net/precision
+precision = 14
+
+; Output buffering is a mechanism for controlling how much output data
+; (excluding headers and cookies) PHP should keep internally before pushing that
+; data to the client. If your application's output exceeds this setting, PHP
+; will send that data in chunks of roughly the size you specify.
+; Turning on this setting and managing its maximum buffer size can yield some
+; interesting side-effects depending on your application and web server.
+; You may be able to send headers and cookies after you've already sent output
+; through print or echo. You also may see performance benefits if your server is
+; emitting less packets due to buffered output versus PHP streaming the output
+; as it gets it. On production servers, 4096 bytes is a good setting for performance
+; reasons.
+; Note: Output buffering can also be controlled via Output Buffering Control
+;   functions.
+; Possible Values:
+;   On = Enabled and buffer is unlimited. (Use with caution)
+;   Off = Disabled
+;   Integer = Enables the buffer and sets its maximum size in bytes.
+; Note: This directive is hardcoded to Off for the CLI SAPI
+; Default Value: Off
+; Development Value: 4096
+; Production Value: 4096
+; http://php.net/output-buffering
 output_buffering = 4096
; You can redirect all of the output of your scripts to a function.  For
@@ -153,30 +238,35 @@ output_buffering = 4096
 ; encoding will be transparently converted to the specified encoding.
 ; Setting any output handler automatically turns on output buffering.
 ; Note: People who wrote portable scripts should not depend on this ini
-;       directive. Instead, explicitly set the output handler using ob_start().
-;       Using this ini directive may cause problems unless you know what script
-;       is doing.
+;   directive. Instead, explicitly set the output handler using ob_start().
+;   Using this ini directive may cause problems unless you know what script
+;   is doing.
 ; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler"
-;       and you cannot use both "ob_gzhandler" and "zlib.output_compression".
+;   and you cannot use both "ob_gzhandler" and "zlib.output_compression".
 ; Note: output_handler must be empty if this is set 'On' !!!!
-;       Instead you must use zlib.output_handler.
+;   Instead you must use zlib.output_handler.
+; http://php.net/output-handler
 ;output_handler =
; Transparent output compression using the zlib library
 ; Valid values for this option are 'off', 'on', or a specific buffer size
 ; to be used for compression (default is 4KB)
 ; Note: Resulting chunk size may vary due to nature of compression. PHP
-;       outputs chunks that are few hundreds bytes each as a result of
-;       compression. If you prefer a larger chunk size for better
-;       performance, enable output_buffering in addition.
+;   outputs chunks that are few hundreds bytes each as a result of
+;   compression. If you prefer a larger chunk size for better
+;   performance, enable output_buffering in addition.
 ; Note: You need to use zlib.output_handler instead of the standard
-;       output_handler, or otherwise the output will be corrupted.
+;   output_handler, or otherwise the output will be corrupted.
+; http://php.net/zlib.output-compression
 zlib.output_compression = Off
+
+; http://php.net/zlib.output-compression-level
 ;zlib.output_compression_level = -1
; You cannot specify additional output handlers if zlib.output_compression
 ; is activated here. This setting does the same as output_handler but in
 ; a different order.
+; http://php.net/zlib.output-handler
 ;zlib.output_handler =
; Implicit flush tells PHP to tell the output layer to flush itself
@@ -184,135 +274,145 @@ zlib.output_compression = Off
 ; PHP function flush() after each and every call to print() or echo() and each
 ; and every HTML block.  Turning this option on has serious performance
 ; implications and is generally recommended for debugging purposes only.
+; http://php.net/implicit-flush
+; Note: This directive is hardcoded to On for the CLI SAPI
 implicit_flush = Off
; The unserialize callback function will be called (with the undefined class'
 ; name as parameter), if the unserializer finds an undefined class
-; which should be instantiated.
-; A warning appears if the specified function is not defined, or if the
-; function doesn't include/implement the missing class.
+; which should be instantiated. A warning appears if the specified function is
+; not defined, or if the function doesn't include/implement the missing class.
 ; So only set this entry, if you really want to implement such a
 ; callback-function.
-unserialize_callback_func=
+unserialize_callback_func =
; When floats & doubles are serialized store serialize_precision significant
 ; digits after the floating point. The default value ensures that when floats
 ; are decoded with unserialize, the data will remain the same.
 serialize_precision = 100
-; Whether to enable the ability to force arguments to be passed by reference
-; at function call time.  This method is deprecated and is likely to be
-; unsupported in future versions of PHP/Zend.  The encouraged method of
-; specifying which arguments should be passed by reference is in the function
-; declaration.  You're encouraged to try and turn this option Off and make
-; sure your scripts work properly with it in order to ensure they will work
-; with future versions of the language (you will receive a warning each time
-; you use this feature, and the argument will be passed by value instead of by
-; reference).
-allow_call_time_pass_reference = Off
-
-;
-; Safe Mode
-;
-safe_mode = Off
-
-; By default, Safe Mode does a UID compare check when
-; opening files. If you want to relax this to a GID compare,
-; then turn on safe_mode_gid.
-safe_mode_gid = Off
-
-; When safe_mode is on, UID/GID checks are bypassed when
-; including files from this directory and its subdirectories.
-; (directory must also be in include_path or full path must
-; be used when including)
-safe_mode_include_dir =
-
-; When safe_mode is on, only executables located in the safe_mode_exec_dir
-; will be allowed to be executed via the exec family of functions.
-safe_mode_exec_dir =
-
-; Setting certain environment variables may be a potential security breach.
-; This directive contains a comma-delimited list of prefixes.  In Safe Mode,
-; the user may only alter environment variables whose names begin with the
-; prefixes supplied here.  By default, users will only be able to set
-; environment variables that begin with PHP_ (e.g. PHP_FOO=BAR).
-;
-; Note:  If this directive is empty, PHP will let the user modify ANY
-; environment variable!
-safe_mode_allowed_env_vars = PHP_
-
-; This directive contains a comma-delimited list of environment variables that
-; the end user won't be able to change using putenv().  These variables will be
-; protected even if safe_mode_allowed_env_vars is set to allow to change them.
-safe_mode_protected_env_vars = LD_LIBRARY_PATH
-
 ; open_basedir, if set, limits all file operations to the defined directory
 ; and below.  This directive makes most sense if used in a per-directory
-; or per-virtualhost web server configuration file. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; or per-virtualhost web server configuration file.
+; http://php.net/open-basedir
 ;open_basedir =
; This directive allows you to disable certain functions for security reasons.
-; It receives a comma-delimited list of function names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; It receives a comma-delimited list of function names.
+; http://php.net/disable-functions
 disable_functions =
; This directive allows you to disable certain classes for security reasons.
-; It receives a comma-delimited list of class names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; It receives a comma-delimited list of class names.
+; http://php.net/disable-classes
 disable_classes =
; Colors for Syntax Highlighting mode.  Anything that's acceptable in
 ; <span style="color: ???????"> would work.
+; http://php.net/syntax-highlighting
 ;highlight.string  = #DD0000
 ;highlight.comment = #FF9900
 ;highlight.keyword = #007700
-;highlight.bg      = #FFFFFF
 ;highlight.default = #0000BB
 ;highlight.html    = #000000
; If enabled, the request will be allowed to complete even if the user aborts
-; the request. Consider enabling it if executing long request, which may end up
-; being interrupted by the user or a browser timing out.
-; ignore_user_abort = On
+; the request. Consider enabling it if executing long requests, which may end up
+; being interrupted by the user or a browser timing out. PHP's default behavior
+; is to disable this feature.
+; http://php.net/ignore-user-abort
+;ignore_user_abort = On
; Determines the size of the realpath cache to be used by PHP. This value should
 ; be increased on systems where PHP opens many files to reflect the quantity of
 ; the file operations performed.
-; realpath_cache_size=16k
+; http://php.net/realpath-cache-size
+;realpath_cache_size = 16k
; Duration of time, in seconds for which to cache realpath information for a given
 ; file or directory. For systems with rarely changing files, consider increasing this
 ; value.
-; realpath_cache_ttl=120
+; http://php.net/realpath-cache-ttl
+;realpath_cache_ttl = 120
+
+; Enables or disables the circular reference collector.
+; http://php.net/zend.enable-gc
+zend.enable_gc = On
+
+; If enabled, scripts may be written in encodings that are incompatible with
+; the scanner.  CP936, Big5, CP949 and Shift_JIS are the examples of such
+; encodings.  To use this feature, mbstring extension must be enabled.
+; Default: Off
+;zend.multibyte = Off
+
+; Allows to set the default encoding for the scripts.  This value will be used
+; unless "declare(encoding=...)" directive appears at the top of the script.
+; Only affects if zend.multibyte is set.
+; Default: ""
+;zend.script_encoding =
+
+;;;;;;;;;;;;;;;;;
+; Miscellaneous ;
+;;;;;;;;;;;;;;;;;
-;
-; Misc
-;
 ; Decides whether PHP may expose the fact that it is installed on the server
 ; (e.g. by adding its signature to the Web server header).  It is no security
 ; threat in any way, but it makes it possible to determine whether you use PHP
 ; on your server or not.
-expose_php = On
-
+; http://php.net/expose-php
+expose_php = Off
;;;;;;;;;;;;;;;;;;;
 ; Resource Limits ;
 ;;;;;;;;;;;;;;;;;;;
-max_execution_time = 30     ; Maximum execution time of each script, in seconds
-max_input_time = 60	; Maximum amount of time each script may spend parsing request data
-;max_input_nesting_level = 64 ; Maximum input variable nesting level
-memory_limit = 128M      ; Maximum amount of memory a script may consume (128MB)
+; Maximum execution time of each script, in seconds
+; http://php.net/max-execution-time
+; Note: This directive is hardcoded to 0 for the CLI SAPI
+max_execution_time = 30
+
+; Maximum amount of time each script may spend parsing request data. It's a good
+; idea to limit this time on productions servers in order to eliminate unexpectedly
+; long running scripts.
+; Note: This directive is hardcoded to -1 for the CLI SAPI
+; Default Value: -1 (Unlimited)
+; Development Value: 60 (60 seconds)
+; Production Value: 60 (60 seconds)
+; http://php.net/max-input-time
+max_input_time = 60
+
+; Maximum input variable nesting level
+; http://php.net/max-input-nesting-level
+;max_input_nesting_level = 64
+; How many GET/POST/COOKIE input variables may be accepted
+; max_input_vars = 1000
+
+; Maximum amount of memory a script may consume (128MB)
+; http://php.net/memory-limit
+memory_limit = 128M
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Error handling and logging ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; error_reporting is a bit-field.  Or each number up to get desired error
-; reporting level
-; E_ALL             - All errors and warnings (doesn't include E_STRICT)
+; This directive informs PHP of which errors, warnings and notices you would like
+; it to take action for. The recommended way of setting values for this
+; directive is through the use of the error level constants and bitwise
+; operators. The error level constants are below here for convenience as well as
+; some common settings and their meanings.
+; By default, PHP is set to take action on all errors, notices and warnings EXCEPT
+; those related to E_NOTICE and E_STRICT, which together cover best practices and
+; recommended coding standards in PHP. For performance reasons, this is the
+; recommend error reporting setting. Your production server shouldn't be wasting
+; resources complaining about best practices and coding standards. That's what
+; development servers and development settings are for.
+; Note: The php.ini-development file has this setting as E_ALL. This
+; means it pretty much reports everything which is exactly what you want during
+; development and early testing.
+;
+; Error Level Constants:
+; E_ALL             - All errors and warnings (includes E_STRICT as of PHP 5.4.0)
 ; E_ERROR           - fatal run-time errors
 ; E_RECOVERABLE_ERROR  - almost fatal run-time errors
 ; E_WARNING         - run-time warnings (non-fatal errors)
@@ -320,7 +420,7 @@ memory_limit = 128M      ; Maximum amount of memory a script may consume (128MB)
 ; E_NOTICE          - run-time notices (these are warnings which often result
 ;                     from a bug in your code, but it's possible that it was
 ;                     intentional (e.g., using an uninitialized variable and
-;                     relying on the fact it's automatically initialized to an
+;                     relying on the fact it is automatically initialized to an
 ;                     empty string)
 ; E_STRICT          - run-time notices, enable to have PHP suggest changes
 ;                     to your code which will ensure the best interoperability
@@ -333,183 +433,275 @@ memory_limit = 128M      ; Maximum amount of memory a script may consume (128MB)
 ; E_USER_ERROR      - user-generated error message
 ; E_USER_WARNING    - user-generated warning message
 ; E_USER_NOTICE     - user-generated notice message
+; E_DEPRECATED      - warn about code that will not work in future versions
+;                     of PHP
+; E_USER_DEPRECATED - user-generated deprecation warnings
 ;
-; Examples:
-;
-;   - Show all errors, except for notices and coding standards warnings
-;
-;error_reporting = E_ALL & ~E_NOTICE
-;
-;   - Show all errors, except for notices
-;
-;error_reporting = E_ALL & ~E_NOTICE | E_STRICT
-;
-;   - Show only errors
-;
-;error_reporting = E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR
-;
-;   - Show all errors, except coding standards warnings
-;
-error_reporting  =  E_ALL
-
-; Print out errors (as a part of the output).  For production web sites,
-; you're strongly encouraged to turn this feature off, and use error logging
-; instead (see below).  Keeping display_errors enabled on a production web site
-; may reveal security information to end users, such as file paths on your Web
-; server, your database schema or other information.
-;
-; possible values for display_errors:
-;
-; Off          - Do not display any errors 
-; stderr       - Display errors to STDERR (affects only CGI/CLI binaries!)   
-; On or stdout - Display errors to STDOUT (default)
-;  
-; To output errors to STDERR with CGI/CLI:              
-;display_errors = "stderr"
-;
-; Default
-;
+; Common Values:
+;   E_ALL (Show all errors, warnings and notices including coding standards.)
+;   E_ALL & ~E_NOTICE  (Show all errors, except for notices)
+;   E_ALL & ~E_NOTICE & ~E_STRICT  (Show all errors, except for notices and coding standards warnings.)
+;   E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR  (Show only errors)
+; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
+; Development Value: E_ALL
+; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
+; http://php.net/error-reporting
+error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
+
+; This directive controls whether or not and where PHP will output errors,
+; notices and warnings too. Error output is very useful during development, but
+; it could be very dangerous in production environments. Depending on the code
+; which is triggering the error, sensitive information could potentially leak
+; out of your application such as database usernames and passwords or worse.
+; For production environments, we recommend logging errors rather than
+; sending them to STDOUT.
+; Possible Values:
+;   Off = Do not display any errors
+;   stderr = Display errors to STDERR (affects only CGI/CLI binaries!)
+;   On or stdout = Display errors to STDOUT
+; Default Value: On
+; Development Value: On
+; Production Value: Off
+; http://php.net/display-errors
 display_errors = Off
-; Even when display_errors is on, errors that occur during PHP's startup
-; sequence are not displayed.  It's strongly recommended to keep
-; display_startup_errors off, except for when debugging.
+; The display of errors which occur during PHP's startup sequence are handled
+; separately from display_errors. PHP's default behavior is to suppress those
+; errors from clients. Turning the display of startup errors on can be useful in
+; debugging configuration problems. We strongly recommend you
+; set this to 'off' for production servers.
+; Default Value: Off
+; Development Value: On
+; Production Value: Off
+; http://php.net/display-startup-errors
 display_startup_errors = Off
-; Log errors into a log file (server-specific log, stderr, or error_log (below))
-; As stated above, you're strongly advised to use error logging in place of
-; error displaying on production web sites.
+; Besides displaying errors, PHP can also log errors to locations such as a
+; server-specific log, STDERR, or a location specified by the error_log
+; directive found below. While errors should not be displayed on productions
+; servers they should still be monitored and logging is a great way to do that.
+; Default Value: Off
+; Development Value: On
+; Production Value: On
+; http://php.net/log-errors
 log_errors = On
; Set maximum length of log_errors. In error_log information about the source is
 ; added. The default is 1024 and 0 allows to not apply any maximum length at all.
+; http://php.net/log-errors-max-len
 log_errors_max_len = 1024
; Do not log repeated messages. Repeated errors must occur in same file on same
-; line until ignore_repeated_source is set true.
+; line unless ignore_repeated_source is set true.
+; http://php.net/ignore-repeated-errors
 ignore_repeated_errors = Off
; Ignore source of message when ignoring repeated messages. When this setting
 ; is On you will not log errors with repeated messages from different files or
 ; source lines.
+; http://php.net/ignore-repeated-source
 ignore_repeated_source = Off
; If this parameter is set to Off, then memory leaks will not be shown (on
 ; stdout or in the log). This has only effect in a debug compile, and if
 ; error reporting includes E_WARNING in the allowed list
+; http://php.net/report-memleaks
 report_memleaks = On
+; This setting is on by default.
 ;report_zend_debug = 0
-; Store the last error/warning message in $php_errormsg (boolean).
+; Store the last error/warning message in $php_errormsg (boolean). Setting this value
+; to On can assist in debugging and is appropriate for development servers. It should
+; however be disabled on production servers.
+; Default Value: Off
+; Development Value: On
+; Production Value: Off
+; http://php.net/track-errors
 track_errors = Off
-; Disable the inclusion of HTML tags in error messages.
-; Note: Never use this feature for production boxes.
+; Turn off normal error reporting and emit XML-RPC error XML
+; http://php.net/xmlrpc-errors
+;xmlrpc_errors = 0
+
+; An XML-RPC faultCode
+;xmlrpc_error_number = 0
+
+; When PHP displays or logs an error, it has the capability of formatting the
+; error message as HTML for easier reading. This directive controls whether
+; the error message is formatted as HTML or not.
+; Note: This directive is hardcoded to Off for the CLI SAPI
+; Default Value: On
+; Development Value: On
+; Production value: On
+; http://php.net/html-errors
 ;html_errors = Off
-; If html_errors is set On PHP produces clickable error messages that direct
-; to a page describing the error or function causing the error in detail.
-; You can download a copy of the PHP manual from http://www.php.net/docs.php
+; If html_errors is set to On *and* docref_root is not empty, then PHP
+; produces clickable error messages that direct to a page describing the error
+; or function causing the error in detail.
+; You can download a copy of the PHP manual from http://php.net/docs
 ; and change docref_root to the base URL of your local copy including the
 ; leading '/'. You must also specify the file extension being used including
-; the dot.
+; the dot. PHP's default behavior is to leave these settings empty, in which
+; case no links to documentation are generated.
 ; Note: Never use this feature for production boxes.
+; http://php.net/docref-root
+; Examples
 ;docref_root = "/phpmanual/"
-;docref_ext = .html
-; String to output before an error message.
-;error_prepend_string = "<font color=ff0000>"
-
-; String to output after an error message.
-;error_append_string = "</font>"
-
-; Log errors to specified file.
-;error_log = filename
+; http://php.net/docref-ext
+;docref_ext = .html
-; Log errors to syslog (Event Log on NT, not valid in Windows 95).
+; String to output before an error message. PHP's default behavior is to leave
+; this setting blank.
+; http://php.net/error-prepend-string
+; Example:
+;error_prepend_string = "<span style='color: #ff0000'>"
+
+; String to output after an error message. PHP's default behavior is to leave
+; this setting blank.
+; http://php.net/error-append-string
+; Example:
+;error_append_string = "</span>"
+
+; Log errors to specified file. PHP's default behavior is to leave this value
+; empty.
+; http://php.net/error-log
+; Example:
+;error_log = php_errors.log
+; Log errors to syslog (Event Log on Windows).
 ;error_log = syslog
+;windows.show_crt_warning
+; Default value: 0
+; Development value: 0
+; Production value: 0
;;;;;;;;;;;;;;;;;
 ; Data Handling ;
 ;;;;;;;;;;;;;;;;;
-;
-; Note - track_vars is ALWAYS enabled as of PHP 4.0.3
; The separator used in PHP generated URLs to separate arguments.
-; Default is "&".
+; PHP's default setting is "&".
+; http://php.net/arg-separator.output
+; Example:
 ;arg_separator.output = "&amp;"
; List of separator(s) used by PHP to parse input URLs into variables.
-; Default is "&".
+; PHP's default setting is "&".
 ; NOTE: Every character in this directive is considered as separator!
+; http://php.net/arg-separator.input
+; Example:
 ;arg_separator.input = ";&"
-; This directive describes the order in which PHP registers GET, POST, Cookie,
-; Environment and Built-in variables (G, P, C, E & S respectively, often
-; referred to as EGPCS or GPC).  Registration is done from left to right, newer
-; values override older values.
+; This directive determines which super global arrays are registered when PHP
+; starts up. G,P,C,E & S are abbreviations for the following respective super
+; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty
+; paid for the registration of these arrays and because ENV is not as commonly
+; used as the others, ENV is not recommended on productions servers. You
+; can still get access to the environment variables through getenv() should you
+; need to.
+; Default Value: "EGPCS"
+; Development Value: "GPCS"
+; Production Value: "GPCS";
+; http://php.net/variables-order
 variables_order = "GPCS"
-; Whether or not to register the EGPCS variables as global variables.  You may
-; want to turn this off if you don't want to clutter your scripts' global scope
-; with user data.  This makes most sense when coupled with track_vars - in which
-; case you can access all of the GPC variables through the $HTTP_*_VARS[],
-; variables.
-;
-; You should do your best to write your scripts so that they do not require
-; register_globals to be on;  Using form variables as globals can easily lead
-; to possible security problems, if the code is not very well thought of.
-register_globals = Off
-
-; Whether or not to register the old-style input arrays, HTTP_GET_VARS
-; and friends.  If you're not using them, it's recommended to turn them off,
-; for performance reasons.
-register_long_arrays = Off
-
-; This directive tells PHP whether to declare the argv&argc variables (that
-; would contain the GET information).  If you don't use these variables, you
-; should turn it off for increased performance.
+; This directive determines which super global data (G,P & C) should be
+; registered into the super global array REQUEST. If so, it also determines
+; the order in which that data is registered. The values for this directive
+; are specified in the same manner as the variables_order directive,
+; EXCEPT one. Leaving this value empty will cause PHP to use the value set
+; in the variables_order directive. It does not mean it will leave the super
+; globals array REQUEST empty.
+; Default Value: None
+; Development Value: "GP"
+; Production Value: "GP"
+; http://php.net/request-order
+request_order = "GP"
+
+; This directive determines whether PHP registers $argv & $argc each time it
+; runs. $argv contains an array of all the arguments passed to PHP when a script
+; is invoked. $argc contains an integer representing the number of arguments
+; that were passed when the script was invoked. These arrays are extremely
+; useful when running scripts from the command line. When this directive is
+; enabled, registering these variables consumes CPU cycles and memory each time
+; a script is executed. For performance reasons, this feature should be disabled
+; on production servers.
+; Note: This directive is hardcoded to On for the CLI SAPI
+; Default Value: On
+; Development Value: Off
+; Production Value: Off
+; http://php.net/register-argc-argv
 register_argc_argv = Off
-; When enabled, the SERVER and ENV variables are created when they're first
-; used (Just In Time) instead of when the script starts. If these variables
-; are not used within a script, having this directive on will result in a
-; performance gain. The PHP directives register_globals, register_long_arrays,
-; and register_argc_argv must be disabled for this directive to have any affect.
+; When enabled, the ENV, REQUEST and SERVER variables are created when they're
+; first used (Just In Time) instead of when the script starts. If these
+; variables are not used within a script, having this directive on will result
+; in a performance gain. The PHP directive register_argc_argv must be disabled
+; for this directive to have any affect.
+; http://php.net/auto-globals-jit
 auto_globals_jit = On
+; Whether PHP will read the POST data.
+; This option is enabled by default.
+; Most likely, you won't want to disable this option globally. It causes $_POST
+; and $_FILES to always be empty; the only way you will be able to read the
+; POST data will be through the php://input stream wrapper. This can be useful
+; to proxy requests or to process the POST data in a memory efficient fashion.
+; http://php.net/enable-post-data-reading
+;enable_post_data_reading = Off
+
 ; Maximum size of POST data that PHP will accept.
+; Its value may be 0 to disable the limit. It is ignored if POST data reading
+; is disabled through enable_post_data_reading.
+; http://php.net/post-max-size
 post_max_size = 8M
-; Magic quotes
-;
-
-; Magic quotes for incoming GET/POST/Cookie data.
-magic_quotes_gpc = Off
-
-; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc.
-magic_quotes_runtime = Off
-
-; Use Sybase-style magic quotes (escape ' with '' instead of ').
-magic_quotes_sybase = Off
-
-; Automatically add files before or after any PHP document.
+; Automatically add files before PHP document.
+; http://php.net/auto-prepend-file
 auto_prepend_file =
+
+; Automatically add files after PHP document.
+; http://php.net/auto-append-file
 auto_append_file =
-; As of 4.0b4, PHP always outputs a character encoding by default in
+; By default, PHP will output a character encoding using
 ; the Content-type: header.  To disable sending of the charset, simply
 ; set it to be empty.
 ;
 ; PHP's built-in default is text/html
+; http://php.net/default-mimetype
 default_mimetype = "text/html"
-;default_charset = "iso-8859-1"
-
-; Always populate the $HTTP_RAW_POST_DATA variable.
-;always_populate_raw_post_data = On
+; PHP's default character set is set to UTF-8.
+; http://php.net/default-charset
+default_charset = "UTF-8"
+
+; PHP internal character encoding is set to empty.
+; If empty, default_charset is used.
+; http://php.net/internal-encoding
+;internal_encoding =
+
+; PHP input character encoding is set to empty.
+; If empty, default_charset is used.
+; http://php.net/input-encoding
+;input_encoding =
+
+; PHP output character encoding is set to empty.
+; If empty, default_charset is used.
+; mbstring or iconv output handler is used.
+; See also output_buffer.
+; http://php.net/output-encoding
+;output_encoding =
+
+; Always populate the $HTTP_RAW_POST_DATA variable. PHP's default behavior is
+; to disable this feature and it will be removed in a future version.
+; If post reading is disabled through enable_post_data_reading,
+; $HTTP_RAW_POST_DATA is *NOT* populated.
+; http://php.net/always-populate-raw-post-data
+;always_populate_raw_post_data = -1
;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Paths and Directories ;
@@ -520,100 +712,130 @@ default_mimetype = "text/html"
 ;
 ; Windows: "\path1;\path2"
 ;include_path = ".;c:\php\includes"
+;
+; PHP's default setting for include_path is ".;/path/to/php/pear"
+; http://php.net/include-path
; The root of the PHP pages, used only if nonempty.
 ; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
 ; if you are running php as a CGI under any web server (other than IIS)
 ; see documentation for security issues.  The alternate is to use the
 ; cgi.force_redirect configuration below
+; http://php.net/doc-root
 doc_root =
; The directory under which PHP opens the script using /~username used only
 ; if nonempty.
+; http://php.net/user-dir
 user_dir =
; Directory in which the loadable extensions (modules) reside.
-extension_dir = "/usr/lib/php/extensions/no-debug-non-zts-20090626/"
+; http://php.net/extension-dir
+; extension_dir = "./"
+; On windows:
+; extension_dir = "ext"
+extension_dir = "/usr/lib/php/extensions/no-debug-zts-20131226/"
+
+; Directory where the temporary files should be placed.
+; Defaults to the system default (see sys_get_temp_dir)
+; sys_temp_dir = "/tmp"
; Whether or not to enable the dl() function.  The dl() function does NOT work
 ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
 ; disabled on them.
-enable_dl = On
+; http://php.net/enable-dl
+enable_dl = Off
; cgi.force_redirect is necessary to provide security running PHP as a CGI under
 ; most web servers.  Left undefined, PHP turns this on by default.  You can
 ; turn it off here AT YOUR OWN RISK
 ; **You CAN safely turn this off for IIS, in fact, you MUST.**
-; cgi.force_redirect = 1
+; http://php.net/cgi.force-redirect
+;cgi.force_redirect = 1
; if cgi.nph is enabled it will force cgi to always sent Status: 200 with
-; every request.
-; cgi.nph = 1
+; every request. PHP's default behavior is to disable this feature.
+;cgi.nph = 1
; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape
 ; (iPlanet) web servers, you MAY need to set an environment variable name that PHP
 ; will look for to know it is OK to continue execution.  Setting this variable MAY
 ; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
-; cgi.redirect_status_env = ;
+; http://php.net/cgi.redirect-status-env
+;cgi.redirect_status_env =
; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI.  PHP's
 ; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
 ; what PATH_INFO is.  For more information on PATH_INFO, see the cgi specs.  Setting
-; this to 1 will cause PHP CGI to fix it's paths to conform to the spec.  A setting
+; this to 1 will cause PHP CGI to fix its paths to conform to the spec.  A setting
 ; of zero causes PHP to behave as before.  Default is 1.  You should fix your scripts
 ; to use SCRIPT_FILENAME rather than PATH_TRANSLATED.
-; cgi.fix_pathinfo=1
+; http://php.net/cgi.fix-pathinfo
+;cgi.fix_pathinfo=1
; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
 ; security tokens of the calling client.  This allows IIS to define the
 ; security context that the request runs under.  mod_fastcgi under Apache
 ; does not currently support this feature (03/17/2002)
 ; Set to 1 if running under IIS.  Default is zero.
-; fastcgi.impersonate = 1;
+; http://php.net/fastcgi.impersonate
+;fastcgi.impersonate = 1
-; Disable logging through FastCGI connection
-; fastcgi.logging = 0
+; Disable logging through FastCGI connection. PHP's default behavior is to enable
+; this feature.
+;fastcgi.logging = 0
; cgi.rfc2616_headers configuration option tells PHP what type of headers to
-; use when sending HTTP response code. If it's set 0 PHP sends Status: header that
-; is supported by Apache. When this option is set to 1 PHP will send
+; use when sending HTTP response code. If set to 0, PHP sends Status: header that
+; is supported by Apache. When this option is set to 1, PHP will send
 ; RFC2616 compliant header.
 ; Default is zero.
+; http://php.net/cgi.rfc2616-headers
 ;cgi.rfc2616_headers = 0
-
 ;;;;;;;;;;;;;;;;
 ; File Uploads ;
 ;;;;;;;;;;;;;;;;
; Whether to allow HTTP file uploads.
+; http://php.net/file-uploads
 file_uploads = On
; Temporary directory for HTTP uploaded files (will use system default if not
 ; specified).
+; http://php.net/upload-tmp-dir
 ;upload_tmp_dir =
; Maximum allowed size for uploaded files.
+; http://php.net/upload-max-filesize
 upload_max_filesize = 2M
+; Maximum number of files that can be uploaded via a single request
+max_file_uploads = 20
;;;;;;;;;;;;;;;;;;
 ; Fopen wrappers ;
 ;;;;;;;;;;;;;;;;;;
; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
-allow_url_fopen = On
+; http://php.net/allow-url-fopen
+allow_url_fopen = Off
; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
+; http://php.net/allow-url-include
 allow_url_include = Off
-; Define the anonymous ftp password (your email address)
+; Define the anonymous ftp password (your email address). PHP's default setting
+; for this is empty.
+; http://php.net/from
 ;from="john@doe.com"
-; Define the User-Agent string
-; user_agent="PHP"
+; Define the User-Agent string. PHP's default setting for this is empty.
+; http://php.net/user-agent
+;user_agent="PHP"
; Default timeout for socket based streams (seconds)
+; http://php.net/default-socket-timeout
 default_socket_timeout = 60
; If your scripts have to deal with files from Macintosh systems,
@@ -621,13 +843,13 @@ default_socket_timeout = 60
 ; unix or win32 systems, setting this flag will cause PHP to
 ; automatically detect the EOL character in those files so that
 ; fgets() and file() will work regardless of the source of the file.
-; auto_detect_line_endings = Off
-
+; http://php.net/auto-detect-line-endings
+;auto_detect_line_endings = Off
;;;;;;;;;;;;;;;;;;;;;;
 ; Dynamic Extensions ;
 ;;;;;;;;;;;;;;;;;;;;;;
-;
+
 ; If you wish to have an extension loaded automatically, use the following
 ; syntax:
 ;
@@ -640,180 +862,308 @@ default_socket_timeout = 60
 ; ... or under UNIX:
 ;
 ;   extension=msql.so
-;
-; Note that it should be the name of the module only; no directory information
-; needs to go here.  Specify the location of the extension with the
-; extension_dir directive above.
-extension=idn.so
+extension=dba.so
+;
+; ... or with a path:
+;
+;   extension=/path/to/extension/msql.so
+;
+; If you only provide the name of the extension, PHP will look for it in its
+; default extension directory.
+;
 ; Windows Extensions
 ; Note that ODBC support is built in, so no dll is needed for it.
 ; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
 ; extension folders as well as the separate PECL DLL download (PHP 5).
 ; Be sure to appropriately set the extension_dir directive.
-
+;
 ;extension=php_bz2.dll
 ;extension=php_curl.dll
-;extension=php_dba.dll
-;extension=php_dbase.dll
-;extension=php_exif.dll
-;extension=php_fdf.dll
+;extension=php_fileinfo.dll
 ;extension=php_gd2.dll
 ;extension=php_gettext.dll
 ;extension=php_gmp.dll
-;extension=php_ifx.dll
+;extension=php_intl.dll
 ;extension=php_imap.dll
 ;extension=php_interbase.dll
 ;extension=php_ldap.dll
 ;extension=php_mbstring.dll
-;extension=php_mcrypt.dll
-;extension=php_mhash.dll
-;extension=php_mime_magic.dll
-;extension=php_ming.dll
-;extension=php_msql.dll
-;extension=php_mssql.dll
+;extension=php_exif.dll      ; Must be after mbstring as it depends on it
 ;extension=php_mysql.dll
 ;extension=php_mysqli.dll
-;extension=php_oci8.dll
+;extension=php_oci8_12c.dll  ; Use with Oracle Database 12c Instant Client
 ;extension=php_openssl.dll
-;extension=php_pdo.dll
 ;extension=php_pdo_firebird.dll
-;extension=php_pdo_mssql.dll
 ;extension=php_pdo_mysql.dll
 ;extension=php_pdo_oci.dll
-;extension=php_pdo_oci8.dll
 ;extension=php_pdo_odbc.dll
 ;extension=php_pdo_pgsql.dll
 ;extension=php_pdo_sqlite.dll
 ;extension=php_pgsql.dll
-;extension=php_pspell.dll
 ;extension=php_shmop.dll
+
+; The MIBS data available in the PHP distribution must be installed.
+; See http://www.php.net/manual/en/snmp.installation.php
 ;extension=php_snmp.dll
+
 ;extension=php_soap.dll
 ;extension=php_sockets.dll
-;extension=php_sqlite.dll
+;extension=php_sqlite3.dll
 ;extension=php_sybase_ct.dll
 ;extension=php_tidy.dll
 ;extension=php_xmlrpc.dll
 ;extension=php_xsl.dll
-;extension=php_zip.dll
;;;;;;;;;;;;;;;;;;;
 ; Module Settings ;
 ;;;;;;;;;;;;;;;;;;;
+[CLI Server]
+; Whether the CLI web server uses ANSI color coding in its terminal output.
+cli_server.color = On
+
 [Date]
 ; Defines the default timezone used by the date functions
+; http://php.net/date.timezone
 ;date.timezone =
+; http://php.net/date.default-latitude
 ;date.default_latitude = 31.7667
+
+; http://php.net/date.default-longitude
 ;date.default_longitude = 35.2333
+; http://php.net/date.sunrise-zenith
 ;date.sunrise_zenith = 90.583333
+
+; http://php.net/date.sunset-zenith
 ;date.sunset_zenith = 90.583333
[filter]
+; http://php.net/filter.default
 ;filter.default = unsafe_raw
+
+; http://php.net/filter.default-flags
 ;filter.default_flags =
[iconv]
-;iconv.input_encoding = ISO-8859-1
-;iconv.internal_encoding = ISO-8859-1
-;iconv.output_encoding = ISO-8859-1
+; Use of this INI entry is deprecated, use global input_encoding instead.
+; If empty, default_charset or input_encoding or iconv.input_encoding is used.
+; The precedence is: default_charset < intput_encoding < iconv.input_encoding
+;iconv.input_encoding =
+
+; Use of this INI entry is deprecated, use global internal_encoding instead.
+; If empty, default_charset or internal_encoding or iconv.internal_encoding is used.
+; The precedence is: default_charset < internal_encoding < iconv.internal_encoding
+;iconv.internal_encoding =
+
+; Use of this INI entry is deprecated, use global output_encoding instead.
+; If empty, default_charset or output_encoding or iconv.output_encoding is used.
+; The precedence is: default_charset < output_encoding < iconv.output_encoding
+; To use an output encoding conversion, iconv's output handler must be set
+; otherwise output encoding conversion cannot be performed.
+;iconv.output_encoding =
+
+[intl]
+;intl.default_locale =
+; This directive allows you to produce PHP errors when some error
+; happens within intl functions. The value is the level of the error produced.
+; Default is 0, which does not produce any errors.
+;intl.error_level = E_WARNING
[sqlite]
+; http://php.net/sqlite.assoc-case
 ;sqlite.assoc_case = 0
-[xmlrpc]
-;xmlrpc_error_number = 0
-;xmlrpc_errors = 0
+[sqlite3]
+;sqlite3.extension_dir =
[Pcre]
 ;PCRE library backtracking limit.
+; http://php.net/pcre.backtrack-limit
 ;pcre.backtrack_limit=100000
-;PCRE library recursion limit. 
-;Please note that if you set this value to a high number you may consume all 
-;the available process stack and eventually crash PHP (due to reaching the 
+;PCRE library recursion limit.
+;Please note that if you set this value to a high number you may consume all
+;the available process stack and eventually crash PHP (due to reaching the
 ;stack size limit imposed by the Operating System).
+; http://php.net/pcre.recursion-limit
 ;pcre.recursion_limit=100000
-[Syslog]
-; Whether or not to define the various syslog variables (e.g. $LOG_PID,
-; $LOG_CRON, etc.).  Turning it off is a good idea performance-wise.  In
-; runtime, you can define these variables by calling define_syslog_variables().
-define_syslog_variables  = Off
+[Pdo]
+; Whether to pool ODBC connections. Can be one of "strict", "relaxed" or "off"
+; http://php.net/pdo-odbc.connection-pooling
+;pdo_odbc.connection_pooling=strict
+
+;pdo_odbc.db2_instance_name
+
+[Pdo_mysql]
+; If mysqlnd is used: Number of cache slots for the internal result set cache
+; http://php.net/pdo_mysql.cache_size
+pdo_mysql.cache_size = 2000
+
+; Default socket name for local MySQL connects.  If empty, uses the built-in
+; MySQL defaults.
+; http://php.net/pdo_mysql.default-socket
+pdo_mysql.default_socket=
+
+[Phar]
+; http://php.net/phar.readonly
+;phar.readonly = On
+
+; http://php.net/phar.require-hash
+;phar.require_hash = On
+
+;phar.cache_list =
[mail function]
 ; For Win32 only.
+; http://php.net/smtp
 SMTP = localhost
+; http://php.net/smtp-port
 smtp_port = 25
; For Win32 only.
+; http://php.net/sendmail-from
 ;sendmail_from = me@example.com
; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
+; http://php.net/sendmail-path
 ;sendmail_path =
; Force the addition of the specified parameters to be passed as extra parameters
 ; to the sendmail binary. These parameters will always replace the value of
-; the 5th parameter to mail(), even in safe mode.
+; the 5th parameter to mail().
 ;mail.force_extra_parameters =
+; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
+mail.add_x_header = On
+
+; The path to a log file that will log all mail() calls. Log entries include
+; the full path of the script, line number, To address and headers.
+;mail.log =
+; Log mail to syslog (Event Log on Windows).
+;mail.log = syslog
+
 [SQL]
+; http://php.net/sql.safe-mode
 sql.safe_mode = Off
[ODBC]
+; http://php.net/odbc.default-db
 ;odbc.default_db    =  Not yet implemented
+
+; http://php.net/odbc.default-user
 ;odbc.default_user  =  Not yet implemented
+
+; http://php.net/odbc.default-pw
 ;odbc.default_pw    =  Not yet implemented
+; Controls the ODBC cursor model.
+; Default: SQL_CURSOR_STATIC (default).
+;odbc.default_cursortype
+
 ; Allow or prevent persistent links.
+; http://php.net/odbc.allow-persistent
 odbc.allow_persistent = On
; Check that a connection is still valid before reuse.
+; http://php.net/odbc.check-persistent
 odbc.check_persistent = On
; Maximum number of persistent links.  -1 means no limit.
+; http://php.net/odbc.max-persistent
 odbc.max_persistent = -1
; Maximum number of links (persistent + non-persistent).  -1 means no limit.
+; http://php.net/odbc.max-links
 odbc.max_links = -1
; Handling of LONG fields.  Returns number of bytes to variables.  0 means
 ; passthru.
+; http://php.net/odbc.defaultlrl
 odbc.defaultlrl = 4096
; Handling of binary data.  0 means passthru, 1 return as is, 2 convert to char.
 ; See the documentation on odbc_binmode and odbc_longreadlen for an explanation
-; of uodbc.defaultlrl and uodbc.defaultbinmode
+; of odbc.defaultlrl and odbc.defaultbinmode
+; http://php.net/odbc.defaultbinmode
 odbc.defaultbinmode = 1
+;birdstep.max_links = -1
+
+[Interbase]
+; Allow or prevent persistent links.
+ibase.allow_persistent = 1
+
+; Maximum number of persistent links.  -1 means no limit.
+ibase.max_persistent = -1
+
+; Maximum number of links (persistent + non-persistent).  -1 means no limit.
+ibase.max_links = -1
+
+; Default database name for ibase_connect().
+;ibase.default_db =
+
+; Default username for ibase_connect().
+;ibase.default_user =
+
+; Default password for ibase_connect().
+;ibase.default_password =
+
+; Default charset for ibase_connect().
+;ibase.default_charset =
+
+; Default timestamp format.
+ibase.timestampformat = "%Y-%m-%d %H:%M:%S"
+
+; Default date format.
+ibase.dateformat = "%Y-%m-%d"
+
+; Default time format.
+ibase.timeformat = "%H:%M:%S"
+
 [MySQL]
+; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
+; http://php.net/mysql.allow_local_infile
+mysql.allow_local_infile = On
+
 ; Allow or prevent persistent links.
+; http://php.net/mysql.allow-persistent
 mysql.allow_persistent = On
+; If mysqlnd is used: Number of cache slots for the internal result set cache
+; http://php.net/mysql.cache_size
+mysql.cache_size = 2000
+
 ; Maximum number of persistent links.  -1 means no limit.
+; http://php.net/mysql.max-persistent
 mysql.max_persistent = -1
; Maximum number of links (persistent + non-persistent).  -1 means no limit.
+; http://php.net/mysql.max-links
 mysql.max_links = -1
; Default port number for mysql_connect().  If unset, mysql_connect() will use
 ; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
 ; compile-time value defined MYSQL_PORT (in that order).  Win32 will only look
 ; at MYSQL_PORT.
+; http://php.net/mysql.default-port
 mysql.default_port =
; Default socket name for local MySQL connects.  If empty, uses the built-in
 ; MySQL defaults.
+; http://php.net/mysql.default-socket
 mysql.default_socket = /var/run/mysql/mysql.sock
; Default host for mysql_connect() (doesn't apply in safe mode).
+; http://php.net/mysql.default-host
 mysql.default_host =
; Default user for mysql_connect() (doesn't apply in safe mode).
+; http://php.net/mysql.default-user
 mysql.default_user =
; Default password for mysql_connect() (doesn't apply in safe mode).
@@ -821,34 +1171,58 @@ mysql.default_user =
 ; *Any* user with PHP access can run 'echo get_cfg_var("mysql.default_password")
 ; and reveal this password!  And of course, any users with read access to this
 ; file will be able to reveal the password as well.
+; http://php.net/mysql.default-password
 mysql.default_password =
; Maximum time (in seconds) for connect timeout. -1 means no limit
+; http://php.net/mysql.connect-timeout
 mysql.connect_timeout = 60
; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
 ; SQL-Errors will be displayed.
+; http://php.net/mysql.trace-mode
 mysql.trace_mode = Off
[MySQLi]
+; Maximum number of persistent links.  -1 means no limit.
+; http://php.net/mysqli.max-persistent
+mysqli.max_persistent = -1
+
+; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
+; http://php.net/mysqli.allow_local_infile
+;mysqli.allow_local_infile = On
+
+; Allow or prevent persistent links.
+; http://php.net/mysqli.allow-persistent
+mysqli.allow_persistent = On
+
 ; Maximum number of links.  -1 means no limit.
+; http://php.net/mysqli.max-links
 mysqli.max_links = -1
+; If mysqlnd is used: Number of cache slots for the internal result set cache
+; http://php.net/mysqli.cache_size
+mysqli.cache_size = 2000
+
 ; Default port number for mysqli_connect().  If unset, mysqli_connect() will use
 ; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
 ; compile-time value defined MYSQL_PORT (in that order).  Win32 will only look
 ; at MYSQL_PORT.
+; http://php.net/mysqli.default-port
 mysqli.default_port = 3306
; Default socket name for local MySQL connects.  If empty, uses the built-in
 ; MySQL defaults.
+; http://php.net/mysqli.default-socket
 mysqli.default_socket =
; Default host for mysql_connect() (doesn't apply in safe mode).
+; http://php.net/mysqli.default-host
 mysqli.default_host =
; Default user for mysql_connect() (doesn't apply in safe mode).
+; http://php.net/mysqli.default-user
 mysqli.default_user =
; Default password for mysqli_connect() (doesn't apply in safe mode).
@@ -856,176 +1230,179 @@ mysqli.default_user =
 ; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw")
 ; and reveal this password!  And of course, any users with read access to this
 ; file will be able to reveal the password as well.
+; http://php.net/mysqli.default-pw
 mysqli.default_pw =
; Allow or prevent reconnect
 mysqli.reconnect = Off
-[mSQL]
-; Allow or prevent persistent links.
-msql.allow_persistent = On
+[mysqlnd]
+; Enable / Disable collection of general statistics by mysqlnd which can be
+; used to tune and monitor MySQL operations.
+; http://php.net/mysqlnd.collect_statistics
+mysqlnd.collect_statistics = On
-; Maximum number of persistent links.  -1 means no limit.
-msql.max_persistent = -1
+; Enable / Disable collection of memory usage statistics by mysqlnd which can be
+; used to tune and monitor MySQL operations.
+; http://php.net/mysqlnd.collect_memory_statistics
+mysqlnd.collect_memory_statistics = Off
-; Maximum number of links (persistent+non persistent).  -1 means no limit.
-msql.max_links = -1
+; Size of a pre-allocated buffer used when sending commands to MySQL in bytes.
+; http://php.net/mysqlnd.net_cmd_buffer_size
+;mysqlnd.net_cmd_buffer_size = 2048
+
+; Size of a pre-allocated buffer used for reading data sent by the server in
+; bytes.
+; http://php.net/mysqlnd.net_read_buffer_size
+;mysqlnd.net_read_buffer_size = 32768
[OCI8]
-; enables privileged connections using external credentials (OCI_SYSOPER, OCI_SYSDBA)
+
+; Connection: Enables privileged connections using external
+; credentials (OCI_SYSOPER, OCI_SYSDBA)
+; http://php.net/oci8.privileged-connect
 ;oci8.privileged_connect = Off
; Connection: The maximum number of persistent OCI8 connections per
 ; process. Using -1 means no limit.
+; http://php.net/oci8.max-persistent
 ;oci8.max_persistent = -1
; Connection: The maximum number of seconds a process is allowed to
 ; maintain an idle persistent connection. Using -1 means idle
 ; persistent connections will be maintained forever.
+; http://php.net/oci8.persistent-timeout
 ;oci8.persistent_timeout = -1
; Connection: The number of seconds that must pass before issuing a
 ; ping during oci_pconnect() to check the connection validity. When
 ; set to 0, each oci_pconnect() will cause a ping. Using -1 disables
 ; pings completely.
+; http://php.net/oci8.ping-interval
 ;oci8.ping_interval = 60
+; Connection: Set this to a user chosen connection class to be used
+; for all pooled server requests with Oracle 11g Database Resident
+; Connection Pooling (DRCP).  To use DRCP, this value should be set to
+; the same string for all web servers running the same application,
+; the database pool must be configured, and the connection string must
+; specify to use a pooled server.
+;oci8.connection_class =
+
+; High Availability: Using On lets PHP receive Fast Application
+; Notification (FAN) events generated when a database node fails. The
+; database must also be configured to post FAN events.
+;oci8.events = Off
+
 ; Tuning: This option enables statement caching, and specifies how
 ; many statements to cache. Using 0 disables statement caching.
+; http://php.net/oci8.statement-cache-size
 ;oci8.statement_cache_size = 20
; Tuning: Enables statement prefetching and sets the default number of
 ; rows that will be fetched automatically after statement execution.
-;oci8.default_prefetch = 10
+; http://php.net/oci8.default-prefetch
+;oci8.default_prefetch = 100
; Compatibility. Using On means oci_close() will not close
 ; oci_connect() and oci_new_connect() connections.
+; http://php.net/oci8.old-oci-close-semantics
 ;oci8.old_oci_close_semantics = Off
-[PostgresSQL]
+[PostgreSQL]
 ; Allow or prevent persistent links.
+; http://php.net/pgsql.allow-persistent
 pgsql.allow_persistent = On
; Detect broken persistent links always with pg_pconnect().
 ; Auto reset feature requires a little overheads.
+; http://php.net/pgsql.auto-reset-persistent
 pgsql.auto_reset_persistent = Off
; Maximum number of persistent links.  -1 means no limit.
+; http://php.net/pgsql.max-persistent
 pgsql.max_persistent = -1
; Maximum number of links (persistent+non persistent).  -1 means no limit.
+; http://php.net/pgsql.max-links
 pgsql.max_links = -1
; Ignore PostgreSQL backends Notice message or not.
 ; Notice message logging require a little overheads.
+; http://php.net/pgsql.ignore-notice
 pgsql.ignore_notice = 0
-; Log PostgreSQL backends Noitce message or not.
+; Log PostgreSQL backends Notice message or not.
 ; Unless pgsql.ignore_notice=0, module cannot log notice message.
+; http://php.net/pgsql.log-notice
 pgsql.log_notice = 0
-[Sybase]
-; Allow or prevent persistent links.
-sybase.allow_persistent = On
-
-; Maximum number of persistent links.  -1 means no limit.
-sybase.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent).  -1 means no limit.
-sybase.max_links = -1
-
-;sybase.interface_file = "/usr/sybase/interfaces"
-
-; Minimum error severity to display.
-sybase.min_error_severity = 10
-
-; Minimum message severity to display.
-sybase.min_message_severity = 10
-
-; Compatibility mode with old versions of PHP 3.0.
-; If on, this will cause PHP to automatically assign types to results according
-; to their Sybase type, instead of treating them all as strings.  This
-; compatibility mode will probably not stay around forever, so try applying
-; whatever necessary changes to your code, and turn it off.
-sybase.compatability_mode = Off
-
 [Sybase-CT]
 ; Allow or prevent persistent links.
+; http://php.net/sybct.allow-persistent
 sybct.allow_persistent = On
; Maximum number of persistent links.  -1 means no limit.
+; http://php.net/sybct.max-persistent
 sybct.max_persistent = -1
; Maximum number of links (persistent + non-persistent).  -1 means no limit.
+; http://php.net/sybct.max-links
 sybct.max_links = -1
; Minimum server message severity to display.
+; http://php.net/sybct.min-server-severity
 sybct.min_server_severity = 10
; Minimum client message severity to display.
+; http://php.net/sybct.min-client-severity
 sybct.min_client_severity = 10
-[bcmath]
-; Number of decimal digits for all bcmath functions.
-bcmath.scale = 0
-
-[browscap]
-;browscap = extra/browscap.ini
-
-[Informix]
-; Default host for ifx_connect() (doesn't apply in safe mode).
-ifx.default_host =
-
-; Default user for ifx_connect() (doesn't apply in safe mode).
-ifx.default_user =
+; Set per-context timeout
+; http://php.net/sybct.timeout
+;sybct.timeout=
-; Default password for ifx_connect() (doesn't apply in safe mode).
-ifx.default_password =
+;sybct.packet_size
-; Allow or prevent persistent links.
-ifx.allow_persistent = On
-
-; Maximum number of persistent links.  -1 means no limit.
-ifx.max_persistent = -1
+; The maximum time in seconds to wait for a connection attempt to succeed before returning failure.
+; Default: one minute
+;sybct.login_timeout=
-; Maximum number of links (persistent + non-persistent).  -1 means no limit.
-ifx.max_links = -1
+; The name of the host you claim to be connecting from, for display by sp_who.
+; Default: none
+;sybct.hostname=
-; If on, select statements return the contents of a text blob instead of its id.
-ifx.textasvarchar = 0
+; Allows you to define how often deadlocks are to be retried. -1 means "forever".
+; Default: 0
+;sybct.deadlock_retry_count=
-; If on, select statements return the contents of a byte blob instead of its id.
-ifx.byteasvarchar = 0
-
-; Trailing blanks are stripped from fixed-length char columns.  May help the
-; life of Informix SE users.
-ifx.charasvarchar = 0
-
-; If on, the contents of text and byte blobs are dumped to a file instead of
-; keeping them in memory.
-ifx.blobinfile = 0
+[bcmath]
+; Number of decimal digits for all bcmath functions.
+; http://php.net/bcmath.scale
+bcmath.scale = 0
-; NULL's are returned as empty strings, unless this is set to 1.  In that case,
-; NULL's are returned as string 'NULL'.
-ifx.nullformat = 0
+[browscap]
+; http://php.net/browscap
+;browscap = extra/browscap.ini
[Session]
 ; Handler used to store/retrieve data.
+; http://php.net/session.save-handler
 session.save_handler = files
; Argument passed to save_handler.  In the case of files, this is the path
 ; where data files are stored. Note: Windows users have to change this
 ; variable in order to use PHP's session functions.
 ;
-; As of PHP 4.0.1, you can define the path as:
+; The path can be defined as:
 ;
 ;     session.save_path = "N;/path"
 ;
 ; where N is an integer.  Instead of storing all the session files in
 ; /path, what this will do is use subdirectories N-levels deep, and
-; store the session data in those directories.  This is useful if you
-; or your OS have problems with lots of files in one directory, and is
-; a more efficient layout for servers that handle lots of sessions.
+; store the session data in those directories.  This is useful if
+; your OS has problems with many files in one directory, and is
+; a more efficient layout for servers that handle many sessions.
 ;
 ; NOTE 1: PHP will not create this directory structure automatically.
 ;         You can use the script in the ext/session dir for that purpose.
@@ -1039,49 +1416,88 @@ session.save_handler = files
 ;
 ; where MODE is the octal representation of the mode. Note that this
 ; does not overwrite the process's umask.
+; http://php.net/session.save-path
 ;session.save_path = "/tmp"
+; Whether to use strict session mode.
+; Strict session mode does not accept uninitialized session ID and regenerate
+; session ID if browser sends uninitialized session ID. Strict mode protects
+; applications from session fixation via session adoption vulnerability. It is
+; disabled by default for maximum compatibility, but enabling it is encouraged.
+; https://wiki.php.net/rfc/strict_sessions
+session.use_strict_mode = 0
+
 ; Whether to use cookies.
+; http://php.net/session.use-cookies
 session.use_cookies = 1
+; http://php.net/session.cookie-secure
 ;session.cookie_secure =
-; This option enables administrators to make their users invulnerable to
-; attacks which involve passing session ids in URLs; defaults to 0.
-; session.use_only_cookies = 1
+; This option forces PHP to fetch and use a cookie for storing and maintaining
+; the session id. We encourage this operation as it's very helpful in combating
+; session hijacking when not specifying and managing your own session id. It is
+; not the be-all and end-all of session hijacking defense, but it's a good start.
+; http://php.net/session.use-only-cookies
+session.use_only_cookies = 1
; Name of the session (used as cookie name).
+; http://php.net/session.name
 session.name = PHPSESSID
; Initialize session on request startup.
+; http://php.net/session.auto-start
 session.auto_start = 0
; Lifetime in seconds of cookie or, if 0, until browser is restarted.
+; http://php.net/session.cookie-lifetime
 session.cookie_lifetime = 0
; The path for which the cookie is valid.
+; http://php.net/session.cookie-path
 session.cookie_path = /
; The domain for which the cookie is valid.
+; http://php.net/session.cookie-domain
 session.cookie_domain =
; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript.
-session.cookie_httponly = 
+; http://php.net/session.cookie-httponly
+session.cookie_httponly =
; Handler used to serialize data.  php is the standard serializer of PHP.
+; http://php.net/session.serialize-handler
 session.serialize_handler = php
-; Define the probability that the 'garbage collection' process is started
-; on every session initialization.
-; The probability is calculated by using gc_probability/gc_divisor,
-; e.g. 1/100 means there is a 1% chance that the GC process starts
-; on each request.
-
+; Defines the probability that the 'garbage collection' process is started
+; on every session initialization. The probability is calculated by using
+; gc_probability/gc_divisor. Where session.gc_probability is the numerator
+; and gc_divisor is the denominator in the equation. Setting this value to 1
+; when the session.gc_divisor value is 100 will give you approximately a 1% chance
+; the gc will run on any give request.
+; Default Value: 1
+; Development Value: 1
+; Production Value: 1
+; http://php.net/session.gc-probability
 session.gc_probability = 1
-session.gc_divisor     = 1000
+
+; Defines the probability that the 'garbage collection' process is started on every
+; session initialization. The probability is calculated by using the following equation:
+; gc_probability/gc_divisor. Where session.gc_probability is the numerator and
+; session.gc_divisor is the denominator in the equation. Setting this value to 1
+; when the session.gc_divisor value is 100 will give you approximately a 1% chance
+; the gc will run on any give request. Increasing this value to 1000 will give you
+; a 0.1% chance the gc will run on any give request. For high volume production servers,
+; this is a more efficient approach.
+; Default Value: 100
+; Development Value: 1000
+; Production Value: 1000
+; http://php.net/session.gc-divisor
+session.gc_divisor = 1000
; After this number of seconds, stored data will be seen as 'garbage' and
 ; cleaned up by the garbage collection process.
+; http://php.net/session.gc-maxlifetime
 session.gc_maxlifetime = 1440
; NOTE: If you are using the subdirectory option for storing session files
@@ -1090,61 +1506,68 @@ session.gc_maxlifetime = 1440
 ;       collection through a shell script, cron entry, or some other method.
 ;       For example, the following script would is the equivalent of
 ;       setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
-;          cd /path/to/sessions; find -cmin +24 | xargs rm
-
-; PHP 4.2 and less have an undocumented feature/bug that allows you to
-; to initialize a session variable in the global scope, albeit register_globals
-; is disabled.  PHP 4.3 and later will warn you, if this feature is used.
-; You can disable the feature and the warning separately. At this time,
-; the warning is only displayed, if bug_compat_42 is enabled.
-
-session.bug_compat_42 = 0
-session.bug_compat_warn = 1
+;          find /path/to/sessions -cmin +24 -type f | xargs rm
; Check HTTP Referer to invalidate externally stored URLs containing ids.
 ; HTTP_REFERER has to contain this substring for the session to be
 ; considered as valid.
+; http://php.net/session.referer-check
 session.referer_check =
; How many bytes to read from the file.
+; http://php.net/session.entropy-length
 session.entropy_length = 0
; Specified here to create the session id.
-session.entropy_file =
-
-;session.entropy_length = 16
-
+; http://php.net/session.entropy-file
+; Defaults to /dev/urandom
+; On systems that don't have /dev/urandom but do have /dev/arandom, this will default to /dev/arandom
+; If neither are found at compile time, the default is no entropy file.
+; On windows, setting the entropy_length setting will activate the
+; Windows random source (using the CryptoAPI)
 ;session.entropy_file = /dev/urandom
; Set to {nocache,private,public,} to determine HTTP caching aspects
 ; or leave this empty to avoid sending anti-caching headers.
+; http://php.net/session.cache-limiter
 session.cache_limiter = nocache
; Document expires after n minutes.
+; http://php.net/session.cache-expire
 session.cache_expire = 180
; trans sid support is disabled by default.
-; Use of trans sid may risk your users security.
+; Use of trans sid may risk your users' security.
 ; Use this option with caution.
 ; - User may send URL contains active session ID
 ;   to other person via. email/irc/etc.
 ; - URL that contains active session ID may be stored
-;   in publically accessible computer.
+;   in publicly accessible computer.
 ; - User may access your site with the same session ID
 ;   always using URL stored in browser's history or bookmarks.
+; http://php.net/session.use-trans-sid
 session.use_trans_sid = 0
-; Select a hash function
-; 0: MD5   (128 bits)
-; 1: SHA-1 (160 bits)
+; Select a hash function for use in generating session ids.
+; Possible Values
+;   0  (MD5 128 bits)
+;   1  (SHA-1 160 bits)
+; This option may also be set to the name of any hash function supported by
+; the hash extension. A list of available hashes is returned by the hash_algos()
+; function.
+; http://php.net/session.hash-function
 session.hash_function = 0
; Define how many bits are stored in each character when converting
 ; the binary hash data to something readable.
-;
-; 4 bits: 0-9, a-f
-; 5 bits: 0-9, a-v
-; 6 bits: 0-9, a-z, A-Z, "-", ","
+; Possible values:
+;   4  (4 bits: 0-9, a-f)
+;   5  (5 bits: 0-9, a-v)
+;   6  (6 bits: 0-9, a-z, A-Z, "-", ",")
+; Default Value: 4
+; Development Value: 5
+; Production Value: 5
+; http://php.net/session.hash-bits-per-character
 session.hash_bits_per_character = 5
; The URL rewriter will look for URLs in a defined set of HTML tags.
@@ -1152,8 +1575,57 @@ session.hash_bits_per_character = 5
 ; add a hidden <input> field with the info which is otherwise appended
 ; to URLs.  If you want XHTML conformity, remove the form entry.
 ; Note that all valid entries require a "=", even if no value follows.
+; Default Value: "a=href,area=href,frame=src,form=,fieldset="
+; Development Value: "a=href,area=href,frame=src,input=src,form=fakeentry"
+; Production Value: "a=href,area=href,frame=src,input=src,form=fakeentry"
+; http://php.net/url-rewriter.tags
 url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry"
+; Enable upload progress tracking in $_SESSION
+; Default Value: On
+; Development Value: On
+; Production Value: On
+; http://php.net/session.upload-progress.enabled
+;session.upload_progress.enabled = On
+
+; Cleanup the progress information as soon as all POST data has been read
+; (i.e. upload completed).
+; Default Value: On
+; Development Value: On
+; Production Value: On
+; http://php.net/session.upload-progress.cleanup
+;session.upload_progress.cleanup = On
+
+; A prefix used for the upload progress key in $_SESSION
+; Default Value: "upload_progress_"
+; Development Value: "upload_progress_"
+; Production Value: "upload_progress_"
+; http://php.net/session.upload-progress.prefix
+;session.upload_progress.prefix = "upload_progress_"
+
+; The index name (concatenated with the prefix) in $_SESSION
+; containing the upload progress information
+; Default Value: "PHP_SESSION_UPLOAD_PROGRESS"
+; Development Value: "PHP_SESSION_UPLOAD_PROGRESS"
+; Production Value: "PHP_SESSION_UPLOAD_PROGRESS"
+; http://php.net/session.upload-progress.name
+;session.upload_progress.name = "PHP_SESSION_UPLOAD_PROGRESS"
+
+; How frequently the upload progress should be updated.
+; Given either in percentages (per-file), or in bytes
+; Default Value: "1%"
+; Development Value: "1%"
+; Production Value: "1%"
+; http://php.net/session.upload-progress.freq
+;session.upload_progress.freq =  "1%"
+
+; The minimum delay between updates, in seconds
+; Default Value: 1
+; Development Value: 1
+; Production Value: 1
+; http://php.net/session.upload-progress.min-freq
+;session.upload_progress.min_freq = "1"
+
 [MSSQL]
 ; Allow or prevent persistent links.
 mssql.allow_persistent = On
@@ -1171,7 +1643,7 @@ mssql.min_error_severity = 10
 mssql.min_message_severity = 10
; Compatibility mode with old versions of PHP 3.0.
-mssql.compatability_mode = Off
+mssql.compatibility_mode = Off
; Connect timeout
 ;mssql.connect_timeout = 5
@@ -1201,70 +1673,106 @@ mssql.secure_connection = Off
 ; FreeTDS defaults to 4096
 ;mssql.max_procs = -1
-; Specify client character set. 
-; If empty or not set the client charset from freetds.comf is used
+; Specify client character set.
+; If empty or not set the client charset from freetds.conf is used
 ; This is only used when compiled with FreeTDS
 ;mssql.charset = "ISO-8859-1"
[Assertion]
 ; Assert(expr); active by default.
+; http://php.net/assert.active
 ;assert.active = On
; Issue a PHP warning for each failed assertion.
+; http://php.net/assert.warning
 ;assert.warning = On
; Don't bail out by default.
+; http://php.net/assert.bail
 ;assert.bail = Off
; User-function to be called if an assertion fails.
+; http://php.net/assert.callback
 ;assert.callback = 0
; Eval the expression with current error_reporting().  Set to true if you want
 ; error_reporting(0) around the eval().
+; http://php.net/assert.quiet-eval
 ;assert.quiet_eval = 0
[COM]
 ; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
+; http://php.net/com.typelib-file
 ;com.typelib_file =
+
 ; allow Distributed-COM calls
+; http://php.net/com.allow-dcom
 ;com.allow_dcom = true
+
 ; autoregister constants of a components typlib on com_load()
+; http://php.net/com.autoregister-typelib
 ;com.autoregister_typelib = true
+
 ; register constants casesensitive
+; http://php.net/com.autoregister-casesensitive
 ;com.autoregister_casesensitive = false
+
 ; show warnings on duplicate constant registrations
+; http://php.net/com.autoregister-verbose
 ;com.autoregister_verbose = true
+; The default character set code-page to use when passing strings to and from COM objects.
+; Default: system ANSI code page
+;com.code_page=
+
 [mbstring]
 ; language for internal character representation.
+; This affects mb_send_mail() and mbstrig.detect_order.
+; http://php.net/mbstring.language
 ;mbstring.language = Japanese
+; Use of this INI entry is deprecated, use global internal_encoding instead.
 ; internal/script encoding.
-; Some encoding cannot work as internal encoding.
-; (e.g. SJIS, BIG5, ISO-2022-*)
-;mbstring.internal_encoding = EUC-JP
+; Some encoding cannot work as internal encoding. (e.g. SJIS, BIG5, ISO-2022-*)
+; If empty, default_charset or internal_encoding or iconv.internal_encoding is used.
+; The precedence is: default_charset < internal_encoding < iconv.internal_encoding
+;mbstring.internal_encoding =
+; Use of this INI entry is deprecated, use global input_encoding instead.
 ; http input encoding.
-;mbstring.http_input = auto
-
-; http output encoding. mb_output_handler must be
-; registered as output buffer to function
-;mbstring.http_output = SJIS
+; mbstring.encoding_traslation = On is needed to use this setting.
+; If empty, default_charset or input_encoding or mbstring.input is used.
+; The precedence is: default_charset < intput_encoding < mbsting.http_input
+; http://php.net/mbstring.http-input
+;mbstring.http_input =
+
+; Use of this INI entry is deprecated, use global output_encoding instead.
+; http output encoding.
+; mb_output_handler must be registered as output buffer to function.
+; If empty, default_charset or output_encoding or mbstring.http_output is used.
+; The precedence is: default_charset < output_encoding < mbstring.http_output
+; To use an output encoding conversion, mbstring's output handler must be set
+; otherwise output encoding conversion cannot be performed.
+; http://php.net/mbstring.http-output
+;mbstring.http_output =
; enable automatic encoding translation according to
 ; mbstring.internal_encoding setting. Input chars are
 ; converted to internal encoding by setting this to On.
 ; Note: Do _not_ use automatic encoding translation for
 ;       portable libs/applications.
+; http://php.net/mbstring.encoding-translation
 ;mbstring.encoding_translation = Off
; automatic encoding detection order.
-; auto means
+; "auto" detect order is changed according to mbstring.language
+; http://php.net/mbstring.detect-order
 ;mbstring.detect_order = auto
; substitute_character used when character cannot be converted
 ; one from another
-;mbstring.substitute_character = none;
+; http://php.net/mbstring.substitute-character
+;mbstring.substitute_character = none
; overload(replace) single byte functions by mbstring functions.
 ; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(),
@@ -1274,30 +1782,23 @@ mssql.secure_connection = Off
 ; 1: Overload mail() function
 ; 2: Overload str*() functions
 ; 4: Overload ereg*() functions
+; http://php.net/mbstring.func-overload
 ;mbstring.func_overload = 0
; enable strict encoding detection.
-;mbstring.strict_encoding = Off
-
-[FrontBase]
-;fbsql.allow_persistent = On
-;fbsql.autocommit = On
-;fbsql.show_timestamp_decimals = Off
-;fbsql.default_database =
-;fbsql.default_database_password =
-;fbsql.default_host =
-;fbsql.default_password =
-;fbsql.default_user = "_SYSTEM"
-;fbsql.generate_warnings = Off
-;fbsql.max_connections = 128
-;fbsql.max_links = 128
-;fbsql.max_persistent = -1
-;fbsql.max_results = 128
+; Default: Off
+;mbstring.strict_detection = On
+
+; This directive specifies the regex pattern of content types for which mb_output_handler()
+; is activated.
+; Default: mbstring.http_output_conv_mimetype=^(text/|application/xhtml+xml)
+;mbstring.http_output_conv_mimetype=
[gd]
-; Tell the jpeg decode to libjpeg warnings and try to create
+; Tell the jpeg decode to ignore warnings and try to create
 ; a gd image. The warning will then be displayed as notices
 ; disabled by default
+; http://php.net/gd.jpeg-ignore-warning
 ;gd.jpeg_ignore_warning = 0
[exif]
@@ -1306,31 +1807,194 @@ mssql.secure_connection = Off
 ; given by corresponding encode setting. When empty mbstring.internal_encoding
 ; is used. For the decode settings you can distinguish between motorola and
 ; intel byte order. A decode setting cannot be empty.
+; http://php.net/exif.encode-unicode
 ;exif.encode_unicode = ISO-8859-15
+
+; http://php.net/exif.decode-unicode-motorola
 ;exif.decode_unicode_motorola = UCS-2BE
+
+; http://php.net/exif.decode-unicode-intel
 ;exif.decode_unicode_intel    = UCS-2LE
+
+; http://php.net/exif.encode-jis
 ;exif.encode_jis =
+
+; http://php.net/exif.decode-jis-motorola
 ;exif.decode_jis_motorola = JIS
+
+; http://php.net/exif.decode-jis-intel
 ;exif.decode_jis_intel    = JIS
[Tidy]
 ; The path to a default tidy configuration file to use when using tidy
+; http://php.net/tidy.default-config
 ;tidy.default_config = /usr/local/lib/php/default.tcfg
; Should tidy clean and repair output automatically?
 ; WARNING: Do not use this option if you are generating non-html content
 ; such as dynamic images
+; http://php.net/tidy.clean-output
 tidy.clean_output = Off
[soap]
 ; Enables or disables WSDL caching feature.
+; http://php.net/soap.wsdl-cache-enabled
 soap.wsdl_cache_enabled=1
+
 ; Sets the directory name where SOAP extension will put cache files.
+; http://php.net/soap.wsdl-cache-dir
 soap.wsdl_cache_dir="/tmp"
-; (time to live) Sets the number of second while cached file will be used 
+
+; (time to live) Sets the number of second while cached file will be used
 ; instead of original one.
+; http://php.net/soap.wsdl-cache-ttl
 soap.wsdl_cache_ttl=86400
+; Sets the size of the cache limit. (Max. number of WSDL files to cache)
+soap.wsdl_cache_limit = 5
+
+[sysvshm]
+; A default size of the shared memory segment
+;sysvshm.init_mem = 10000
+
+[ldap]
+; Sets the maximum number of open links or -1 for unlimited.
+ldap.max_links = -1
+
+[mcrypt]
+; For more information about mcrypt settings see http://php.net/mcrypt-module-open
+
+; Directory where to load mcrypt algorithms
+; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt)
+;mcrypt.algorithms_dir=
+
+; Directory where to load mcrypt modes
+; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt)
+;mcrypt.modes_dir=
+
+[dba]
+;dba.default_handler=
+
+[opcache]
+; Determines if Zend OPCache is enabled
+;opcache.enable=0
+
+; Determines if Zend OPCache is enabled for the CLI version of PHP
+;opcache.enable_cli=0
+
+; The OPcache shared memory storage size.
+;opcache.memory_consumption=64
+
+; The amount of memory for interned strings in Mbytes.
+;opcache.interned_strings_buffer=4
+
+; The maximum number of keys (scripts) in the OPcache hash table.
+; Only numbers between 200 and 100000 are allowed.
+;opcache.max_accelerated_files=2000
+
+; The maximum percentage of "wasted" memory until a restart is scheduled.
+;opcache.max_wasted_percentage=5
+
+; When this directive is enabled, the OPcache appends the current working
+; directory to the script key, thus eliminating possible collisions between
+; files with the same name (basename). Disabling the directive improves
+; performance, but may break existing applications.
+;opcache.use_cwd=1
+
+; When disabled, you must reset the OPcache manually or restart the
+; webserver for changes to the filesystem to take effect.
+;opcache.validate_timestamps=1
+
+; How often (in seconds) to check file timestamps for changes to the shared
+; memory storage allocation. ("1" means validate once per second, but only
+; once per request. "0" means always validate)
+;opcache.revalidate_freq=2
+
+; Enables or disables file search in include_path optimization
+;opcache.revalidate_path=0
+
+; If disabled, all PHPDoc comments are dropped from the code to reduce the
+; size of the optimized code.
+;opcache.save_comments=1
+
+; If disabled, PHPDoc comments are not loaded from SHM, so "Doc Comments"
+; may be always stored (save_comments=1), but not loaded by applications
+; that don't need them anyway.
+;opcache.load_comments=1
+
+; If enabled, a fast shutdown sequence is used for the accelerated code
+;opcache.fast_shutdown=0
+
+; Allow file existence override (file_exists, etc.) performance feature.
+;opcache.enable_file_override=0
+
+; A bitmask, where each bit enables or disables the appropriate OPcache
+; passes
+;opcache.optimization_level=0xffffffff
+
+;opcache.inherited_hack=1
+;opcache.dups_fix=0
+
+; The location of the OPcache blacklist file (wildcards allowed).
+; Each OPcache blacklist file is a text file that holds the names of files
+; that should not be accelerated. The file format is to add each filename
+; to a new line. The filename may be a full path or just a file prefix
+; (i.e., /var/www/x  blacklists all the files and directories in /var/www
+; that start with 'x'). Line starting with a ; are ignored (comments).
+;opcache.blacklist_filename=
+
+; Allows exclusion of large files from being cached. By default all files
+; are cached.
+;opcache.max_file_size=0
+
+; Check the cache checksum each N requests.
+; The default value of "0" means that the checks are disabled.
+;opcache.consistency_checks=0
+
+; How long to wait (in seconds) for a scheduled restart to begin if the cache
+; is not being accessed.
+;opcache.force_restart_timeout=180
+
+; OPcache error_log file name. Empty string assumes "stderr".
+;opcache.error_log=
+
+; All OPcache errors go to the Web server log.
+; By default, only fatal errors (level 0) or errors (level 1) are logged.
+; You can also enable warnings (level 2), info messages (level 3) or
+; debug messages (level 4).
+;opcache.log_verbosity_level=1
+
+; Preferred Shared Memory back-end. Leave empty and let the system decide.
+;opcache.preferred_memory_model=
+
+; Protect the shared memory from unexpected writing during script execution.
+; Useful for internal debugging only.
+;opcache.protect_memory=0
+
+[curl]
+; A default value for the CURLOPT_CAINFO option. This is required to be an
+; absolute path.
+;curl.cainfo =
+
+[openssl]
+; The location of a Certificate Authority (CA) file on the local filesystem
+; to use when verifying the identity of SSL/TLS peers. Most users should
+; not specify a value for this directive as PHP will attempt to use the
+; OS-managed cert stores in its absence. If specified, this value may still
+; be overridden on a per-stream basis via the "cafile" SSL stream context
+; option.
+;openssl.cafile=
+
+; If openssl.cafile is not specified or if the CA file is not found, the
+; directory pointed to by openssl.capath is searched for a suitable
+; certificate. This value must be a correctly hashed certificate directory.
+; Most users should not specify a value for this directive as PHP will
+; attempt to use the OS-managed cert stores in its absence. If specified,
+; this value may still be overridden on a per-stream basis via the "capath"
+; SSL stream context option.
+;openssl.capath=
+
 ; Local Variables:
 ; tab-width: 4
 ; End:
+
diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 7e33a15..3f8cb13 100644
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -15,6 +15,7 @@ etc/httpd/conf/default-server.conf
 #etc/httpd/conf/extra/httpd-ssl.conf
 #etc/httpd/conf/extra/httpd-userdir.conf
 #etc/httpd/conf/extra/httpd-vhosts.conf
+#etc/httpd/conf/extra/proxy-html.conf
 etc/httpd/conf/global.conf
 etc/httpd/conf/hostname.conf
 etc/httpd/conf/httpd.conf
@@ -23,6 +24,7 @@ etc/httpd/conf/loadmodule.conf
 etc/httpd/conf/magic
 etc/httpd/conf/mime.types
 etc/httpd/conf/mod_log_config.conf
+etc/httpd/conf/mpm.conf
 #etc/httpd/conf/original
 #etc/httpd/conf/original/extra
 #etc/httpd/conf/original/extra/httpd-autoindex.conf
@@ -36,6 +38,7 @@ etc/httpd/conf/mod_log_config.conf
 #etc/httpd/conf/original/extra/httpd-ssl.conf
 #etc/httpd/conf/original/extra/httpd-userdir.conf
 #etc/httpd/conf/original/extra/httpd-vhosts.conf
+#etc/httpd/conf/original/extra/proxy-html.conf
 #etc/httpd/conf/original/httpd.conf
 etc/httpd/conf/server-tuning.conf
 etc/httpd/conf/ssl-global.conf
@@ -49,6 +52,8 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire
 #srv/web/ipfire/cgi-bin
 #srv/web/ipfire/cgi-bin/printenv
+#srv/web/ipfire/cgi-bin/printenv.vbs
+#srv/web/ipfire/cgi-bin/printenv.wsf
 #srv/web/ipfire/cgi-bin/test-cgi
 #srv/web/ipfire/error
 #srv/web/ipfire/error/HTTP_BAD_GATEWAY.html.var
@@ -87,9 +92,9 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/icons/alert.red.png
 #srv/web/ipfire/icons/apache_pb.gif
 #srv/web/ipfire/icons/apache_pb.png
+#srv/web/ipfire/icons/apache_pb.svg
 #srv/web/ipfire/icons/apache_pb2.gif
 #srv/web/ipfire/icons/apache_pb2.png
-#srv/web/ipfire/icons/apache_pb2_ani.gif
 #srv/web/ipfire/icons/back.gif
 #srv/web/ipfire/icons/back.png
 #srv/web/ipfire/icons/ball.gray.gif
@@ -168,6 +173,23 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/icons/link.png
 #srv/web/ipfire/icons/movie.gif
 #srv/web/ipfire/icons/movie.png
+#srv/web/ipfire/icons/odf6odb.png
+#srv/web/ipfire/icons/odf6odc.png
+#srv/web/ipfire/icons/odf6odf.png
+#srv/web/ipfire/icons/odf6odg.png
+#srv/web/ipfire/icons/odf6odi.png
+#srv/web/ipfire/icons/odf6odm.png
+#srv/web/ipfire/icons/odf6odp.png
+#srv/web/ipfire/icons/odf6ods.png
+#srv/web/ipfire/icons/odf6odt.png
+#srv/web/ipfire/icons/odf6otc.png
+#srv/web/ipfire/icons/odf6otf.png
+#srv/web/ipfire/icons/odf6otg.png
+#srv/web/ipfire/icons/odf6oth.png
+#srv/web/ipfire/icons/odf6oti.png
+#srv/web/ipfire/icons/odf6otp.png
+#srv/web/ipfire/icons/odf6ots.png
+#srv/web/ipfire/icons/odf6ott.png
 #srv/web/ipfire/icons/p.gif
 #srv/web/ipfire/icons/p.png
 #srv/web/ipfire/icons/patch.gif
@@ -227,12 +249,12 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/icons/small/compressed.png
 #srv/web/ipfire/icons/small/continued.gif
 #srv/web/ipfire/icons/small/continued.png
-#srv/web/ipfire/icons/small/dir.gif
-#srv/web/ipfire/icons/small/dir.png
-#srv/web/ipfire/icons/small/dir2.gif
-#srv/web/ipfire/icons/small/dir2.png
 #srv/web/ipfire/icons/small/doc.gif
 #srv/web/ipfire/icons/small/doc.png
+#srv/web/ipfire/icons/small/folder.gif
+#srv/web/ipfire/icons/small/folder.png
+#srv/web/ipfire/icons/small/folder2.gif
+#srv/web/ipfire/icons/small/folder2.png
 #srv/web/ipfire/icons/small/forward.gif
 #srv/web/ipfire/icons/small/forward.png
 #srv/web/ipfire/icons/small/generic.gif
@@ -279,6 +301,7 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/icons/sphere1.png
 #srv/web/ipfire/icons/sphere2.gif
 #srv/web/ipfire/icons/sphere2.png
+#srv/web/ipfire/icons/svg.png
 #srv/web/ipfire/icons/tar.gif
 #srv/web/ipfire/icons/tar.png
 #srv/web/ipfire/icons/tex.gif
@@ -299,7 +322,9 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/icons/world1.png
 #srv/web/ipfire/icons/world2.gif
 #srv/web/ipfire/icons/world2.png
+#srv/web/ipfire/icons/xml.png
 #srv/web/ipfire/manual
+#srv/web/ipfire/manual/BUILDING
 #srv/web/ipfire/manual/LICENSE
 #srv/web/ipfire/manual/bind.html
 #srv/web/ipfire/manual/bind.html.de
@@ -329,6 +354,7 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/custom-error.html
 #srv/web/ipfire/manual/custom-error.html.en
 #srv/web/ipfire/manual/custom-error.html.es
+#srv/web/ipfire/manual/custom-error.html.fr
 #srv/web/ipfire/manual/custom-error.html.ja.utf8
 #srv/web/ipfire/manual/custom-error.html.ko.euc-kr
 #srv/web/ipfire/manual/custom-error.html.tr.utf8
@@ -347,31 +373,44 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/developer/index.html
 #srv/web/ipfire/manual/developer/index.html.en
 #srv/web/ipfire/manual/developer/index.html.zh-cn.utf8
+#srv/web/ipfire/manual/developer/modguide.html
+#srv/web/ipfire/manual/developer/modguide.html.en
 #srv/web/ipfire/manual/developer/modules.html
 #srv/web/ipfire/manual/developer/modules.html.en
 #srv/web/ipfire/manual/developer/modules.html.ja.utf8
+#srv/web/ipfire/manual/developer/new_api_2_4.html
+#srv/web/ipfire/manual/developer/new_api_2_4.html.en
+#srv/web/ipfire/manual/developer/output-filters.html
+#srv/web/ipfire/manual/developer/output-filters.html.en
 #srv/web/ipfire/manual/developer/request.html
 #srv/web/ipfire/manual/developer/request.html.en
 #srv/web/ipfire/manual/developer/thread_safety.html
 #srv/web/ipfire/manual/developer/thread_safety.html.en
 #srv/web/ipfire/manual/dns-caveats.html
 #srv/web/ipfire/manual/dns-caveats.html.en
+#srv/web/ipfire/manual/dns-caveats.html.fr
 #srv/web/ipfire/manual/dns-caveats.html.ja.utf8
 #srv/web/ipfire/manual/dns-caveats.html.ko.euc-kr
 #srv/web/ipfire/manual/dns-caveats.html.tr.utf8
 #srv/web/ipfire/manual/dso.html
 #srv/web/ipfire/manual/dso.html.en
+#srv/web/ipfire/manual/dso.html.fr
 #srv/web/ipfire/manual/dso.html.ja.utf8
 #srv/web/ipfire/manual/dso.html.ko.euc-kr
 #srv/web/ipfire/manual/dso.html.tr.utf8
 #srv/web/ipfire/manual/env.html
 #srv/web/ipfire/manual/env.html.en
+#srv/web/ipfire/manual/env.html.fr
 #srv/web/ipfire/manual/env.html.ja.utf8
 #srv/web/ipfire/manual/env.html.ko.euc-kr
 #srv/web/ipfire/manual/env.html.tr.utf8
+#srv/web/ipfire/manual/expr.html
+#srv/web/ipfire/manual/expr.html.en
+#srv/web/ipfire/manual/expr.html.fr
 #srv/web/ipfire/manual/faq
 #srv/web/ipfire/manual/faq/index.html
 #srv/web/ipfire/manual/faq/index.html.en
+#srv/web/ipfire/manual/faq/index.html.fr
 #srv/web/ipfire/manual/faq/index.html.tr.utf8
 #srv/web/ipfire/manual/faq/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/filter.html
@@ -381,6 +420,9 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/filter.html.ja.utf8
 #srv/web/ipfire/manual/filter.html.ko.euc-kr
 #srv/web/ipfire/manual/filter.html.tr.utf8
+#srv/web/ipfire/manual/getting-started.html
+#srv/web/ipfire/manual/getting-started.html.en
+#srv/web/ipfire/manual/getting-started.html.fr
 #srv/web/ipfire/manual/glossary.html
 #srv/web/ipfire/manual/glossary.html.de
 #srv/web/ipfire/manual/glossary.html.en
@@ -395,12 +437,12 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/handler.html.fr
 #srv/web/ipfire/manual/handler.html.ja.utf8
 #srv/web/ipfire/manual/handler.html.ko.euc-kr
-#srv/web/ipfire/manual/handler.html.ru.koi8-r
 #srv/web/ipfire/manual/handler.html.tr.utf8
 #srv/web/ipfire/manual/handler.html.zh-cn.utf8
 #srv/web/ipfire/manual/howto
 #srv/web/ipfire/manual/howto/access.html
 #srv/web/ipfire/manual/howto/access.html.en
+#srv/web/ipfire/manual/howto/access.html.fr
 #srv/web/ipfire/manual/howto/auth.html
 #srv/web/ipfire/manual/howto/auth.html.en
 #srv/web/ipfire/manual/howto/auth.html.fr
@@ -409,6 +451,7 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/howto/auth.html.tr.utf8
 #srv/web/ipfire/manual/howto/cgi.html
 #srv/web/ipfire/manual/howto/cgi.html.en
+#srv/web/ipfire/manual/howto/cgi.html.fr
 #srv/web/ipfire/manual/howto/cgi.html.ja.utf8
 #srv/web/ipfire/manual/howto/cgi.html.ko.euc-kr
 #srv/web/ipfire/manual/howto/htaccess.html
@@ -419,20 +462,26 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/howto/htaccess.html.pt-br
 #srv/web/ipfire/manual/howto/index.html
 #srv/web/ipfire/manual/howto/index.html.en
+#srv/web/ipfire/manual/howto/index.html.fr
 #srv/web/ipfire/manual/howto/index.html.ja.utf8
 #srv/web/ipfire/manual/howto/index.html.ko.euc-kr
 #srv/web/ipfire/manual/howto/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/howto/public_html.html
 #srv/web/ipfire/manual/howto/public_html.html.en
+#srv/web/ipfire/manual/howto/public_html.html.fr
 #srv/web/ipfire/manual/howto/public_html.html.ja.utf8
 #srv/web/ipfire/manual/howto/public_html.html.ko.euc-kr
 #srv/web/ipfire/manual/howto/public_html.html.tr.utf8
 #srv/web/ipfire/manual/howto/ssi.html
 #srv/web/ipfire/manual/howto/ssi.html.en
+#srv/web/ipfire/manual/howto/ssi.html.fr
 #srv/web/ipfire/manual/howto/ssi.html.ja.utf8
 #srv/web/ipfire/manual/howto/ssi.html.ko.euc-kr
 #srv/web/ipfire/manual/images
 #srv/web/ipfire/manual/images/apache_header.gif
+#srv/web/ipfire/manual/images/build_a_mod_2.png
+#srv/web/ipfire/manual/images/build_a_mod_3.png
+#srv/web/ipfire/manual/images/build_a_mod_4.png
 #srv/web/ipfire/manual/images/caching_fig1.gif
 #srv/web/ipfire/manual/images/caching_fig1.png
 #srv/web/ipfire/manual/images/caching_fig1.tr.png
@@ -457,6 +506,7 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/images/mod_rewrite_fig2.png
 #srv/web/ipfire/manual/images/pixel.gif
 #srv/web/ipfire/manual/images/rewrite_backreferences.png
+#srv/web/ipfire/manual/images/rewrite_process_uri.png
 #srv/web/ipfire/manual/images/rewrite_rule_flow.png
 #srv/web/ipfire/manual/images/right.gif
 #srv/web/ipfire/manual/images/ssl_intro_fig1.gif
@@ -470,6 +520,7 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/images/syntax_rewriterule.png
 #srv/web/ipfire/manual/images/up.gif
 #srv/web/ipfire/manual/index.html
+#srv/web/ipfire/manual/index.html.da
 #srv/web/ipfire/manual/index.html.de
 #srv/web/ipfire/manual/index.html.en
 #srv/web/ipfire/manual/index.html.es
@@ -494,7 +545,6 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/invoking.html.fr
 #srv/web/ipfire/manual/invoking.html.ja.utf8
 #srv/web/ipfire/manual/invoking.html.ko.euc-kr
-#srv/web/ipfire/manual/invoking.html.ru.koi8-r
 #srv/web/ipfire/manual/invoking.html.tr.utf8
 #srv/web/ipfire/manual/license.html
 #srv/web/ipfire/manual/license.html.en
@@ -507,39 +557,38 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/misc
 #srv/web/ipfire/manual/misc/index.html
 #srv/web/ipfire/manual/misc/index.html.en
+#srv/web/ipfire/manual/misc/index.html.fr
 #srv/web/ipfire/manual/misc/index.html.ko.euc-kr
 #srv/web/ipfire/manual/misc/index.html.tr.utf8
 #srv/web/ipfire/manual/misc/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/misc/password_encryptions.html
 #srv/web/ipfire/manual/misc/password_encryptions.html.en
+#srv/web/ipfire/manual/misc/password_encryptions.html.fr
 #srv/web/ipfire/manual/misc/perf-tuning.html
 #srv/web/ipfire/manual/misc/perf-tuning.html.en
+#srv/web/ipfire/manual/misc/perf-tuning.html.fr
 #srv/web/ipfire/manual/misc/perf-tuning.html.ko.euc-kr
 #srv/web/ipfire/manual/misc/perf-tuning.html.tr.utf8
 #srv/web/ipfire/manual/misc/relevant_standards.html
 #srv/web/ipfire/manual/misc/relevant_standards.html.en
+#srv/web/ipfire/manual/misc/relevant_standards.html.fr
 #srv/web/ipfire/manual/misc/relevant_standards.html.ko.euc-kr
-#srv/web/ipfire/manual/misc/rewriteguide.html
-#srv/web/ipfire/manual/misc/rewriteguide.html.en
-#srv/web/ipfire/manual/misc/rewriteguide.html.ko.euc-kr
 #srv/web/ipfire/manual/misc/security_tips.html
 #srv/web/ipfire/manual/misc/security_tips.html.en
+#srv/web/ipfire/manual/misc/security_tips.html.fr
 #srv/web/ipfire/manual/misc/security_tips.html.ko.euc-kr
 #srv/web/ipfire/manual/misc/security_tips.html.tr.utf8
 #srv/web/ipfire/manual/mod
-#srv/web/ipfire/manual/mod/beos.html
-#srv/web/ipfire/manual/mod/beos.html.de
-#srv/web/ipfire/manual/mod/beos.html.en
-#srv/web/ipfire/manual/mod/beos.html.es
-#srv/web/ipfire/manual/mod/beos.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/core.html
 #srv/web/ipfire/manual/mod/core.html.de
 #srv/web/ipfire/manual/mod/core.html.en
+#srv/web/ipfire/manual/mod/core.html.es
 #srv/web/ipfire/manual/mod/core.html.fr
 #srv/web/ipfire/manual/mod/core.html.ja.utf8
 #srv/web/ipfire/manual/mod/core.html.tr.utf8
 #srv/web/ipfire/manual/mod/directive-dict.html
 #srv/web/ipfire/manual/mod/directive-dict.html.en
+#srv/web/ipfire/manual/mod/directive-dict.html.fr
 #srv/web/ipfire/manual/mod/directive-dict.html.ja.utf8
 #srv/web/ipfire/manual/mod/directive-dict.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/directive-dict.html.tr.utf8
@@ -547,33 +596,45 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/mod/directives.html.de
 #srv/web/ipfire/manual/mod/directives.html.en
 #srv/web/ipfire/manual/mod/directives.html.es
+#srv/web/ipfire/manual/mod/directives.html.fr
 #srv/web/ipfire/manual/mod/directives.html.ja.utf8
 #srv/web/ipfire/manual/mod/directives.html.ko.euc-kr
-#srv/web/ipfire/manual/mod/directives.html.ru.koi8-r
 #srv/web/ipfire/manual/mod/directives.html.tr.utf8
 #srv/web/ipfire/manual/mod/directives.html.zh-cn.utf8
 #srv/web/ipfire/manual/mod/event.html
 #srv/web/ipfire/manual/mod/event.html.en
+#srv/web/ipfire/manual/mod/event.html.fr
 #srv/web/ipfire/manual/mod/index.html
 #srv/web/ipfire/manual/mod/index.html.de
 #srv/web/ipfire/manual/mod/index.html.en
 #srv/web/ipfire/manual/mod/index.html.es
+#srv/web/ipfire/manual/mod/index.html.fr
 #srv/web/ipfire/manual/mod/index.html.ja.utf8
 #srv/web/ipfire/manual/mod/index.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/index.html.tr.utf8
 #srv/web/ipfire/manual/mod/index.html.zh-cn.utf8
+#srv/web/ipfire/manual/mod/mod_access_compat.html
+#srv/web/ipfire/manual/mod/mod_access_compat.html.en
+#srv/web/ipfire/manual/mod/mod_access_compat.html.fr
+#srv/web/ipfire/manual/mod/mod_access_compat.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_actions.html
 #srv/web/ipfire/manual/mod/mod_actions.html.de
 #srv/web/ipfire/manual/mod/mod_actions.html.en
+#srv/web/ipfire/manual/mod/mod_actions.html.fr
 #srv/web/ipfire/manual/mod/mod_actions.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_actions.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_alias.html
 #srv/web/ipfire/manual/mod/mod_alias.html.en
+#srv/web/ipfire/manual/mod/mod_alias.html.fr
 #srv/web/ipfire/manual/mod/mod_alias.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_alias.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_alias.html.tr.utf8
+#srv/web/ipfire/manual/mod/mod_allowmethods.html
+#srv/web/ipfire/manual/mod/mod_allowmethods.html.en
+#srv/web/ipfire/manual/mod/mod_allowmethods.html.fr
 #srv/web/ipfire/manual/mod/mod_asis.html
 #srv/web/ipfire/manual/mod/mod_asis.html.en
+#srv/web/ipfire/manual/mod/mod_asis.html.fr
 #srv/web/ipfire/manual/mod/mod_asis.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_asis.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_auth_basic.html
@@ -585,53 +646,64 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/mod/mod_auth_digest.html.en
 #srv/web/ipfire/manual/mod/mod_auth_digest.html.fr
 #srv/web/ipfire/manual/mod/mod_auth_digest.html.ko.euc-kr
-#srv/web/ipfire/manual/mod/mod_authn_alias.html
-#srv/web/ipfire/manual/mod/mod_authn_alias.html.en
-#srv/web/ipfire/manual/mod/mod_authn_alias.html.fr
+#srv/web/ipfire/manual/mod/mod_auth_form.html
+#srv/web/ipfire/manual/mod/mod_auth_form.html.en
+#srv/web/ipfire/manual/mod/mod_auth_form.html.fr
 #srv/web/ipfire/manual/mod/mod_authn_anon.html
 #srv/web/ipfire/manual/mod/mod_authn_anon.html.en
+#srv/web/ipfire/manual/mod/mod_authn_anon.html.fr
 #srv/web/ipfire/manual/mod/mod_authn_anon.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_authn_anon.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_authn_core.html
+#srv/web/ipfire/manual/mod/mod_authn_core.html.en
+#srv/web/ipfire/manual/mod/mod_authn_core.html.fr
 #srv/web/ipfire/manual/mod/mod_authn_dbd.html
 #srv/web/ipfire/manual/mod/mod_authn_dbd.html.en
+#srv/web/ipfire/manual/mod/mod_authn_dbd.html.fr
 #srv/web/ipfire/manual/mod/mod_authn_dbm.html
 #srv/web/ipfire/manual/mod/mod_authn_dbm.html.en
+#srv/web/ipfire/manual/mod/mod_authn_dbm.html.fr
 #srv/web/ipfire/manual/mod/mod_authn_dbm.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_authn_dbm.html.ko.euc-kr
-#srv/web/ipfire/manual/mod/mod_authn_default.html
-#srv/web/ipfire/manual/mod/mod_authn_default.html.en
-#srv/web/ipfire/manual/mod/mod_authn_default.html.ja.utf8
-#srv/web/ipfire/manual/mod/mod_authn_default.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authn_file.html
 #srv/web/ipfire/manual/mod/mod_authn_file.html.en
 #srv/web/ipfire/manual/mod/mod_authn_file.html.fr
 #srv/web/ipfire/manual/mod/mod_authn_file.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_authn_file.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_authn_socache.html
+#srv/web/ipfire/manual/mod/mod_authn_socache.html.en
+#srv/web/ipfire/manual/mod/mod_authn_socache.html.fr
+#srv/web/ipfire/manual/mod/mod_authnz_fcgi.html
+#srv/web/ipfire/manual/mod/mod_authnz_fcgi.html.en
 #srv/web/ipfire/manual/mod/mod_authnz_ldap.html
 #srv/web/ipfire/manual/mod/mod_authnz_ldap.html.en
 #srv/web/ipfire/manual/mod/mod_authnz_ldap.html.fr
+#srv/web/ipfire/manual/mod/mod_authz_core.html
+#srv/web/ipfire/manual/mod/mod_authz_core.html.en
+#srv/web/ipfire/manual/mod/mod_authz_core.html.fr
+#srv/web/ipfire/manual/mod/mod_authz_dbd.html
+#srv/web/ipfire/manual/mod/mod_authz_dbd.html.en
+#srv/web/ipfire/manual/mod/mod_authz_dbd.html.fr
 #srv/web/ipfire/manual/mod/mod_authz_dbm.html
 #srv/web/ipfire/manual/mod/mod_authz_dbm.html.en
+#srv/web/ipfire/manual/mod/mod_authz_dbm.html.fr
 #srv/web/ipfire/manual/mod/mod_authz_dbm.html.ko.euc-kr
-#srv/web/ipfire/manual/mod/mod_authz_default.html
-#srv/web/ipfire/manual/mod/mod_authz_default.html.en
-#srv/web/ipfire/manual/mod/mod_authz_default.html.ja.utf8
-#srv/web/ipfire/manual/mod/mod_authz_default.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authz_groupfile.html
 #srv/web/ipfire/manual/mod/mod_authz_groupfile.html.en
+#srv/web/ipfire/manual/mod/mod_authz_groupfile.html.fr
 #srv/web/ipfire/manual/mod/mod_authz_groupfile.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_authz_groupfile.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authz_host.html
 #srv/web/ipfire/manual/mod/mod_authz_host.html.en
 #srv/web/ipfire/manual/mod/mod_authz_host.html.fr
-#srv/web/ipfire/manual/mod/mod_authz_host.html.ja.utf8
-#srv/web/ipfire/manual/mod/mod_authz_host.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authz_owner.html
 #srv/web/ipfire/manual/mod/mod_authz_owner.html.en
+#srv/web/ipfire/manual/mod/mod_authz_owner.html.fr
 #srv/web/ipfire/manual/mod/mod_authz_owner.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_authz_owner.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authz_user.html
 #srv/web/ipfire/manual/mod/mod_authz_user.html.en
+#srv/web/ipfire/manual/mod/mod_authz_user.html.fr
 #srv/web/ipfire/manual/mod/mod_authz_user.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_authz_user.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_autoindex.html
@@ -640,180 +712,323 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/mod/mod_autoindex.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_autoindex.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_autoindex.html.tr.utf8
+#srv/web/ipfire/manual/mod/mod_buffer.html
+#srv/web/ipfire/manual/mod/mod_buffer.html.en
+#srv/web/ipfire/manual/mod/mod_buffer.html.fr
 #srv/web/ipfire/manual/mod/mod_cache.html
 #srv/web/ipfire/manual/mod/mod_cache.html.en
+#srv/web/ipfire/manual/mod/mod_cache.html.fr
 #srv/web/ipfire/manual/mod/mod_cache.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_cache.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_cache_disk.html
+#srv/web/ipfire/manual/mod/mod_cache_disk.html.en
+#srv/web/ipfire/manual/mod/mod_cache_disk.html.fr
+#srv/web/ipfire/manual/mod/mod_cache_disk.html.ja.utf8
+#srv/web/ipfire/manual/mod/mod_cache_disk.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_cache_socache.html
+#srv/web/ipfire/manual/mod/mod_cache_socache.html.en
+#srv/web/ipfire/manual/mod/mod_cache_socache.html.fr
 #srv/web/ipfire/manual/mod/mod_cern_meta.html
 #srv/web/ipfire/manual/mod/mod_cern_meta.html.en
+#srv/web/ipfire/manual/mod/mod_cern_meta.html.fr
 #srv/web/ipfire/manual/mod/mod_cern_meta.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_cgi.html
 #srv/web/ipfire/manual/mod/mod_cgi.html.en
+#srv/web/ipfire/manual/mod/mod_cgi.html.fr
 #srv/web/ipfire/manual/mod/mod_cgi.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_cgi.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_cgid.html
 #srv/web/ipfire/manual/mod/mod_cgid.html.en
+#srv/web/ipfire/manual/mod/mod_cgid.html.fr
 #srv/web/ipfire/manual/mod/mod_cgid.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_cgid.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_charset_lite.html
 #srv/web/ipfire/manual/mod/mod_charset_lite.html.en
+#srv/web/ipfire/manual/mod/mod_charset_lite.html.fr
 #srv/web/ipfire/manual/mod/mod_charset_lite.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_data.html
+#srv/web/ipfire/manual/mod/mod_data.html.en
+#srv/web/ipfire/manual/mod/mod_data.html.fr
 #srv/web/ipfire/manual/mod/mod_dav.html
 #srv/web/ipfire/manual/mod/mod_dav.html.en
+#srv/web/ipfire/manual/mod/mod_dav.html.fr
 #srv/web/ipfire/manual/mod/mod_dav.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_dav.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_dav_fs.html
 #srv/web/ipfire/manual/mod/mod_dav_fs.html.en
+#srv/web/ipfire/manual/mod/mod_dav_fs.html.fr
 #srv/web/ipfire/manual/mod/mod_dav_fs.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_dav_fs.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_dav_lock.html
 #srv/web/ipfire/manual/mod/mod_dav_lock.html.en
+#srv/web/ipfire/manual/mod/mod_dav_lock.html.fr
 #srv/web/ipfire/manual/mod/mod_dav_lock.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_dbd.html
 #srv/web/ipfire/manual/mod/mod_dbd.html.en
+#srv/web/ipfire/manual/mod/mod_dbd.html.fr
 #srv/web/ipfire/manual/mod/mod_deflate.html
 #srv/web/ipfire/manual/mod/mod_deflate.html.en
+#srv/web/ipfire/manual/mod/mod_deflate.html.fr
 #srv/web/ipfire/manual/mod/mod_deflate.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_deflate.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_dialup.html
+#srv/web/ipfire/manual/mod/mod_dialup.html.en
+#srv/web/ipfire/manual/mod/mod_dialup.html.fr
 #srv/web/ipfire/manual/mod/mod_dir.html
 #srv/web/ipfire/manual/mod/mod_dir.html.en
+#srv/web/ipfire/manual/mod/mod_dir.html.fr
 #srv/web/ipfire/manual/mod/mod_dir.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_dir.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_dir.html.tr.utf8
-#srv/web/ipfire/manual/mod/mod_disk_cache.html
-#srv/web/ipfire/manual/mod/mod_disk_cache.html.en
-#srv/web/ipfire/manual/mod/mod_disk_cache.html.ja.utf8
-#srv/web/ipfire/manual/mod/mod_disk_cache.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_dumpio.html
 #srv/web/ipfire/manual/mod/mod_dumpio.html.en
+#srv/web/ipfire/manual/mod/mod_dumpio.html.fr
 #srv/web/ipfire/manual/mod/mod_dumpio.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_echo.html
 #srv/web/ipfire/manual/mod/mod_echo.html.en
+#srv/web/ipfire/manual/mod/mod_echo.html.fr
 #srv/web/ipfire/manual/mod/mod_echo.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_echo.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_env.html
 #srv/web/ipfire/manual/mod/mod_env.html.en
+#srv/web/ipfire/manual/mod/mod_env.html.fr
 #srv/web/ipfire/manual/mod/mod_env.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_env.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_env.html.tr.utf8
-#srv/web/ipfire/manual/mod/mod_example.html
-#srv/web/ipfire/manual/mod/mod_example.html.en
-#srv/web/ipfire/manual/mod/mod_example.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_example_hooks.html
+#srv/web/ipfire/manual/mod/mod_example_hooks.html.en
+#srv/web/ipfire/manual/mod/mod_example_hooks.html.fr
+#srv/web/ipfire/manual/mod/mod_example_hooks.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_expires.html
 #srv/web/ipfire/manual/mod/mod_expires.html.en
+#srv/web/ipfire/manual/mod/mod_expires.html.fr
 #srv/web/ipfire/manual/mod/mod_expires.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_expires.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_ext_filter.html
 #srv/web/ipfire/manual/mod/mod_ext_filter.html.en
+#srv/web/ipfire/manual/mod/mod_ext_filter.html.fr
 #srv/web/ipfire/manual/mod/mod_ext_filter.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_ext_filter.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_file_cache.html
 #srv/web/ipfire/manual/mod/mod_file_cache.html.en
+#srv/web/ipfire/manual/mod/mod_file_cache.html.fr
 #srv/web/ipfire/manual/mod/mod_file_cache.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_filter.html
 #srv/web/ipfire/manual/mod/mod_filter.html.en
+#srv/web/ipfire/manual/mod/mod_filter.html.fr
 #srv/web/ipfire/manual/mod/mod_headers.html
 #srv/web/ipfire/manual/mod/mod_headers.html.en
+#srv/web/ipfire/manual/mod/mod_headers.html.fr
 #srv/web/ipfire/manual/mod/mod_headers.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_headers.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_heartbeat.html
+#srv/web/ipfire/manual/mod/mod_heartbeat.html.en
+#srv/web/ipfire/manual/mod/mod_heartbeat.html.fr
+#srv/web/ipfire/manual/mod/mod_heartmonitor.html
+#srv/web/ipfire/manual/mod/mod_heartmonitor.html.en
+#srv/web/ipfire/manual/mod/mod_heartmonitor.html.fr
+#srv/web/ipfire/manual/mod/mod_http2.html
+#srv/web/ipfire/manual/mod/mod_http2.html.en
 #srv/web/ipfire/manual/mod/mod_ident.html
 #srv/web/ipfire/manual/mod/mod_ident.html.en
+#srv/web/ipfire/manual/mod/mod_ident.html.fr
 #srv/web/ipfire/manual/mod/mod_ident.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_ident.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_imagemap.html
 #srv/web/ipfire/manual/mod/mod_imagemap.html.en
+#srv/web/ipfire/manual/mod/mod_imagemap.html.fr
 #srv/web/ipfire/manual/mod/mod_imagemap.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_include.html
 #srv/web/ipfire/manual/mod/mod_include.html.en
+#srv/web/ipfire/manual/mod/mod_include.html.fr
 #srv/web/ipfire/manual/mod/mod_include.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_info.html
 #srv/web/ipfire/manual/mod/mod_info.html.en
+#srv/web/ipfire/manual/mod/mod_info.html.fr
 #srv/web/ipfire/manual/mod/mod_info.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_info.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_isapi.html
 #srv/web/ipfire/manual/mod/mod_isapi.html.en
+#srv/web/ipfire/manual/mod/mod_isapi.html.fr
 #srv/web/ipfire/manual/mod/mod_isapi.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_lbmethod_bybusyness.html
+#srv/web/ipfire/manual/mod/mod_lbmethod_bybusyness.html.en
+#srv/web/ipfire/manual/mod/mod_lbmethod_bybusyness.html.fr
+#srv/web/ipfire/manual/mod/mod_lbmethod_byrequests.html
+#srv/web/ipfire/manual/mod/mod_lbmethod_byrequests.html.en
+#srv/web/ipfire/manual/mod/mod_lbmethod_byrequests.html.fr
+#srv/web/ipfire/manual/mod/mod_lbmethod_bytraffic.html
+#srv/web/ipfire/manual/mod/mod_lbmethod_bytraffic.html.en
+#srv/web/ipfire/manual/mod/mod_lbmethod_bytraffic.html.fr
+#srv/web/ipfire/manual/mod/mod_lbmethod_heartbeat.html
+#srv/web/ipfire/manual/mod/mod_lbmethod_heartbeat.html.en
+#srv/web/ipfire/manual/mod/mod_lbmethod_heartbeat.html.fr
 #srv/web/ipfire/manual/mod/mod_ldap.html
 #srv/web/ipfire/manual/mod/mod_ldap.html.en
+#srv/web/ipfire/manual/mod/mod_ldap.html.fr
 #srv/web/ipfire/manual/mod/mod_log_config.html
 #srv/web/ipfire/manual/mod/mod_log_config.html.en
+#srv/web/ipfire/manual/mod/mod_log_config.html.fr
 #srv/web/ipfire/manual/mod/mod_log_config.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_log_config.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_log_config.html.tr.utf8
+#srv/web/ipfire/manual/mod/mod_log_debug.html
+#srv/web/ipfire/manual/mod/mod_log_debug.html.en
+#srv/web/ipfire/manual/mod/mod_log_debug.html.fr
 #srv/web/ipfire/manual/mod/mod_log_forensic.html
 #srv/web/ipfire/manual/mod/mod_log_forensic.html.en
+#srv/web/ipfire/manual/mod/mod_log_forensic.html.fr
 #srv/web/ipfire/manual/mod/mod_log_forensic.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_log_forensic.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_logio.html
 #srv/web/ipfire/manual/mod/mod_logio.html.en
+#srv/web/ipfire/manual/mod/mod_logio.html.fr
 #srv/web/ipfire/manual/mod/mod_logio.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_logio.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_logio.html.tr.utf8
-#srv/web/ipfire/manual/mod/mod_mem_cache.html
-#srv/web/ipfire/manual/mod/mod_mem_cache.html.en
-#srv/web/ipfire/manual/mod/mod_mem_cache.html.ja.utf8
-#srv/web/ipfire/manual/mod/mod_mem_cache.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_lua.html
+#srv/web/ipfire/manual/mod/mod_lua.html.en
+#srv/web/ipfire/manual/mod/mod_lua.html.fr
+#srv/web/ipfire/manual/mod/mod_macro.html
+#srv/web/ipfire/manual/mod/mod_macro.html.en
+#srv/web/ipfire/manual/mod/mod_macro.html.fr
 #srv/web/ipfire/manual/mod/mod_mime.html
 #srv/web/ipfire/manual/mod/mod_mime.html.en
+#srv/web/ipfire/manual/mod/mod_mime.html.fr
 #srv/web/ipfire/manual/mod/mod_mime.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_mime_magic.html
 #srv/web/ipfire/manual/mod/mod_mime_magic.html.en
+#srv/web/ipfire/manual/mod/mod_mime_magic.html.fr
 #srv/web/ipfire/manual/mod/mod_negotiation.html
 #srv/web/ipfire/manual/mod/mod_negotiation.html.en
+#srv/web/ipfire/manual/mod/mod_negotiation.html.fr
 #srv/web/ipfire/manual/mod/mod_negotiation.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_nw_ssl.html
 #srv/web/ipfire/manual/mod/mod_nw_ssl.html.en
+#srv/web/ipfire/manual/mod/mod_nw_ssl.html.fr
+#srv/web/ipfire/manual/mod/mod_privileges.html
+#srv/web/ipfire/manual/mod/mod_privileges.html.en
+#srv/web/ipfire/manual/mod/mod_privileges.html.fr
 #srv/web/ipfire/manual/mod/mod_proxy.html
 #srv/web/ipfire/manual/mod/mod_proxy.html.en
 #srv/web/ipfire/manual/mod/mod_proxy.html.fr
 #srv/web/ipfire/manual/mod/mod_proxy.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_ajp.html
 #srv/web/ipfire/manual/mod/mod_proxy_ajp.html.en
+#srv/web/ipfire/manual/mod/mod_proxy_ajp.html.fr
 #srv/web/ipfire/manual/mod/mod_proxy_ajp.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_balancer.html
 #srv/web/ipfire/manual/mod/mod_proxy_balancer.html.en
+#srv/web/ipfire/manual/mod/mod_proxy_balancer.html.fr
 #srv/web/ipfire/manual/mod/mod_proxy_balancer.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_connect.html
 #srv/web/ipfire/manual/mod/mod_proxy_connect.html.en
+#srv/web/ipfire/manual/mod/mod_proxy_connect.html.fr
 #srv/web/ipfire/manual/mod/mod_proxy_connect.html.ja.utf8
+#srv/web/ipfire/manual/mod/mod_proxy_express.html
+#srv/web/ipfire/manual/mod/mod_proxy_express.html.en
+#srv/web/ipfire/manual/mod/mod_proxy_express.html.fr
+#srv/web/ipfire/manual/mod/mod_proxy_fcgi.html
+#srv/web/ipfire/manual/mod/mod_proxy_fcgi.html.en
+#srv/web/ipfire/manual/mod/mod_proxy_fcgi.html.fr
+#srv/web/ipfire/manual/mod/mod_proxy_fdpass.html
+#srv/web/ipfire/manual/mod/mod_proxy_fdpass.html.en
+#srv/web/ipfire/manual/mod/mod_proxy_fdpass.html.fr
 #srv/web/ipfire/manual/mod/mod_proxy_ftp.html
 #srv/web/ipfire/manual/mod/mod_proxy_ftp.html.en
-#srv/web/ipfire/manual/mod/mod_proxy_ftp.html.ja.utf8
+#srv/web/ipfire/manual/mod/mod_proxy_ftp.html.fr
+#srv/web/ipfire/manual/mod/mod_proxy_html.html
+#srv/web/ipfire/manual/mod/mod_proxy_html.html.en
+#srv/web/ipfire/manual/mod/mod_proxy_html.html.fr
 #srv/web/ipfire/manual/mod/mod_proxy_http.html
 #srv/web/ipfire/manual/mod/mod_proxy_http.html.en
 #srv/web/ipfire/manual/mod/mod_proxy_http.html.fr
-#srv/web/ipfire/manual/mod/mod_proxy_http.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_scgi.html
 #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.en
-#srv/web/ipfire/manual/mod/mod_proxy_scgi.html.ja.utf8
+#srv/web/ipfire/manual/mod/mod_proxy_scgi.html.fr
+#srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html
+#srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html.en
+#srv/web/ipfire/manual/mod/mod_ratelimit.html
+#srv/web/ipfire/manual/mod/mod_ratelimit.html.en
+#srv/web/ipfire/manual/mod/mod_ratelimit.html.fr
+#srv/web/ipfire/manual/mod/mod_reflector.html
+#srv/web/ipfire/manual/mod/mod_reflector.html.en
+#srv/web/ipfire/manual/mod/mod_reflector.html.fr
+#srv/web/ipfire/manual/mod/mod_remoteip.html
+#srv/web/ipfire/manual/mod/mod_remoteip.html.en
+#srv/web/ipfire/manual/mod/mod_remoteip.html.fr
 #srv/web/ipfire/manual/mod/mod_reqtimeout.html
 #srv/web/ipfire/manual/mod/mod_reqtimeout.html.en
+#srv/web/ipfire/manual/mod/mod_reqtimeout.html.fr
+#srv/web/ipfire/manual/mod/mod_request.html
+#srv/web/ipfire/manual/mod/mod_request.html.en
+#srv/web/ipfire/manual/mod/mod_request.html.fr
+#srv/web/ipfire/manual/mod/mod_request.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_rewrite.html
 #srv/web/ipfire/manual/mod/mod_rewrite.html.en
 #srv/web/ipfire/manual/mod/mod_rewrite.html.fr
+#srv/web/ipfire/manual/mod/mod_sed.html
+#srv/web/ipfire/manual/mod/mod_sed.html.en
+#srv/web/ipfire/manual/mod/mod_sed.html.fr
+#srv/web/ipfire/manual/mod/mod_session.html
+#srv/web/ipfire/manual/mod/mod_session.html.en
+#srv/web/ipfire/manual/mod/mod_session.html.fr
+#srv/web/ipfire/manual/mod/mod_session_cookie.html
+#srv/web/ipfire/manual/mod/mod_session_cookie.html.en
+#srv/web/ipfire/manual/mod/mod_session_cookie.html.fr
+#srv/web/ipfire/manual/mod/mod_session_crypto.html
+#srv/web/ipfire/manual/mod/mod_session_crypto.html.en
+#srv/web/ipfire/manual/mod/mod_session_crypto.html.fr
+#srv/web/ipfire/manual/mod/mod_session_dbd.html
+#srv/web/ipfire/manual/mod/mod_session_dbd.html.en
+#srv/web/ipfire/manual/mod/mod_session_dbd.html.fr
 #srv/web/ipfire/manual/mod/mod_setenvif.html
 #srv/web/ipfire/manual/mod/mod_setenvif.html.en
+#srv/web/ipfire/manual/mod/mod_setenvif.html.fr
 #srv/web/ipfire/manual/mod/mod_setenvif.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_setenvif.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_setenvif.html.tr.utf8
+#srv/web/ipfire/manual/mod/mod_slotmem_plain.html
+#srv/web/ipfire/manual/mod/mod_slotmem_plain.html.en
+#srv/web/ipfire/manual/mod/mod_slotmem_plain.html.fr
+#srv/web/ipfire/manual/mod/mod_slotmem_shm.html
+#srv/web/ipfire/manual/mod/mod_slotmem_shm.html.en
+#srv/web/ipfire/manual/mod/mod_slotmem_shm.html.fr
 #srv/web/ipfire/manual/mod/mod_so.html
 #srv/web/ipfire/manual/mod/mod_so.html.en
+#srv/web/ipfire/manual/mod/mod_so.html.fr
 #srv/web/ipfire/manual/mod/mod_so.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_so.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_so.html.tr.utf8
+#srv/web/ipfire/manual/mod/mod_socache_dbm.html
+#srv/web/ipfire/manual/mod/mod_socache_dbm.html.en
+#srv/web/ipfire/manual/mod/mod_socache_dbm.html.fr
+#srv/web/ipfire/manual/mod/mod_socache_dc.html
+#srv/web/ipfire/manual/mod/mod_socache_dc.html.en
+#srv/web/ipfire/manual/mod/mod_socache_dc.html.fr
+#srv/web/ipfire/manual/mod/mod_socache_memcache.html
+#srv/web/ipfire/manual/mod/mod_socache_memcache.html.en
+#srv/web/ipfire/manual/mod/mod_socache_memcache.html.fr
+#srv/web/ipfire/manual/mod/mod_socache_shmcb.html
+#srv/web/ipfire/manual/mod/mod_socache_shmcb.html.en
+#srv/web/ipfire/manual/mod/mod_socache_shmcb.html.fr
 #srv/web/ipfire/manual/mod/mod_speling.html
 #srv/web/ipfire/manual/mod/mod_speling.html.en
+#srv/web/ipfire/manual/mod/mod_speling.html.fr
 #srv/web/ipfire/manual/mod/mod_speling.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_speling.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_ssl.html
 #srv/web/ipfire/manual/mod/mod_ssl.html.en
+#srv/web/ipfire/manual/mod/mod_ssl.html.fr
 #srv/web/ipfire/manual/mod/mod_status.html
 #srv/web/ipfire/manual/mod/mod_status.html.en
+#srv/web/ipfire/manual/mod/mod_status.html.fr
 #srv/web/ipfire/manual/mod/mod_status.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_status.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_status.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_substitute.html
 #srv/web/ipfire/manual/mod/mod_substitute.html.en
+#srv/web/ipfire/manual/mod/mod_substitute.html.fr
 #srv/web/ipfire/manual/mod/mod_suexec.html
 #srv/web/ipfire/manual/mod/mod_suexec.html.en
 #srv/web/ipfire/manual/mod/mod_suexec.html.fr
@@ -822,57 +1037,77 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/mod/mod_suexec.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_unique_id.html
 #srv/web/ipfire/manual/mod/mod_unique_id.html.en
+#srv/web/ipfire/manual/mod/mod_unique_id.html.fr
 #srv/web/ipfire/manual/mod/mod_unique_id.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_unique_id.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_unixd.html
+#srv/web/ipfire/manual/mod/mod_unixd.html.en
+#srv/web/ipfire/manual/mod/mod_unixd.html.fr
+#srv/web/ipfire/manual/mod/mod_unixd.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_userdir.html
 #srv/web/ipfire/manual/mod/mod_userdir.html.en
+#srv/web/ipfire/manual/mod/mod_userdir.html.fr
 #srv/web/ipfire/manual/mod/mod_userdir.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_userdir.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_userdir.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_usertrack.html
 #srv/web/ipfire/manual/mod/mod_usertrack.html.en
+#srv/web/ipfire/manual/mod/mod_usertrack.html.fr
 #srv/web/ipfire/manual/mod/mod_version.html
 #srv/web/ipfire/manual/mod/mod_version.html.en
 #srv/web/ipfire/manual/mod/mod_version.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_version.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_vhost_alias.html
 #srv/web/ipfire/manual/mod/mod_vhost_alias.html.en
+#srv/web/ipfire/manual/mod/mod_vhost_alias.html.fr
 #srv/web/ipfire/manual/mod/mod_vhost_alias.html.tr.utf8
+#srv/web/ipfire/manual/mod/mod_watchdog.html
+#srv/web/ipfire/manual/mod/mod_watchdog.html.en
+#srv/web/ipfire/manual/mod/mod_xml2enc.html
+#srv/web/ipfire/manual/mod/mod_xml2enc.html.en
+#srv/web/ipfire/manual/mod/mod_xml2enc.html.fr
 #srv/web/ipfire/manual/mod/module-dict.html
 #srv/web/ipfire/manual/mod/module-dict.html.en
+#srv/web/ipfire/manual/mod/module-dict.html.fr
 #srv/web/ipfire/manual/mod/module-dict.html.ja.utf8
 #srv/web/ipfire/manual/mod/module-dict.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/module-dict.html.tr.utf8
 #srv/web/ipfire/manual/mod/mpm_common.html
 #srv/web/ipfire/manual/mod/mpm_common.html.de
 #srv/web/ipfire/manual/mod/mpm_common.html.en
+#srv/web/ipfire/manual/mod/mpm_common.html.fr
 #srv/web/ipfire/manual/mod/mpm_common.html.ja.utf8
 #srv/web/ipfire/manual/mod/mpm_common.html.tr.utf8
 #srv/web/ipfire/manual/mod/mpm_netware.html
 #srv/web/ipfire/manual/mod/mpm_netware.html.en
+#srv/web/ipfire/manual/mod/mpm_netware.html.fr
 #srv/web/ipfire/manual/mod/mpm_winnt.html
 #srv/web/ipfire/manual/mod/mpm_winnt.html.de
 #srv/web/ipfire/manual/mod/mpm_winnt.html.en
+#srv/web/ipfire/manual/mod/mpm_winnt.html.fr
 #srv/web/ipfire/manual/mod/mpm_winnt.html.ja.utf8
 #srv/web/ipfire/manual/mod/mpmt_os2.html
 #srv/web/ipfire/manual/mod/mpmt_os2.html.en
+#srv/web/ipfire/manual/mod/mpmt_os2.html.fr
 #srv/web/ipfire/manual/mod/prefork.html
 #srv/web/ipfire/manual/mod/prefork.html.de
 #srv/web/ipfire/manual/mod/prefork.html.en
+#srv/web/ipfire/manual/mod/prefork.html.fr
 #srv/web/ipfire/manual/mod/prefork.html.ja.utf8
 #srv/web/ipfire/manual/mod/prefork.html.tr.utf8
 #srv/web/ipfire/manual/mod/quickreference.html
 #srv/web/ipfire/manual/mod/quickreference.html.de
 #srv/web/ipfire/manual/mod/quickreference.html.en
 #srv/web/ipfire/manual/mod/quickreference.html.es
+#srv/web/ipfire/manual/mod/quickreference.html.fr
 #srv/web/ipfire/manual/mod/quickreference.html.ja.utf8
 #srv/web/ipfire/manual/mod/quickreference.html.ko.euc-kr
-#srv/web/ipfire/manual/mod/quickreference.html.ru.koi8-r
 #srv/web/ipfire/manual/mod/quickreference.html.tr.utf8
 #srv/web/ipfire/manual/mod/quickreference.html.zh-cn.utf8
 #srv/web/ipfire/manual/mod/worker.html
 #srv/web/ipfire/manual/mod/worker.html.de
 #srv/web/ipfire/manual/mod/worker.html.en
+#srv/web/ipfire/manual/mod/worker.html.fr
 #srv/web/ipfire/manual/mod/worker.html.ja.utf8
 #srv/web/ipfire/manual/mod/worker.html.tr.utf8
 #srv/web/ipfire/manual/mpm.html
@@ -896,93 +1131,124 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/new_features_2_2.html
 #srv/web/ipfire/manual/new_features_2_2.html.en
 #srv/web/ipfire/manual/new_features_2_2.html.fr
-#srv/web/ipfire/manual/new_features_2_2.html.ja.utf8
 #srv/web/ipfire/manual/new_features_2_2.html.ko.euc-kr
 #srv/web/ipfire/manual/new_features_2_2.html.pt-br
 #srv/web/ipfire/manual/new_features_2_2.html.tr.utf8
+#srv/web/ipfire/manual/new_features_2_4.html
+#srv/web/ipfire/manual/new_features_2_4.html.en
+#srv/web/ipfire/manual/new_features_2_4.html.fr
+#srv/web/ipfire/manual/new_features_2_4.html.tr.utf8
 #srv/web/ipfire/manual/platform
 #srv/web/ipfire/manual/platform/ebcdic.html
 #srv/web/ipfire/manual/platform/ebcdic.html.en
 #srv/web/ipfire/manual/platform/ebcdic.html.ko.euc-kr
 #srv/web/ipfire/manual/platform/index.html
 #srv/web/ipfire/manual/platform/index.html.en
+#srv/web/ipfire/manual/platform/index.html.fr
 #srv/web/ipfire/manual/platform/index.html.ko.euc-kr
 #srv/web/ipfire/manual/platform/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/platform/netware.html
 #srv/web/ipfire/manual/platform/netware.html.en
+#srv/web/ipfire/manual/platform/netware.html.fr
 #srv/web/ipfire/manual/platform/netware.html.ko.euc-kr
 #srv/web/ipfire/manual/platform/perf-hp.html
 #srv/web/ipfire/manual/platform/perf-hp.html.en
+#srv/web/ipfire/manual/platform/perf-hp.html.fr
 #srv/web/ipfire/manual/platform/perf-hp.html.ko.euc-kr
+#srv/web/ipfire/manual/platform/rpm.html
+#srv/web/ipfire/manual/platform/rpm.html.en
 #srv/web/ipfire/manual/platform/win_compiling.html
 #srv/web/ipfire/manual/platform/win_compiling.html.en
+#srv/web/ipfire/manual/platform/win_compiling.html.fr
 #srv/web/ipfire/manual/platform/win_compiling.html.ko.euc-kr
 #srv/web/ipfire/manual/platform/windows.html
 #srv/web/ipfire/manual/platform/windows.html.en
+#srv/web/ipfire/manual/platform/windows.html.fr
 #srv/web/ipfire/manual/platform/windows.html.ko.euc-kr
 #srv/web/ipfire/manual/programs
 #srv/web/ipfire/manual/programs/ab.html
 #srv/web/ipfire/manual/programs/ab.html.en
+#srv/web/ipfire/manual/programs/ab.html.fr
 #srv/web/ipfire/manual/programs/ab.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/ab.html.tr.utf8
 #srv/web/ipfire/manual/programs/apachectl.html
 #srv/web/ipfire/manual/programs/apachectl.html.en
+#srv/web/ipfire/manual/programs/apachectl.html.fr
 #srv/web/ipfire/manual/programs/apachectl.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/apachectl.html.tr.utf8
 #srv/web/ipfire/manual/programs/apxs.html
 #srv/web/ipfire/manual/programs/apxs.html.en
+#srv/web/ipfire/manual/programs/apxs.html.fr
 #srv/web/ipfire/manual/programs/apxs.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/apxs.html.tr.utf8
 #srv/web/ipfire/manual/programs/configure.html
 #srv/web/ipfire/manual/programs/configure.html.en
+#srv/web/ipfire/manual/programs/configure.html.fr
 #srv/web/ipfire/manual/programs/configure.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/configure.html.tr.utf8
 #srv/web/ipfire/manual/programs/dbmmanage.html
 #srv/web/ipfire/manual/programs/dbmmanage.html.en
+#srv/web/ipfire/manual/programs/dbmmanage.html.fr
 #srv/web/ipfire/manual/programs/dbmmanage.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/dbmmanage.html.tr.utf8
+#srv/web/ipfire/manual/programs/fcgistarter.html
+#srv/web/ipfire/manual/programs/fcgistarter.html.en
+#srv/web/ipfire/manual/programs/fcgistarter.html.fr
+#srv/web/ipfire/manual/programs/fcgistarter.html.tr.utf8
 #srv/web/ipfire/manual/programs/htcacheclean.html
 #srv/web/ipfire/manual/programs/htcacheclean.html.en
+#srv/web/ipfire/manual/programs/htcacheclean.html.fr
 #srv/web/ipfire/manual/programs/htcacheclean.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/htcacheclean.html.tr.utf8
 #srv/web/ipfire/manual/programs/htdbm.html
 #srv/web/ipfire/manual/programs/htdbm.html.en
+#srv/web/ipfire/manual/programs/htdbm.html.fr
 #srv/web/ipfire/manual/programs/htdbm.html.tr.utf8
 #srv/web/ipfire/manual/programs/htdigest.html
 #srv/web/ipfire/manual/programs/htdigest.html.en
+#srv/web/ipfire/manual/programs/htdigest.html.fr
 #srv/web/ipfire/manual/programs/htdigest.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/htdigest.html.tr.utf8
 #srv/web/ipfire/manual/programs/htpasswd.html
 #srv/web/ipfire/manual/programs/htpasswd.html.en
+#srv/web/ipfire/manual/programs/htpasswd.html.fr
 #srv/web/ipfire/manual/programs/htpasswd.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/htpasswd.html.tr.utf8
 #srv/web/ipfire/manual/programs/httpd.html
 #srv/web/ipfire/manual/programs/httpd.html.en
+#srv/web/ipfire/manual/programs/httpd.html.fr
 #srv/web/ipfire/manual/programs/httpd.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/httpd.html.tr.utf8
 #srv/web/ipfire/manual/programs/httxt2dbm.html
 #srv/web/ipfire/manual/programs/httxt2dbm.html.en
+#srv/web/ipfire/manual/programs/httxt2dbm.html.fr
 #srv/web/ipfire/manual/programs/httxt2dbm.html.tr.utf8
 #srv/web/ipfire/manual/programs/index.html
 #srv/web/ipfire/manual/programs/index.html.en
 #srv/web/ipfire/manual/programs/index.html.es
-#srv/web/ipfire/manual/programs/index.html.ja.utf8
+#srv/web/ipfire/manual/programs/index.html.fr
 #srv/web/ipfire/manual/programs/index.html.ko.euc-kr
-#srv/web/ipfire/manual/programs/index.html.ru.koi8-r
 #srv/web/ipfire/manual/programs/index.html.tr.utf8
 #srv/web/ipfire/manual/programs/index.html.zh-cn.utf8
+#srv/web/ipfire/manual/programs/log_server_status.html
+#srv/web/ipfire/manual/programs/log_server_status.html.en
 #srv/web/ipfire/manual/programs/logresolve.html
 #srv/web/ipfire/manual/programs/logresolve.html.en
+#srv/web/ipfire/manual/programs/logresolve.html.fr
 #srv/web/ipfire/manual/programs/logresolve.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/logresolve.html.tr.utf8
 #srv/web/ipfire/manual/programs/other.html
 #srv/web/ipfire/manual/programs/other.html.en
+#srv/web/ipfire/manual/programs/other.html.fr
 #srv/web/ipfire/manual/programs/other.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/other.html.tr.utf8
 #srv/web/ipfire/manual/programs/rotatelogs.html
 #srv/web/ipfire/manual/programs/rotatelogs.html.en
+#srv/web/ipfire/manual/programs/rotatelogs.html.fr
 #srv/web/ipfire/manual/programs/rotatelogs.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/rotatelogs.html.tr.utf8
+#srv/web/ipfire/manual/programs/split-logfile.html
+#srv/web/ipfire/manual/programs/split-logfile.html.en
 #srv/web/ipfire/manual/programs/suexec.html
 #srv/web/ipfire/manual/programs/suexec.html.en
 #srv/web/ipfire/manual/programs/suexec.html.ko.euc-kr
@@ -990,15 +1256,19 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/rewrite
 #srv/web/ipfire/manual/rewrite/access.html
 #srv/web/ipfire/manual/rewrite/access.html.en
+#srv/web/ipfire/manual/rewrite/access.html.fr
 #srv/web/ipfire/manual/rewrite/advanced.html
 #srv/web/ipfire/manual/rewrite/advanced.html.en
+#srv/web/ipfire/manual/rewrite/advanced.html.fr
 #srv/web/ipfire/manual/rewrite/avoid.html
 #srv/web/ipfire/manual/rewrite/avoid.html.en
+#srv/web/ipfire/manual/rewrite/avoid.html.fr
 #srv/web/ipfire/manual/rewrite/flags.html
 #srv/web/ipfire/manual/rewrite/flags.html.en
 #srv/web/ipfire/manual/rewrite/flags.html.fr
 #srv/web/ipfire/manual/rewrite/htaccess.html
 #srv/web/ipfire/manual/rewrite/htaccess.html.en
+#srv/web/ipfire/manual/rewrite/htaccess.html.fr
 #srv/web/ipfire/manual/rewrite/index.html
 #srv/web/ipfire/manual/rewrite/index.html.en
 #srv/web/ipfire/manual/rewrite/index.html.fr
@@ -1009,15 +1279,19 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/rewrite/intro.html.fr
 #srv/web/ipfire/manual/rewrite/proxy.html
 #srv/web/ipfire/manual/rewrite/proxy.html.en
+#srv/web/ipfire/manual/rewrite/proxy.html.fr
 #srv/web/ipfire/manual/rewrite/remapping.html
 #srv/web/ipfire/manual/rewrite/remapping.html.en
+#srv/web/ipfire/manual/rewrite/remapping.html.fr
 #srv/web/ipfire/manual/rewrite/rewritemap.html
 #srv/web/ipfire/manual/rewrite/rewritemap.html.en
+#srv/web/ipfire/manual/rewrite/rewritemap.html.fr
 #srv/web/ipfire/manual/rewrite/tech.html
 #srv/web/ipfire/manual/rewrite/tech.html.en
 #srv/web/ipfire/manual/rewrite/tech.html.fr
 #srv/web/ipfire/manual/rewrite/vhosts.html
 #srv/web/ipfire/manual/rewrite/vhosts.html.en
+#srv/web/ipfire/manual/rewrite/vhosts.html.fr
 #srv/web/ipfire/manual/sections.html
 #srv/web/ipfire/manual/sections.html.en
 #srv/web/ipfire/manual/sections.html.fr
@@ -1026,6 +1300,7 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/sections.html.tr.utf8
 #srv/web/ipfire/manual/server-wide.html
 #srv/web/ipfire/manual/server-wide.html.en
+#srv/web/ipfire/manual/server-wide.html.fr
 #srv/web/ipfire/manual/server-wide.html.ja.utf8
 #srv/web/ipfire/manual/server-wide.html.ko.euc-kr
 #srv/web/ipfire/manual/server-wide.html.tr.utf8
@@ -1033,24 +1308,33 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/sitemap.html.de
 #srv/web/ipfire/manual/sitemap.html.en
 #srv/web/ipfire/manual/sitemap.html.es
+#srv/web/ipfire/manual/sitemap.html.fr
 #srv/web/ipfire/manual/sitemap.html.ja.utf8
 #srv/web/ipfire/manual/sitemap.html.ko.euc-kr
 #srv/web/ipfire/manual/sitemap.html.tr.utf8
 #srv/web/ipfire/manual/sitemap.html.zh-cn.utf8
+#srv/web/ipfire/manual/socache.html
+#srv/web/ipfire/manual/socache.html.en
+#srv/web/ipfire/manual/socache.html.fr
 #srv/web/ipfire/manual/ssl
 #srv/web/ipfire/manual/ssl/index.html
 #srv/web/ipfire/manual/ssl/index.html.en
+#srv/web/ipfire/manual/ssl/index.html.fr
 #srv/web/ipfire/manual/ssl/index.html.ja.utf8
 #srv/web/ipfire/manual/ssl/index.html.tr.utf8
 #srv/web/ipfire/manual/ssl/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/ssl/ssl_compat.html
 #srv/web/ipfire/manual/ssl/ssl_compat.html.en
+#srv/web/ipfire/manual/ssl/ssl_compat.html.fr
 #srv/web/ipfire/manual/ssl/ssl_faq.html
 #srv/web/ipfire/manual/ssl/ssl_faq.html.en
+#srv/web/ipfire/manual/ssl/ssl_faq.html.fr
 #srv/web/ipfire/manual/ssl/ssl_howto.html
 #srv/web/ipfire/manual/ssl/ssl_howto.html.en
+#srv/web/ipfire/manual/ssl/ssl_howto.html.fr
 #srv/web/ipfire/manual/ssl/ssl_intro.html
 #srv/web/ipfire/manual/ssl/ssl_intro.html.en
+#srv/web/ipfire/manual/ssl/ssl_intro.html.fr
 #srv/web/ipfire/manual/ssl/ssl_intro.html.ja.utf8
 #srv/web/ipfire/manual/stopping.html
 #srv/web/ipfire/manual/stopping.html.de
@@ -1093,12 +1377,11 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/suexec.html.ko.euc-kr
 #srv/web/ipfire/manual/suexec.html.tr.utf8
 #srv/web/ipfire/manual/upgrading.html
-#srv/web/ipfire/manual/upgrading.html.de
 #srv/web/ipfire/manual/upgrading.html.en
 #srv/web/ipfire/manual/upgrading.html.fr
-#srv/web/ipfire/manual/upgrading.html.ja.utf8
 #srv/web/ipfire/manual/urlmapping.html
 #srv/web/ipfire/manual/urlmapping.html.en
+#srv/web/ipfire/manual/urlmapping.html.fr
 #srv/web/ipfire/manual/urlmapping.html.ja.utf8
 #srv/web/ipfire/manual/urlmapping.html.ko.euc-kr
 #srv/web/ipfire/manual/urlmapping.html.tr.utf8
@@ -1126,7 +1409,6 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/vhosts/index.html.fr
 #srv/web/ipfire/manual/vhosts/index.html.ja.utf8
 #srv/web/ipfire/manual/vhosts/index.html.ko.euc-kr
-#srv/web/ipfire/manual/vhosts/index.html.ru.koi8-r
 #srv/web/ipfire/manual/vhosts/index.html.tr.utf8
 #srv/web/ipfire/manual/vhosts/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/vhosts/ip-based.html
@@ -1137,6 +1419,7 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/vhosts/ip-based.html.tr.utf8
 #srv/web/ipfire/manual/vhosts/mass.html
 #srv/web/ipfire/manual/vhosts/mass.html.en
+#srv/web/ipfire/manual/vhosts/mass.html.fr
 #srv/web/ipfire/manual/vhosts/mass.html.ko.euc-kr
 #srv/web/ipfire/manual/vhosts/mass.html.tr.utf8
 #srv/web/ipfire/manual/vhosts/name-based.html
@@ -1146,13 +1429,19 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/vhosts/name-based.html.ja.utf8
 #srv/web/ipfire/manual/vhosts/name-based.html.ko.euc-kr
 #srv/web/ipfire/manual/vhosts/name-based.html.tr.utf8
-#usr/bin/apr-1-config
-#usr/bin/apu-1-config
+#usr/bin/ab
+usr/bin/apr-1-config
+usr/bin/apu-1-config
+#usr/bin/apxs
+#usr/bin/dbmmanage
+#usr/bin/logresolve
 #usr/include/apache
 #usr/include/apache/ap_compat.h
 #usr/include/apache/ap_config.h
 #usr/include/apache/ap_config_auto.h
 #usr/include/apache/ap_config_layout.h
+#usr/include/apache/ap_expr.h
+#usr/include/apache/ap_hooks.h
 #usr/include/apache/ap_listen.h
 #usr/include/apache/ap_mmn.h
 #usr/include/apache/ap_mpm.h
@@ -1160,77 +1449,11 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #usr/include/apache/ap_regex.h
 #usr/include/apache/ap_regkey.h
 #usr/include/apache/ap_release.h
-#usr/include/apache/apr.h
-#usr/include/apache/apr_allocator.h
-#usr/include/apache/apr_anylock.h
-#usr/include/apache/apr_atomic.h
-#usr/include/apache/apr_base64.h
-#usr/include/apache/apr_buckets.h
-#usr/include/apache/apr_crypto.h
-#usr/include/apache/apr_date.h
-#usr/include/apache/apr_dbd.h
-#usr/include/apache/apr_dbm.h
-#usr/include/apache/apr_dso.h
-#usr/include/apache/apr_env.h
-#usr/include/apache/apr_errno.h
-#usr/include/apache/apr_escape.h
-#usr/include/apache/apr_file_info.h
-#usr/include/apache/apr_file_io.h
-#usr/include/apache/apr_fnmatch.h
-#usr/include/apache/apr_general.h
-#usr/include/apache/apr_getopt.h
-#usr/include/apache/apr_global_mutex.h
-#usr/include/apache/apr_hash.h
-#usr/include/apache/apr_hooks.h
-#usr/include/apache/apr_inherit.h
-#usr/include/apache/apr_ldap.h
-#usr/include/apache/apr_ldap_init.h
-#usr/include/apache/apr_ldap_option.h
-#usr/include/apache/apr_ldap_rebind.h
-#usr/include/apache/apr_ldap_url.h
-#usr/include/apache/apr_lib.h
-#usr/include/apache/apr_md4.h
-#usr/include/apache/apr_md5.h
-#usr/include/apache/apr_memcache.h
-#usr/include/apache/apr_mmap.h
-#usr/include/apache/apr_network_io.h
-#usr/include/apache/apr_optional.h
-#usr/include/apache/apr_optional_hooks.h
-#usr/include/apache/apr_poll.h
-#usr/include/apache/apr_pools.h
-#usr/include/apache/apr_portable.h
-#usr/include/apache/apr_proc_mutex.h
-#usr/include/apache/apr_queue.h
-#usr/include/apache/apr_random.h
-#usr/include/apache/apr_reslist.h
-#usr/include/apache/apr_ring.h
-#usr/include/apache/apr_rmm.h
-#usr/include/apache/apr_sdbm.h
-#usr/include/apache/apr_sha1.h
-#usr/include/apache/apr_shm.h
-#usr/include/apache/apr_signal.h
-#usr/include/apache/apr_skiplist.h
-#usr/include/apache/apr_strings.h
-#usr/include/apache/apr_strmatch.h
-#usr/include/apache/apr_support.h
-#usr/include/apache/apr_tables.h
-#usr/include/apache/apr_thread_cond.h
-#usr/include/apache/apr_thread_mutex.h
-#usr/include/apache/apr_thread_pool.h
-#usr/include/apache/apr_thread_proc.h
-#usr/include/apache/apr_thread_rwlock.h
-#usr/include/apache/apr_time.h
-#usr/include/apache/apr_uri.h
-#usr/include/apache/apr_user.h
-#usr/include/apache/apr_uuid.h
-#usr/include/apache/apr_version.h
-#usr/include/apache/apr_want.h
-#usr/include/apache/apr_xlate.h
-#usr/include/apache/apr_xml.h
-#usr/include/apache/apu.h
-#usr/include/apache/apu_errno.h
-#usr/include/apache/apu_version.h
-#usr/include/apache/apu_want.h
+#usr/include/apache/ap_slotmem.h
+#usr/include/apache/ap_socache.h
+#usr/include/apache/apache_noprobes.h
+#usr/include/apache/cache_common.h
+#usr/include/apache/heartbeat.h
 #usr/include/apache/http_config.h
 #usr/include/apache/http_connection.h
 #usr/include/apache/http_core.h
@@ -1241,6 +1464,7 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #usr/include/apache/http_vhost.h
 #usr/include/apache/httpd.h
 #usr/include/apache/mod_auth.h
+#usr/include/apache/mod_cache.h
 #usr/include/apache/mod_cgi.h
 #usr/include/apache/mod_core.h
 #usr/include/apache/mod_dav.h
@@ -1248,144 +1472,270 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #usr/include/apache/mod_include.h
 #usr/include/apache/mod_log_config.h
 #usr/include/apache/mod_proxy.h
+#usr/include/apache/mod_request.h
 #usr/include/apache/mod_rewrite.h
+#usr/include/apache/mod_session.h
+#usr/include/apache/mod_so.h
 #usr/include/apache/mod_ssl.h
 #usr/include/apache/mod_status.h
-#usr/include/apache/mpm.h
+#usr/include/apache/mod_unixd.h
+#usr/include/apache/mod_watchdog.h
+#usr/include/apache/mod_xml2enc.h
 #usr/include/apache/mpm_common.h
-#usr/include/apache/mpm_default.h
 #usr/include/apache/os.h
 #usr/include/apache/scoreboard.h
 #usr/include/apache/unixd.h
 #usr/include/apache/util_cfgtree.h
 #usr/include/apache/util_charset.h
+#usr/include/apache/util_cookies.h
 #usr/include/apache/util_ebcdic.h
+#usr/include/apache/util_fcgi.h
 #usr/include/apache/util_filter.h
 #usr/include/apache/util_ldap.h
 #usr/include/apache/util_md5.h
+#usr/include/apache/util_mutex.h
 #usr/include/apache/util_script.h
 #usr/include/apache/util_time.h
+#usr/include/apache/util_varbuf.h
 #usr/include/apache/util_xml.h
+#usr/include/apr-1
+#usr/include/apr-1/apr.h
+#usr/include/apr-1/apr_allocator.h
+#usr/include/apr-1/apr_anylock.h
+#usr/include/apr-1/apr_atomic.h
+#usr/include/apr-1/apr_base64.h
+#usr/include/apr-1/apr_buckets.h
+#usr/include/apr-1/apr_crypto.h
+#usr/include/apr-1/apr_date.h
+#usr/include/apr-1/apr_dbd.h
+#usr/include/apr-1/apr_dbm.h
+#usr/include/apr-1/apr_dso.h
+#usr/include/apr-1/apr_env.h
+#usr/include/apr-1/apr_errno.h
+#usr/include/apr-1/apr_escape.h
+#usr/include/apr-1/apr_file_info.h
+#usr/include/apr-1/apr_file_io.h
+#usr/include/apr-1/apr_fnmatch.h
+#usr/include/apr-1/apr_general.h
+#usr/include/apr-1/apr_getopt.h
+#usr/include/apr-1/apr_global_mutex.h
+#usr/include/apr-1/apr_hash.h
+#usr/include/apr-1/apr_hooks.h
+#usr/include/apr-1/apr_inherit.h
+#usr/include/apr-1/apr_ldap.h
+#usr/include/apr-1/apr_ldap_init.h
+#usr/include/apr-1/apr_ldap_option.h
+#usr/include/apr-1/apr_ldap_rebind.h
+#usr/include/apr-1/apr_ldap_url.h
+#usr/include/apr-1/apr_lib.h
+#usr/include/apr-1/apr_md4.h
+#usr/include/apr-1/apr_md5.h
+#usr/include/apr-1/apr_memcache.h
+#usr/include/apr-1/apr_mmap.h
+#usr/include/apr-1/apr_network_io.h
+#usr/include/apr-1/apr_optional.h
+#usr/include/apr-1/apr_optional_hooks.h
+#usr/include/apr-1/apr_poll.h
+#usr/include/apr-1/apr_pools.h
+#usr/include/apr-1/apr_portable.h
+#usr/include/apr-1/apr_proc_mutex.h
+#usr/include/apr-1/apr_queue.h
+#usr/include/apr-1/apr_random.h
+#usr/include/apr-1/apr_reslist.h
+#usr/include/apr-1/apr_ring.h
+#usr/include/apr-1/apr_rmm.h
+#usr/include/apr-1/apr_sdbm.h
+#usr/include/apr-1/apr_sha1.h
+#usr/include/apr-1/apr_shm.h
+#usr/include/apr-1/apr_signal.h
+#usr/include/apr-1/apr_skiplist.h
+#usr/include/apr-1/apr_strings.h
+#usr/include/apr-1/apr_strmatch.h
+#usr/include/apr-1/apr_support.h
+#usr/include/apr-1/apr_tables.h
+#usr/include/apr-1/apr_thread_cond.h
+#usr/include/apr-1/apr_thread_mutex.h
+#usr/include/apr-1/apr_thread_pool.h
+#usr/include/apr-1/apr_thread_proc.h
+#usr/include/apr-1/apr_thread_rwlock.h
+#usr/include/apr-1/apr_time.h
+#usr/include/apr-1/apr_uri.h
+#usr/include/apr-1/apr_user.h
+#usr/include/apr-1/apr_uuid.h
+#usr/include/apr-1/apr_version.h
+#usr/include/apr-1/apr_want.h
+#usr/include/apr-1/apr_xlate.h
+#usr/include/apr-1/apr_xml.h
+#usr/include/apr-1/apu.h
+#usr/include/apr-1/apu_errno.h
+#usr/include/apr-1/apu_version.h
+#usr/include/apr-1/apu_want.h
 #usr/lib/apache
 #usr/lib/apache/build
-#usr/lib/apache/build/apr_rules.mk
 #usr/lib/apache/build/config.nice
 #usr/lib/apache/build/config_vars.mk
 #usr/lib/apache/build/instdso.sh
 #usr/lib/apache/build/library.mk
-#usr/lib/apache/build/libtool
 #usr/lib/apache/build/ltlib.mk
-#usr/lib/apache/build/make_exports.awk
-#usr/lib/apache/build/make_var_export.awk
 #usr/lib/apache/build/mkdir.sh
 #usr/lib/apache/build/program.mk
 #usr/lib/apache/build/rules.mk
 #usr/lib/apache/build/special.mk
 #usr/lib/apache/httpd.exp
+usr/lib/apache/mod_access_compat.so
 usr/lib/apache/mod_actions.so
 usr/lib/apache/mod_alias.so
+usr/lib/apache/mod_allowmethods.so
 usr/lib/apache/mod_asis.so
 usr/lib/apache/mod_auth_basic.so
 usr/lib/apache/mod_auth_digest.so
+usr/lib/apache/mod_auth_form.so
 usr/lib/apache/mod_authn_anon.so
+usr/lib/apache/mod_authn_core.so
 usr/lib/apache/mod_authn_dbd.so
 usr/lib/apache/mod_authn_dbm.so
-usr/lib/apache/mod_authn_default.so
 usr/lib/apache/mod_authn_file.so
+usr/lib/apache/mod_authn_socache.so
+usr/lib/apache/mod_authnz_fcgi.so
+usr/lib/apache/mod_authz_core.so
+usr/lib/apache/mod_authz_dbd.so
 usr/lib/apache/mod_authz_dbm.so
-usr/lib/apache/mod_authz_default.so
 usr/lib/apache/mod_authz_groupfile.so
 usr/lib/apache/mod_authz_host.so
 usr/lib/apache/mod_authz_owner.so
 usr/lib/apache/mod_authz_user.so
 usr/lib/apache/mod_autoindex.so
-usr/lib/apache/mod_cern_meta.so
+usr/lib/apache/mod_buffer.so
+usr/lib/apache/mod_cache.so
+usr/lib/apache/mod_cache_disk.so
+usr/lib/apache/mod_cache_socache.so
 usr/lib/apache/mod_cgi.so
-usr/lib/apache/mod_dav.so
-usr/lib/apache/mod_dav_fs.so
+usr/lib/apache/mod_cgid.so
+usr/lib/apache/mod_charset_lite.so
+usr/lib/apache/mod_data.so
 usr/lib/apache/mod_dbd.so
 usr/lib/apache/mod_deflate.so
+usr/lib/apache/mod_dialup.so
 usr/lib/apache/mod_dir.so
 usr/lib/apache/mod_dumpio.so
+usr/lib/apache/mod_echo.so
 usr/lib/apache/mod_env.so
 usr/lib/apache/mod_expires.so
 usr/lib/apache/mod_ext_filter.so
+usr/lib/apache/mod_file_cache.so
 usr/lib/apache/mod_filter.so
 usr/lib/apache/mod_headers.so
-usr/lib/apache/mod_ident.so
-usr/lib/apache/mod_imagemap.so
+usr/lib/apache/mod_heartbeat.so
+usr/lib/apache/mod_heartmonitor.so
 usr/lib/apache/mod_include.so
 usr/lib/apache/mod_info.so
 usr/lib/apache/mod_log_config.so
+usr/lib/apache/mod_log_debug.so
 usr/lib/apache/mod_log_forensic.so
 usr/lib/apache/mod_logio.so
+usr/lib/apache/mod_macro.so
 usr/lib/apache/mod_mime.so
 usr/lib/apache/mod_mime_magic.so
+usr/lib/apache/mod_mpm_event.so
+usr/lib/apache/mod_mpm_prefork.so
+usr/lib/apache/mod_mpm_worker.so
 usr/lib/apache/mod_negotiation.so
 usr/lib/apache/mod_proxy.so
 usr/lib/apache/mod_proxy_ajp.so
 usr/lib/apache/mod_proxy_balancer.so
 usr/lib/apache/mod_proxy_connect.so
+usr/lib/apache/mod_proxy_express.so
+usr/lib/apache/mod_proxy_fcgi.so
+usr/lib/apache/mod_proxy_fdpass.so
 usr/lib/apache/mod_proxy_ftp.so
+usr/lib/apache/mod_proxy_html.so
 usr/lib/apache/mod_proxy_http.so
 usr/lib/apache/mod_proxy_scgi.so
+usr/lib/apache/mod_proxy_wstunnel.so
+usr/lib/apache/mod_ratelimit.so
+usr/lib/apache/mod_reflector.so
+usr/lib/apache/mod_remoteip.so
 usr/lib/apache/mod_reqtimeout.so
+usr/lib/apache/mod_request.so
 usr/lib/apache/mod_rewrite.so
+usr/lib/apache/mod_sed.so
+usr/lib/apache/mod_session.so
+usr/lib/apache/mod_session_cookie.so
+usr/lib/apache/mod_session_crypto.so
+usr/lib/apache/mod_session_dbd.so
 usr/lib/apache/mod_setenvif.so
+usr/lib/apache/mod_slotmem_plain.so
+usr/lib/apache/mod_slotmem_shm.so
+usr/lib/apache/mod_socache_dbm.so
+usr/lib/apache/mod_socache_memcache.so
+usr/lib/apache/mod_socache_shmcb.so
 usr/lib/apache/mod_speling.so
 usr/lib/apache/mod_ssl.so
 usr/lib/apache/mod_status.so
 usr/lib/apache/mod_substitute.so
+usr/lib/apache/mod_suexec.so
 usr/lib/apache/mod_unique_id.so
+usr/lib/apache/mod_unixd.so
 usr/lib/apache/mod_userdir.so
 usr/lib/apache/mod_usertrack.so
 usr/lib/apache/mod_version.so
 usr/lib/apache/mod_vhost_alias.so
+usr/lib/apache/mod_watchdog.so
+usr/lib/apache/mod_xml2enc.so
+usr/lib/apache/suexec
 #usr/lib/apr-util-1
+usr/lib/apr-util-1/apr_crypto_openssl-1.so
+#usr/lib/apr-util-1/apr_crypto_openssl.la
+usr/lib/apr-util-1/apr_crypto_openssl.so
 usr/lib/apr-util-1/apr_dbd_sqlite3-1.so
-#usr/lib/apr-util-1/apr_dbd_sqlite3.a
 #usr/lib/apr-util-1/apr_dbd_sqlite3.la
 usr/lib/apr-util-1/apr_dbd_sqlite3.so
+usr/lib/apr-util-1/apr_dbm_gdbm-1.so
+#usr/lib/apr-util-1/apr_dbm_gdbm.la
+usr/lib/apr-util-1/apr_dbm_gdbm.so
 #usr/lib/apr.exp
 #usr/lib/aprutil.exp
-#usr/lib/libapr-1.a
 #usr/lib/libapr-1.la
 usr/lib/libapr-1.so
 usr/lib/libapr-1.so.0
-usr/lib/libapr-1.so.0.5.1
-#usr/lib/libaprutil-1.a
+usr/lib/libapr-1.so.0.5.2
 #usr/lib/libaprutil-1.la
 usr/lib/libaprutil-1.so
 usr/lib/libaprutil-1.so.0
-usr/lib/libaprutil-1.so.0.5.3
+usr/lib/libaprutil-1.so.0.5.4
 #usr/lib/pkgconfig/apr-1.pc
 #usr/lib/pkgconfig/apr-util-1.pc
-#usr/sbin/ab
 usr/sbin/apachectl
-#usr/sbin/apxs
 #usr/sbin/checkgid
-#usr/sbin/dbmmanage
 #usr/sbin/envvars
 #usr/sbin/envvars-std
+#usr/sbin/fcgistarter
 #usr/sbin/htcacheclean
 #usr/sbin/htdbm
 #usr/sbin/htdigest
 usr/sbin/htpasswd
 usr/sbin/httpd
 #usr/sbin/httxt2dbm
-#usr/sbin/logresolve
 #usr/sbin/rotatelogs
+#usr/share/apr-1
+#usr/share/apr-1/build
+#usr/share/apr-1/build/apr_rules.mk
+#usr/share/apr-1/build/libtool
+#usr/share/apr-1/build/make_exports.awk
+#usr/share/apr-1/build/make_var_export.awk
+#usr/share/apr-1/build/mkdir.sh
+#usr/share/man/man1/ab.1
+#usr/share/man/man1/apxs.1
 #usr/share/man/man1/dbmmanage.1
 #usr/share/man/man1/htdbm.1
 #usr/share/man/man1/htdigest.1
 #usr/share/man/man1/htpasswd.1
 #usr/share/man/man1/httxt2dbm.1
-#usr/share/man/man8/ab.8
+#usr/share/man/man1/logresolve.1
 #usr/share/man/man8/apachectl.8
-#usr/share/man/man8/apxs.8
+#usr/share/man/man8/fcgistarter.8
 #usr/share/man/man8/htcacheclean.8
 #usr/share/man/man8/httpd.8
-#usr/share/man/man8/logresolve.8
 #usr/share/man/man8/rotatelogs.8
 #usr/share/man/man8/suexec.8
 var/log/httpd
diff --git a/config/rootfiles/common/pcre b/config/rootfiles/common/pcre
index 8c4cc2a..12c04a1 100644
--- a/config/rootfiles/common/pcre
+++ b/config/rootfiles/common/pcre
@@ -10,7 +10,15 @@
 #usr/lib/libpcre.la
 usr/lib/libpcre.so
 usr/lib/libpcre.so.1
-usr/lib/libpcre.so.1.2.5
+usr/lib/libpcre.so.1.2.6
+#usr/lib/libpcre16.la
+usr/lib/libpcre16.so
+usr/lib/libpcre16.so.0
+usr/lib/libpcre16.so.0.2.6
+#usr/lib/libpcre32.la
+usr/lib/libpcre32.so
+usr/lib/libpcre32.so.0
+usr/lib/libpcre32.so.0.0.6
 #usr/lib/libpcrecpp.la
 usr/lib/libpcrecpp.so
 usr/lib/libpcrecpp.so.0
@@ -20,74 +28,76 @@ usr/lib/libpcreposix.so
 usr/lib/libpcreposix.so.0
 usr/lib/libpcreposix.so.0.0.3
 #usr/lib/pkgconfig/libpcre.pc
+#usr/lib/pkgconfig/libpcre16.pc
+#usr/lib/pkgconfig/libpcre32.pc
 #usr/lib/pkgconfig/libpcrecpp.pc
 #usr/lib/pkgconfig/libpcreposix.pc
-#usr/share/doc/pcre
-#usr/share/doc/pcre/AUTHORS
-#usr/share/doc/pcre/COPYING
-#usr/share/doc/pcre/ChangeLog
-#usr/share/doc/pcre/LICENCE
-#usr/share/doc/pcre/NEWS
-#usr/share/doc/pcre/README
-#usr/share/doc/pcre/html
-#usr/share/doc/pcre/html/NON-AUTOTOOLS-BUILD.txt
-#usr/share/doc/pcre/html/README.txt
-#usr/share/doc/pcre/html/index.html
-#usr/share/doc/pcre/html/pcre-config.html
-#usr/share/doc/pcre/html/pcre.html
-#usr/share/doc/pcre/html/pcre16.html
-#usr/share/doc/pcre/html/pcre32.html
-#usr/share/doc/pcre/html/pcre_assign_jit_stack.html
-#usr/share/doc/pcre/html/pcre_compile.html
-#usr/share/doc/pcre/html/pcre_compile2.html
-#usr/share/doc/pcre/html/pcre_config.html
-#usr/share/doc/pcre/html/pcre_copy_named_substring.html
-#usr/share/doc/pcre/html/pcre_copy_substring.html
-#usr/share/doc/pcre/html/pcre_dfa_exec.html
-#usr/share/doc/pcre/html/pcre_exec.html
-#usr/share/doc/pcre/html/pcre_free_study.html
-#usr/share/doc/pcre/html/pcre_free_substring.html
-#usr/share/doc/pcre/html/pcre_free_substring_list.html
-#usr/share/doc/pcre/html/pcre_fullinfo.html
-#usr/share/doc/pcre/html/pcre_get_named_substring.html
-#usr/share/doc/pcre/html/pcre_get_stringnumber.html
-#usr/share/doc/pcre/html/pcre_get_stringtable_entries.html
-#usr/share/doc/pcre/html/pcre_get_substring.html
-#usr/share/doc/pcre/html/pcre_get_substring_list.html
-#usr/share/doc/pcre/html/pcre_jit_exec.html
-#usr/share/doc/pcre/html/pcre_jit_stack_alloc.html
-#usr/share/doc/pcre/html/pcre_jit_stack_free.html
-#usr/share/doc/pcre/html/pcre_maketables.html
-#usr/share/doc/pcre/html/pcre_pattern_to_host_byte_order.html
-#usr/share/doc/pcre/html/pcre_refcount.html
-#usr/share/doc/pcre/html/pcre_study.html
-#usr/share/doc/pcre/html/pcre_utf16_to_host_byte_order.html
-#usr/share/doc/pcre/html/pcre_utf32_to_host_byte_order.html
-#usr/share/doc/pcre/html/pcre_version.html
-#usr/share/doc/pcre/html/pcreapi.html
-#usr/share/doc/pcre/html/pcrebuild.html
-#usr/share/doc/pcre/html/pcrecallout.html
-#usr/share/doc/pcre/html/pcrecompat.html
-#usr/share/doc/pcre/html/pcrecpp.html
-#usr/share/doc/pcre/html/pcredemo.html
-#usr/share/doc/pcre/html/pcregrep.html
-#usr/share/doc/pcre/html/pcrejit.html
-#usr/share/doc/pcre/html/pcrelimits.html
-#usr/share/doc/pcre/html/pcrematching.html
-#usr/share/doc/pcre/html/pcrepartial.html
-#usr/share/doc/pcre/html/pcrepattern.html
-#usr/share/doc/pcre/html/pcreperform.html
-#usr/share/doc/pcre/html/pcreposix.html
-#usr/share/doc/pcre/html/pcreprecompile.html
-#usr/share/doc/pcre/html/pcresample.html
-#usr/share/doc/pcre/html/pcrestack.html
-#usr/share/doc/pcre/html/pcresyntax.html
-#usr/share/doc/pcre/html/pcretest.html
-#usr/share/doc/pcre/html/pcreunicode.html
-#usr/share/doc/pcre/pcre-config.txt
-#usr/share/doc/pcre/pcre.txt
-#usr/share/doc/pcre/pcregrep.txt
-#usr/share/doc/pcre/pcretest.txt
+#usr/share/doc/pcre-pcre-8.38
+#usr/share/doc/pcre-pcre-8.38/AUTHORS
+#usr/share/doc/pcre-pcre-8.38/COPYING
+#usr/share/doc/pcre-pcre-8.38/ChangeLog
+#usr/share/doc/pcre-pcre-8.38/LICENCE
+#usr/share/doc/pcre-pcre-8.38/NEWS
+#usr/share/doc/pcre-pcre-8.38/README
+#usr/share/doc/pcre-pcre-8.38/html
+#usr/share/doc/pcre-pcre-8.38/html/NON-AUTOTOOLS-BUILD.txt
+#usr/share/doc/pcre-pcre-8.38/html/README.txt
+#usr/share/doc/pcre-pcre-8.38/html/index.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre-config.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre16.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre32.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_assign_jit_stack.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_compile.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_compile2.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_config.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_copy_named_substring.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_copy_substring.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_dfa_exec.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_exec.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_free_study.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_free_substring.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_free_substring_list.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_fullinfo.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_get_named_substring.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_get_stringnumber.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_get_stringtable_entries.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_get_substring.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_get_substring_list.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_jit_exec.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_jit_stack_alloc.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_jit_stack_free.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_maketables.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_pattern_to_host_byte_order.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_refcount.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_study.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_utf16_to_host_byte_order.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_utf32_to_host_byte_order.html
+#usr/share/doc/pcre-pcre-8.38/html/pcre_version.html
+#usr/share/doc/pcre-pcre-8.38/html/pcreapi.html
+#usr/share/doc/pcre-pcre-8.38/html/pcrebuild.html
+#usr/share/doc/pcre-pcre-8.38/html/pcrecallout.html
+#usr/share/doc/pcre-pcre-8.38/html/pcrecompat.html
+#usr/share/doc/pcre-pcre-8.38/html/pcrecpp.html
+#usr/share/doc/pcre-pcre-8.38/html/pcredemo.html
+#usr/share/doc/pcre-pcre-8.38/html/pcregrep.html
+#usr/share/doc/pcre-pcre-8.38/html/pcrejit.html
+#usr/share/doc/pcre-pcre-8.38/html/pcrelimits.html
+#usr/share/doc/pcre-pcre-8.38/html/pcrematching.html
+#usr/share/doc/pcre-pcre-8.38/html/pcrepartial.html
+#usr/share/doc/pcre-pcre-8.38/html/pcrepattern.html
+#usr/share/doc/pcre-pcre-8.38/html/pcreperform.html
+#usr/share/doc/pcre-pcre-8.38/html/pcreposix.html
+#usr/share/doc/pcre-pcre-8.38/html/pcreprecompile.html
+#usr/share/doc/pcre-pcre-8.38/html/pcresample.html
+#usr/share/doc/pcre-pcre-8.38/html/pcrestack.html
+#usr/share/doc/pcre-pcre-8.38/html/pcresyntax.html
+#usr/share/doc/pcre-pcre-8.38/html/pcretest.html
+#usr/share/doc/pcre-pcre-8.38/html/pcreunicode.html
+#usr/share/doc/pcre-pcre-8.38/pcre-config.txt
+#usr/share/doc/pcre-pcre-8.38/pcre.txt
+#usr/share/doc/pcre-pcre-8.38/pcregrep.txt
+#usr/share/doc/pcre-pcre-8.38/pcretest.txt
 #usr/share/man/man1/pcre-config.1
 #usr/share/man/man1/pcregrep.1
 #usr/share/man/man1/pcretest.1
@@ -191,3 +201,4 @@ usr/lib/libpcreposix.so.0.0.3
 #usr/share/man/man3/pcrestack.3
 #usr/share/man/man3/pcresyntax.3
 #usr/share/man/man3/pcreunicode.3
+
diff --git a/config/rootfiles/common/php b/config/rootfiles/common/php
index 23031e9..c433fee 100644
--- a/config/rootfiles/common/php
+++ b/config/rootfiles/common/php
@@ -1,4 +1,5 @@
-etc/pear.conf
+#etc/pear.conf
+#etc/php-fpm.conf.default
 etc/php.ini
 #usr/bin/pear
 #usr/bin/peardev
@@ -6,25 +7,24 @@ etc/php.ini
 usr/bin/phar
 usr/bin/phar.phar
 usr/bin/php
+#usr/bin/php-cgi
 #usr/bin/php-config
 #usr/bin/phpize
 #usr/include/php
 #usr/include/php/TSRM
 #usr/include/php/TSRM/TSRM.h
-#usr/include/php/TSRM/acconfig.h
 #usr/include/php/TSRM/readdir.h
 #usr/include/php/TSRM/tsrm_config.h
 #usr/include/php/TSRM/tsrm_config.w32.h
 #usr/include/php/TSRM/tsrm_config_common.h
 #usr/include/php/TSRM/tsrm_nw.h
 #usr/include/php/TSRM/tsrm_strtok_r.h
-#usr/include/php/TSRM/tsrm_virtual_cwd.h
 #usr/include/php/TSRM/tsrm_win32.h
 #usr/include/php/Zend
-#usr/include/php/Zend/acconfig.h
 #usr/include/php/Zend/zend.h
 #usr/include/php/Zend/zend_API.h
 #usr/include/php/Zend/zend_alloc.h
+#usr/include/php/Zend/zend_ast.h
 #usr/include/php/Zend/zend_build.h
 #usr/include/php/Zend/zend_builtin_functions.h
 #usr/include/php/Zend/zend_closures.h
@@ -33,14 +33,15 @@ usr/bin/php
 #usr/include/php/Zend/zend_config.nw.h
 #usr/include/php/Zend/zend_config.w32.h
 #usr/include/php/Zend/zend_constants.h
+#usr/include/php/Zend/zend_dtrace.h
 #usr/include/php/Zend/zend_dynamic_array.h
 #usr/include/php/Zend/zend_errors.h
 #usr/include/php/Zend/zend_exceptions.h
 #usr/include/php/Zend/zend_execute.h
 #usr/include/php/Zend/zend_extensions.h
-#usr/include/php/Zend/zend_fast_cache.h
 #usr/include/php/Zend/zend_float.h
 #usr/include/php/Zend/zend_gc.h
+#usr/include/php/Zend/zend_generators.h
 #usr/include/php/Zend/zend_globals.h
 #usr/include/php/Zend/zend_globals_macros.h
 #usr/include/php/Zend/zend_hash.h
@@ -67,13 +68,16 @@ usr/bin/php
 #usr/include/php/Zend/zend_operators.h
 #usr/include/php/Zend/zend_ptr_stack.h
 #usr/include/php/Zend/zend_qsort.h
+#usr/include/php/Zend/zend_signal.h
 #usr/include/php/Zend/zend_stack.h
 #usr/include/php/Zend/zend_static_allocator.h
 #usr/include/php/Zend/zend_stream.h
+#usr/include/php/Zend/zend_string.h
 #usr/include/php/Zend/zend_strtod.h
 #usr/include/php/Zend/zend_ts_hash.h
 #usr/include/php/Zend/zend_types.h
 #usr/include/php/Zend/zend_variables.h
+#usr/include/php/Zend/zend_virtual_cwd.h
 #usr/include/php/Zend/zend_vm.h
 #usr/include/php/Zend/zend_vm_def.h
 #usr/include/php/Zend/zend_vm_execute.h
@@ -99,21 +103,36 @@ usr/bin/php
 #usr/include/php/ext/filter
 #usr/include/php/ext/filter/php_filter.h
 #usr/include/php/ext/gd
+#usr/include/php/ext/gd/gd_compat.h
 #usr/include/php/ext/gd/gdcache.h
+#usr/include/php/ext/gd/libgd
+#usr/include/php/ext/gd/libgd/gd.h
+#usr/include/php/ext/gd/libgd/gd_intern.h
+#usr/include/php/ext/gd/libgd/gd_io.h
+#usr/include/php/ext/gd/libgd/gdcache.h
+#usr/include/php/ext/gd/libgd/gdfontg.h
+#usr/include/php/ext/gd/libgd/gdfontl.h
+#usr/include/php/ext/gd/libgd/gdfontmb.h
+#usr/include/php/ext/gd/libgd/gdfonts.h
+#usr/include/php/ext/gd/libgd/gdfontt.h
+#usr/include/php/ext/gd/libgd/gdhelpers.h
+#usr/include/php/ext/gd/libgd/jisx0208.h
+#usr/include/php/ext/gd/libgd/wbmp.h
+#usr/include/php/ext/gd/libgd/webpimg.h
 #usr/include/php/ext/gd/php_gd.h
 #usr/include/php/ext/hash
 #usr/include/php/ext/hash/php_hash.h
 #usr/include/php/ext/hash/php_hash_adler32.h
 #usr/include/php/ext/hash/php_hash_crc32.h
+#usr/include/php/ext/hash/php_hash_fnv.h
 #usr/include/php/ext/hash/php_hash_gost.h
 #usr/include/php/ext/hash/php_hash_haval.h
+#usr/include/php/ext/hash/php_hash_joaat.h
 #usr/include/php/ext/hash/php_hash_md.h
 #usr/include/php/ext/hash/php_hash_ripemd.h
-#usr/include/php/ext/hash/php_hash_salsa.h
 #usr/include/php/ext/hash/php_hash_sha.h
 #usr/include/php/ext/hash/php_hash_snefru.h
 #usr/include/php/ext/hash/php_hash_tiger.h
-#usr/include/php/ext/hash/php_hash_types.h
 #usr/include/php/ext/hash/php_hash_whirlpool.h
 #usr/include/php/ext/iconv
 #usr/include/php/ext/iconv/php_have_bsd_iconv.h
@@ -123,6 +142,7 @@ usr/bin/php
 #usr/include/php/ext/iconv/php_have_libiconv.h
 #usr/include/php/ext/iconv/php_iconv.h
 #usr/include/php/ext/iconv/php_iconv_aliased_libiconv.h
+#usr/include/php/ext/iconv/php_iconv_broken_ignore.h
 #usr/include/php/ext/iconv/php_iconv_supports_errno.h
 #usr/include/php/ext/iconv/php_php_iconv_h_path.h
 #usr/include/php/ext/iconv/php_php_iconv_impl.h
@@ -154,6 +174,30 @@ usr/bin/php
 #usr/include/php/ext/mbstring/oniguruma/oniguruma.h
 #usr/include/php/ext/mbstring/php_mbregex.h
 #usr/include/php/ext/mbstring/php_onig_compat.h
+#usr/include/php/ext/mysqli
+#usr/include/php/ext/mysqli/mysqli_mysqlnd.h
+#usr/include/php/ext/mysqli/php_mysqli_structs.h
+#usr/include/php/ext/mysqlnd
+#usr/include/php/ext/mysqlnd/config-win.h
+#usr/include/php/ext/mysqlnd/mysql_float_to_double.h
+#usr/include/php/ext/mysqlnd/mysqlnd.h
+#usr/include/php/ext/mysqlnd/mysqlnd_alloc.h
+#usr/include/php/ext/mysqlnd/mysqlnd_block_alloc.h
+#usr/include/php/ext/mysqlnd/mysqlnd_charset.h
+#usr/include/php/ext/mysqlnd/mysqlnd_debug.h
+#usr/include/php/ext/mysqlnd/mysqlnd_enum_n_def.h
+#usr/include/php/ext/mysqlnd/mysqlnd_ext_plugin.h
+#usr/include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h
+#usr/include/php/ext/mysqlnd/mysqlnd_net.h
+#usr/include/php/ext/mysqlnd/mysqlnd_portability.h
+#usr/include/php/ext/mysqlnd/mysqlnd_priv.h
+#usr/include/php/ext/mysqlnd/mysqlnd_result.h
+#usr/include/php/ext/mysqlnd/mysqlnd_result_meta.h
+#usr/include/php/ext/mysqlnd/mysqlnd_reverse_api.h
+#usr/include/php/ext/mysqlnd/mysqlnd_statistics.h
+#usr/include/php/ext/mysqlnd/mysqlnd_structs.h
+#usr/include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
+#usr/include/php/ext/mysqlnd/php_mysqlnd.h
 #usr/include/php/ext/pcre
 #usr/include/php/ext/pcre/pcrelib
 #usr/include/php/ext/pcre/pcrelib/config.h
@@ -165,12 +209,16 @@ usr/bin/php
 #usr/include/php/ext/pdo
 #usr/include/php/ext/pdo/php_pdo.h
 #usr/include/php/ext/pdo/php_pdo_driver.h
+#usr/include/php/ext/pdo/php_pdo_error.h
+#usr/include/php/ext/phar
+#usr/include/php/ext/phar/php_phar.h
 #usr/include/php/ext/session
 #usr/include/php/ext/session/mod_files.h
 #usr/include/php/ext/session/mod_user.h
 #usr/include/php/ext/session/php_session.h
-#usr/include/php/ext/sockets
-#usr/include/php/ext/sockets/php_sockets.h
+#usr/include/php/ext/simplexml
+#usr/include/php/ext/simplexml/php_simplexml.h
+#usr/include/php/ext/simplexml/php_simplexml_exports.h
 #usr/include/php/ext/spl
 #usr/include/php/ext/spl/php_spl.h
 #usr/include/php/ext/spl/spl_array.h
@@ -183,10 +231,6 @@ usr/bin/php
 #usr/include/php/ext/spl/spl_heap.h
 #usr/include/php/ext/spl/spl_iterators.h
 #usr/include/php/ext/spl/spl_observer.h
-#usr/include/php/ext/sqlite
-#usr/include/php/ext/sqlite/libsqlite
-#usr/include/php/ext/sqlite/libsqlite/src
-#usr/include/php/ext/sqlite/libsqlite/src/sqlite.h
 #usr/include/php/ext/sqlite3
 #usr/include/php/ext/sqlite3/libsqlite
 #usr/include/php/ext/sqlite3/libsqlite/sqlite3.h
@@ -209,6 +253,7 @@ usr/bin/php
 #usr/include/php/ext/standard/fsock.h
 #usr/include/php/ext/standard/head.h
 #usr/include/php/ext/standard/html.h
+#usr/include/php/ext/standard/html_tables.h
 #usr/include/php/ext/standard/info.h
 #usr/include/php/ext/standard/md5.h
 #usr/include/php/ext/standard/microtime.h
@@ -234,6 +279,7 @@ usr/bin/php
 #usr/include/php/ext/standard/php_mail.h
 #usr/include/php/ext/standard/php_math.h
 #usr/include/php/ext/standard/php_metaphone.h
+#usr/include/php/ext/standard/php_password.h
 #usr/include/php/ext/standard/php_rand.h
 #usr/include/php/ext/standard/php_smart_str.h
 #usr/include/php/ext/standard/php_smart_str_public.h
@@ -260,16 +306,13 @@ usr/bin/php
 #usr/include/php/main/SAPI.h
 #usr/include/php/main/build-defs.h
 #usr/include/php/main/fopen_wrappers.h
-#usr/include/php/main/logos.h
 #usr/include/php/main/php.h
-#usr/include/php/main/php3_compat.h
 #usr/include/php/main/php_compat.h
 #usr/include/php/main/php_config.h
 #usr/include/php/main/php_content_types.h
 #usr/include/php/main/php_getopt.h
 #usr/include/php/main/php_globals.h
 #usr/include/php/main/php_ini.h
-#usr/include/php/main/php_logos.h
 #usr/include/php/main/php_main.h
 #usr/include/php/main/php_memory_streams.h
 #usr/include/php/main/php_network.h
@@ -277,13 +320,13 @@ usr/bin/php
 #usr/include/php/main/php_output.h
 #usr/include/php/main/php_reentrancy.h
 #usr/include/php/main/php_scandir.h
+#usr/include/php/main/php_stdint.h
 #usr/include/php/main/php_streams.h
 #usr/include/php/main/php_syslog.h
 #usr/include/php/main/php_ticks.h
 #usr/include/php/main/php_variables.h
 #usr/include/php/main/php_version.h
 #usr/include/php/main/rfc1867.h
-#usr/include/php/main/safe_mode.h
 #usr/include/php/main/snprintf.h
 #usr/include/php/main/spprintf.h
 #usr/include/php/main/streams
@@ -297,6 +340,9 @@ usr/bin/php
 #usr/include/php/main/streams/php_streams_int.h
 #usr/include/php/main/win32_internal_function_disabled.h
 #usr/include/php/main/win95nt.h
+#usr/include/php/sapi
+#usr/include/php/sapi/cli
+#usr/include/php/sapi/cli/cli.h
 usr/lib/apache/libphp5.so
 #usr/lib/php
 #usr/lib/php/.channels
@@ -344,8 +390,8 @@ usr/lib/php/Log/sqlite.php
 usr/lib/php/Log/syslog.php
 usr/lib/php/Log/win.php
 #usr/lib/php/OS
-#usr/lib/php/OS/Guess.php
-usr/lib/php/PEAR
+usr/lib/php/OS/Guess.php
+#usr/lib/php/PEAR
 usr/lib/php/PEAR.php
 usr/lib/php/PEAR/Autoloader.php
 usr/lib/php/PEAR/Builder.php
@@ -386,7 +432,6 @@ usr/lib/php/PEAR/Downloader.php
 usr/lib/php/PEAR/Downloader/Package.php
 usr/lib/php/PEAR/ErrorStack.php
 usr/lib/php/PEAR/Exception.php
-usr/lib/php/PEAR/FixPHP5PEARWarnings.php
 #usr/lib/php/PEAR/Frontend
 usr/lib/php/PEAR/Frontend.php
 usr/lib/php/PEAR/Frontend/CLI.php
@@ -403,6 +448,8 @@ usr/lib/php/PEAR/Installer/Role/Doc.php
 usr/lib/php/PEAR/Installer/Role/Doc.xml
 usr/lib/php/PEAR/Installer/Role/Ext.php
 usr/lib/php/PEAR/Installer/Role/Ext.xml
+usr/lib/php/PEAR/Installer/Role/Man.php
+usr/lib/php/PEAR/Installer/Role/Man.xml
 usr/lib/php/PEAR/Installer/Role/Php.php
 usr/lib/php/PEAR/Installer/Role/Php.xml
 usr/lib/php/PEAR/Installer/Role/Script.php
@@ -452,7 +499,6 @@ usr/lib/php/PEAR/Validate.php
 #usr/lib/php/PEAR/Validator
 usr/lib/php/PEAR/Validator/PECL.php
 usr/lib/php/PEAR/XMLParser.php
-usr/lib/php/PEAR5.php
 #usr/lib/php/Structures
 #usr/lib/php/Structures/Graph
 usr/lib/php/Structures/Graph.php
@@ -479,8 +525,6 @@ usr/lib/php/XML/Util.php
 #usr/lib/php/data/PEAR
 #usr/lib/php/data/PEAR/package.dtd
 #usr/lib/php/data/PEAR/template.spec
-#usr/lib/php/data/Structures_Graph
-#usr/lib/php/data/Structures_Graph/LICENSE
 #usr/lib/php/doc
 #usr/lib/php/doc/Archive_Tar
 #usr/lib/php/doc/Archive_Tar/docs
@@ -488,32 +532,10 @@ usr/lib/php/XML/Util.php
 #usr/lib/php/doc/PEAR
 #usr/lib/php/doc/PEAR/INSTALL
 #usr/lib/php/doc/PEAR/LICENSE
-#usr/lib/php/doc/PEAR/README
+#usr/lib/php/doc/PEAR/README.rst
 #usr/lib/php/doc/Structures_Graph
+#usr/lib/php/doc/Structures_Graph/LICENSE
 #usr/lib/php/doc/Structures_Graph/docs
-#usr/lib/php/doc/Structures_Graph/docs/generate.sh
-#usr/lib/php/doc/Structures_Graph/docs/html
-#usr/lib/php/doc/Structures_Graph/docs/html/Structures_Graph
-#usr/lib/php/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph.html
-#usr/lib/php/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph_Manipulator_AcyclicTest.html
-#usr/lib/php/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph_Manipulator_TopologicalSorter.html
-#usr/lib/php/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph_Node.html
-#usr/lib/php/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_Manipulator_AcyclicTest_php.html
-#usr/lib/php/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_Manipulator_TopologicalSorter_php.html
-#usr/lib/php/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_Node_php.html
-#usr/lib/php/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_php.html
-#usr/lib/php/doc/Structures_Graph/docs/html/Structures_Graph/tutorial_Structures_Graph.pkg.html
-#usr/lib/php/doc/Structures_Graph/docs/html/classtrees_Structures_Graph.html
-#usr/lib/php/doc/Structures_Graph/docs/html/elementindex.html
-#usr/lib/php/doc/Structures_Graph/docs/html/elementindex_Structures_Graph.html
-#usr/lib/php/doc/Structures_Graph/docs/html/errors.html
-#usr/lib/php/doc/Structures_Graph/docs/html/index.html
-#usr/lib/php/doc/Structures_Graph/docs/html/li_Structures_Graph.html
-#usr/lib/php/doc/Structures_Graph/docs/html/media
-#usr/lib/php/doc/Structures_Graph/docs/html/media/banner.css
-#usr/lib/php/doc/Structures_Graph/docs/html/media/stylesheet.css
-#usr/lib/php/doc/Structures_Graph/docs/html/packages.html
-#usr/lib/php/doc/Structures_Graph/docs/html/todolist.html
 #usr/lib/php/doc/Structures_Graph/docs/tutorials
 #usr/lib/php/doc/Structures_Graph/docs/tutorials/Structures_Graph
 #usr/lib/php/doc/Structures_Graph/docs/tutorials/Structures_Graph/Structures_Graph.pkg
@@ -522,20 +544,28 @@ usr/lib/php/XML/Util.php
 usr/lib/php/doc/XML_Util/examples/example.php
 usr/lib/php/doc/XML_Util/examples/example2.php
 #usr/lib/php/extensions
-#usr/lib/php/extensions/no-debug-non-zts-20090626
-usr/lib/php/extensions/no-debug-non-zts-20090626/dba.so
-usr/lib/php/extensions/no-debug-non-zts-20090626/idn.so
-#usr/lib/php/pearcmd.php
-#usr/lib/php/peclcmd.php
+#usr/lib/php/extensions/no-debug-zts-20131226
+usr/lib/php/extensions/no-debug-zts-20131226/dba.so
+#usr/lib/php/extensions/no-debug-zts-20131226/intl.so
+#usr/lib/php/extensions/no-debug-zts-20131226/opcache.so
+usr/lib/php/pearcmd.php
+usr/lib/php/peclcmd.php
 #usr/lib/php/test
+#usr/lib/php/test/Console_Getopt
+#usr/lib/php/test/Console_Getopt/tests
+#usr/lib/php/test/Console_Getopt/tests/001-getopt.phpt
+#usr/lib/php/test/Console_Getopt/tests/bug10557.phpt
+#usr/lib/php/test/Console_Getopt/tests/bug11068.phpt
+#usr/lib/php/test/Console_Getopt/tests/bug13140.phpt
 #usr/lib/php/test/Structures_Graph
 #usr/lib/php/test/Structures_Graph/tests
-#usr/lib/php/test/Structures_Graph/tests/AllTests.php
-#usr/lib/php/test/Structures_Graph/tests/testCase
-#usr/lib/php/test/Structures_Graph/tests/testCase/BasicGraph.php
+usr/lib/php/test/Structures_Graph/tests/AcyclicTestTest.php
+usr/lib/php/test/Structures_Graph/tests/AllTests.php
+usr/lib/php/test/Structures_Graph/tests/BasicGraphTest.php
+usr/lib/php/test/Structures_Graph/tests/TopologicalSorterTest.php
+#usr/lib/php/test/Structures_Graph/tests/helper.inc
 #usr/lib/php/test/XML_Util
 #usr/lib/php/test/XML_Util/tests
-#usr/lib/php/test/XML_Util/tests/AllTests.php
 #usr/lib/php/test/XML_Util/tests/testBasic_apiVersion.phpt
 #usr/lib/php/test/XML_Util/tests/testBasic_attributesToString.phpt
 #usr/lib/php/test/XML_Util/tests/testBasic_collapseEmptyTags.phpt
@@ -552,9 +582,17 @@ usr/lib/php/extensions/no-debug-non-zts-20090626/idn.so
 #usr/lib/php/test/XML_Util/tests/testBasic_replaceEntities.phpt
 #usr/lib/php/test/XML_Util/tests/testBasic_reverseEntities.phpt
 #usr/lib/php/test/XML_Util/tests/testBasic_splitQualifiedName.phpt
+#usr/lib/php/test/XML_Util/tests/testBug_18343.phpt
 #usr/lib/php/test/XML_Util/tests/testBug_4950.phpt
 #usr/lib/php/test/XML_Util/tests/testBug_5392.phpt
-#usr/man/man1/php-config.1
-#usr/man/man1/php.1
-#usr/man/man1/phpize.1
-etc/httpd/conf/conf.d/php5.conf
+#usr/sbin/php-fpm
+#usr/share/man/man1/phar.1
+#usr/share/man/man1/phar.phar.1
+#usr/share/man/man1/php-cgi.1
+#usr/share/man/man1/php-config.1
+#usr/share/man/man1/php.1
+#usr/share/man/man1/phpize.1
+#usr/share/man/man8/php-fpm.8
+#usr/share/php
+#usr/share/php/fpm
+#usr/share/php/fpm/status.html
\ No newline at end of file
diff --git a/lfs/apache2 b/lfs/apache2
index 57c3447..cfa70c5 100644
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014   IPFire Team  info@ipfire.org                    #
+# Copyright (C) 2007-2015   IPFire Team  info@ipfire.org                    #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -25,27 +25,28 @@
include Config
-VER        = 2.2.29
+VER        = 2.4.18
THISAPP    = httpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = apache2
###############################################################################
 # Top-level Rules
 ###############################################################################
-objects = $(DL_FILE) \
-	httpd-2.2.2-config-1.patch
+objects = $(DL_FILE) apr-1.5.2.tar.bz2 apr-util-1.5.4.tar.bz2
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch
+$(DL_FILE)				= $(DL_FROM)/$(DL_FILE)
+apr-1.5.2.tar.bz2			= $(DL_FROM)/apr-1.5.2.tar.bz2
+apr-util-1.5.4.tar.bz2			= $(DL_FROM)/apr-util-1.5.4.tar.bz2
-$(DL_FILE)_MD5 = 579342fdeaa7b8b68d17fee91f8fab6e
-httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822
+$(DL_FILE)_MD5				= 3690b3cc991b7dfd22aea9e1264a11b9
+apr-1.5.2.tar.bz2_MD5			= 4e9769f3349fe11fc0a5e1b224c236aa
+apr-util-1.5.4.tar.bz2_MD5		= 2202b18f269ad606d70e1864857ed93c
install : $(TARGET)
@@ -55,16 +56,17 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
+dist:
+	@$(PAK)
+
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
    @$(CHECK)
-
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
    @$(LOAD)
-
 $(subst %,%_MD5,$(objects)) :
    @$(MD5)
@@ -74,9 +76,35 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
+	# Build apr
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/apr-1.5.2.tar.bz2
+	cd $(DIR_SRC)/apr-1.5.2 && ./configure		\
+			--prefix=/usr			\
+			--disable-static		\
+			--with-installbuilddir=/usr/share/apr-1/build
+
+	cd $(DIR_SRC)/apr-1.5.2 && make $(MAKETUNING)
+	cd $(DIR_SRC)/apr-1.5.2 && make install
+	@rm -rf $(DIR_SRC)/apr-1.5.2
+
+	# Build apr-util
+	cd $(DIR_SRC) && tar jxf $(DIR_DL)/apr-util-1.5.4.tar.bz2
+	cd $(DIR_SRC)/apr-util-1.5.4 && ./configure	\
+			--prefix=/usr			\
+			--with-apr=/usr			\
+			--with-gdbm=/usr		\
+			--with-openssl=/usr		\
+			--with-crypto			\
+			--with-sqlite3=/usr
+
+	cd $(DIR_SRC)/apr-util-1.5.4 && make $(MAKETUNING)
+	cd $(DIR_SRC)/apr-util-1.5.4 && make install
+	@rm -rf $(DIR_SRC)/apr-util-1.5.4
+
+	# Build Apache
+	OPT="$(CFLAGS)"
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/httpd-2.2.2-config-1.patch
-
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/httpd-2.4.18_absolut_path_apxs.patch
    ### Add IPFire's layout, too
    echo "# IPFire layout" >> $(DIR_APP)/config.layout
    echo "<Layout IPFire>" >> $(DIR_APP)/config.layout
@@ -102,19 +130,50 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    echo "    proxycachedir:      /var/cache/apache/proxy" >> $(DIR_APP)/config.layout
    echo "</Layout>" >> $(DIR_APP)/config.layout
-	cd $(DIR_APP) && ./configure --enable-layout=IPFire \
-				--enable-ssl --enable-mods-shared=all --enable-proxy
+	cd $(DIR_APP) && ./configure --enable-layout=IPFire			\
+				--enable-ssl					\
+				--with-ssl=/usr/include/openssl 		\
+				--enable-mods-shared="all cgi"	 		\
+				--enable-mpms-shared=all			\
+				--enable-proxy					\
+				--enable-dbd					\
+				--enable-session				\
+				--enable-cache					\
+				--enable-authnz-fcgi				\
+				--enable-authz-dbd				\
+				--enable-deflate				\
+				--enable-lbmethod-heartbeat=no			\
+				--enable-lbmethod-bybusyness=no			\
+				--enable-lbmethod-byrequests=no			\
+				--enable-lbmethod-bytraffic=no			\
+				--enable-suexec=shared				\
+				--with-apr=/usr/bin/apr-1-config                \
+				--with-apr-util=/usr/bin/apu-1-config           \
+				--with-suexec-bin=/usr/lib/apache/suexec 	\
+				--with-suexec-caller=apache			\
+				--with-suexec-docroot=/srv/web			\
+				--with-suexec-logfile=/var/log/httpd/suexec.log \
+				--with-suexec-uidmin=100			\
+				--with-suexec-userdir=public_html		\
+				--enable-dav=no
+
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
-	chown -v root:root /usr/lib/apache/httpd.exp \
-	    /usr/sbin/{apxs,apachectl,dbmmanage,envvars{,-std}} \
-	    /usr/share/man/man1/{dbmmanage,ht{dbm,digest,passwd,txt2dbm}}.1 \
-	    /usr/share/man/man8/{ab,apachectl,apxs,htcacheclean,httpd}.8 \
-	    /usr/share/man/man8/{logresolve,rotatelogs,suexec}.8
-
-	# Install apache config
-	cp -rf $(DIR_CONF)/httpd/* /etc/httpd/conf
+	chown -v root:root /usr/share/man/man1/{dbmmanage,ht{dbm,digest,passwd,txt2dbm}}.1 \
+		/usr/share/man/man8/{apachectl,htcacheclean,httpd,rotatelogs,suexec}.8
+
+	### Install apache config
+	cp -rvf $(DIR_CONF)/httpd/* /etc/httpd/conf
    ln -sf $(CONFIG_ROOT)/main/hostname.conf /etc/httpd/conf/
+	install -d -m 755 /var/run/httpd/
+
+	### copy files to old locations
+	mv -v /usr/bin/htpasswd /usr/sbin/
+	mv -v /usr/bin/htdigest /usr/sbin/
+	mv -v /usr/bin/htdbm /usr/sbin/
+	mv -v /usr/bin/httxt2dbm /usr/sbin/
+	mv -v /usr/sbin/suexec /usr/lib/apache/suexec
@rm -rf $(DIR_APP)
    @$(POSTBUILD)
+
diff --git a/lfs/pcre b/lfs/pcre
index fd66350..aa10c64 100644
--- a/lfs/pcre
+++ b/lfs/pcre
@@ -24,10 +24,10 @@
include Config
-VER        = 8.37
+VER        = 8.38
THISAPP    = pcre-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6e0cc6d1bdac7a4308151f9b3571b86e
+$(DL_FILE)_MD5 = 00aabbfe56d5a48b270f999b508c5ad2
install : $(TARGET)
@@ -70,18 +70,23 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-recursive-back-referen.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-forward-reference-within-bac.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-another-buffer-overflow.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch
-	cd $(DIR_APP) && ./configure \
-		--prefix=/usr \
-		--disable-static \
-		--enable-utf8 \
-		--disable-jit \
-		--enable-unicode-properties
+	cd $(DIR_APP) && ./configure		\
+		--prefix=/usr			\
+		--disable-static		\
+		--enable-utf8			\
+		--disable-jit			\
+		--enable-pcre16			\
+		--enable-pcre32			\
+		--enable-pcregrep-libz		\
+		--enable-pcregrep-libbz2	\
+		--enable-pcretest-libreadline	\
+		--enable-unicode-properties	\
+		--disable-static		\
+		--docdir=/usr/share/doc/pcre-$(THISAPP)
+
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
+
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
+
diff --git a/lfs/php b/lfs/php
index 8139e21..b2ad63e 100644
--- a/lfs/php
+++ b/lfs/php
@@ -24,10 +24,10 @@
include Config
-VER        = 5.3.27
+VER        = 5.6.17
THISAPP    = php-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,15 +40,15 @@ endif
 # Top-level Rules
 ###############################################################################
-objects = $(DL_FILE) idn-0.1.tgz Log-1.9.11.tgz
+objects = $(DL_FILE) intl-3.0.0.tgz Log-1.12.9.tgz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz
-Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz
+intl-3.0.0.tgz = $(DL_FROM)/intl-3.0.0.tgz
+Log-1.12.9.tgz = $(DL_FROM)/Log-1.12.9.tgz
-$(DL_FILE)_MD5 = 25ae23a5b9615fe8d33de5b63e1bb788
-idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1
-Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513
+$(DL_FILE)_MD5 = 5e080e4b7df5db24f1b64313f8114bd8
+intl-3.0.0.tgz_MD5 = a6029b9e7b1d0fcdb6e8bfad49e59ae9
+Log-1.12.9.tgz_MD5 = 980bda64d7feb22d0899999f4e0bddd9
install : $(TARGET)
@@ -77,62 +77,73 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
-	@rm -rf $(DIR_APP) $(DIR_SRC)/idn-* $(DIR_SRC)/Log-* $(DIR_SRC)/package.xml && \
-		cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr \
-										            --sysconfdir=/etc \
-										            --with-apxs2 \
-										            --enable-force-cgi-redirect \
-										            --enable-discard-path \
-										            --enable-fastcgi \
-										            --with-config-file-path=/etc \
-										            --with-openssl \
-										            --with-kerberos \
-										            --with-zlib \
-										            --enable-bcmath \
-										            --with-bz2 \
-										            --enable-calendar \
-										            --with-curl \
-										            --with-curlwrappers \
-										            --enable-dba=shared \
-										            --with-gdbm \
-										            --with-db4 \
-										            --with-inifile \
-										            --with-flatfile \
-										            --enable-exif \
-										            --enable-ftp \
-										            --with-openssl-dir=/usr \
-										            --with-gd=/usr \
-										            --with-jpeg-dir=/usr \
-										            --with-png-dir=/usr \
-										            --with-zlib-dir=/usr \
-										            --with-freetype-dir=/usr \
-										            --with-gettext \
-										            --with-gmp \
-										            --enable-mbstring \
-										            --with-mysql \
-										            --with-mysql-sock=/var/run/mysql \
-										            --with-ncurses \
-										            --with-pdo-mysql \
-										            --with-pdo-sqlite \
-										            --with-readline \
-										            --enable-sockets \
-										            --with-xsl \
-										            --with-iconv \
-										            --enable-zip
-	cd $(DIR_APP) && make $(MAKETUNING)
+	@rm -rf $(DIR_APP) $(DIR_SRC)/intl-* $(DIR_SRC)/Log-* $(DIR_SRC)/package.xml && \
+	cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/php-5.6.17_db6.patch
+	cd $(DIR_APP) && ./configure --prefix=/usr		\
+			--enable-maintainer-zts			\
+			--enable-zend-signals			\
+			--with-apxs2=/usr/bin/apxs		\
+			--with-config-file-path=/etc		\
+			--sysconfdir=/etc			\
+			--localstatedir=/var 			\
+			--datadir=/usr/share/php		\
+			--mandir=/usr/share/man			\
+			--enable-intl				\
+			--enable-calendar			\
+			--enable-dba=shared			\
+			--enable-ftp				\
+			--enable-bcmath				\
+			--enable-mbstring			\
+			--enable-zip				\
+			--enable-exif				\
+			--enable-soap				\
+			--enable-zip				\
+			--enable-fpm				\
+			--with-fpm-user				\
+			--with-fpm-group			\
+			--with-zlib				\
+			--with-bz2				\
+			--with-curl				\
+			--with-gdbm				\
+			--with-gmp				\
+			--with-xsl				\
+			--with-iconv				\
+			--with-readline				\
+			--with-gettext				\
+			--with-icu-dir=/usr			\
+			--with-openssl				\
+			--with-openssl-dir=/usr			\
+			--with-mysql				\
+			--with-mysql-sock=/run/mysql		\
+			--with-mysqli=mysqlnd			\
+			--with-pear=/usr/lib/php		\
+			--with-pdo-sqlite			\
+			--with-pdo-mysql=mysqlnd		\
+			--with-gd				\
+			--with-jpeg-dir=/usr			\
+			--with-png-dir=/usr			\
+			--with-zlib-dir=/usr			\
+			--with-freetype-dir=/usr 		\
+			--with-db4
+
    cd $(DIR_APP) && make install
+	cd $(DIR_APP) && make $(MAKETUNING)
+
    cd $(DIR_APP) && install -v -m644 $(DIR_SRC)/config/php/php.ini /etc/php.ini
    -grep -v libphp5.so < /etc/httpd/conf/httpd.conf > /etc/httpd/conf/httpd.conf.bak
    mv -f /etc/httpd/conf/httpd.conf.bak /etc/httpd/conf/httpd.conf
-	cd $(DIR_SRC) && tar xfz $(DIR_DL)/idn-0.1.tgz
-	-rm -f $(DIR_SRC)/package.xml
-	cd $(DIR_SRC)/idn-* && phpize
-	cd $(DIR_SRC)/idn-* && ./configure --prefix=/usr --with-idn
-	cd $(DIR_SRC)/idn-* && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_SRC)/idn-* && make install
-	cd $(DIR_SRC) && tar xfz $(DIR_DL)/Log-1.9.11.tgz
+
+	# Install intl
+	cd $(DIR_SRC) && tar xfz $(DIR_DL)/intl-3.0.0.tgz
+	#-rm -f $(DIR_SRC)/package.xml
+	cd $(DIR_SRC)/intl-* && phpize
+	cd $(DIR_SRC)/intl-* && ./configure --prefix=/usr --enable-intl
+	cd $(DIR_SRC)/intl-* && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_SRC)/intl-* && make install
+	cd $(DIR_SRC) && tar xfz $(DIR_DL)/Log-1.12.9.tgz
    -rm -f $(DIR_SRC)/package.xml
+
    cd $(DIR_SRC)/Log-* && cp -av Log Log.php /usr/lib/php 
-	@rm -rf $(DIR_APP) $(DIR_SRC)/idn-* $(DIR_SRC)/Log-* $(DIR_SRC)/package.xml
+	@rm -rf $(DIR_APP) $(DIR_SRC)/intl-* $(DIR_SRC)/Log-* $(DIR_SRC)/package.xml
    @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 9f119bf..cfe4ec5 100755
--- a/make.sh
+++ b/make.sh
@@ -344,12 +344,12 @@ buildbase() {
     lfsmake2 perl
     lfsmake2 readline
     lfsmake2 readline-compat
+    lfsmake2 bzip2
     lfsmake2 pcre
     lfsmake2 pcre-compat
     lfsmake2 autoconf
     lfsmake2 automake
     lfsmake2 bash
-    lfsmake2 bzip2
     lfsmake2 diffutils
     lfsmake2 e2fsprogs
     lfsmake2 ed
@@ -483,6 +483,7 @@ buildipfire() {
   ipfiremake bind
   ipfiremake dhcp
   ipfiremake dhcpcd
+  ipfiremake icu
   ipfiremake boost
   ipfiremake linux-atm
   ipfiremake expat
@@ -523,6 +524,7 @@ buildipfire() {
   ipfiremake cyrus-sasl
   ipfiremake openldap
   ipfiremake apache2
+  ipfiremake apache2-modsec
   ipfiremake php
   ipfiremake web-user-interface
   ipfiremake flag-icons
diff --git a/src/patches/pcre-8.37-Fix-another-buffer-overflow.patch b/src/patches/pcre-8.37-Fix-another-buffer-overflow.patch
deleted file mode 100644
index 20ead09..0000000
--- a/src/patches/pcre-8.37-Fix-another-buffer-overflow.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From f6efcf125123199d446c5561266c3c3846ed9f30 Mon Sep 17 00:00:00 2001
-From: ph10 ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15
-Date: Wed, 3 Jun 2015 16:51:59 +0000
-Subject: [PATCH] Fix another buffer overflow.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Ported to 8.37:
-
-commit 225f0d5eb16c7a26591a1e3f286c7476907b5a6a
-Author: ph10 ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15
-Date:   Wed Jun 3 16:51:59 2015 +0000
-
-    Fix another buffer overflow.
-
-    git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1562 2f5784b3-3f2a-0410-8824-cb99058d5e15
-
-Signed-off-by: Petr Písař ppisar@redhat.com
----
- pcre_compile.c           | 7 ++++++-
- testdata/testinput2      | 2 ++
- testdata/testoutput11-16 | 2 +-
- testdata/testoutput11-32 | 2 +-
- testdata/testoutput11-8  | 2 +-
- testdata/testoutput2     | 2 ++
- 6 files changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/pcre_compile.c b/pcre_compile.c
-index 8b4aaef..f5d2384 100644
---- a/pcre_compile.c
-+++ b/pcre_compile.c
-@@ -7210,7 +7210,12 @@ for (;; ptr++)
-           real compile this will be picked up and the reference wrapped with
-           OP_ONCE to make it atomic, so we must space in case this occurs. */
- 
--          if (recno == 0) *lengthptr += 2 + 2*LINK_SIZE;
-+          /* In fact, this can happen for a non-forward reference because
-+          another group with the same number might be created later. This
-+          issue is fixed "properly" in PCRE2. As PCRE1 is now in maintenance
-+          only mode, we finesse the bug by allowing more memory always. */
-+
-+          /* if (recno == 0) */ *lengthptr += 2 + 2*LINK_SIZE;
-           }
- 
-         /* In the real compile, search the name table. We check the name
-diff --git a/testdata/testinput2 b/testdata/testinput2
-index 5cc9ce6..e12de3a 100644
---- a/testdata/testinput2
-+++ b/testdata/testinput2
-@@ -4156,4 +4156,6 @@ backtracking verbs. --/
- 
- /(?=di(?<=(?1))|(?=(.))))/
- 
-+"(?J:(?|(?'R')(\k'R')|((?'R'))))"
-+
- /-- End of testinput2 --/
-diff --git a/testdata/testoutput11-16 b/testdata/testoutput11-16
-index 422f2ad..e222e7c 100644
---- a/testdata/testoutput11-16
-+++ b/testdata/testoutput11-16
-@@ -231,7 +231,7 @@ Memory allocation (code space): 73
- ------------------------------------------------------------------
- 
- /(?P<a>a)...(?P=a)bbb(?P>a)d/BM
--Memory allocation (code space): 61
-+Memory allocation (code space): 77
- ------------------------------------------------------------------
-   0  24 Bra
-   2   5 CBra 1
-diff --git a/testdata/testoutput11-32 b/testdata/testoutput11-32
-index d953ec8..9a80ec9 100644
---- a/testdata/testoutput11-32
-+++ b/testdata/testoutput11-32
-@@ -231,7 +231,7 @@ Memory allocation (code space): 155
- ------------------------------------------------------------------
- 
- /(?P<a>a)...(?P=a)bbb(?P>a)d/BM
--Memory allocation (code space): 125
-+Memory allocation (code space): 157
- ------------------------------------------------------------------
-   0  24 Bra
-   2   5 CBra 1
-diff --git a/testdata/testoutput11-8 b/testdata/testoutput11-8
-index 6ec18ec..3adaca2 100644
---- a/testdata/testoutput11-8
-+++ b/testdata/testoutput11-8
-@@ -231,7 +231,7 @@ Memory allocation (code space): 45
- ------------------------------------------------------------------
- 
- /(?P<a>a)...(?P=a)bbb(?P>a)d/BM
--Memory allocation (code space): 38
-+Memory allocation (code space): 50
- ------------------------------------------------------------------
-   0  30 Bra
-   3   7 CBra 1
-diff --git a/testdata/testoutput2 b/testdata/testoutput2
-index 4decb8d..5bad26c 100644
---- a/testdata/testoutput2
-+++ b/testdata/testoutput2
-@@ -14428,4 +14428,6 @@ Failed: lookbehind assertion is not fixed length at offset 17
- /(?=di(?<=(?1))|(?=(.))))/
- Failed: unmatched parentheses at offset 23
- 
-+"(?J:(?|(?'R')(\k'R')|((?'R'))))"
-+
- /-- End of testinput2 --/
--- 
-2.4.3
-
diff --git a/src/patches/pcre-8.37-Fix-buffer-overflow-for-forward-reference-within-bac.patch b/src/patches/pcre-8.37-Fix-buffer-overflow-for-forward-reference-within-bac.patch
deleted file mode 100644
index 16fd45c..0000000
--- a/src/patches/pcre-8.37-Fix-buffer-overflow-for-forward-reference-within-bac.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 354e1f8e921dcb9cf2f3a5eac93cd826d01a7d8a Mon Sep 17 00:00:00 2001
-From: ph10 ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15
-Date: Tue, 23 Jun 2015 16:34:53 +0000
-Subject: [PATCH] Fix buffer overflow for forward reference within backward
- assertion with excess closing parenthesis. Bugzilla 1651.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is upstream commit ported to 8.37:
-
-commit 764692f9aea9eab50fdba6cb537441d8b34c6c37
-Author: ph10 ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15
-Date:   Tue Jun 23 16:34:53 2015 +0000
-
-    Fix buffer overflow for forward reference within backward assertion with excess
-    closing parenthesis. Bugzilla 1651.
-
-    git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1571 2f5784b3-3f2a-0410-8824-cb99058d5e15
-
-It fixes CVE-2015-5073.
-
-Signed-off-by: Petr Písař ppisar@redhat.com
----
- pcre_compile.c       | 2 +-
- testdata/testinput2  | 2 ++
- testdata/testoutput2 | 3 +++
- 3 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/pcre_compile.c b/pcre_compile.c
-index 6f06912..b66b1f6 100644
---- a/pcre_compile.c
-+++ b/pcre_compile.c
-@@ -9392,7 +9392,7 @@ OP_RECURSE that are not fixed length get a diagnosic with a useful offset. The
- exceptional ones forgo this. We scan the pattern to check that they are fixed
- length, and set their lengths. */
- 
--if (cd->check_lookbehind)
-+if (errorcode == 0 && cd->check_lookbehind)
-   {
-   pcre_uchar *cc = (pcre_uchar *)codestart;
- 
-diff --git a/testdata/testinput2 b/testdata/testinput2
-index 83bb471..5cc9ce6 100644
---- a/testdata/testinput2
-+++ b/testdata/testinput2
-@@ -4154,4 +4154,6 @@ backtracking verbs. --/
- 
- "(?J)(?'d'(?'d'\g{d}))"
- 
-+/(?=di(?<=(?1))|(?=(.))))/
-+
- /-- End of testinput2 --/
-diff --git a/testdata/testoutput2 b/testdata/testoutput2
-index 7dff52a..4decb8d 100644
---- a/testdata/testoutput2
-+++ b/testdata/testoutput2
-@@ -14425,4 +14425,7 @@ Failed: lookbehind assertion is not fixed length at offset 17
- 
- "(?J)(?'d'(?'d'\g{d}))"
- 
-+/(?=di(?<=(?1))|(?=(.))))/
-+Failed: unmatched parentheses at offset 23
-+
- /-- End of testinput2 --/
--- 
-2.4.3
-
diff --git a/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-recursive-back-referen.patch b/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-recursive-back-referen.patch
deleted file mode 100644
index c97849f..0000000
--- a/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-recursive-back-referen.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 68ff1beb43bb3d4d8838f3285c97023d1e50513a Mon Sep 17 00:00:00 2001
-From: ph10 ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15
-Date: Fri, 15 May 2015 17:17:03 +0000
-Subject: [PATCH] Fix buffer overflow for named recursive back reference when
- the name is duplicated.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream commit ported to pcre-8.37:
-
-commit 4b79af6b4cbeb5326ae5e4d83f3e935e00286c19
-Author: ph10 ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15
-Date:   Fri May 15 17:17:03 2015 +0000
-
-    Fix buffer overflow for named recursive back reference when the name is
-    duplicated.
-
-    git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1558 2f5784b3-3f2a-0410-8824-cb99058d5e15
-
-This fixes CVE-2015-3210.
-
-Signed-off-by: Petr Písař ppisar@redhat.com
----
- pcre_compile.c       | 16 ++++++++++++++--
- testdata/testinput2  |  2 ++
- testdata/testoutput2 |  2 ++
- 3 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/pcre_compile.c b/pcre_compile.c
-index 0efad26..6f06912 100644
---- a/pcre_compile.c
-+++ b/pcre_compile.c
-@@ -7173,14 +7173,26 @@ for (;; ptr++)
-           number. If the name is not found, set the value to 0 for a forward
-           reference. */
- 
-+          recno = 0;
-           ng = cd->named_groups;
-           for (i = 0; i < cd->names_found; i++, ng++)
-             {
-             if (namelen == ng->length &&
-                 STRNCMP_UC_UC(name, ng->name, namelen) == 0)
--              break;
-+              {
-+              open_capitem *oc;
-+              recno = ng->number;
-+              if (is_recurse) break;
-+              for (oc = cd->open_caps; oc != NULL; oc = oc->next)         
-+                {          
-+                if (oc->number == recno)                                     
-+                  {               
-+                  oc->flag = TRUE;                                      
-+                  break;
-+                  }                                                         
-+                }                          
-+              }    
-             }
--          recno = (i < cd->names_found)? ng->number : 0;
- 
-           /* Count named back references. */
- 
-diff --git a/testdata/testinput2 b/testdata/testinput2
-index 58fe53b..83bb471 100644
---- a/testdata/testinput2
-+++ b/testdata/testinput2
-@@ -4152,4 +4152,6 @@ backtracking verbs. --/
- 
- /((?2){73}(?2))((?1))/
- 
-+"(?J)(?'d'(?'d'\g{d}))"
-+
- /-- End of testinput2 --/
-diff --git a/testdata/testoutput2 b/testdata/testoutput2
-index b718df0..7dff52a 100644
---- a/testdata/testoutput2
-+++ b/testdata/testoutput2
-@@ -14423,4 +14423,6 @@ Failed: lookbehind assertion is not fixed length at offset 17
- 
- /((?2){73}(?2))((?1))/
- 
-+"(?J)(?'d'(?'d'\g{d}))"
-+
- /-- End of testinput2 --/
--- 
-2.4.3
-
diff --git a/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch b/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch
deleted file mode 100644
index ab1b962..0000000
--- a/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From b3f0b0dd971314df8f865e221aa1a88e75d6d1a6 Mon Sep 17 00:00:00 2001
-From: ph10 ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15
-Date: Wed, 5 Aug 2015 15:38:32 +0000
-Subject: [PATCH] Fix buffer overflow for named references in (?| situations.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Ported for 8.37:
-
-commit 7af8e8717def179fd7b69e173abd347c1a3547cb
-Author: ph10 ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15
-Date:   Wed Aug 5 15:38:32 2015 +0000
-
-    Fix buffer overflow for named references in (?| situations.
-
-    git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1585 2f5784b3-3f2a-0410-8824-cb99058d5e15
-
-Signed-off-by: Petr Písař ppisar@redhat.com
----
- pcre_compile.c       | 74 ++++++++++++++++++++++++++++++----------------------
- pcre_internal.h      |  1 +
- testdata/testinput2  |  2 ++
- testdata/testoutput2 |  2 ++
- 4 files changed, 48 insertions(+), 31 deletions(-)
-
-diff --git a/pcre_compile.c b/pcre_compile.c
-index f5d2384..5fe5c1d 100644
---- a/pcre_compile.c
-+++ b/pcre_compile.c
-@@ -6641,6 +6641,7 @@ for (;; ptr++)
-         /* ------------------------------------------------------------ */
-         case CHAR_VERTICAL_LINE:  /* Reset capture count for each branch */
-         reset_bracount = TRUE;
-+        cd->dupgroups = TRUE;     /* Record (?| encountered */ 
-         /* Fall through */
- 
-         /* ------------------------------------------------------------ */
-@@ -7151,7 +7152,8 @@ for (;; ptr++)
-         if (lengthptr != NULL)
-           {
-           named_group *ng;
--
-+          recno = 0;
-+           
-           if (namelen == 0)
-             {
-             *errorcodeptr = ERR62;
-@@ -7168,32 +7170,6 @@ for (;; ptr++)
-             goto FAILED;
-             }
- 
--          /* The name table does not exist in the first pass; instead we must
--          scan the list of names encountered so far in order to get the
--          number. If the name is not found, set the value to 0 for a forward
--          reference. */
--
--          recno = 0;
--          ng = cd->named_groups;
--          for (i = 0; i < cd->names_found; i++, ng++)
--            {
--            if (namelen == ng->length &&
--                STRNCMP_UC_UC(name, ng->name, namelen) == 0)
--              {
--              open_capitem *oc;
--              recno = ng->number;
--              if (is_recurse) break;
--              for (oc = cd->open_caps; oc != NULL; oc = oc->next)
--                {
--                if (oc->number == recno)
--                  {
--                  oc->flag = TRUE;
--                  break;
--                  }
--                }
--              }
--            }
--
-           /* Count named back references. */
- 
-           if (!is_recurse) cd->namedrefcount++;
-@@ -7215,7 +7191,44 @@ for (;; ptr++)
-           issue is fixed "properly" in PCRE2. As PCRE1 is now in maintenance
-           only mode, we finesse the bug by allowing more memory always. */
- 
--          /* if (recno == 0) */ *lengthptr += 2 + 2*LINK_SIZE;
-+          *lengthptr += 2 + 2*LINK_SIZE;
-+          
-+          /* It is even worse than that. The current reference may be to an
-+          existing named group with a different number (so apparently not
-+          recursive) but which later on is also attached to a group with the
-+          current number. This can only happen if $(| has been previous 
-+          encountered. In that case, we allow yet more memory, just in case. 
-+          (Again, this is fixed "properly" in PCRE2. */
-+          
-+          if (cd->dupgroups) *lengthptr += 2 + 2*LINK_SIZE;
-+
-+          /* Otherwise, check for recursion here. The name table does not exist
-+          in the first pass; instead we must scan the list of names encountered
-+          so far in order to get the number. If the name is not found, leave
-+          the value of recno as 0 for a forward reference. */
-+           
-+          else
-+            { 
-+            ng = cd->named_groups;
-+            for (i = 0; i < cd->names_found; i++, ng++)
-+              {
-+              if (namelen == ng->length &&
-+                  STRNCMP_UC_UC(name, ng->name, namelen) == 0)
-+                {
-+                open_capitem *oc;
-+                recno = ng->number;
-+                if (is_recurse) break;
-+                for (oc = cd->open_caps; oc != NULL; oc = oc->next)
-+                  {
-+                  if (oc->number == recno)
-+                    {
-+                    oc->flag = TRUE;
-+                    break;
-+                    }
-+                  }
-+                }
-+              }
-+            }   
-           }
- 
-         /* In the real compile, search the name table. We check the name
-@@ -7262,8 +7275,6 @@ for (;; ptr++)
-           for (i++; i < cd->names_found; i++)
-             {
-             if (STRCMP_UC_UC(slot + IMM2_SIZE, cslot + IMM2_SIZE) != 0) break;
--
--
-             count++;
-             cslot += cd->name_entry_size;
-             }
-@@ -9189,6 +9200,7 @@ cd->names_found = 0;
- cd->name_entry_size = 0;
- cd->name_table = NULL;
- cd->dupnames = FALSE;
-+cd->dupgroups = FALSE;
- cd->namedrefcount = 0;
- cd->start_code = cworkspace;
- cd->hwm = cworkspace;
-@@ -9223,7 +9235,7 @@ if (errorcode != 0) goto PCRE_EARLY_ERROR_RETURN;
- 
- DPRINTF(("end pre-compile: length=%d workspace=%d\n", length,
-   (int)(cd->hwm - cworkspace)));
--
-+  
- if (length > MAX_PATTERN_SIZE)
-   {
-   errorcode = ERR20;
-diff --git a/pcre_internal.h b/pcre_internal.h
-index dd0ac7f..7ca6020 100644
---- a/pcre_internal.h
-+++ b/pcre_internal.h
-@@ -2446,6 +2446,7 @@ typedef struct compile_data {
-   BOOL had_pruneorskip;             /* (*PRUNE) or (*SKIP) encountered */
-   BOOL check_lookbehind;            /* Lookbehinds need later checking */
-   BOOL dupnames;                    /* Duplicate names exist */
-+  BOOL dupgroups;                   /* Duplicate groups exist: (?| found */ 
-   BOOL iscondassert;                /* Next assert is a condition */
-   int  nltype;                      /* Newline type */
-   int  nllen;                       /* Newline string length */
-diff --git a/testdata/testinput2 b/testdata/testinput2
-index e12de3a..8e044f8 100644
---- a/testdata/testinput2
-+++ b/testdata/testinput2
-@@ -4158,4 +4158,6 @@ backtracking verbs. --/
- 
- "(?J:(?|(?'R')(\k'R')|((?'R'))))"
- 
-+/(?J:(?|(:(?|(?'R')(\k'R')|((?'R')))H'Rk'Rf)|s(?'R')))/
-+
- /-- End of testinput2 --/
-diff --git a/testdata/testoutput2 b/testdata/testoutput2
-index 5bad26c..6019425 100644
---- a/testdata/testoutput2
-+++ b/testdata/testoutput2
-@@ -14430,4 +14430,6 @@ Failed: unmatched parentheses at offset 23
- 
- "(?J:(?|(?'R')(\k'R')|((?'R'))))"
- 
-+/(?J:(?|(:(?|(?'R')(\k'R')|((?'R')))H'Rk'Rf)|s(?'R')))/
-+
- /-- End of testinput2 --/
--- 
-2.4.3
-
diff --git a/src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch b/src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch
deleted file mode 100644
index 837e86f..0000000
--- a/src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 83ed574998fe7b844b98ab7cd56291068feb9e31 Mon Sep 17 00:00:00 2001
-From: ph10 ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15
-Date: Sat, 16 May 2015 11:05:40 +0000
-Subject: [PATCH] Fix named forward reference to duplicate group number
- overflow bug.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Port to 8.37:
-
-commit 2fa78aa4e42bcebf2d616c4ee89c012f29dc3447
-Author: ph10 ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15
-Date:   Sat May 16 11:05:40 2015 +0000
-
-    Fix named forward reference to duplicate group number overflow bug.
-
-    git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1559 2f5784b3-3f2a-0410-8824-cb99058d5e15
-
-Signed-off-by: Petr Písař ppisar@redhat.com
----
- pcre_compile.c       | 24 ++++++++++++++++--------
- testdata/testinput1  |  3 +++
- testdata/testoutput1 |  5 +++++
- 3 files changed, 24 insertions(+), 8 deletions(-)
-
-diff --git a/pcre_compile.c b/pcre_compile.c
-index b66b1f6..8b4aaef 100644
---- a/pcre_compile.c
-+++ b/pcre_compile.c
-@@ -7183,15 +7183,15 @@ for (;; ptr++)
-               open_capitem *oc;
-               recno = ng->number;
-               if (is_recurse) break;
--              for (oc = cd->open_caps; oc != NULL; oc = oc->next)         
--                {          
--                if (oc->number == recno)                                     
--                  {               
--                  oc->flag = TRUE;                                      
-+              for (oc = cd->open_caps; oc != NULL; oc = oc->next)
-+                {
-+                if (oc->number == recno)
-+                  {
-+                  oc->flag = TRUE;
-                   break;
--                  }                                                         
--                }                          
--              }    
-+                  }
-+                }
-+              }
-             }
- 
-           /* Count named back references. */
-@@ -7203,6 +7203,14 @@ for (;; ptr++)
-           16-bit data item. */
- 
-           *lengthptr += IMM2_SIZE;
-+
-+          /* If this is a forward reference and we are within a (?|...) group,
-+          the reference may end up as the number of a group which we are
-+          currently inside, that is, it could be a recursive reference. In the
-+          real compile this will be picked up and the reference wrapped with
-+          OP_ONCE to make it atomic, so we must space in case this occurs. */
-+
-+          if (recno == 0) *lengthptr += 2 + 2*LINK_SIZE;
-           }
- 
-         /* In the real compile, search the name table. We check the name
-diff --git a/testdata/testinput1 b/testdata/testinput1
-index 73c2f4d..8379ce0 100644
---- a/testdata/testinput1
-+++ b/testdata/testinput1
-@@ -5730,4 +5730,7 @@ AbcdCBefgBhiBqz
- "(?1)(?#?'){8}(a)"
-     baaaaaaaaac
- 
-+"(?|(\k'Pm')|(?'Pm'))"
-+    abcd
-+
- /-- End of testinput1 --/
-diff --git a/testdata/testoutput1 b/testdata/testoutput1
-index 0a53fd0..e852ab9 100644
---- a/testdata/testoutput1
-+++ b/testdata/testoutput1
-@@ -9429,4 +9429,9 @@ No match
-  0: aaaaaaaaa
-  1: a
- 
-+"(?|(\k'Pm')|(?'Pm'))"
-+    abcd
-+ 0: 
-+ 1: 
-+
- /-- End of testinput1 --/
--- 
-2.4.3
-
-- 
2.4.4


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

[PATCH] Update: To version Apache-2.4.18 and PHP-5.6-17.