* remaining web changes merged. This batch is mostly apache related
--- Merging r23204 into '.':
A    packages/httpd24
A    packages/httpd24/fpmake.pp
A    packages/httpd24/Makefile.fpc
A    packages/httpd24/src
A    packages/httpd24/src/util_filter.inc
A    packages/httpd24/src/httpd.inc
A    packages/httpd24/src/httpd24.pas
A    packages/httpd24/src/http_config.inc
A    packages/httpd24/src/ap_config.inc
A    packages/httpd24/src/ap_mmn.inc
A    packages/httpd24/src/http_core.inc
A    packages/httpd24/src/aprutil
A    packages/httpd24/src/aprutil/apr_uri.inc
A    packages/httpd24/src/aprutil/apr_buckets.inc
A    packages/httpd24/src/ap_regex.inc
A    packages/httpd24/src/apr
A    packages/httpd24/src/apr/apr_pools.inc
A    packages/httpd24/src/apr/apr_time.inc
A    packages/httpd24/src/apr/apr_user.inc
A    packages/httpd24/src/apr/apr_allocator.inc
A    packages/httpd24/src/apr/apr_errno.inc
A    packages/httpd24/src/apr/apr_version.inc
A    packages/httpd24/src/apr/apr_strings.inc
A    packages/httpd24/src/apr/apr.pas
A    packages/httpd24/src/apr/apr_file_info.inc
A    packages/httpd24/src/apr/apr_mmap.inc
A    packages/httpd24/src/apr/apr_tables.inc
A    packages/httpd24/src/util_cfgtree.inc
A    packages/httpd24/src/ap_expr.inc
A    packages/httpd24/src/ap_release.inc
A    packages/httpd24/src/http_log.inc
A    packages/httpd24/src/http_protocol.inc
A    packages/httpd24/Makefile
A    packages/httpd24/examples
A    packages/httpd24/examples/Makefile
A    packages/httpd24/examples/mod_hello.pp
A    packages/httpd24/examples/Makefile.fpc
--- Merging r23206 into '.':
U    packages/fpmake_proc.inc
U    packages/fpmake_add.inc
--- Merging r23207 into '.':
U    packages/httpd24/fpmake.pp
A    packages/httpd24/src/apr/apr24.pas
D    packages/httpd24/src/apr/apr.pas
U    packages/httpd24/src/httpd24.pas
--- Merging r23208 into '.':
C    packages/fcl-web/src/base/Makefile
U    packages/fcl-web/src/base/Makefile.fpc
A    packages/fcl-web/src/base/fpapache24.pp
--- Merging r23209 into '.':
U    packages/fcl-web/fpmake.pp
--- Merging r23242 into '.':
G    packages/fcl-web/fpmake.pp
--- Merging r23244 into '.':
U    packages/httpd24/src/apr/apr_mmap.inc
Summary of conflicts:
  Text conflicts: 1

# revisions: 23204,23206,23207,23208,23209,23242,23244
r23204 | michael | 2012-12-22 13:41:25 +0100 (Sat, 22 Dec 2012) | 1 line
Changed paths:
   A /trunk/packages/httpd24
   A /trunk/packages/httpd24/Makefile
   A /trunk/packages/httpd24/Makefile.fpc
   A /trunk/packages/httpd24/examples
   A /trunk/packages/httpd24/examples/Makefile
   A /trunk/packages/httpd24/examples/Makefile.fpc
   A /trunk/packages/httpd24/examples/mod_hello.pp
   A /trunk/packages/httpd24/fpmake.pp
   A /trunk/packages/httpd24/src
   A /trunk/packages/httpd24/src/ap_config.inc
   A /trunk/packages/httpd24/src/ap_expr.inc
   A /trunk/packages/httpd24/src/ap_mmn.inc
   A /trunk/packages/httpd24/src/ap_regex.inc
   A /trunk/packages/httpd24/src/ap_release.inc
   A /trunk/packages/httpd24/src/apr
   A /trunk/packages/httpd24/src/apr/apr.pas
   A /trunk/packages/httpd24/src/apr/apr_allocator.inc
   A /trunk/packages/httpd24/src/apr/apr_errno.inc
   A /trunk/packages/httpd24/src/apr/apr_file_info.inc
   A /trunk/packages/httpd24/src/apr/apr_mmap.inc
   A /trunk/packages/httpd24/src/apr/apr_pools.inc
   A /trunk/packages/httpd24/src/apr/apr_strings.inc
   A /trunk/packages/httpd24/src/apr/apr_tables.inc
   A /trunk/packages/httpd24/src/apr/apr_time.inc
   A /trunk/packages/httpd24/src/apr/apr_user.inc
   A /trunk/packages/httpd24/src/apr/apr_version.inc
   A /trunk/packages/httpd24/src/aprutil
   A /trunk/packages/httpd24/src/aprutil/apr_buckets.inc
   A /trunk/packages/httpd24/src/aprutil/apr_uri.inc
   A /trunk/packages/httpd24/src/http_config.inc
   A /trunk/packages/httpd24/src/http_core.inc
   A /trunk/packages/httpd24/src/http_log.inc
   A /trunk/packages/httpd24/src/http_protocol.inc
   A /trunk/packages/httpd24/src/httpd.inc
   A /trunk/packages/httpd24/src/httpd24.pas
   A /trunk/packages/httpd24/src/util_cfgtree.inc
   A /trunk/packages/httpd24/src/util_filter.inc

* httpd 2.4 (Apache 2.4) headers by A. Borka
r23206 | michael | 2012-12-22 17:31:41 +0100 (Sat, 22 Dec 2012) | 1 line
Changed paths:
   M /trunk/packages/fpmake_add.inc
   M /trunk/packages/fpmake_proc.inc

* Also compile httpd24
r23207 | michael | 2012-12-22 17:36:43 +0100 (Sat, 22 Dec 2012) | 1 line
Changed paths:
   M /trunk/packages/httpd24/fpmake.pp
   D /trunk/packages/httpd24/src/apr/apr.pas
   A /trunk/packages/httpd24/src/apr/apr24.pas (from /trunk/packages/httpd24/src/apr/apr.pas:23204)
   M /trunk/packages/httpd24/src/httpd24.pas

* Avoid nameclash in apr too
r23208 | michael | 2012-12-22 17:37:50 +0100 (Sat, 22 Dec 2012) | 1 line
Changed paths:
   M /trunk/packages/fcl-web/src/base/Makefile
   M /trunk/packages/fcl-web/src/base/Makefile.fpc
   A /trunk/packages/fcl-web/src/base/fpapache24.pp

* Version of apache module application that works with Apache 2.4
r23209 | michael | 2012-12-22 17:39:18 +0100 (Sat, 22 Dec 2012) | 1 line
Changed paths:
   M /trunk/packages/fcl-web/fpmake.pp

* Compile fpapache24
r23242 | pierre | 2012-12-28 16:33:58 +0100 (Fri, 28 Dec 2012) | 1 line
Changed paths:
   M /trunk/packages/fcl-web/fpmake.pp

 CustHttpApp.pp has no resource strings
r23244 | florian | 2012-12-28 22:51:57 +0100 (Fri, 28 Dec 2012) | 1 line
Changed paths:
   M /trunk/packages/httpd24/src/apr/apr_mmap.inc

* patch by olivier to fix BeOS compilation, resolves #23545