Skip to content

Sanity check - #5

Closed
marcstern wants to merge 7707 commits into
apache:trunkfrom
marcstern:patch-1
Closed

Sanity check#5
marcstern wants to merge 7707 commits into
apache:trunkfrom
marcstern:patch-1

Conversation

@marcstern

@marcstern marcstern commented Jun 23, 2017

Copy link
Copy Markdown

In case pfd.fd < 0, the poll() function waits until the time-out is expired.
This problem happens when, for instance, ModSecurity drops a connection in httpd. In this case, ressources gets blocked until the timeout expires.
In this situation, we should immediately return an error.
Same problem/solution in v1.6.x

Yann Ylavic and others added 30 commits July 18, 2014 00:25
Yann Ylavic
Follow up to r1611515: remove useless <limits.h> inclusion (for unuse…
50b94fb 
…d INT_MAX).

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1611517 13f79535-47bb-0310-9956-ffa450edef68
Guenter Knauf
NetWare build fixes.
dd97112 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1613086 13f79535-47bb-0310-9956-ffa450edef68
Guenter Knauf
Some more NetWare build fixes.
0bcdce8 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1613114 13f79535-47bb-0310-9956-ffa450edef68
Jeff Trawick
Fix Android compile error caused by assumption that crypt is available.
9bc5b11 
PR: 56627
Submitted by: Fredrik Fornwall <fredrik fornwall.net>, trawick


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1618843 13f79535-47bb-0310-9956-ffa450edef68
Jeff Trawick
apr_crypto_get_driver(): Fix invalid storage reference
737a8c1 
on error path.

Submitted by: Philip Martin <philip.martin wandisco.com>
Reviewed by: trawick


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1619438 13f79535-47bb-0310-9956-ffa450edef68
Guenter Knauf
Fix NetWare build: set NLM version with commandline option
c929a05 
instead of linker def file due to bug with mwldnlm linker
where patch version > 26 is ignored from def file.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1621593 13f79535-47bb-0310-9956-ffa450edef68
Jeff Trawick
Follow up to r1604596: include skiplist test in the cmake-based build
308c90d 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1625173 13f79535-47bb-0310-9956-ffa450edef68
Jeff Trawick
cmake >= 2.8.12 doesn't generate .pdb files for static libs,
61a5c68 
and points out that they aren't useful anyway:

  http://public.kitware.com/Bug/view.php?id=14600

remove .pdb handling for static libs regardless of cmake version


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1625175 13f79535-47bb-0310-9956-ffa450edef68
Jeff Trawick
MySQL driver: Fix incorrect check for bad parameter in the
140dfca 
driver support for apr_dbd_transaction_end().

PR: 56330
Submitted by: Weiqiang Li <weiqiang_li hotmail.com>


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1625247 13f79535-47bb-0310-9956-ffa450edef68
Graham Leggett
apr_crypto_nss: Explicitly declare key sizes when using NSS. Not all …
bc80d91 
…versions

of NSS detect key sizes correctly, leading to test failures.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1626561 13f79535-47bb-0310-9956-ffa450edef68
Rainer Jung
Update config.guess and config.sub from
35c8e94 
http://git.savannah.gnu.org/cgit/config.git.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1626564 13f79535-47bb-0310-9956-ffa450edef68
Gregg L. Smith
The better way
d4444a6 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1626658 13f79535-47bb-0310-9956-ffa450edef68
Eric Covener
*) On z/OS, apr_sockaddr_info_get() with family == APR_UNSPEC was not
01d209f 
     returning IPv4 addresses if any IPv6 addresses were returned. 
     [Eric Covener]




git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1634615 13f79535-47bb-0310-9956-ffa450edef68
Ruediger Pluem
* Correctly calculate the size of the returned string and set the cor…
3537573 
…rect

  return value in case we actually escape the string.

