summaryrefslogtreecommitdiffstats
path: root/server (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Move the POSIX reg* implementations into the ap_* namespace;Joe Orton2005-02-115-43/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | internalise the ap_reg*<->PCRE wrapper: * configure.in: Add srclib/pcre to the include path. * include/ap_regex.h: Renamed from include/pcreposix.h. Prefix all constants with AP_; prefix all functions and types with ap_. Define AP_DECLARE to nothing if necessary. Remove regcomp error codes. * include/httpd.h: Include ap_regex.h not pcreposix.h. (ap_pregcomp, ap_regexec, ap_regfree): s/regex_t/ap_regex_t/. (ap_regexec, ap_regerror): Prototypes moved to ap_regex.h. * server/util.c (regex_cleanup, ap_pregcomp, ap_pregsub, ap_pregfree): Adjust for ap_ prefixed types. (ap_regexec, ap_regerror): Removed. * server/Makefile.in: Build util_pcre.c. * server/util_pcre.c: Copied from srclib/pcre/pcreposix.c; remove use of PCRE-internals to do error mapping; rename types to add AP_/ap_ prefixes as above. Use APR includes. (ap_regerror): Use apr_snprintf. * srclib/pcre/Makefile.in: Don't build pcreposix.c into libpcre.la. * modules/*: Update to use new type and constant names. PR: 27750 (part one) Submitted by: Andres Salomon <dilinger voxel.net>, Joe Orton git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153384 13f79535-47bb-0310-9956-ffa450edef68
* Only recompile buildmark.c when we have to relink httpd.Justin Erenkrantz2005-02-101-2/+1
| | | | | | | | This allows us to be able to do a make on an up-to-date tree without forcing a recompile and relink. Yay! git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153266 13f79535-47bb-0310-9956-ffa450edef68
* Remove formatting characters from ap_log_error() calls. TheseJeff Trawick2005-02-091-3/+3
| | | | | | | | | | were escaped as fallout from CAN-2003-0020. Submitted by: Eric Covener <ecovener gmail.com> Reviewed by: Jeff Trawick git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153105 13f79535-47bb-0310-9956-ffa450edef68
* Update copyright year to 2005 and standardize on current copyright owner line.Justin Erenkrantz2005-02-0475-75/+150
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
* Fix --with-apr=/usr and/or --with-apr-util=/usr.Justin Erenkrantz2005-02-041-1/+6
| | | | | | | | | PR: 29740 Submitted by: Max Bowsher <maxb ukf.net> Reviewed by: Justin Erenkrantz git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151255 13f79535-47bb-0310-9956-ffa450edef68
* Keep track of time taken to process requests again.Jim Jagielski2005-02-021-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@149550 13f79535-47bb-0310-9956-ffa450edef68
* Remove upper limit on the LimitRequestFieldSize directiveBill Stoddard2005-01-311-7/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@149269 13f79535-47bb-0310-9956-ffa450edef68
* limit_req_fieldsize is signed, correct a signedness error usingWilliam A. Rowe Jr2005-01-051-1/+1
| | | | | | | a cast since it's not possible to have a negative limit. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@124283 13f79535-47bb-0310-9956-ffa450edef68
* Eliminate a very ugly race - the parallel starting threads were pickingWilliam A. Rowe Jr2005-01-021-12/+14
| | | | | | | | | up thread identifiers other than their own. Because the limit of threads is an int, stuffing the int into the void* value is a safe argument convention. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@123899 13f79535-47bb-0310-9956-ffa450edef68
* FINALLY Correct ap_http_method()! It is NOT a method, it's a SCHEME!William A. Rowe Jr2005-01-022-5/+5
| | | | | | | | | | Bumped mmn, and ap module cookie, for this function rename. It's not a deprecation, as ap_http_method would be a lovely function name sometime in the future: to determine what the function name implies. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@123882 13f79535-47bb-0310-9956-ffa450edef68
* * Add bits to use APR_TCP_DEFER_ACCEPTPaul Querna2004-12-111-1/+14
| | | | | | | * Log Warnings when adding defer accept or an accept filter fails. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@111596 13f79535-47bb-0310-9956-ffa450edef68
* * core_filters.c: If APR_MAX_IOVEC_SIZE is defined, make sure we are under ↵Paul Querna2004-12-111-0/+8
| | | | | | that limit. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@111594 13f79535-47bb-0310-9956-ffa450edef68
* ap_queue_push: update comment to reflect realityGreg Ames2004-12-092-6/+8
| | | | | | | pointed out by: Ron Park (ronp cnet.com) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@111385 13f79535-47bb-0310-9956-ffa450edef68
* Revert patch r104923. This patch doesn't actually fix bug 18757 andBradley Nicholes2004-12-071-4/+1
| | | | | | | | breaks TLS upgrade functionality. Also, removing the content length for HEAD requests is being handled in ap_http_header_filter(). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@110141 13f79535-47bb-0310-9956-ffa450edef68
* * server/mpm/experimental/event/event.c: Go through and reformat and correctJustin Erenkrantz2004-12-041-53/+58
| | | | | | | | | comments to be more appropriate. *no functional changes* git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@109773 13f79535-47bb-0310-9956-ffa450edef68
* fix child process aborts withGreg Ames2004-12-031-3/+49
| | | | | | | | | assertion "!((queue)->nelts == (queue)->bounds)" failed due to worker queue overflows. The listener/event thread needs to block when all worker threads are busy. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@109631 13f79535-47bb-0310-9956-ffa450edef68
* worker MPM: Fix a problem which could cause httpd processes toJeff Trawick2004-12-022-59/+147
| | | | | | | | | | | | | | | | remain active after shutdown. The problem occurred when a scoreboard entry currently in use by an exiting child process was used for a new child process. At that point, the MPM forgot about the exiting child process, so ap_reclaim_child_processes() wouldn't be able to forceably terminate it. (An exiting child process may *never* exit due to a stuck or long-running request being handled on one of the threads.) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@109510 13f79535-47bb-0310-9956-ffa450edef68
* Fix gcc "no previous prototype" warnings after reorganisation:Joe Orton2004-12-023-20/+21
| | | | | | | | | | | | | * server/core_filters.c (ap_core_input_filter, ap_core_output_filter, ap_net_time_filter): Renamed to add ap_ prefixes for global symbols. * include/ap_listen.h: Don't export ap_listen_open at all, it's not used outside server/listen.c any more. * server/listen.c (open_listeners): Renamed from ap_listen_open. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@109498 13f79535-47bb-0310-9956-ffa450edef68
* Declare the ap_set_listen* functions with AP_DECLARE_NONSTD for Win32 support.Justin Erenkrantz2004-11-301-4/+8
| | | | | | | (I think this is what is needed for Win32, but I'm not quite sure.) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106988 13f79535-47bb-0310-9956-ffa450edef68
* zap extra blank in error messageJeff Trawick2004-11-291-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106918 13f79535-47bb-0310-9956-ffa450edef68
* * server/core.c: Give an error instead of silently going on when a section ↵Paul Querna2004-11-291-0/+37
| | | | | | | | | | is missing an argument. PR: 25460 Submitted By: Geoffrey Young git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106879 13f79535-47bb-0310-9956-ffa450edef68
* Properly export ap_listen_* functions.Justin Erenkrantz2004-11-281-7/+7
| | | | | | | | * server/listen.c: Add AP_DECLARE as appropriate. * include/ap_listen.h: Add AP_DECLARE as appropriate. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106843 13f79535-47bb-0310-9956-ffa450edef68
* Fixing various compiler error when compiling against the latest version of ↵Bradley Nicholes2004-11-271-1/+1
| | | | | | LibC SDK git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106766 13f79535-47bb-0310-9956-ffa450edef68
* listener_thread: no functional changes, formatting changes onlyGreg Ames2004-11-271-116/+115
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106744 13f79535-47bb-0310-9956-ffa450edef68
* only need one main listener loop.Greg Ames2004-11-271-13/+5
| | | | | | | logic changes only to minimize diff. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106743 13f79535-47bb-0310-9956-ffa450edef68
* Initial pass at refactoring some files to eliminate our 150K C source behemoths.Justin Erenkrantz2004-11-273-870/+937
| | | | | | | | | | | | | | | | | | | | | | | | | * Makefile.in: Change order of dependencies to bring in exports.o first so that we have every symbol 'used' before the linker starts processing. * build/rules.mk.in: Add a 'program-install' target which just copies httpd. * server/Makefile.in, modules/http/config2.m4: Add in new file targets. * NWGNUmakefile, libhttpd.dsp: Blind updates for Netware and Win32. (I tried.) * server/core.c: Move core_input_filter, net_time_filter, and core_output_filter and all supporting functions to... * server/core_filters.c (copied): ...here. * modules/http/http_protocol.c: Move functions from here to there...namely: * modules/http/byterange_filter.c (copied): Relocate ap_byterange_filter() and friends. * modules/http/chunk_filter.c (copied): Relocate chunk_filter(). * modules/http/http_etag.c (copied): Relocate ap_set_etag and ap_make_etag(). * modules/http/http_filters.c (copied): Relocate ap_http_filter(), ap_http_header_filter(), ap_discard_request_body(), ap_setup_client_block(), ap_should_client_block(), and ap_get_client_block(). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106692 13f79535-47bb-0310-9956-ffa450edef68
* make the type field in listener_poll_type an enum to make gdb output moreGreg Ames2004-11-271-5/+7
| | | | | | | | | useful. add a comment about a field I haven't been able to grok yet. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106674 13f79535-47bb-0310-9956-ffa450edef68
* If thread_num is long, this better be an %ldWilliam A. Rowe Jr2004-11-261-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106653 13f79535-47bb-0310-9956-ffa450edef68
* Drop a worthless emit.William A. Rowe Jr2004-11-211-1/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106075 13f79535-47bb-0310-9956-ffa450edef68
* The Event MPM.Paul Querna2004-11-2010-3/+3098
| | | | | | | | | | | | | | | | | | | | Designed to minimize Apache's KeepAlive overhead. This MPM depends on the current APR-trunk for new features added to the apr_pollset interface. Currently the underlying operating system must support KQueue or EPoll. Status: Should work as a drop in replacement for all non-ssl servers. SSL Requests that use HTTP 1.1 Pipelining do not currently work. Testing: I have tested it with Linux 2.6, FreeBSD 5.2.1, and OS X 10.3. Originally based on the patch by Greg Ames. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105919 13f79535-47bb-0310-9956-ffa450edef68
* Remove the .cvsignore files.Joe Orton2004-11-199-60/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105796 13f79535-47bb-0310-9956-ffa450edef68
* remove out-of-date comment... BillS reports thatJeff Trawick2004-11-041-5/+0
| | | | | | | | | | AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK provides the necessary capability to the MPM Submitted by: stoddard a.k.a. BillS a.k.a. FirstBill git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105682 13f79535-47bb-0310-9956-ffa450edef68
* Fix for memory consumption DoS, CVE CAN-2004-0942:Joe Orton2004-11-041-47/+22
| | | | | | | | | | | | | * server/protocol.c (ap_rgetline_core): Don't trim trailing whitespace from the buffer here. (ap_get_mime_headers_core): Trim trailing whitespace here, after reading a complete field including continuation lines. Also simplify code to remove whitespace between field-name and colon. Reviewed by: Andr�� Malo, Bill Stoddard git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105680 13f79535-47bb-0310-9956-ffa450edef68
* * server/util_filter.c (ap_save_brigade): Be more tolerant of a bucketJoe Orton2004-11-021-3/+8
| | | | | | | | | type which neither implements ->setaside nor morphs on ->read, such as the mod_perl SV bucket type in mod_perl <1.99_17; defer returning an error in this case until after calling setaside on each bucket. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105664 13f79535-47bb-0310-9956-ffa450edef68
* Change core connection handling so that a connection-orientedJeff Trawick2004-11-011-1/+16
| | | | | | | | | | | | | | | error disabling nagle* is logged with the client IP address and a debug log level. We filter out not-implemented errors from platforms which don't support TCP_NODELAY. *This is typically EINVAL, which means that the client already dropped the connection. Also, mention an earlier change to include the client IP address when logging connection-oriented errors. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105652 13f79535-47bb-0310-9956-ffa450edef68
* add ap_log_cerror(); use it in a couple of places in core output filterJeff Trawick2004-10-292-10/+28
| | | | | | | so that the client IP address is recorded in the log git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105625 13f79535-47bb-0310-9956-ffa450edef68
* Use a more descriptive error message, and make it an INFO insteead of NOTICE.Paul Querna2004-10-251-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105593 13f79535-47bb-0310-9956-ffa450edef68
* PR: 31875Nick Kew2004-10-251-0/+10
| | | | | | | Fix URI parsing bug in case of a leading double-slash git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105586 13f79535-47bb-0310-9956-ffa450edef68
* This will put some messages in the error log when some people try a lamePaul Querna2004-10-251-1/+4
| | | | | | | | | | | | | | | | DoS by just opening a socket, and never sending any data. Ivan suggested such a change about a month ago, to match the 1.3 behavoir. Today I helped OSU's Admins figure out that someone was trying this 'attack' against their mirror server. The server status just showed hundreds of Apache Children stuck in Reading. This will at least hint to the admins where the problem is by telling them about it in the error log. Inspired by: Rici Lake, Ivan Ristic <ivanr webkreator.com> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105583 13f79535-47bb-0310-9956-ffa450edef68
* veto and revert win64 patch: 64bit changes must percolate from theRoy T. Fielding2004-10-246-59/+47
| | | | | | | | | bottom (APR/system) up -- we can't give the client a 64bit API and then cast it to 32bits internally without introducing security holes on other platforms. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105572 13f79535-47bb-0310-9956-ffa450edef68
* WIN64: API changes to clean up Windows 64bit compile warningsAllan K. Edwards2004-10-226-47/+59
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105545 13f79535-47bb-0310-9956-ffa450edef68
* Minor comment fixes, no code changes:Erik Abele2004-10-111-1/+1
| | | | | | | | | | | | | | - 'sub request' -> 'subrequest' - @retrn -> @return - ... PR: Obtained from: Submitted by: Reviewed by: git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105408 13f79535-47bb-0310-9956-ffa450edef68
* parm cast should be DWORDAllan K. Edwards2004-10-061-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105394 13f79535-47bb-0310-9956-ffa450edef68
* remove dead codeJeff Trawick2004-10-061-4/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105392 13f79535-47bb-0310-9956-ffa450edef68
* clarify select() usage on WindowsAllan K. Edwards2004-10-061-1/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105391 13f79535-47bb-0310-9956-ffa450edef68
* WIN64: fix some windows specific 64bit warningsAllan K. Edwards2004-10-061-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105390 13f79535-47bb-0310-9956-ffa450edef68
* WIN64: SOCKET is not int on 64bit platformsAllan K. Edwards2004-10-051-6/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105386 13f79535-47bb-0310-9956-ffa450edef68
* * server/util_filter.c (ap_save_brigade): Handle an ENOTIMPL setasideJoe Orton2004-09-261-4/+15
| | | | | | | | | | | | function correctly. * modules/generators/mod_cgi.c (cgi_handler): Revert r1.169, unnecessary CGI bucket lifetime kludge. PR: 31247 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105297 13f79535-47bb-0310-9956-ffa450edef68
* * server/mpm_common.c (dummy_connection): Log the address if theJoe Orton2004-09-231-1/+1
| | | | | | | connect() fails. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105264 13f79535-47bb-0310-9956-ffa450edef68
* * server/log.c (log_error_core): For APLOG_DEBUG on Unix, if __FILE__Joe Orton2004-09-221-1/+8
| | | | | | | is an absolute path (as in a VPATH build), just log the basename. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105258 13f79535-47bb-0310-9956-ffa450edef68