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
26,790 Commits 62 Branches 306 Tags
25a2e41ea7e474100375986de0a0d792ff8094de
Commit Graph

989 Commits

Author SHA1 Message Date
Eric Covener
ecf622ac2e split-logfile: Fix perl error: 'Can't use string ("example.org:80") 
as a symbol ref while "strict refs"'. PR 56329.

Submitted By: Holger Mauermann <mauermann gmail.com>
Committed By: covener




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1648719 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-31 15:39:02 +00:00
Jan Kaluža
430892c1ab ab: Use only one connection to determine working destination socket address. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1628388 13f79535-47bb-0310-9956-ffa450edef68
 2014-09-30 10:39:41 +00:00
Jan Kaluža
79a0532100 ab: try all destination socket addresses returned by apr_sockaddr_info_get 
instead of failing on first one when not available.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1626956 13f79535-47bb-0310-9956-ffa450edef68
 2014-09-23 07:12:54 +00:00
Jan Kaluža
43803691a0 ab: increase request and response header size to 8192 bytes, 
fix potential buffer-overflow in Server: header handling.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1622450 13f79535-47bb-0310-9956-ffa450edef68
 2014-09-04 10:52:24 +00:00
Jan Kaluža
b19b5a54c3 * support/ab.c: Fix crash caused by integer overflow when printing stats with 
lot of requests (for example -n 500000000).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1617913 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 12:15:31 +00:00
Christophe Jaillet
b854d7e818 Remove some 'register' in variable declaration. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1610366 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-14 09:05:27 +00:00
Yann Ylavic
f0f9b0bfb3 ab: support custom HTTP method with -m argument. PR 56604. 
Example: ab -n 1 -m PING http://127.0.0.1/

Submitted By: Roman Jurkov <winfinit gmail com>
Committed By: ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1601076 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-07 08:45:56 +00:00
Jeff Trawick
56da5cba0a Ensure that min/max valid timestamps (milliseconds since the epoch) 
make sense:  no negative numbers, and require an input of "-" instead
of "0" to indicate that the timestamp isn't being provided.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1595034 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-15 20:19:10 +00:00
Jeff Trawick
c51e4d9cbc Add module mod_ssl_ct, which provides an implementation of Certificate 
Transparency (RFC 6962) for httpd.

mod_ssl_ct requires OpenSSL 1.0.2 (in beta) and must be explicitly
enabled via configure.

Note that support/ctauditscts is purposefully not installed; it
does not properly function due to a dependency on a 
certificate-transparency open source project tool which itself is
not sufficiently complete at this time.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1588987 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-21 21:14:21 +00:00
Joe Orton
b7d63d4da7 * support/rotatelogs.c (main): Prevent creation of zombies from 
post-rotate programs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1587255 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-14 16:38:30 +00:00
Joe Orton
252dcdcf31 * support/ab.c: Revert accidental version bump in r1580928. 
(Although it seems likely this *should* have been bumped sometime
   since 2006?)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1580935 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-24 17:43:10 +00:00
Joe Orton
31badda9f4 * support/ab.c (write_request): Avoid redundant write(,,0) preceding 
the write() of the request.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1580928 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-24 17:20:47 +00:00
Jeff Trawick
1a3a8daf9b follow-up to r1542533: 
fix format string (unsigned vs. size_t)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1543020 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-18 12:52:03 +00:00
Stefan Fritsch
b792a83b1e Check all memory allocations and abort on failure 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542533 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-16 17:11:55 +00:00
Jeff Trawick
30f8aa6460 more apr_file_write_full() simplification (like r1542413) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542416 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-15 22:03:16 +00:00
Joe Orton
00cf228909 * support/rotatelogs.c: Introduce an adjusted_time_t type to store the 
weird "adjusted time since epoch" type returned by get_now().
  Switch from int to long to fix an unnecessary Y2K38 issue.  Adjust
  use throughout and clean up other type issues.  No functional change
  intended apart from fixing Y2K38.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1537718 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-31 21:58:31 +00:00
