www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-08 04:22:21 +03:00
Code Activity
22,500 Commits 62 Branches 304 Tags
c7f1896fa72eafc46943b51a07b72634fda93ca3
Commit Graph

1417 Commits

Author SHA1 Message Date
Jeff Trawick
d854b9d90c fix or complain about some invalid errno references 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@882269 13f79535-47bb-0310-9956-ffa450edef68
 2009-11-19 20:00:12 +00:00
Daniel Earl Poirier
04fd4abf90 Fix a lot of doxygen warnings. Thanks to Brad Hards for the patch. 
I added a few more fixes, and there are still more that might
need a doxygen expert.

PR: 48061
Submitted by: Brad Hards
Reviewed by: poirier


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@830527 13f79535-47bb-0310-9956-ffa450edef68
 2009-10-28 13:25:49 +00:00
Stefan Fritsch
3fa2c0e208 Allow ProxyPreserveHost to work in <Proxy> sections 
PR: 34901


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@824072 13f79535-47bb-0310-9956-ffa450edef68
 2009-10-11 13:38:51 +00:00
Jean-Frederic Clere
3c6bce62c6 When pick was zero no worker where choosen. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@823093 13f79535-47bb-0310-9956-ffa450edef68
 2009-10-08 08:52:14 +00:00
Jean-Frederic Clere
c673a9f77e Oops the slotmem uses apr_time_now. Can't use stat on shared memory :-) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@822758 13f79535-47bb-0310-9956-ffa450edef68
 2009-10-07 14:36:49 +00:00
Guenter Knauf
4fd9ac729f set property. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@820507 13f79535-47bb-0310-9956-ffa450edef68
 2009-10-01 01:34:41 +00:00
Guenter Knauf
647dceee80 prepare to add mod_serf to NetWare build. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@820505 13f79535-47bb-0310-9956-ffa450edef68
 2009-10-01 01:32:06 +00:00
Jim Jagielski
2810699d0c Try to have consistent interface regardless of slotmem or 
file-based.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@820388 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-30 18:58:34 +00:00
Guenter Knauf
1088a868e3 Added mod_proxy_fcgi to NetWare build. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@820381 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-30 18:44:50 +00:00
Jean-Frederic Clere
da843ec5e9 When connecting to no http protocol response will be NULL and httpd cores. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@820216 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-30 08:56:10 +00:00
Jean-Frederic Clere
406bf000e2 Add port in the logic. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@820213 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-30 08:50:57 +00:00
Daniel Earl Poirier
e43f032844 Make comment agree with code. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@820036 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-29 17:27:56 +00:00
Jean-Frederic Clere
42e280b1ae When using Heartmonitor choose the back-end randomly for the list provider by mod_heartmonitor. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@819984 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-29 15:28:25 +00:00
Jean-Frederic Clere
6b75969829 typo. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@819962 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-29 14:16:50 +00:00
Guenter Knauf
8be8757f8d Fixed internal NLM name. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@818688 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-25 01:23:15 +00:00
Guenter Knauf
fb2aef47fe Added mod_proxy_scgi to NetWare build. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@818683 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-25 00:58:56 +00:00
André Malo
9fd72cdebd remove useless line 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@817066 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-20 17:57:05 +00:00
Jim Jagielski
5ee4ddf065 use what we know 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@816361 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-17 19:58:40 +00:00
Jim Jagielski
51097f8040 kinda old 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@816203 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-17 14:09:37 +00:00
Guenter Knauf
5d67263c06 changed build of proxy modules to use common mod_proxy.imp file. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@815392 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-15 16:55:03 +00:00
Joe Orton
f5ad1a54ca * modules/proxy/mod_proxy_ftp.c (parse_epsv_reply): Remove redundant 
check for !p[0], thanks rpluem.  Also update to take const argument
  and fix comment, since the string is not modified in-place.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@814785 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-14 19:17:16 +00:00
Joe Orton
8d3f77b70d Security fix - this is presumed to fix CVE-2009-3094 (the disclosed 
information was limited so this has not been confirmed):

* modules/proxy/mod_proxy_ftp.c (parse_epsv_reply): New function.
  (proxy_ftp_handler): Fix possible NULL pointer deference in
  apr_socket_close(NULL) on error paths.  Fix possible buffer overread
  in EPSV response parser; use parse_epsv_reply instead.  Thanks to
  Jeff Trawick and Stefan Fritsch for analysis of this issue.

Submitted by: Stefan Fritsch <sf fritsch.de>, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@814652 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-14 14:16:14 +00:00
Joe Orton
0f0480b263 Security fix - this is presumed to fix CVE-2009-3095 (the disclosed 
information was limited so this has not been confirmed):

* modules/proxy/mod_proxy_ftp.c (proxy_ftp_handler): Fail if the
  decoded Basic credentials contain "special" characters.
  Thanks to Stefan Fritsch for analysis of this issue.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@814045 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-11 21:49:50 +00:00
