www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity
22,617 Commits 62 Branches 306 Tags
e46cdfc8a61609b354ac14beba2f689fbda17b60
Commit Graph

1557 Commits

Author SHA1 Message Date
Jim Jagielski
9675b7484f Allow for changing of string more easily... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1214296 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 15:29:19 +00:00
Graham Leggett
cb21a0dbcc Further clarify the naming of the entity that directly connects to us by 
calling that entity a client instead of a peer.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1214015 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 01:10:52 +00:00
Graham Leggett
2af2fa44ad Further clarify the naming of the entity that originates the request by 
calling that entity a useragent instead of a client.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1214003 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 00:31:51 +00:00
Stefan Fritsch
91ce790cd3 Limit length of lines in .htaccess to 8K again, to reduce DoS potential. 
Make ap_varbuf_cfg_getline() strictly enforce the max_len parameter.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1213338 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-12 17:50:33 +00:00
Joe Orton
fd967eab44 * include/httpd.h, server/mpm/*/*.h: Tidy up doxygen tree view by moving 
private interfaces into a separate group.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1211490 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-07 16:06:16 +00:00
Joe Orton
0071b626f2 * include/: Various doxy markup tweaks. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1211364 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-07 10:06:21 +00:00
Joe Orton
abeba696e8 * include/util_varbuf.h: Doxygen tweaks. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1211351 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-07 09:40:41 +00:00
Stefan Fritsch
45750ca9ee -1 to introducing new months so late in the release cycle 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1210219 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-04 20:58:51 +00:00
Graham Leggett
ea4340c12a mod_proxy: Note that proxy_lb_workers was removed from the public API. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1210019 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-03 21:51:55 +00:00
Graham Leggett
7d3c369168 MMN bump for the removals from the public mod_proxy API. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209956 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-03 17:24:30 +00:00
Stefan Fritsch
daea1baa46 update MMN, not only the comment 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209773 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-02 23:09:31 +00:00
Stefan Fritsch
b3cde50489 Add APLOGNO() macro for unique tags for every log message. 
Add some scripts to make adding these tags easier.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209743 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-02 22:26:54 +00:00
Graham Leggett
45eb1cdd06 mod_session: Use apr_status_t as a return code across the mod_session API, 
clarify where we ignore errors and why.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209603 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-02 17:47:05 +00:00
Graham Leggett
d0d00b5d01 mod_cache: Apply the API change that allows future mod_cache providers to 
invalidate cache entries, which will fix PR15868.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1208822 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-30 21:56:11 +00:00
Graham Leggett
394e5594d6 Introduce a per connection "peer_ip" and a per request "client_ip" to 
distinguish between the raw IP address of the connection and the effective
IP address of the request.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1206291 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-25 19:42:04 +00:00
Jim Jagielski
f66d79b8b2 Use varargs... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205894 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-24 15:53:16 +00:00
Stefan Fritsch
ea54b8b1d5 fix comment 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205564 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-23 20:24:49 +00:00
Jim Jagielski
d2342460fd Add ap_pass_brigade_fchk() which does a Filter CHecK on the 
brigade pass.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205419 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-23 14:52:43 +00:00
Graham Leggett
4ee7eea4cf Introduce a per request version of the remote IP address, which can be 
optionally modified by a module when the effective IP of the client
is not the same as the real IP of the client (such as a load balancer).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204968 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-22 13:10:39 +00:00
Stefan Fritsch
e0184da329 Pass ap_errorlog_info to error_log hook. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204614 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-21 17:36:26 +00:00
Stefan Fritsch
ab7b448082 Fix segfault caused by r1204104 on non-async mpms. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204180 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-20 16:41:42 +00:00
Stefan Fritsch
40ac38ff05 Remove MPM-private stuff from conn_state_t 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204104 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-19 23:35:46 +00:00
Stefan Fritsch
92663b1e32 Limit recursion in ap_expr evaluation to avoid unbounded stack usage 
* evaluate chains of ||, &&, and string concatenation non-recursively
* limit other types of recursion to 20 levels
* avoid some string copies if concatenating more than 2 strings


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204087 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-19 21:58:48 +00:00
Ruediger Pluem
fc08292c7e * Actually change the defines and not only the comment. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203792 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-18 19:12:31 +00:00
Jeff Trawick
7cc67a8c39 add conn_rec to error log hook 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203634 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-18 13:10:06 +00:00
Guenter Knauf
ed588c6e1a Since we have branched 2.4.x we are now at 2.5.0 in trunk. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1201924 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-14 21:55:07 +00:00
Guenter Knauf
69218cb912 Added apreq to NetWare build. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1201918 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-14 21:39:19 +00:00
Philip M. Gollucci
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
Philip M. Gollucci
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
Philip M. Gollucci
e9806ab9d9 import apreq include files 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200458 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-10 18:08:04 +00:00
Jeff Trawick
5405226ae2 end-generation hook: Fix false notification of end-of-generation for 
temporary intervals with no active MPM children.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200449 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-10 17:46:57 +00:00
Jim Jagielski
7ce4868e40 And we are at 2.3.16-dev 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199519 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-08 23:07:29 +00:00
Jim Jagielski
4cab24c02a Getting ready to tag 2.3.15-dev 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199516 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-08 23:05:46 +00:00
Jim Jagielski
59066a3ff3 Change def timeout from a nasty 5 mins to a more reasonable 1min 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199485 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-08 22:07:58 +00:00
Stefan Fritsch
ccc76d4e43 Change default FileETag to be "size mtime", i.e. remove the inode. Adjust the 
etag generation in mod_dav_fs to the new default.

PR 49623.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199086 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-08 03:06:08 +00:00
Eric Covener
2af550c8c9 mod_lua: Expose SSL variables via r:ssl_var_lookup() 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199056 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-08 01:53:15 +00:00
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