158 Commits

Author SHA1 Message Date
396751b94f remove leftovers from initial libapreq import
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1201373 13f79535-47bb-0310-9956-ffa450edef68
2011-11-13 00:21:15 +00:00
4472a86146 As discussed at AC NA 2011
o relocate srclib/libapreq/library/*.c -> server/apreq_${f}.c
o relocate srclib/libapreq/include/*.h -> include/*.h
o remove apreq_version.[hc] related stuff since its nolonger its own lib
o connect modules/apreq to the build under 'most' default comment out in httpd.conf
o update make_exports.awk to handle APREQ marcos




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1201372 13f79535-47bb-0310-9956-ffa450edef68
2011-11-13 00:20:32 +00:00
80765aa7fe A stab at libapreq build integration, still disabled by default.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200715 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 03:01:33 +00:00
83b7b317c4 hook up srclib/libapreq to the build system
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200590 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 21:59:07 +00:00
e854d63840 add Makefile.in for apreq
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200575 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 21:39:00 +00:00
ab9323a911 relocate the .h files to play nice with the srclib setup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200570 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 21:34:29 +00:00
9493bf62e4 move build system files over from apr-build-system branch in apreq
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200464 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 18:25:14 +00:00
972764a586 relocate some files to match the apr-build-system apreq branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200463 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 18:22:29 +00:00
9ba9dfc5ff drop tests and automake code for now
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200455 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 18:05:46 +00:00
c1902d9d28 relocate apreq/library as a srclib
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200454 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 18:04:56 +00:00
84bd9a2553 Stop bundling PCRE in trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@721020 13f79535-47bb-0310-9956-ffa450edef68
2008-11-26 22:53:34 +00:00
920ec27cf7 A better solution than /wd4996 to disable "depreciated posix" garbage.
This solution doesn't emit warnings under VC 6.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@567523 13f79535-47bb-0310-9956-ffa450edef68
2007-08-20 02:19:09 +00:00
fe27b423e8 minor cosmetic changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@563232 13f79535-47bb-0310-9956-ffa450edef68
2007-08-06 19:28:49 +00:00
19be2766df Remove extra colon from /wd compiler directive.
On conversion the VS2005 reports:
ommand line error D8021 : invalid numeric argument '/wd:4996'	cl

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@464208 13f79535-47bb-0310-9956-ffa450edef68
2006-10-15 15:21:18 +00:00
887abb5995 Revert 463929
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@464141 13f79535-47bb-0310-9956-ffa450edef68
2006-10-15 07:03:14 +00:00
9d69c78d60 Fix compile warning. The /wd:XXXX is invalid. It should
be /wdXXXX, and since its for VS2005 only use the standard
preprocessor directives instead of that.
This should be backported to 2.2 as well.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@463929 13f79535-47bb-0310-9956-ffa450edef68
2006-10-14 13:34:58 +00:00
0162304773 Silence VC2005 faux-errors in pcre with the minimum tweak required.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@439639 13f79535-47bb-0310-9956-ffa450edef68
2006-09-02 19:23:01 +00:00
f65c47bd75 Remove all /machine:I386 references, these are getting in the way
of switching linkers from the x86 (default linker) to x64 or other
  possible target platforms.  (Also, this commit cleans up lingering
  /GX switches from the 'BASE' options that are supposed to be unused).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@397407 13f79535-47bb-0310-9956-ffa450edef68
2006-04-27 05:30:39 +00:00
663687ae8e s|/GX |/EHsc | because they were always synonyms, and Visual Studio
2005 edition complains bitterly and loudly that /GX is deprecated.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395419 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 22:51:02 +00:00
cc6c19b0d9 Make trunk build with -DDEBUG on just about all the platforms under my roof (FreeBSD, Darwin, Ubuntu Breezy)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@381783 13f79535-47bb-0310-9956-ffa450edef68
2006-02-28 21:14:36 +00:00
9fdf7c8ac4 Backport patch from pcre 6.2 to fix integer overflows in quantifier
parsing:

* srclib/pcre/pcre.c (read_repeat_counts): Check for integer overflow.

Obtained from: pcre 6.2 upstream


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@233493 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 15:56:36 +00:00
20d06d7a06 Reintroduce stack frame construction with /Oy- (removal was implied by /O2).
This makes binaries far easier to debug, during operation and for post-crash
  .dmp analysis.  Do not alter /Gs optimizations per brane.

Reviewed by: stoddard, brane

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170253 13f79535-47bb-0310-9956-ffa450edef68
2005-05-15 19:11:57 +00:00
b1d6541d7c Fix three problems with pcre for portability;
1. study.c's pointer arg didn't jive with pcre_fullinfo()'s prototype,
     however there was no (trivial) way to get them to concur.  Cast in
     this case was the least of several evils.

  2. byteflip had an error for high-bit set bytes, because right shift
     signed is allowed to extend the sign bit.  These had to be unsigned,
     and the real_pcre types were the safest way to do this.

  3. split byteflip into byteflip2/4, to drop size truncation emits, 
     as the arguments are unambigiously 16 or 32 bits as defined 
     in pcre_internal.h.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@157948 13f79535-47bb-0310-9956-ffa450edef68
2005-03-17 17:50:29 +00:00
e681eb22c8 Get httpd-2.1 building once again on win32.
NEVER NEVER screw around with redeclaring AP_ macros and constants.
  If the compiler won't pick them up, e.g., AP_DECLARE, ya've done 
  something wrong from the start.

  All httpd/ap headers depend on httpd.h - plain and simple, so this
  un-convolutes the unusual order here.

  STATIC has become PCRE_STATIC, along with some other odd definitions.
  The only remaining emit is that _pcre_free export is imported, which
  implies something is unusual with the declaration.  Still researching.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154207 13f79535-47bb-0310-9956-ffa450edef68
2005-02-17 23:45:16 +00:00
502606508c Support use of an external copy of the PCRE library:
* configure.in: Set abs_{builddir,srcdir} higher.  Add --with-pcre
flag; build against external PCRE library if used.

* Makefile.in (install-include): Don't install pcre headers any more.

* srclib/Makefile.in (SUBDIRS): Remove.

PR: 27550 (part two)
Submitted by: Andres Salomon <dilinger voxel.net>, Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153400 13f79535-47bb-0310-9956-ffa450edef68
2005-02-11 14:08:24 +00:00
a0570c8746 Move the POSIX reg* implementations into the ap_* namespace;
internalise the ap_reg*<->PCRE wrapper:

* configure.in: Add srclib/pcre to the include path.

* include/ap_regex.h: Renamed from include/pcreposix.h.  Prefix all
constants with AP_; prefix all functions and types with ap_.  Define
AP_DECLARE to nothing if necessary.  Remove regcomp error codes.

* include/httpd.h: Include ap_regex.h not pcreposix.h.
(ap_pregcomp, ap_regexec, ap_regfree): s/regex_t/ap_regex_t/.
(ap_regexec, ap_regerror): Prototypes moved to ap_regex.h.

* server/util.c (regex_cleanup, ap_pregcomp, ap_pregsub, ap_pregfree):
Adjust for ap_ prefixed types.  (ap_regexec, ap_regerror): Removed.

* server/Makefile.in: Build util_pcre.c.

* server/util_pcre.c: Copied from srclib/pcre/pcreposix.c; remove use
of PCRE-internals to do error mapping; rename types to add AP_/ap_
prefixes as above.  Use APR includes.  (ap_regerror): Use apr_snprintf.

* srclib/pcre/Makefile.in: Don't build pcreposix.c into libpcre.la.

* modules/*: Update to use new type and constant names.

PR: 27750 (part one)
Submitted by: Andres Salomon <dilinger voxel.net>, Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153384 13f79535-47bb-0310-9956-ffa450edef68
2005-02-11 12:00:41 +00:00
4433699079 Allow APR-UTIL to exist and build outside of the httpd/srclib file structure
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@109566 13f79535-47bb-0310-9956-ffa450edef68
2004-12-02 22:00:05 +00:00
2e5c4bd5f7 Remove pcreposix.h that is now in main include dir.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106905 13f79535-47bb-0310-9956-ffa450edef68
2004-11-29 11:52:09 +00:00
e1df40c45f Use pcreposix.h from main include dir.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106904 13f79535-47bb-0310-9956-ffa450edef68
2004-11-29 11:39:00 +00:00
c8ffb083c3 dftables now uses output file as command line param.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106900 13f79535-47bb-0310-9956-ffa450edef68
2004-11-29 10:11:22 +00:00
f53dd44bac Add missing pcreposix.h from vendor/pcre/5.0.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106899 13f79535-47bb-0310-9956-ffa450edef68
2004-11-29 10:09:15 +00:00
c82b6595dc Moving pcreposix.h to include/ to replace the (now out of date) version there
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106755 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 20:21:20 +00:00
48d886e963 Update the NetWare and Windows version of the autoconf derived files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106749 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 19:51:42 +00:00
5a4f391433 Removed the documentation files because they were making the httpd
source checkout too large, added a README file pointing to the reference
copy of the docs in the PCRE vendor branch


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106747 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 19:43:25 +00:00
b90599f28f * srclib/pcre/pcre.c (pcre_compile): Remove unused variable.
(sent upstream too).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106698 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 09:22:38 +00:00
99ea2adc1f Upgraded the copy of PCRE within srclib/pcre to version 5.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106690 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 07:28:04 +00:00
f8c39471bf restore the files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106243 13f79535-47bb-0310-9956-ffa450edef68
2004-11-22 23:55:03 +00:00
0ba9b802f7 these files are broken by svn:eol-style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106239 13f79535-47bb-0310-9956-ffa450edef68
2004-11-22 23:49:31 +00:00
cc27d97ae1 general property cleanup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106103 13f79535-47bb-0310-9956-ffa450edef68
2004-11-21 18:50:36 +00:00
c81af0c696 Preparation step to simplify merging to a newer pcre:
* srclib/pcre/ltmain.sh, ltconfig, config.guess, config.sub: Remove
files which are unneeded when pcre is built by the httpd build system.

* srclib/pcre/RunTest: Remove generated file, a leftover from an older
version of pcre.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105820 13f79535-47bb-0310-9956-ffa450edef68
2004-11-19 14:07:37 +00:00
c36ecfa64f Remove the .cvsignore files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105796 13f79535-47bb-0310-9956-ffa450edef68
2004-11-19 09:07:29 +00:00
e0af4588ef Clean up a few minor issues with the NetWare make file
Submitted by: "NormW" <normw@bocnet.com.au>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102502 13f79535-47bb-0310-9956-ffa450edef68
2004-02-04 17:43:29 +00:00
281948b722 After discussions at length on dev@apr/httpd, it is determined that
the older .dbg format symbols are not worth the interference with
  generating complete .pdb symbolic debugging databases.

  This patch further eliminates pdbtype:sept flags that interfere with
  deciphering local symbols and type information.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98970 13f79535-47bb-0310-9956-ffa450edef68
2003-03-11 00:58:59 +00:00
25ac108fe2 After consultations on the APR list, it was decided that /map files are
fairly redundant when you retain rich .pdb debugging symbol files.  We
  have rarely used them, and generally .dbg and .pdb files prove much more
  useful for the cases we have.

  While eliminating /map files, we are also shrinking the size of the .dbg
  files by stripping 'private' symbol information.  Really this means less
  rich diagnostics from Dr. Watson on NT or Win9x when they query the .dbg
  symbols in creating a DrWatson log file.  But it's more than compensated
  for on newer OS'es where Dr. Watson will query the .pdb symbols, on all
  Win32 flavors when WinDbg is used with the .pdb symbols, and the fact that
  the distribution of binary symbols will use less bandwidth when less
  information is duplicated from the .pdb format into the .dbg files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98743 13f79535-47bb-0310-9956-ffa450edef68
2003-02-20 15:56:04 +00:00
a45632ba37 *) Introduce debugging symbols for Win32 release builds, both .pdb
and .dbg files (older debuggers and Dr. Watson-type utilities
     on WinNT or Win9x don't support the newer .pdb flavor.)
     [Allen Edwards, William Rowe]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98596 13f79535-47bb-0310-9956-ffa450edef68
2003-02-07 21:30:53 +00:00
f82b8c7481 Missing an include path for build the dftables support utility
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98316 13f79535-47bb-0310-9956-ffa450edef68
2003-01-18 00:36:52 +00:00
05eb74d7fe config.log and config.status are created by configure and need to
be removed by make distclean


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96576 13f79535-47bb-0310-9956-ffa450edef68
2002-08-29 19:30:51 +00:00
e197d0cf24 Fixing up a dependancy problem and making sure that the platform header
files have been properly renamed before building.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96358 13f79535-47bb-0310-9956-ffa450edef68
2002-08-12 15:47:32 +00:00
f134bd84a1 Add autom4te.cache to cvsignore files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95910 13f79535-47bb-0310-9956-ffa450edef68
2002-06-29 07:39:12 +00:00
a2762309d3 NetWare makefile for building the dftables utility
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95824 13f79535-47bb-0310-9956-ffa450edef68
2002-06-20 14:53:34 +00:00