PR: 57230
Submitted by: <aduryagin gmail.com>
Reviewed by: rpluem



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1642159 13f79535-47bb-0310-9956-ffa450edef68
Eric Covener
apr_pollset state fixes for z/OS
3efd1f7 
Submitted By: Pat Odonnell <patod us ibm com>
Committed By: covener



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1646891 13f79535-47bb-0310-9956-ffa450edef68
Eric Covener
fix email addr syntax
9d71b0e 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1646892 13f79535-47bb-0310-9956-ffa450edef68
Eric Covener
typo again, sigh
6422227 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1646893 13f79535-47bb-0310-9956-ffa450edef68
Rainer Jung
Happy New Year 2015
3c818c6 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1648830 13f79535-47bb-0310-9956-ffa450edef68
Graham Leggett
Remove the --parents option that causes rpmbuild on CentOS7 to break.
9e2079a 
Reported by 河本和彦 kohmoto iris eonet ne jp.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1664074 13f79535-47bb-0310-9956-ffa450edef68
Jim Jagielski
FIX: Skiplists should allow for dups by default. Also, when added, dups
304e78d 
are added *after* each other, not before


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1664406 13f79535-47bb-0310-9956-ffa450edef68
Yann Ylavic
skiplist: Follow up to r1664406: use insert() in apr_skiplist_merge a…
caebbcc 
…nd optimize test in insert_compare().

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1664447 13f79535-47bb-0310-9956-ffa450edef68
Yann Ylavic
skiplist: Follow up to r1664406+r1664447: Better optimize test in ins…
1de0df6 
…ert_compare() and keep find_compare() in sync.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1664451 13f79535-47bb-0310-9956-ffa450edef68
Yann Ylavic
skiplist: keep tests in sync with 1.5.x and 1.6.x.
de29540 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1664467 13f79535-47bb-0310-9956-ffa450edef68
Yann Ylavic
skiplist: improve duplicates ordering test.
7ec9268 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1664471 13f79535-47bb-0310-9956-ffa450edef68
Yann Ylavic
skiplist: more optimizations.
d7c432c 
We don't need to create the top before inserting, this will be done
if/once the value is really added (since r1611193).

Check compare value only if m->next is not NULL, otherwise we already
known it is to be handled as negative (down).


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1664769 13f79535-47bb-0310-9956-ffa450edef68
Yann Ylavic
skiplist: provide apr_skiplist_element().
96d837f 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1664770 13f79535-47bb-0310-9956-ffa450edef68
Yann Ylavic
skiplist:
ff225d4 
Generalize the internal stack structure as a queue (FIFO), and use it for the
spare nodes (instead of apr_skiplist_alloc()/free()) and the insertion stack.

Fix a memory leak in destroy() when memory is malloc()ed (pool is NULL).


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1664775 13f79535-47bb-0310-9956-ffa450edef68
Jim Jagielski
Adj test to ensure that dups are entered AFTER existing ones
6fd5e8f 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1664900 13f79535-47bb-0310-9956-ffa450edef68
Jim Jagielski
remove debug
945c6f1 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1664901 13f79535-47bb-0310-9956-ffa450edef68
Jim Jagielski
fix test
d5d7952 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1664904 13f79535-47bb-0310-9956-ffa450edef68
Yann Ylavic and others added 21 commits April 7, 2017 00:01
Yann Ylavic
locks: follow up to r1667900.
e7459ef 
Axe the 'absolute' argument of apr_{thread,proc,global}_mutex_timedlock()
which was confusing, hence 'timeout' is always relative now.

It still makes sense (to me) to handle a negative timeout as INFINITE, a nul
one as IMMEDIATE, and a positive one as an upper bound timeout (like most if
not all of the underlying system calls...).



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1790488 13f79535-47bb-0310-9956-ffa450edef68
Yann Ylavic
locks: follow up to r1790488.
a701bf8 
Make it clear in the type that it's a relative/interval time.



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1790521 13f79535-47bb-0310-9956-ffa450edef68
Yann Ylavic
locks: follow up to r1790488 and r1790521: likewise for the
83b2c59 
apr_proc_mutex_unix_lock_methods_t's timedacquired method.



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1790523 13f79535-47bb-0310-9956-ffa450edef68
Jim Jagielski
No longer return NOTIMPL for macOS
623b93e 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1790546 13f79535-47bb-0310-9956-ffa450edef68
Yann Ylavic
locks: follow up to r1790488, r1790521 and r1790523: likewise for the…
4862276 
… tests.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1790569 13f79535-47bb-0310-9956-ffa450edef68
Yann Ylavic
apr_{thread,proc,global}_timedlock() with negative timeout is now equ…
9bb2475 
…ivalent

