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

18794 Commits

Author SHA1 Message Date
William A. Rowe Jr
338307478e Tag 2.2.19
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.19@1125464 13f79535-47bb-0310-9956-ffa450edef68
2011-05-20 16:55:14 +00:00
William A. Rowe Jr
1345125f07 Prepare to tag 2.2.19
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1125463 13f79535-47bb-0310-9956-ffa450edef68
2011-05-20 16:54:17 +00:00
Jeff Trawick
6f31f3a0c0 mention ap_unescape_url_keep2f_ex()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1124670 13f79535-47bb-0310-9956-ffa450edef68
2011-05-19 10:28:44 +00:00
Eric Covener
a323572790 restore ABI break in r1082630, changed signature of ap_unescape_url_keep2f().
Reviewed By: covener, wrowe, trawick
  http://mail-archives.apache.org/mod_mbox/httpd-dev/201105.mbox/%3C4DD4032F.1070400@p6m7g8.com%3E



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1124515 13f79535-47bb-0310-9956-ffa450edef68
2011-05-19 02:17:37 +00:00
William A. Rowe Jr
6ca1d4ac08 Correct Win64 Servername Identification
PR: 47418
Submitted by: [Jorge Schrauwen <jorge.schrauwen gmail.com>]
Backports: r1104624


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1104673 13f79535-47bb-0310-9956-ffa450edef68
2011-05-18 03:07:48 +00:00
Guenter Knauf
512ea7ce09 yeah, vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1104650 13f79535-47bb-0310-9956-ffa450edef68
2011-05-18 01:27:40 +00:00
Jeff Trawick
910725b277 ho hum
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1104642 13f79535-47bb-0310-9956-ffa450edef68
2011-05-18 00:51:51 +00:00
William A. Rowe Jr
333af3f1fc Suggest
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1104629 13f79535-47bb-0310-9956-ffa450edef68
2011-05-17 23:23:13 +00:00
Nilgun Belma Buguner
0fb26f66bd update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1102964 13f79535-47bb-0310-9956-ffa450edef68
2011-05-14 07:02:28 +00:00
Nilgun Belma Buguner
01618c05fa update for sync with English docs.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by:  Orhan Berent <berent belgeler.org>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1102963 13f79535-47bb-0310-9956-ffa450edef68
2011-05-14 06:56:23 +00:00
Nilgun Belma Buguner
4001c76258 fixed validation error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1102962 13f79535-47bb-0310-9956-ffa450edef68
2011-05-14 06:54:28 +00:00
William A. Rowe Jr
31fe6949cd Plenty of text here
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1101198 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 20:07:31 +00:00
William A. Rowe Jr
8cc286684b Text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1101190 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 20:00:30 +00:00
William A. Rowe Jr
3e9bd69a1f Another text file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1101189 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 19:58:55 +00:00
Graham Leggett
9f8865e197 rpm spec file: Remove reference to ssl.key and ssl.crt directories in line
with httpd-trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1101112 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 17:02:29 +00:00
Graham Leggett
cdb8ffa14f rpm spec file: Remove requirement for /usr/share/magic.mime, we don't reference
this file anywhere within the package.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1101092 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 16:29:35 +00:00
Graham Leggett
76324aa960 rpm spec file: Remove corrupted %changelog entry:
error: bad date in %changelog: See http://www.apache.org/dist/httpd/CHANGES_2.2


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1101065 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 15:32:45 +00:00
Rich Bowen
824be281a3 Rebuilds various language transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1101015 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 13:17:01 +00:00
Rich Bowen
8df0657dbe Missing line breaks. via couleurfofuca gmail.com
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1101011 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 13:11:06 +00:00
William A. Rowe Jr
9dc86e28cf Noted these win32 build files were missing from -win32-src on unix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1100868 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 03:02:00 +00:00
William A. Rowe Jr
6a8de32a9b Bump after tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1100690 13f79535-47bb-0310-9956-ffa450edef68
2011-05-08 06:49:48 +00:00
William A. Rowe Jr
d6df8ffc44 Prepare for 2.2.18 tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1100688 13f79535-47bb-0310-9956-ffa450edef68
2011-05-08 06:47:03 +00:00
William A. Rowe Jr
3c1afd5e8c No showstoppers, 1.4.4 and 1.3.11 are both approved en-route to release.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1100633 13f79535-47bb-0310-9956-ffa450edef68
2011-05-07 21:35:15 +00:00
Eric Covener
c7fba5724c Merge r1100511 from trunk:
use APR_STATUS_IS_TIMEUP() instead of direct comparison with APR_TIMEUP.