Ruediger Pluem
fdc5eea45b * More style fixes. No functional changes. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@813265 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-10 07:00:27 +00:00
Ruediger Pluem
7aa37bccb6 * Style fixes. No functional changes. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@813254 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-10 06:35:34 +00:00
Ruediger Pluem
09ccc5d520 * Silence compiler warnings 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@813249 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-10 06:19:27 +00:00
Graham Leggett
c8fe617ea4 mod_proxy_connect: The connect method doesn't work if the client is 
connecting to the apache proxy through an ssl socket. Fixed.
PR: 29744.
Submitted by: Brad Boyer, Mark Cave-Ayland, Julian Gilbey, Fabrice Durand,
David Gence, Tim Dodge, Per Gunnar Hans, Emmanuel Elango, Kevin Croft,
Rudolf Cardinal


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@813178 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-09 23:56:29 +00:00
Jim Jagielski
7fe574e381 OK, might as well finish this... Allow ServerTokens Off 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@808895 13f79535-47bb-0310-9956-ffa450edef68
 2009-08-28 14:31:00 +00:00
William A. Rowe Jr
5181635ab3 Always make mod_*.h files available where they exist, modpath by modpath 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@808722 13f79535-47bb-0310-9956-ffa450edef68
 2009-08-28 01:27:46 +00:00
Brian Havard
60fbe11de1 Bring back OS/2 support. 
Reverses r758929 with a little bit of conflict resolution.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@807930 13f79535-47bb-0310-9956-ffa450edef68
 2009-08-26 08:56:13 +00:00
Nick Kew
93cdac913c Return consistent error status for proxy unable to connect 
PR 46971


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@806920 13f79535-47bb-0310-9956-ffa450edef68
 2009-08-23 02:00:43 +00:00
Ruediger Pluem
3fadc493c9 * Do better checking of pollset operations in various places to avoid segfaults. 
PR: 46467
Submitted by: Stefan Fritsch <sf sfritsch.de>
Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@804764 13f79535-47bb-0310-9956-ffa450edef68
 2009-08-16 20:29:47 +00:00
Jeff Trawick
7dc5818d99 mark some private module data as "static", resolving 
a duplicate definition error from the linker


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@798923 13f79535-47bb-0310-9956-ffa450edef68
 2009-07-29 14:38:02 +00:00
Jeff Trawick
42ef5ed945 fix type mismatch in argument to attach() method 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@798921 13f79535-47bb-0310-9956-ffa450edef68
 2009-07-29 14:28:31 +00:00
Jean-Frederic Clere
d072258f05 Put the hm_slot_server_t in a common include. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@798507 13f79535-47bb-0310-9956-ffa450edef68
 2009-07-28 12:28:18 +00:00
Jim Jagielski
85a6ee67c6 In the case where we have no members, they aren't in error 
states :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@795954 13f79535-47bb-0310-9956-ffa450edef68
 2009-07-20 18:53:08 +00:00
Ruediger Pluem
65f63d24a8 * Silence compiler warnings about unused variables. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@792407 13f79535-47bb-0310-9956-ffa450edef68
 2009-07-09 06:07:36 +00:00
Jean-Frederic Clere
84c7d1c676 Add use slotmem. Directive HeartbeatMaxServers > 10 to activate the logic. 
Otherwise it uses the file logic to store the heartbeats.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@791617 13f79535-47bb-0310-9956-ffa450edef68
 2009-07-06 21:14:21 +00:00
Joe Orton
b5c7491d67 Security fix for CVE-2009-1890: 
* modules/proxy/mod_proxy_http.c (stream_reqbody_cl): Specify the base
  passed to apr_strtoff, and validate the Content-Length in the same
  way the HTTP_IN filter does.  If the number of bytes streamed
  exceeds the expected body length, bail out of the loop.

Thanks to: Toadie <toadie643 gmail.com> for reporting and diagnosis of
	this issue.
Submitted by: niq, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@790587 13f79535-47bb-0310-9956-ffa450edef68
 2009-07-02 13:41:18 +00:00
Jean-Frederic Clere
a94b2e9e90 Don't set worker->s if already set (for balancer using slotmem for examples). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@788718 13f79535-47bb-0310-9956-ffa450edef68
 2009-06-26 14:26:19 +00:00
Nick Kew
10177a507c mod_proxy_http: fix case sensitivity checking transfer encoding 
PR 47383 [Ryuzo Yamamoto]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@785661 13f79535-47bb-0310-9956-ffa450edef68
 2009-06-17 15:21:21 +00:00
William A. Rowe Jr
c95b61b4b8 Favor DECL over DECLS 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@780365 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-31 04:22:12 +00:00
William A. Rowe Jr
4409fcddf4 Restructure fdpass logic to not spew stderr crap for without purpose, and 
purposefully fail if --enable-proxy-fdpass is demanded without support.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@780364 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-31 04:13:11 +00:00
Nick Kew
fd4393f664 Fix IPv6 literal addresses passed to a proxied backend. 
PR 47177
Patch by Carlos Garcia Braschi


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@778531 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-25 23:19:16 +00:00
Jim Jagielski
591bb63111 unused var 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774774 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-14 14:13:52 +00:00
Jim Jagielski
ceeb8b0403 standard method 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774428 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-13 16:56:12 +00:00
Jim Jagielski
13bce6474d Return APR_EGENERAL for the error 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774423 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-13 16:46:59 +00:00
Jean-Frederic Clere
48ae3d9efa Allow the load balancing method to "create" workers. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774400 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-13 15:27:05 +00:00
Jean-Frederic Clere
ab9ed6d974 server_rec *r... Oops should be server_rec *s. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774239 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-13 06:55:57 +00:00
Jean-Frederic Clere
a970341df7 Arrange the proxy_balancer_method: 
- Put context back after the finder().
- Use  server_rec as second parameter for reset() and age().
- Add the call for reset().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@773929 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-12 15:10:56 +00:00