1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Commit Graph

44 Commits

Author SHA1 Message Date
Mike Rumph
ebd3ed2bf8 Fix some comment typos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1594301 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 17:50:39 +00:00
Jeff Trawick
2571d1f90c fix whitespace in a debug message
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546730 13f79535-47bb-0310-9956-ffa450edef68
2013-11-30 14:06:55 +00:00
Jeff Trawick
88e5f7cc40 Follow-up to r1538490:
Ensure that conn_rec->sbh is always cleared when returning from process_socket().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1545736 13f79535-47bb-0310-9956-ffa450edef68
2013-11-26 17:11:51 +00:00
Jim Jagielski
18070dd81a Consistent types (2nd commit for future backport ease)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1545412 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 21:24:20 +00:00
Jim Jagielski
d21042e2a8 naming suggestion re: trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1545408 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 21:10:05 +00:00
Jim Jagielski
43625092ad Use offset which is smack dab in the middle.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1545364 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 18:28:53 +00:00
Jim Jagielski
cc4921ed2f Use correct type...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1545325 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 15:40:16 +00:00
Jim Jagielski
6eb75cff89 r1545286 for eventopt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1545292 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 14:08:17 +00:00
Jim Jagielski
320f4d382e revert 1544876
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1545130 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 01:32:53 +00:00
Jim Jagielski
ab81fdf796 Just critically warn people... but keep pushing through.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1544876 13f79535-47bb-0310-9956-ffa450edef68
2013-11-23 20:29:55 +00:00
Eric Covener
b6e7d2dbf0 c->sbh can be unexpectedly NULL when the thread that pulls the ready keepalive
connection out of the queue laps the thread that put it on the queue.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1538490 13f79535-47bb-0310-9956-ffa450edef68
2013-11-04 01:37:31 +00:00
Jeff Trawick
2bd622626f Disable event/eventopt if apr skiplist isn't available
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1529442 13f79535-47bb-0310-9956-ffa450edef68
2013-10-05 12:44:36 +00:00
Jim Jagielski
898365fd1d skiplist is now in apr 1.5 and above
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1528437 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 12:12:36 +00:00
Rainer Jung
67e9e54493 Fix "unused variable" warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1494531 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 10:16:03 +00:00
Jim Jagielski
a3aff5b836 subpool
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1494157 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 14:31:36 +00:00
Stefan Fritsch
ca2948ea2d update log tags
replace duplicate, add missing


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481396 13f79535-47bb-0310-9956-ffa450edef68
2013-05-11 19:45:09 +00:00
Graham Leggett
a47569f7c1 core, mod_ssl: Lift the restriction that prevents mod_ssl taking
full advantage of the event MPM. Enable the ability for a module
to reverse the sense of a poll event from a read to a write or vice
versa.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1470679 13f79535-47bb-0310-9956-ffa450edef68
2013-04-22 19:48:25 +00:00
Jim Jagielski
9c4a88068a And now make aware... compile/build again :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1451620 13f79535-47bb-0310-9956-ffa450edef68
2013-03-01 15:36:00 +00:00
Jim Jagielski
a06c6b096e Move skiplist to core
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1451618 13f79535-47bb-0310-9956-ffa450edef68
2013-03-01 15:29:30 +00:00
Jim Jagielski
78f315375a sync
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1451617 13f79535-47bb-0310-9956-ffa450edef68
2013-03-01 15:24:25 +00:00
Jim Jagielski
18ad4754d8 1st phase of moving into httpd "core"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1451616 13f79535-47bb-0310-9956-ffa450edef68
2013-03-01 15:24:05 +00:00
Jim Jagielski
de1f4ca41b streamline TZ check
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1451615 13f79535-47bb-0310-9956-ffa450edef68
2013-03-01 15:24:02 +00:00
Jim Jagielski
fdee075e67 sync w/ current event bug-fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1451614 13f79535-47bb-0310-9956-ffa450edef68
2013-03-01 15:23:58 +00:00
Jim Jagielski
0e9846c693 resync w/ some event fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1448148 13f79535-47bb-0310-9956-ffa450edef68
2013-02-20 13:11:29 +00:00
Jim Jagielski
8fee5391ff typos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1447872 13f79535-47bb-0310-9956-ffa450edef68
2013-02-19 19:08:53 +00:00
Jim Jagielski
72f579f5fc ensure positive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1447871 13f79535-47bb-0310-9956-ffa450edef68
2013-02-19 19:08:24 +00:00
Christophe Jaillet
08b6d16ffc Log a warning if ThreadStackSize has an inappropriate value.
PR : 54311
Submitted by: Tianyin Xu <tixu cs ucsd edu>