Submitted By: Ruediger Pluem
Reviewed By: wrowe, rjung, covener
  http://mail-archives.apache.org/mod_mbox/httpd-dev/201105.mbox/%3C4DC4D6A8.7070804@apache.org%3E



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1100512 13f79535-47bb-0310-9956-ffa450edef68
2011-05-07 11:39:29 +00:00
William A. Rowe Jr
4670e623f8 Regenerate dependencies; fixes an issue noted by Bert on the
apr project (abspath includes in RSC targets), and add srclib
targets to the system INCLUDE path so that these are excluded
from the dependencies; seperate builds will work without the
srclib/ files. 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1100447 13f79535-47bb-0310-9956-ffa450edef68
2011-05-07 04:37:47 +00:00
William A. Rowe Jr
6fcce2cae6 Regenerate dependencies; fixes an issue noted by Bert on the
apr project (abspath includes in RSC targets), and add srclib
targets to the system INCLUDE path so that these are excluded
from the dependencies; seperate builds will work without the
srclib/ files. 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1100446 13f79535-47bb-0310-9956-ffa450edef68
2011-05-07 04:37:24 +00:00
William A. Rowe Jr
8c7dad18b4 Regenerate dependencies; fixes an issue noted by Bert on the
apr project (abspath includes in RSC targets), and add srclib
targets to the system INCLUDE path so that these are excluded
from the dependencies; seperate builds will work without the
srclib/ files. 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1100445 13f79535-47bb-0310-9956-ffa450edef68
2011-05-07 04:36:03 +00:00
William A. Rowe Jr
6b1b27e2b4 Not possible; you don't declare a variable const and then
maniuplate it.

Backports: r1100443

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1100444 13f79535-47bb-0310-9956-ffa450edef68
2011-05-07 04:15:27 +00:00
William A. Rowe Jr
66aa5b8454 Going forwards, keep win32 build in svn once a tree is stable.
Visual Studio 2010 users cannot convert our .dsp files, and
ddk toolchain users couldn't either.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1100294 13f79535-47bb-0310-9956-ffa450edef68
2011-05-06 17:28:00 +00:00
William A. Rowe Jr
5aa83f5274 Revert unreviewed status item with insufficient explanation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1100264 13f79535-47bb-0310-9956-ffa450edef68
2011-05-06 16:26:09 +00:00
Jeff Trawick
f4286c21a9 Grab these from trunk:
r1091079 fix const-ness mismatch in call to mpm_nt_eventlog_stderr_open()
r1091076 match expected type of arg to StartService()
r1089600 cleanups to function signatures, prototypes, visibility
r1089605 yank some dead code and variables
         (only a small part of the patch to service.c was applicable)
r1089614 Log the OS socket (int) instead of the apr_socket_t *.
r1089624 can't format time_t with %d; cast this small interval time to int
r1089639 HANDLE is PVOID which is reasonably formatted by %pp, but not by %d
r1089659 format string fixes: DWORD is unsigned long and needs %lu instead of %d or %i
r1089688 axe ap_registry_get_server_root(), which seems to have been unused after httpd 1.3
r1089689 get prototype for ap_os_create_privileged_process()
r1089690 axe a couple of unused vars, mark a function as static
r1089857-equivalent Fix format string for pid in "Child: <pid>" messages
r1040220 subset (fuangk) Fixed some win32 types.
         mod_win32.c changes aren't needed
         "DWORD tid" is "unsigned tid" due to use of different thread create fn
r1025492 subset (fuangk)  get prototypes for time(), _beginthreadex()
         remove cast from apr_getopt_init() call to fix warning,
         fix const-ness of service_name
r983412 (fuangk) ap_regkey.c: Added casts to silent compiler warnings.

No direct trunk equiv since code was rewritten or removed:
. util_script.c warnings for assignent+truth value
. missing const from signature of set_disable_acceptex()

Reviewed by: wrowe, covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1100216 13f79535-47bb-0310-9956-ffa450edef68
2011-05-06 13:51:38 +00:00
Jeff Trawick
fb980e3cce Grab r1090634 from trunk:
don't try to shut down child if it wasn't created
(or, fix warning about reference to uninitialized variable
child_exit_event)

