www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Code Activity
5,059 Commits 62 Branches 306 Tags
ee760bf405331e4c1fc350ec4df1b1a5d5de47f9
Commit Graph

1595 Commits

Author SHA1 Message Date
Cliff Woolley
ee760bf405 The bucket should be created with the size of the data NOT including a null 
terminator as its length.  Otherwise, the bucket length value is wrong (too big
by one).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89654 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-23 13:45:44 +00:00
Jeff Trawick
31dfddfafd fix a typo (duplicate return statement) 
Submitted by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89652 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-23 11:50:11 +00:00
Ryan Bloom
46ff196b32 Fix a cosmetic problem with mod_include. Non-existant SSI vars 
used to appear as '(none', without the closing paren.
Submitted by:	G�nter Knauf <eflash@gmx.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89651 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-22 23:00:52 +00:00
William A. Rowe Jr
05fcc41a1f Update for latest structure changes for 2.0.21 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89644 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-20 20:00:50 +00:00
William A. Rowe Jr
b07a17a64f That's it. Adjust for our pcre transition, and the whole thing links 
once again.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89631 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-19 22:35:32 +00:00
William A. Rowe Jr
c0b8cc5aa8 We want the ssl_expr evaluators, now 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89629 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-19 22:23:38 +00:00
William A. Rowe Jr
e0e8319ca1 Hope I've got these generated bits right. Note bison is more common 
for Win32 then lexx.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89628 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-19 22:20:58 +00:00
William A. Rowe Jr
e1a4ca3ba6 Take care of folk's assert() undefined errors. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89627 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-19 22:20:09 +00:00
William A. Rowe Jr
d6bff4d622 A dash of portability 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89624 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-19 21:39:26 +00:00
William A. Rowe Jr
4ba473bd88 Since mpm.h wraps unixd.h and scoreboard.h nicely, and win32 has 
no unixd.h, well...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89623 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-19 21:30:37 +00:00
William A. Rowe Jr
50572ad029 Uhmm... need to NOCRYPT away WinCrypt.h 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89622 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-19 21:29:20 +00:00
Ralf S. Engelschall
2f9d44683b Update TODO list 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89621 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-19 21:03:43 +00:00
William A. Rowe Jr
d8f39cdd57 Workaround till connection_hook details are resolved 
[MATHIHALLI,MADHUSUDAN <madhusudan_mathihalli@hp.com>]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89620 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-19 20:02:28 +00:00
Ralf S. Engelschall
ca8f54367f Apply mod_ssl MEGA porting patch. This is a cleaned up version of the 
latest patches from Madhusudan which makes mod_ssl 95% working inside
Apache 2.0. There is still a lot of more work (both porting and cleanup)
to do be done. See modules/ssl/README for details.

Submitted by: Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89618 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-19 16:08:01 +00:00
William A. Rowe Jr
db65b5a2a2 Last of the ignore goodness for today. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89611 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-18 21:15:50 +00:00
Ian Holsman
4318882a79 Remove APR_NO_INHERIT as it is now private. 
sigh... the cost of being bleeding edge
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89607 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-18 20:35:13 +00:00
Doug MacEachern
506b33a955 s/destroy/free/g; likeness to SSL naming 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89606 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-18 20:35:07 +00:00
Doug MacEachern
f962339ad5 give some more diagnostics if server cert or key file cannot be read 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89605 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-18 20:29:29 +00:00
Paul J. Reder
620a48e609 Changed AP_MPMQ_MAX_DAEMONS to refer to MaxClients and 
added an AP_MPMQ_MAX_DAEMON_USED to refer to the highest
daemon index actually used in the scoreboard. I also
updated the pertinent calls.

