www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Code Activity
22,233 Commits 62 Branches 306 Tags
bd5efb04fa7d28ed07b1b5fa402620e8c19e4e34
Commit Graph

1521 Commits

Author SHA1 Message Date
Stefan Fritsch
b791885bad Only init the RNG once at startup. This saves some entropy and works around the APR bug 
fixed in r1198921


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1198930 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-07 20:57:02 +00:00
Stefan Fritsch
7c5a4c2bc9 Call apr_random_after_fork() manually in the child processes because the MPMs 
use plain fork() and not apr_proc_fork().
Also add some workaround for APR not changing the RNG state in the parent.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1198868 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-07 18:46:47 +00:00
Graham Leggett
b84938b043 mod_include: Add support for application/x-www-form-urlencoded encoding 
and decoding.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1194870 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-29 11:13:37 +00:00
Stefan Fritsch
308d06fd8d Improve handling of maxlen = APR_SIZE_MAX, noticed by Jim. 
Use apr_pregsub_ex() and maxlen = 0 for unlimited in mod_substitute.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1189985 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-27 20:15:36 +00:00
Stefan Fritsch
04ca93ecff Limit ap_pregsub() to 64K, add ap_pregsub_ex() for longer strings and with 
better error reporting. Modify ap_varbuf_regsub() to be similar to
ap_pregsub_ex().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1188950 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-25 22:29:13 +00:00
Stefan Fritsch
40b2bb8f92 There is absolutely no reason to have two 4k-sized constant strmatch patterns 
in each per-dir config.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1183475 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-14 19:51:17 +00:00
Stefan Fritsch
0ddfb3e6cc Add -D DUMP_RUN_CFG option to dump some configuration items 
from the parsed (or default) config. This is useful for init scripts that
need to setup temporary directories and permissions, for example if those
temporary directories are located on a ram disk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180681 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-09 18:35:23 +00:00
Stefan Fritsch
cd17cd2c10 Consistenly use apr_file_* API instead of libc when dumping config because 
mixing the two can give strange results due to buffering.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180671 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-09 17:55:06 +00:00
Stefan Fritsch
14db7672ac Remove ap_proxy_removestr(). It has been unused for a decade and has quadratic 
memory usage.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180654 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-09 17:07:17 +00:00
Stefan Fritsch
e325580d01 re-add "extern" accidentally removed by r1179448 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1179715 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-06 17:28:41 +00:00
Stefan Fritsch
6327f51ed2 Export ap_max_mem_free, needed by r1178079, as pointed out by Gregg L. Smith 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1179448 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-05 21:25:58 +00:00
Paul Querna
3bc7336e01 Remove trailing comma on last enum member for authz_status 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1177497 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-30 03:55:42 +00:00
Stefan Fritsch
e1fc6f9d0c Some varbuf enhancements: 
- Introduce new ap_varbuf_pdup() and ap_varbuf_regsub() functions.
- Fix some bugs in ap_varbuf_strmemcat().
- Make ap_varbuf.buf point to an empty string if no buffer has been allocated,
  yet.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1176018 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-26 20:05:09 +00:00
Stefan Fritsch
1951a037bf More cleanup: Expand tabs and some more indentation fixes 
No functional change


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174929 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-23 18:08:42 +00:00
Jim Jagielski
103f776c25 Cleanup effort in prep for GA push: 
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174748 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-23 13:38:09 +00:00
Stefan Fritsch
01ed21af9d Add wrappers for malloc, calloc, realloc that check for out of memory 
situations.  Use them in most places where malloc, and friends are used.
This results in clean error messages in an out of memory situation instead of
segfaulting or silently malfunctioning. In some places, it just allows to
remove some logging code.

PR 51568, PR 51569, PR 51571.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1172686 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-19 16:25:42 +00:00
Stefan Fritsch
817a209e9a Fix cut'n'paste errors: APR_DECLARE -> AP_DECLARE 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1171652 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-16 16:37:06 +00:00
Stefan Fritsch
2d4e23d88b Create wrapper API for apr_random; 
use in mod_lbmethod_heartbeat and mod_serf to
- replace some needles use of apr_generate_random_bytes
- remove code duplication


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1171247 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-15 19:53:59 +00:00
Jim Jagielski
625b89a7e2 Add in MaxRangeOverlaps and MaxRangeReversals to accomodate 
more control over acceptable Range headers:

        See: http://trac.tools.ietf.org/wg/httpbis/trac/ticket/311

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1169756 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-12 14:15:53 +00:00
William A. Rowe Jr
17d8f0aace unixfy 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1169594 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-12 02:14:35 +00:00
William A. Rowe Jr
386f5f4c12 RM warning text 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1169593 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-12 02:12:49 +00:00
Eric Covener
5de00b4e54 typo in comment 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1166672 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-08 13:10:22 +00:00
Eric Covener
c45e14b246 refactor to pull setting of Accept-Ranges header into http_protocol.c which 
had been copied to other handlers.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1166663 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-08 12:56:08 +00:00
Eric Covener
fe5f7b561d take care of some MaxRanges feedback: 
* allow "none" to be expressed in config
 * send Accept-Ranges: none with MaxRanges none
 * stop accepting confusing/ambiguous "0", start accepting "unlimited".



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1166282 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-07 17:29:49 +00:00
Eric Covener
1aaea94cb5 add MaxRanges directive institute a default limit of 200 (post-merge where 
applicable) Ranges before returning the complete resource.