to apr_{thread,proc,global}_trylock(), i.e. immediate attempt to acquire the
lock (but returning APR_TIMEUP if busy).



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1790632 13f79535-47bb-0310-9956-ffa450edef68
Nick Kew
Set perms correctly on file copy where destination exists
d63e0fa 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1791029 13f79535-47bb-0310-9956-ffa450edef68
Rainer Jung
Update config.guess and config.sub from
a468734 
http://git.savannah.gnu.org/cgit/config.git.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1791598 13f79535-47bb-0310-9956-ffa450edef68
Yann Ylavic
locks: follow up to r1790446.
6856a65 
Since proc_pthread_mutex_cond_locked() macro is also used as an lvalue, don't
define it as a conditional and put the condition where needed in the code.



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1791718 13f79535-47bb-0310-9956-ffa450edef68
Yann Ylavic
locks: follow up to r1790436.
ea1881b 
Fix proc_mutex_pthread_acquire_ex() for the APR_USE_PROC_PTHREAD_MUTEX_COND
case which shouldn't use undefined pthread_cond_timedwait().



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1791728 13f79535-47bb-0310-9956-ffa450edef68
Yann Ylavic
locks: Windows: work around 64bit usecs to native 32bit msecs timeout…
e4aba1f 
…s for

apr_{proc,thread}_{mutex,cond}_timed{lock,wait}(), such that the given timeout
interval value is not truncated or switched from/to signed/unsigned.



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1792620 13f79535-47bb-0310-9956-ffa450edef68
Yann Ylavic
locks: unix: provide a macro helper for a pattern used several times.
c336a0c 
No functional change.



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1792621 13f79535-47bb-0310-9956-ffa450edef68
Yann Ylavic
locks: unix: timedlock: better handling of spurious wakeups that may be
0c6fd0a 
inherent to some native/OS condvar implementation.



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1792622 13f79535-47bb-0310-9956-ffa450edef68
Yann Ylavic
locks: unix: follow up to r1792622.
56e4475 
Indent block previously preserved (for easier review), no functional change.



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1792625 13f79535-47bb-0310-9956-ffa450edef68
Rainer Jung
pthread_mutex_timedlock is broken on Solaris 10.
3c3ebef 
It can block without timeout in case of EDEADLK.
On Solaris 8 it does not exist, on Solaris 11
it is fixed. For Solaris 10 no patch is available.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1792961 13f79535-47bb-0310-9956-ffa450edef68
Rainer Jung
Remove unintended change from r1792961.
63c80e8 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1792963 13f79535-47bb-0310-9956-ffa450edef68
Yann Ylavic
locks: thread: timedlock: better handling of spurious wakeups that ma…
10e4e46 
…y be

inherent to some native/OS condvar implementation.



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1794266 13f79535-47bb-0310-9956-ffa450edef68
William A. Rowe Jr
On Windows, OS2 and BEOS, the singluar lock mechanisms were already c…
f3e077c 
…ompatible

with timed locks, so there is no delta between DEFAULT and DEFAULT_TIMED.

Avoid gratuitous API changes to typical OS lock information.



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1797415 13f79535-47bb-0310-9956-ffa450edef68
Christophe Jaillet
Save some cycles by not copying the pollfds.
ce544b0 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1797422 13f79535-47bb-0310-9956-ffa450edef68
William A. Rowe Jr
Rather than fetch-me-a-rock, report all tool check results for
1116d61 
all the tools on any attempt, then fail if any of the tools
are missing/old.



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1798105 13f79535-47bb-0310-9956-ffa450edef68
Marc Stern
Sanity check
efd529f 
In case pfd.fd < 0, the poll() function waits until the time-out is expired.
This problem happens when, for instance, ModSecurity drops a connection in httpd. In this case, ressources gets blocked until the timeout expires.
In this situation, we should immediately return an error.
Same problem/solution in v1.6.x
@marcstern

ghost commented Jun 23, 2017 •
edited by marcstern
Loading

Copy link
Copy Markdown
Author

Credits: @ferrieux

@marcstern marcstern mentioned this pull request Jun 23, 2017
Closed
jeking3
jeking3 reviewed Jan 9, 2018
View reviewed changes

ghost left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a good change.

@ylavic

ghost commented Jun 28, 2018

Copy link
Copy Markdown
Member

Sorry for the late, gh is not the best place to propose changes for APR, developers mostly look for the dev@apr.apache.org mailing list and the Apache bugzilla.

Regarding the sanity check proposed in this PR, we don't do defensive programming in APR, if apr_wait_for_io_or_timeout() is called with an invalid file or socket fd, please blame the caller.

@ylavic

ghost commented Jun 28, 2018

Copy link
Copy Markdown
Member

Oh, already discussed here: https://bz.apache.org/bugzilla/show_bug.cgi?id=61985

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@jeking3 jeking3 jeking3 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.