Jeff Trawick
9f238af57d Remove unused APXS setting from template for generated Makefile 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1535699 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-25 11:36:00 +00:00
Ben Reser
386cb9c13c rotatelogs: Remove last constant length error buffer. 
* support/rotatelogs.c
  (ERRMSGSZ): Remove.
  (rotate_status): Remove errbuff member.
  (truncate_and_write_error): Accept the error message as an argument.
  (doRotate): Shift the pool destruction slightly later and use it to generate
    the error message to pass truncate_and_write_error().
  (main): In case of write errors create a pool to generate the error message,
    since the other pools available may never been freed.  Adjust to pass
    message directly to truncate_and_write_error().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1534914 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-23 05:14:45 +00:00
Ben Reser
1eb6352e2a rotatelogs: Remove another use of a consant length buffer for errors. 
* support/rotatelogs.c
  (doRotate): Use apr_psprintf() and %pm.  Move the destruction of the pool
    after we're done with the error message so the error string stays allocated
    long enough.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1534896 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-23 03:12:46 +00:00
Ben Reser
e2e2cd9b25 rotatelogs: Use apr_psprintf() with %pm instead of a constant length buffer for 
errors.

* support/rotatelogs.c
  (post_rotate, doRotate): Switch to using apr_psprintf() with %pm.

Suggested by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1534895 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-23 03:01:05 +00:00
Ben Reser
779bd67fa2 Add an option to autocreate directories to rotatelogs. 
* support/rotatelogs.c
  (rotate_config): Remove const from szLogRoot since we'll be passing it to
    apr_filepath_merge.  Add create_path member.
  (usage, dumpConfig): Update to reflect new -d option.
  (doRotate): Add code that knows how to create the directories a log file
    is going to go into.
  (main): Add the -d option and canonicalize the incoming path with
    apr_filepath_merge() so that the code in doRotate can work properly.

* docs/man/rotatelogs.8,
  docs/manual/programs/rotatelogs.html.en: Update for -d option.

PR: 46669
Submitted by: Philippe Lantin <plantin cobaltgroup.com>
              (which was actually a patch written by myself when I worked there)
Tweaked by: breser (ported to trunk and changed option from -p to -d)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533810 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-19 19:10:33 +00:00
Joe Orton
ce61f94003 * support/rotatelogs.c (get_now): Fix the NULL ptr dereferences 
added in r1532281.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532289 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-15 11:19:38 +00:00
Joe Orton
fd4ae8e200 * support/rotatelogs.c (get_now): Return the offset applied to the 
Unix time as a parameter.
  (doRotate): When exploding the time for strtfime formatting, iff in
  -l mode, subtract the offset and explode the real Unix time as a
  local time so %Z etc works correctly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532281 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-15 10:44:17 +00:00
Jeff Trawick
3c93046fcf fcgistarter: Specify SO_REUSEADDR to allow starting a server 
with old connections in TIME_WAIT.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1515050 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-18 00:35:33 +00:00
Jeff Trawick
71672c7113 ab: Fix potential buffer overflows when processing the T and X 
command-line options.

