1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

138 Commits

Author SHA1 Message Date
Joe Orton
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
William A. Rowe Jr
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
William A. Rowe Jr
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
William A. Rowe Jr
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
Joe Orton
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
Joe Orton
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
Bradley Nicholes
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
Mladen Turk
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
Mladen Turk
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
Mladen Turk
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
Mladen Turk
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
Brian Pane
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
Bradley Nicholes
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
Brian Pane
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
Joe Orton
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
Brian Pane
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
André Malo
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
André Malo
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
André Malo
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
Joe Orton
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
Joe Orton
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
Bradley Nicholes
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
William A. Rowe Jr
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
William A. Rowe Jr
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
William A. Rowe Jr
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
Bradley Nicholes
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
Jeff Trawick
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
Bradley Nicholes
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
Justin Erenkrantz
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
Bradley Nicholes
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
William A. Rowe Jr
a997a50103 Ooops... newline. Caught it
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95739 13f79535-47bb-0310-9956-ffa450edef68
2002-06-17 22:45:09 +00:00
William A. Rowe Jr
8709990d4b Quiet emits for win32 folks building with zlib for mod_deflate
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95738 13f79535-47bb-0310-9956-ffa450edef68
2002-06-17 22:44:37 +00:00
William A. Rowe Jr
93dc524eb3 cvs up/diff gets pretty hard to track with vc7 builds.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95524 13f79535-47bb-0310-9956-ffa450edef68
2002-06-05 14:56:46 +00:00
William A. Rowe Jr
d227cad013 We appear to never have had any complaints about copy srcname dstname
not overwriting dstname ... this flavor is certain not to emit a file
  exists error [with the obvious caviat - if it's write protected, your
  problem.]  Much simpler than /y, <.y or set copycmd fooness.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95265 13f79535-47bb-0310-9956-ffa450edef68
2002-05-24 15:16:53 +00:00
Justin Erenkrantz
12921bc4fd First pass at trying to standardize httpd-2.0's usage of APR and APR-util
so that they can be separated - use an installed APR and APR-util with
httpd-2.0.  This is not expected to achieve full separation, but is
merely the first step in the process.  The tree should still be buildable
in the source-only case.

This commit does the following things:
- Use the standard find_apr.m4 and find_apu.m4 m4 macro files that flood and
  Subversion already use for locating APR and APR-util.  This adds the
  --with-apr and --with-apr-util configure options.
- Stop using APRVARS and export_vars.sh.
- Use apr-config and apu-config to determine dependencies.
- Add AP_BUILD_SRCLIB_DIRS and AP_CLEAN_SRCLIB_DIRS values (names stink)
  to dynamically figure out what subdirs in srclib we will build.
  (What we really want to do is set one value - go L->R on build and
   R->L on clean.  I can't think of a way to do this.)
- If we are using APR and APR-util that are already installed, don't
  specify them in srclib.  (This still needs some work I bet.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95061 13f79535-47bb-0310-9956-ffa450edef68
2002-05-13 08:39:30 +00:00
Justin Erenkrantz
c0c7c0be9a Merge in latest GNU config.guess and config.sub files. Synchronize all
config.guess/config.sub files to be identical.  Previously, we had three
different versions of the guess files - now they are the same.

I attempted to merge in ASF changes that were marked and still needed.
Please verify that these work on your platform.  (Particular attention
is required for the IBM platforms.)

Part of PR 7818 stems from the fact that the bundled expat did not have an
included config.guess/config.sub.  Therefore, it would take the config.guess
from the system.  Icarus's autoconf/libtool is very old (2.13/1.3.5).  The
machine that was used to roll 2.0.32 had a recent autoconf/libtool which
explains the behavior that Sander saw in the PR.  Therefore, we now
explicitly provide a config.guess/.sub for the bundled expat so that
all of the versions are in sync.  This should minimize configuration
problems.

pcre was using a config.guess that was imported when Brian made the 3.9
import.  It did not have the Apache modifications, but seems to have
had the Darwin changes.  Go figure.  Sync it up as well.

PR: 7818
Obtained from: GNU FSF - ftp.gnu.org/gnu/config


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94671 13f79535-47bb-0310-9956-ffa450edef68
2002-04-16 08:49:03 +00:00
Brian Pane
987b84f020 Performance optimization: use a temp buffer on the stack instead
of a malloc'ed buffer in regexec() in cases where the required
buffer size is small.

This will help us avoid a malloc/free pair when executing mod_rewrite
rules that use $1/$2/etc to reference sequences in the matched pattern.

Note: I've also submitted this change as a patch for PCRE, but because
the next PCRE release isn't planned until later this year I'm
committing it to the httpd-2.0 copy of PCRE in the meantime.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94069 13f79535-47bb-0310-9956-ffa450edef68
2002-03-21 04:17:11 +00:00
Cliff Woolley
0fd1fa6c7e Fix the build on Win32 by syncing up the .hw headers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94058 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 19:04:24 +00:00
Brian Pane
73cf0ac122 Fix for some damage that I did to configure.in while merging the
latest version of PCRE


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94047 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 06:56:34 +00:00
Brian Pane
e1352700de removing configure file that got picked up in PCRE 3.9 import
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94045 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 06:38:37 +00:00
Brian Pane
175a726e87 PCRE 3.9 merge
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94044 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 06:34:29 +00:00
Brian Pane
a3b01fe787 PCRE 3.9 merge
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94043 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 06:22:57 +00:00
Brian Pane
3585b72c41 resolve merge conflicts for PCRE 3.9
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94042 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 06:17:33 +00:00
Brian Pane
dcfb4eb1a3 This commit was generated by cvs2svn to compensate for changes in r8100,
which included commits to RCS files with non-trunk default branches.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94037 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 05:54:26 +00:00
Brian Pane
da5612c792 Initial revision
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94033 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 05:53:59 +00:00
Aaron Bannert
cabbbaaf08 Whoops, didn't mean to get rid of the whole line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92614 13f79535-47bb-0310-9956-ffa450edef68
2001-12-27 02:28:38 +00:00
Aaron Bannert
ab30b9262f This old variable does not appear to be in use any longer.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92613 13f79535-47bb-0310-9956-ffa450edef68
2001-12-27 02:18:58 +00:00
William A. Rowe Jr
54071db177 This broken bit causes a segfault after locking pconf as read-only.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91181 13f79535-47bb-0310-9956-ffa450edef68
2001-09-28 17:15:12 +00:00
Ryan Bloom
73f768d207 rules.mk is stored in $(top_blddir). Without this change, VPATH builds
stop working.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91017 13f79535-47bb-0310-9956-ffa450edef68
2001-09-13 06:49:09 +00:00
Ryan Bloom
8e90e6632e Allow us to build APR before APR-util, but clean APR-util before
APR.  This should fix the build for BeOS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90850 13f79535-47bb-0310-9956-ffa450edef68
2001-08-31 17:02:23 +00:00