Only event.c has been compiled on my system. The 2 others are just cut and paste.
I have left the same value for APLOGNO in event and eventopt has for the other logged messages. I don't know if it is the right way to do.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1433682 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 21:53:07 +00:00
Jim Jagielski
4e11083cde Fix peek
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1415753 13f79535-47bb-0310-9956-ffa450edef68
2012-11-30 17:24:01 +00:00
Jim Jagielski
baf137d08f Sometimes we miss the last few items in the Q due
to time fuzzyness. Force the full Q by adding an extra
2sec fudge factor

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1412086 13f79535-47bb-0310-9956-ffa450edef68
2012-11-21 13:21:01 +00:00
Jim Jagielski
ab9803fcd7 Bug from not using pools by default :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1411715 13f79535-47bb-0310-9956-ffa450edef68
2012-11-20 16:03:09 +00:00
Jim Jagielski
faa04cbcae Force even malloc'ed mem to be 0ed. And pull out wasted cycles that
did the nulling.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1411424 13f79535-47bb-0310-9956-ffa450edef68
2012-11-19 21:24:04 +00:00
Jim Jagielski
96ed42af33 Some formatting and a bugfix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1411415 13f79535-47bb-0310-9956-ffa450edef68
2012-11-19 21:10:51 +00:00
Jim Jagielski
7d4ff823f6 The compiler *should* do this, but just in case
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1411361 13f79535-47bb-0310-9956-ffa450edef68
2012-11-19 19:31:34 +00:00
Jim Jagielski
5f30e9a2e8 skiplist_destroy() is new-ish
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1411279 13f79535-47bb-0310-9956-ffa450edef68
2012-11-19 16:28:13 +00:00
Jim Jagielski
91ffb02d09 Remove from API
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1411274 13f79535-47bb-0310-9956-ffa450edef68
2012-11-19 16:17:19 +00:00
Jim Jagielski
2b7363557a Merge branch 'skiplist'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1411190 13f79535-47bb-0310-9956-ffa450edef68
2012-11-19 14:11:38 +00:00
Jim Jagielski
baae6f3ca1 Document the check in open_logs()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410885 13f79535-47bb-0310-9956-ffa450edef68
2012-11-18 13:21:05 +00:00
Jim Jagielski
46ea0fc7ab fdq expects a certain behavior from atomics... ensure that
the event mpms check this.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410459 13f79535-47bb-0310-9956-ffa450edef68
2012-11-16 16:49:31 +00:00
Jim Jagielski
e46152c143 Fold in a missing optimization...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410328 13f79535-47bb-0310-9956-ffa450edef68
2012-11-16 13:07:48 +00:00
Jim Jagielski
93194d6f96 Update and sync
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1409909 13f79535-47bb-0310-9956-ffa450edef68
2012-11-15 18:35:02 +00:00
Jim Jagielski
4c780352f3 Prefer higher-mode polling, but allow for drop down to default
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1409878 13f79535-47bb-0310-9956-ffa450edef68
2012-11-15 16:49:04 +00:00
Jim Jagielski
3452941de8 no longer needed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1409273 13f79535-47bb-0310-9956-ffa450edef68
2012-11-14 17:45:42 +00:00
Jim Jagielski
a24b85145b Pull out the "extended" pod functions used by event and worker
to core, since it will be used by Simple and Lean and
likely other MPMs. Avoid duplication.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1409214 13f79535-47bb-0310-9956-ffa450edef68
2012-11-14 14:26:26 +00:00
Jim Jagielski
7c3e75bdd0 Pull the event optimization MPM back into trunk. This
provides more eyes and allows work to continue on
it...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407533 13f79535-47bb-0310-9956-ffa450edef68
2012-11-09 16:41:12 +00:00