Reviewed by: wrowe, covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1100211 13f79535-47bb-0310-9956-ffa450edef68
2011-05-06 13:35:49 +00:00
Eric Covener
6bbd792703 Merge r820760, r919323, r937858, r938265 from trunk:
Reviewed By: sf, trawick, covener

    core: Treat timeout reading request as 408 error, not 400.
    Log 408 errors in access log as was done in Apache 1.3.x.

    PR: 39785
    Submitted by: Nobutaka Mantani, Stefan Fritsch
    Reviewed and added to by: Dan Poirier


    * Only log a 408 if it is no keepalive timeout.

    PR: 39785
    Submitted by: Mark Montague <markmont umich.edu>, rpluem
    Reviewed by: rpluem


    PR49167, unexpected 413 and double-errordoc during a timeout reading a 
    chunk-size.



    Use the more specific 408 (timed out) instead of a generic 400 during a timeout 
    reading a chunk-length.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1100200 13f79535-47bb-0310-9956-ffa450edef68
2011-05-06 13:14:27 +00:00
Eric Covener
8e9ead33d6 vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1100196 13f79535-47bb-0310-9956-ffa450edef68
2011-05-06 13:04:17 +00:00
Rich Bowen
dda31d6bc4 Add BSD-specific note about core dumping. (Via mi+apache aldan.algebra.com)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1099787 13f79535-47bb-0310-9956-ffa450edef68
2011-05-05 13:34:59 +00:00
Roy T. Fielding
3a68fb9c51 yes, mime.types is CTR -- done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1099229 13f79535-47bb-0310-9956-ffa450edef68
2011-05-03 20:17:34 +00:00
Roy T. Fielding
579a0900dc sync with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1099223 13f79535-47bb-0310-9956-ffa450edef68
2011-05-03 20:13:58 +00:00
Rainer Jung
6cace1496b Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1099029 13f79535-47bb-0310-9956-ffa450edef68
2011-05-03 11:56:47 +00:00
Eric Covener
e35f08b28d Merge r1098872 from trunk:
mention mod_expires bailing out when the handler has set an Expires header.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1098875 13f79535-47bb-0310-9956-ffa450edef68
2011-05-03 00:39:18 +00:00
Lucien Gentis
b014ed12ff Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1098362 13f79535-47bb-0310-9956-ffa450edef68
2011-05-01 16:03:23 +00:00
Jeff Trawick
4303dd4e22 vote, note
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1098105 13f79535-47bb-0310-9956-ffa450edef68
2011-04-30 12:22:23 +00:00
Jeff Trawick
ee0a595781 Grab trunk r888310:
Core HTTP: disable keepalive when the Client has sent
     Expect: 100-continue
 but we respond directly with a non-100 response.  Keepalive here led
 to data from clients continuing being treated as a new request.

PR: 47087
Submitted by: niq
Reviewed by: wrowe, sf, trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1098104 13f79535-47bb-0310-9956-ffa450edef68
2011-04-30 12:10:23 +00:00
Graham Leggett
bd1b98aed8 Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1096618 13f79535-47bb-0310-9956-ffa450edef68
2011-04-25 21:50:54 +00:00
Stefan Fritsch
308579cf50 - vote+promote
- propose
- remove old failed proposal


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1096558 13f79535-47bb-0310-9956-ffa450edef68
2011-04-25 18:47:58 +00:00
William A. Rowe Jr
210d232922 /agree
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1094649 13f79535-47bb-0310-9956-ffa450edef68
2011-04-18 16:57:24 +00:00
Rich Bowen
a1e8718a08 Corrected link to the rewrite documentation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1094566 13f79535-47bb-0310-9956-ffa450edef68
2011-04-18 13:35:37 +00:00
Guenter Knauf
0bffb845e7 Fixed line length to < 80 char.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1094189 13f79535-47bb-0310-9956-ffa450edef68
2011-04-17 19:17:40 +00:00
Guenter Knauf
62ac86f17f Added docu patch for htpasswd change with r1094184.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1094188 13f79535-47bb-0310-9956-ffa450edef68
2011-04-17 19:15:57 +00:00
Guenter Knauf
12b344c571 Syncronize with trunk version.
This includes a couple of backports / fixes: r826805, r826822,
r829162, r829355, r829431. The default algorithm is now md5
on all platforms.
All patches by sf; backport reviewed by fuankg, wrowe, trawick.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1094184 13f79535-47bb-0310-9956-ffa450edef68
2011-04-17 19:07:23 +00:00
Guenter Knauf
43e53dc11e Added shebang check for '! so that .vbs scripts can work as CGI.
Backport of r1054347 from trunk; reviewed by wrowe, trawick.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1094174 13f79535-47bb-0310-9956-ffa450edef68
2011-04-17 16:38:42 +00:00