PR: 55360
Submitted by: Mike Rumph <mike.rumph oracle.com>
Reviewed by: trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1510707 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-05 20:24:39 +00:00
Christophe Jaillet
b315d5dfef Fix command line parsing. This was introduced in r1395253 when refactoring the code. 
Untested
PR 55264 <jrhett netconsonance com>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1503866 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-16 20:16:58 +00:00
Guenter Knauf
e169772873 Make MSVC compilers happy. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1494317 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-18 21:30:53 +00:00
Eric Covener
65f9d99f5c don't truncate the very first file opened (unless the truncate flag is there too) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1490761 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-07 18:12:17 +00:00
Christophe Jaillet
099561a7e1 Fix commit 1465115. 
truncpw was allocated from a pool and not via malloc

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1490507 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-07 04:41:45 +00:00
Eric Covener
dab3bc1339 rotatelogs: add -n number-of-files option to roate through a number 
of fixed-name logfiles. 




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1490493 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-07 01:51:31 +00:00
Christophe Jaillet
288ff9e014 Add a new -l parameter in order not to check the length of the responses. This can be usefull with dynamic pages. 
PR9945, PR27888, PR42040

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1488644 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-02 06:30:03 +00:00
Guenter Knauf
67c7acc204 Added header protection. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1488496 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 08:52:35 +00:00
Christophe Jaillet
10bcdb2c12 Check if malloc succeeded 
PR54344 [Bill Parker, wp02855 gmail com]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1488492 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 08:43:12 +00:00
Christophe Jaillet
49082c9492 3rd patch from PR45355 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1488471 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 06:03:32 +00:00
Guenter Knauf
728bc90cc0 Fixed include for Windows. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481677 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-13 00:36:41 +00:00
Rainer Jung
e6a4c07241 htdigest: Fix buffer overflow when reading digest 
password file with very long lines.

PR 54893.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1475878 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-25 18:02:48 +00:00
Stefan Fritsch
b02101b083 htpasswd: Add -v option to verify a password 
htpasswd and htdbm could use some more refactoring...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1465116 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-05 20:20:33 +00:00
Stefan Fritsch
e84335b00d fix htpasswd/htdbm brown paper bag bugs 
- use the correct string to generate the hash from. PR 54735
- print error message instead of empty string

while there, replace strdup + check for oom with apr_pstrdup


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1465115 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-05 20:15:15 +00:00
Stefan Fritsch
52b220298d remove unused variables 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1465084 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-05 18:26:01 +00:00
Christophe Jaillet
2a213716af Use apr_file_printf(... "%pm"...) instead of explicit call to apr_strerror 
+ add some spaces to improve formatting

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1464675 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-04 18:46:56 +00:00
Christophe Jaillet
2b2015379b Use apr_file_printf(... "%pm"...) instead of explicit call to apr_strerror 
+ add some spaces to improve formatting

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1464674 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-04 18:44:02 +00:00
Christophe Jaillet
ae8de8d48c Use apr_file_printf(... "%pm"...) instead of explicit call to apr_strerror 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1463750 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-02 21:03:25 +00:00
Christophe Jaillet
a9f8426059 Use apr_snprintf(... "%pm"...) instead of explicit call to apr_strerror 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1463736 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-02 20:20:12 +00:00
Christophe Jaillet
bb69ec6cfe Remove useless tests. 
Turn
   if (*x && apr_isspace(*x))
into
   if (apr_isspace(*x))

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1452128 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-03 21:25:46 +00:00
Christophe Jaillet
b1976f87a2 The 2 first patches from PR45355 have been ported 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1451849 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-02 08:13:16 +00:00
Joe Orton
4b2fd1c117 * support/htcacheclean.c (main): Ensure -p was used before attempting 
to process URL arguments.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1436401 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-21 15:09:13 +00:00
Rainer Jung
0f7fb45f59 Fix htcacheclean list options "-a" and "-A". 
No filetype without APR_FINFO_TYPE.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1433001 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-14 17:38:34 +00:00
Stefan Fritsch
93d536555a htdbm, htpasswd: print error message if out of memory 
PR: 54345


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1425775 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-25 21:16:17 +00:00
Stefan Fritsch
6a1c04e803 Exit with error message if out of mem 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1425772 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-25 20:54:47 +00:00
Christophe Jaillet
844012a006 ab: add the possibility to define a socket timeout (-s timeout) 
[Guido Serra <zeph fsfe org>]

Also some changes In usage():
- reword -t option to be more clear with the new -s
- add missing -q
- add the new -s option
- reword some options to better match online documentation

ab.xml claimed that -s was already there, but nothing in the code looks like that.
So, I guess it only landed on the online doc...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1422937 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-17 14:10:50 +00:00