(minor mmn bump for core_dir_config addition)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162584 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-28 20:35:07 +00:00
Stefan Fritsch
17dcad4b5a Actually commit the header added in r1157354 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1157361 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-13 09:33:38 +00:00
Stefan Fritsch
84a104bb22 Add ap_varbuf API for resizable buffers. 
Increase length limit of lines in the configuration file to 16MB.
Increase length limit of lines in the group file to 16MB.

PR: 45888, 50824, 43084

Windows and Netware build changes are untested.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1157354 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-13 09:06:35 +00:00
Eric Covener
f5b63175fc mod_ldap: remove hard-coded loops of 10 retries w/o delay with a configurable 
number of retries (LDAPRetries, default 3) and configurable delay between 
retries (LDAPRetryDelay, no delay by default).

The LDAP connection is re-initted every other retry, instead of
on the fifth retry -- this was a much more recent addition then
the basic looping behavior.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1156790 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-11 20:05:18 +00:00
Stefan Fritsch
9d2ca013b6 cleanups related to new AllowOverrideList functionality: 
- add new NOT_IN_HTACCESS flag for ap_check_cmd_context() 
- describe the need for this in new_api_2_4.xml
- forbid Define and UnDefine in .htaccess


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1153676 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-03 21:36:18 +00:00
Jim Jagielski
db7bd57c24 And we are at 2.3.15-dev 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1152855 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-01 16:24:16 +00:00
Jim Jagielski
3ae9c54dfc Get ready to tag 2.3.14 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1152854 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-01 16:22:39 +00:00
Daniel Ruggeri
0d69087127 Add AllowOverrideList directive and documentation 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1151654 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-27 22:24:14 +00:00
Stefan Fritsch
ec8235ddbf Document the weird semantics of ap_find_command_in_modules() 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1151045 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-26 09:47:51 +00:00
Ruediger Pluem
480b79f5a5 * Make trunk compile with APR trunk again (without LDAP support of course), by 
ensuring that we only include the include files of the APR / APU LDAP API if
  we use 1.x. Move stuff that depends on it inside the APR_HAS_LDAP block.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1150559 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-25 07:08:33 +00:00
Stefan Fritsch
068a678142 Add change log entry, bump MMN 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@1150173 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-23 17:32:24 +00:00
Stefan Fritsch
602791140b Revert r1129808: 
Incorporate the ap_ldap incomplete API, as there is no interest or effort
    at APR to make this a complete abstraction, and it was voted 'off the island'
    with APR 2.0.  This will allow httpd 2.3 to build against either apr-2.0
    or apr+util 1.x.

This also reverts part of r1142938, which needs to be re-done.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@1150172 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-23 17:29:42 +00:00
Stefan Fritsch
9674eb32cb Revert r1129886: 
Shift declaration logic of LDAP_DECLARE to ap_ldap.h from util_ldap.h



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@1150169 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-23 17:21:02 +00:00
Stefan Fritsch
6e1307b58e Revert r1129891: 
LDAP_DECLARE Header adjustment for nw/win32



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@1150168 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-23 17:19:55 +00:00
Stefan Fritsch
533704a7fa Revert r1131393: 
Several fixes for the ap_ldap build logic. This should fix compilation
    without --with-ldap.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@1150165 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-23 17:16:54 +00:00
Stefan Fritsch
2d42def875 Revert r1140069: 
Fix load order dependencies in LDAP code by switching to use of APR
    optional functions for the inter-module API...



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@1150164 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-23 17:10:49 +00:00
Stefan Fritsch
4d88b32162 Revert r1143221: 
No tabs please.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@1150160 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-23 17:06:55 +00:00
Stefan Fritsch
47e13744e8 Revert r1143225: 
Removed define which is now in ap_ldap.h.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@1150158 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-23 17:04:57 +00:00
Stefan Fritsch
beb3ea9c11 Add more (trace) logging to the ap_scan_script_header*() functions 
Add ap_scan_script_header*_ex() functions that take a module index for
logging.
Make mod_cgi, mod_cgid, mod_proxy_fcgi, mod_proxy_scgi, mod_isapi use the
new functions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1147493 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-16 21:53:18 +00:00
Jeff Trawick
7eb1caed9a fix def'n of AP_SLOTMEM_PROVIDER_VERSION, use it 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1146737 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-14 14:47:59 +00:00
Guenter Knauf
5cbce65f88 Removed define which is now in ap_ldap.h. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1143225 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-05 23:39:29 +00:00
Guenter Knauf
3e0698bf52 No tabs please. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1143221 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-05 22:54:37 +00:00
Stefan Fritsch
3b66f2bef8 Fix build failure without HAVE_SYSLOG, e.g. on Netware 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1142457 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-03 16:41:39 +00:00
Stefan Fritsch
46d4791a5d Add string valued expressions to ap_expr, do some API cleanup 
- add possibility to have expressions that evaluate to a string and not to
  a boolean value
- modify ap_expr_parse_cmd() interface to support this and make it more
  convenient to use in general
- rename AP_EXPR_FLAGS_* to AP_EXPR_FLAG_* for consistency


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1142164 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-02 07:45:00 +00:00
Jim Jagielski
fa8dc749ee And roll on to 2.3.14 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1140734 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-28 17:18:24 +00:00
Jim Jagielski
c0497d613d Get ready to tag as 2.3.13-beta 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1140730 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-28 17:16:06 +00:00