Paul J. Reder


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89604 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-18 20:29:00 +00:00
Doug MacEachern
1a44af4868 only reset request level filters in reset_filters(), else for example 
TLSFilter gets wiped out, breaking any response that comes through ap_die
(including the frequent '304 not modified')
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89601 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-18 19:52:40 +00:00
William A. Rowe Jr
1501c81198 Remove last public vestigages of APR_INHERIT 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89600 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-18 19:41:20 +00:00
Doug MacEachern
dbfb786c1f add cleanup of SSLStateMachine to tls filter 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89597 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-18 18:18:20 +00:00
William A. Rowe Jr
a9d2877e63 Fix incl/libpath to / slashes for an upcoming patch to cvtdsp.c 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89570 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-17 22:13:57 +00:00
Ian Holsman
175af69f8e Change the APR_INHERIT flag to APR_NO_INHERIT,which is the default (as recommended by rbb) 
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89569 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-17 21:43:35 +00:00
Ralf S. Engelschall
75c03e1921 Remember current porting state 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89567 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-17 17:26:48 +00:00
Doug MacEachern
d7d869e327 dummy ssl hooks need to return an int value for server to function with mod_ssl compiled in 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89566 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-17 16:36:15 +00:00
Ralf S. Engelschall
97c1ff53d7 Merge in part II of a set of mod_ssl porting changes. 
Submitted by: Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89564 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-17 14:57:35 +00:00
Ralf S. Engelschall
928be41381 Merge in part of a set of mod_ssl porting changes. 
Submitted by: Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89563 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-17 14:38:06 +00:00
William A. Rowe Jr
1fa29a8d2d Obvious files that need inheritance, correct me if I'm wrong. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89561 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-16 21:07:40 +00:00
Ian Holsman
eef8a5ccff applies change in APR function apr_socket_create, which added a new parameter. 
I defaulted these to APR_INHERIT.
Also..
the connection-close was being merged, insted of 'set'
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89559 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-16 17:54:38 +00:00
Ian Holsman
9467f6ad75 Last Log entry was bogus. 
Changed to 'setting' the X-Forwarded-Server X-Forwarded-Host X-Forwarded-For
headers instead of merging them
PR:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89551 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-14 20:18:45 +00:00
Ian Holsman
f99ed71713 PR: 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89550 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-14 20:17:07 +00:00
Greg Ames
5139e492bd scratch an old itch - give lingering close its own state in the scoreboard. 
clean up SERVER_ACCEPTING and SERVER_QUEUEING (never set) while I'm at it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89542 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-12 03:20:50 +00:00
Greg Ames
13a3c248cc Provide vhost and abbreviated request strings on ExtendedStatus displays. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89541 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-12 02:19:41 +00:00
Bill Stoddard
13793b8a50 Performance improvement to mod_mime.c. find_ct() in mod_mime, 
spends a lot of time in apr_table_get calls.  Using the default
httpd.conf, the tables for languages and charsets are somewhat
large, so the time spent scanning them on each request is
significant. Replacing the tables with hash tables provides
a nice speedup. [Brian Pane <bpane@pacbell.net>]

Had to handmerge a lot of this patch so please review! Dean had some suggestions
for improvement which are not currently implemented.

Submitted by:	Brian Pane
Reviewed by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89535 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-11 04:47:02 +00:00
Greg Ames
537f07df5e fix pid numbers in mod_status output when using a threaded mpm. pid_buffer was 
being indexed by worker slot during initialization, then by process slot when
generating output.

This saves a little storage and a few cycles, too.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89534 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-10 22:50:54 +00:00
Jeff Trawick
1bc52ecfd0 ignore generated DSO-related files on OS/390 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89529 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-10 04:54:14 +00:00
William A. Rowe Jr
6d821dd1a7 Remove openssl path-specific .h comparisons 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89525 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-09 17:53:16 +00:00
William A. Rowe Jr
b457c188fa Win32 build changes for recent module updates 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89524 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-09 17:41:41 +00:00
Chuck Murcko
f93d782272 fix params for logging call 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89520 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-09 06:35:51 +00:00
Cliff Woolley
c721f48845 Avoid redundant strlen() calls by using apr_brigade_write() instead of 
apr_brigade_puts().  There is still some redundancy--it'd be ideal if there
were an apr_pstrcat() variant that returned the length of the string since
it computes it (twice) anyway so we didn't have to do it yet again.  Until
such a beast exists, computing the length three times is better than four.
:-/


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89516 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-08 06:24:55 +00:00
David Reid
a80a9b823f s/cont/pool/ 
Bring this back in line with changes to APR.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89511 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-07 16:21:53 +00:00
David Reid
bb2ac7e982 s/cont/pool/ 
This gets us building again after the change in APR.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89510 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-07 16:20:45 +00:00
Victor J. Orlikowski
3bb89937f4 Remove a couple of extraneous calls to apr_brigade_cleanup() 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89489 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-02 03:37:37 +00:00
Chuck Murcko
6383dfad3b Fix abort code path for HTTP proxy. Similar to Victor's patch for FTP 
proxy. No, Julia, it really *is* a double negative.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89486 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-30 04:50:31 +00:00
Victor J. Orlikowski
99801a5d6d Fix the code, to properly handle the case of the user aborting the connection 
or the connection being broken.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89485 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-29 22:22:19 +00:00
Chuck Murcko
a64f4f382a FTP return code variable cleanup; fixed login bug (same var used for 
return code and loop index)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89483 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-29 00:12:08 +00:00
Victor J. Orlikowski
b4eaa1e5e3 Close the sockets, the right way this time. 
Use the ones that the connections are using, rather
than those used to initialize the connection.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89481 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-28 21:29:19 +00:00
Victor J. Orlikowski
fe91c29215 Use the variable we've been using for return codes. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89480 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-28 20:40:51 +00:00
Victor J. Orlikowski
ed7d24c13b Get the messages returned from the FTP Server in order. 
Otherwise we break RFC959.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89479 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-28 20:29:45 +00:00