Re: svn commit: r1587695 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS include/ap_mmn.h include/mpm_common.h server/mpm/event/event.c server/mpm_common.c

2014-04-17 Thread Yann Ylavic
On Tue, Apr 15, 2014 at 9:15 PM,  j...@apache.org wrote:
 Author: jim
 Date: Tue Apr 15 19:15:02 2014
 New Revision: 1587695

 URL: http://svn.apache.org/r1587695
 Log:
 Merge r1546759, r1546760 from trunk:

 Add suspend_connection and resume_connection hooks to notify modules
 when the thread/connection relationship changes.  (Currently implemented
 only for the Event MPM; should be implemented for all async MPMs.)

When I tested and voted for this feature, my ./configure was using
--enable-exception-hook.
With a fresh new build, without this option, compilation fails with :

mpm_common.c: In function ‘ap_hook_suspend_connection’:
mpm_common.c:113: error: ‘struct anonymous’ has no member named
‘link_suspend_connection’
[...]
mpm_common.c: In function ‘ap_hook_resume_connection’:
mpm_common.c:116: error: ‘struct anonymous’ has no member named
‘link_resume_connection’

Sorry to not have caught this before...

Probably the following patch should be applied too (ie. declare the
links when AP_ENABLE_EXCEPTION_HOOK is 0) :

Index: server/mpm_common.c
===
--- server/mpm_common.c(revision 1588240)
+++ server/mpm_common.c(working copy)
@@ -88,6 +88,8 @@
 APR_HOOK_LINK(mpm_get_name)
 APR_HOOK_LINK(end_generation)
 APR_HOOK_LINK(child_status)
+APR_HOOK_LINK(suspend_connection)
+APR_HOOK_LINK(resume_connection)
 )
 #endif
 AP_IMPLEMENT_HOOK_RUN_ALL(int, monitor,
[END]

Regards,
Yann.


Re: svn commit: r1587695 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS include/ap_mmn.h include/mpm_common.h server/mpm/event/event.c server/mpm_common.c

2014-04-17 Thread Jeff Trawick
On Thu, Apr 17, 2014 at 9:47 AM, Yann Ylavic ylavic@gmail.com wrote:

 On Tue, Apr 15, 2014 at 9:15 PM,  j...@apache.org wrote:
  Author: jim
  Date: Tue Apr 15 19:15:02 2014
  New Revision: 1587695
 
  URL: http://svn.apache.org/r1587695
  Log:
  Merge r1546759, r1546760 from trunk:
 
  Add suspend_connection and resume_connection hooks to notify modules
  when the thread/connection relationship changes.  (Currently implemented
  only for the Event MPM; should be implemented for all async MPMs.)

 When I tested and voted for this feature, my ./configure was using
 --enable-exception-hook.
 With a fresh new build, without this option, compilation fails with :

 mpm_common.c: In function ‘ap_hook_suspend_connection’:
 mpm_common.c:113: error: ‘struct anonymous’ has no member named
 ‘link_suspend_connection’
 [...]
 mpm_common.c: In function ‘ap_hook_resume_connection’:
 mpm_common.c:116: error: ‘struct anonymous’ has no member named
 ‘link_resume_connection’

 Sorry to not have caught this before...

 Probably the following patch should be applied too (ie. declare the
 links when AP_ENABLE_EXCEPTION_HOOK is 0) :

 Index: server/mpm_common.c
 ===
 --- server/mpm_common.c(revision 1588240)
 +++ server/mpm_common.c(working copy)
 @@ -88,6 +88,8 @@
  APR_HOOK_LINK(mpm_get_name)
  APR_HOOK_LINK(end_generation)
  APR_HOOK_LINK(child_status)
 +APR_HOOK_LINK(suspend_connection)
 +APR_HOOK_LINK(resume_connection)
  )
  #endif
  AP_IMPLEMENT_HOOK_RUN_ALL(int, monitor,
 [END]

 Regards,
 Yann.


Ouch/apologies!  I'll do the right thing now...

-- 
Born in Roswell... married an alien...
http://emptyhammock.com/
http://edjective.org/


Re: svn commit: r1587695 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS include/ap_mmn.h include/mpm_common.h server/mpm/event/event.c server/mpm_common.c

2014-04-17 Thread Jeff Trawick
On Thu, Apr 17, 2014 at 10:02 AM, Jeff Trawick traw...@gmail.com wrote:

 On Thu, Apr 17, 2014 at 9:47 AM, Yann Ylavic ylavic@gmail.com wrote:

 On Tue, Apr 15, 2014 at 9:15 PM,  j...@apache.org wrote:
  Author: jim
  Date: Tue Apr 15 19:15:02 2014
  New Revision: 1587695
 
  URL: http://svn.apache.org/r1587695
  Log:
  Merge r1546759, r1546760 from trunk:
 
  Add suspend_connection and resume_connection hooks to notify modules
  when the thread/connection relationship changes.  (Currently implemented
  only for the Event MPM; should be implemented for all async MPMs.)

 When I tested and voted for this feature, my ./configure was using
 --enable-exception-hook.
 With a fresh new build, without this option, compilation fails with :

 mpm_common.c: In function ‘ap_hook_suspend_connection’:
 mpm_common.c:113: error: ‘struct anonymous’ has no member named
 ‘link_suspend_connection’
 [...]
 mpm_common.c: In function ‘ap_hook_resume_connection’:
 mpm_common.c:116: error: ‘struct anonymous’ has no member named
 ‘link_resume_connection’

 Sorry to not have caught this before...

 Probably the following patch should be applied too (ie. declare the
 links when AP_ENABLE_EXCEPTION_HOOK is 0) :

 Index: server/mpm_common.c
 ===
 --- server/mpm_common.c(revision 1588240)
 +++ server/mpm_common.c(working copy)
 @@ -88,6 +88,8 @@
  APR_HOOK_LINK(mpm_get_name)
  APR_HOOK_LINK(end_generation)
  APR_HOOK_LINK(child_status)
 +APR_HOOK_LINK(suspend_connection)
 +APR_HOOK_LINK(resume_connection)
  )
  #endif
  AP_IMPLEMENT_HOOK_RUN_ALL(int, monitor,
 [END]

 Regards,
 Yann.


 Ouch/apologies!  I'll do the right thing now...


Ahh, 2.4.x needs the cleanup in trunk to avoid that mess:

 #define DEFAULT_HOOK_LINKS \
APR_HOOK_LINK(monitor) \
APR_HOOK_LINK(drop_privileges) \
APR_HOOK_LINK(mpm) \
APR_HOOK_LINK(mpm_query) \
APR_HOOK_LINK(mpm_register_timed_callback) \
APR_HOOK_LINK(mpm_register_socket_callback) \
APR_HOOK_LINK(mpm_unregister_socket_callback) \
APR_HOOK_LINK(mpm_get_name) \
APR_HOOK_LINK(end_generation) \
APR_HOOK_LINK(child_status) \
APR_HOOK_LINK(suspend_connection) \
APR_HOOK_LINK(resume_connection)

#if AP_ENABLE_EXCEPTION_HOOK
APR_HOOK_STRUCT(
APR_HOOK_LINK(fatal_exception)
DEFAULT_HOOK_LINKS
)
AP_IMPLEMENT_HOOK_RUN_ALL(int, fatal_exception,
  (ap_exception_info_t *ei), (ei), OK, DECLINED)
#else
APR_HOOK_STRUCT(
DEFAULT_HOOK_LINKS
)
#endif

I'll propose a 2.4.x patch shortly in STATUS...



 --
 Born in Roswell... married an alien...
 http://emptyhammock.com/
 http://edjective.org/




-- 
Born in Roswell... married an alien...
http://emptyhammock.com/
http://edjective.org/


Re: svn commit: r1587695 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS include/ap_mmn.h include/mpm_common.h server/mpm/event/event.c server/mpm_common.c

2014-04-17 Thread Yann Ylavic
On Thu, Apr 17, 2014 at 4:06 PM, Jeff Trawick traw...@gmail.com wrote:
 Ahh, 2.4.x needs the cleanup in trunk to avoid that mess:

Yes, exactly, DEFAULT_HOOK_STRUCT is duplicated in 2.4.x, not in trunk...


Re: svn commit: r1587695 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS include/ap_mmn.h include/mpm_common.h server/mpm/event/event.c server/mpm_common.c

2014-04-17 Thread Yann Ylavic
Works now, thanks.

On Thu, Apr 17, 2014 at 4:06 PM, Jeff Trawick traw...@gmail.com wrote:
 On Thu, Apr 17, 2014 at 10:02 AM, Jeff Trawick traw...@gmail.com wrote:

 On Thu, Apr 17, 2014 at 9:47 AM, Yann Ylavic ylavic@gmail.com wrote:

 On Tue, Apr 15, 2014 at 9:15 PM,  j...@apache.org wrote:
  Author: jim
  Date: Tue Apr 15 19:15:02 2014
  New Revision: 1587695
 
  URL: http://svn.apache.org/r1587695
  Log:
  Merge r1546759, r1546760 from trunk:
 
  Add suspend_connection and resume_connection hooks to notify modules
  when the thread/connection relationship changes.  (Currently
  implemented
  only for the Event MPM; should be implemented for all async MPMs.)

 When I tested and voted for this feature, my ./configure was using
 --enable-exception-hook.
 With a fresh new build, without this option, compilation fails with :

 mpm_common.c: In function ‘ap_hook_suspend_connection’:
 mpm_common.c:113: error: ‘struct anonymous’ has no member named
 ‘link_suspend_connection’
 [...]
 mpm_common.c: In function ‘ap_hook_resume_connection’:
 mpm_common.c:116: error: ‘struct anonymous’ has no member named
 ‘link_resume_connection’

 Sorry to not have caught this before...

 Probably the following patch should be applied too (ie. declare the
 links when AP_ENABLE_EXCEPTION_HOOK is 0) :

 Index: server/mpm_common.c
 ===
 --- server/mpm_common.c(revision 1588240)
 +++ server/mpm_common.c(working copy)
 @@ -88,6 +88,8 @@
  APR_HOOK_LINK(mpm_get_name)
  APR_HOOK_LINK(end_generation)
  APR_HOOK_LINK(child_status)
 +APR_HOOK_LINK(suspend_connection)
 +APR_HOOK_LINK(resume_connection)
  )
  #endif
  AP_IMPLEMENT_HOOK_RUN_ALL(int, monitor,
 [END]

 Regards,
 Yann.


 Ouch/apologies!  I'll do the right thing now...


 Ahh, 2.4.x needs the cleanup in trunk to avoid that mess:

  #define DEFAULT_HOOK_LINKS \
 APR_HOOK_LINK(monitor) \
 APR_HOOK_LINK(drop_privileges) \
 APR_HOOK_LINK(mpm) \
 APR_HOOK_LINK(mpm_query) \
 APR_HOOK_LINK(mpm_register_timed_callback) \
 APR_HOOK_LINK(mpm_register_socket_callback) \
 APR_HOOK_LINK(mpm_unregister_socket_callback) \
 APR_HOOK_LINK(mpm_get_name) \
 APR_HOOK_LINK(end_generation) \
 APR_HOOK_LINK(child_status) \
 APR_HOOK_LINK(suspend_connection) \
 APR_HOOK_LINK(resume_connection)

 #if AP_ENABLE_EXCEPTION_HOOK
 APR_HOOK_STRUCT(
 APR_HOOK_LINK(fatal_exception)
 DEFAULT_HOOK_LINKS
 )
 AP_IMPLEMENT_HOOK_RUN_ALL(int, fatal_exception,
   (ap_exception_info_t *ei), (ei), OK, DECLINED)
 #else
 APR_HOOK_STRUCT(
 DEFAULT_HOOK_LINKS
 )
 #endif

 I'll propose a 2.4.x patch shortly in STATUS...



 --
 Born in Roswell... married an alien...
 http://emptyhammock.com/
 http://edjective.org/




 --
 Born in Roswell... married an alien...
 http://emptyhammock.com/
 http://edjective.org/



Re: svn commit: r1588135 - in /httpd/httpd/branches/2.4.x/docs/manual/mod: mod_logio.html.en mod_logio.xml

2014-04-17 Thread Mike Rumph

Grammar corrections below.

On 4/16/2014 10:38 PM, jaillet...@apache.org wrote:

Author: jailletc36
Date: Thu Apr 17 05:38:49 2014
New Revision: 1588135

URL: http://svn.apache.org/r1588135
Log:
s/two/three/

Modified:
 httpd/httpd/branches/2.4.x/docs/manual/mod/mod_logio.html.en
 httpd/httpd/branches/2.4.x/docs/manual/mod/mod_logio.xml

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_logio.html.en
URL: 
http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_logio.html.en?rev=1588135r1=1588134r2=1588135view=diff
==
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_logio.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_logio.html.en Thu Apr 17 
05:38:49 2014
@@ -68,7 +68,7 @@
  h2a name=formats id=formatsCustom Log Formats/a/h2
  
  
-pThis modules adds two new logging directives. The characteristics of the

+pThis modules adds three new logging directives. The characteristics of 
the

 s/This modules/This module/

  request itself are logged by placing code%/code directives in
  the format string, which are replaced in the log file by the values as
  follows:/p

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_logio.xml
URL: 
http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_logio.xml?rev=1588135r1=1588134r2=1588135view=diff
==
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_logio.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_logio.xml Thu Apr 17 
05:38:49 2014
@@ -52,7 +52,7 @@
  section id=formats
  titleCustom Log Formats/title
  
-pThis modules adds two new logging directives. The characteristics of the

+pThis modules adds three new logging directives. The characteristics of 
the

 s/This modules/This module/

  request itself are logged by placing code%/code directives in
  the format string, which are replaced in the log file by the values as
  follows:/p







Re: svn commit: r1588244 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS docs/manual/mod/mod_headers.xml modules/metadata/mod_headers.c

2014-04-17 Thread Marion Christophe JAILLET

Hi,

Changelog entry is about Header and RequestHeader but doc has only been 
updated for the first one.

Moreover, a compatibility note should be, IMO, added for the updated syntax.

CJ


Le 17/04/2014 15:36, j...@apache.org a écrit :
  
  Changes with Apache 2.4.10
  
+  *) mod_headers: Allow the value parameter of Header and RequestHeader to

+ contain an ap_expr expression if prefixed with expr=. [Eric Covener]
+
*) rotatelogs: Avoid creation of zombie processes when -p is used on
   Unix platforms.  [Joe Orton]
  


Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_headers.xml
URL: 
http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_headers.xml?rev=1588244r1=1588243r2=1588244view=diff
==
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_headers.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_headers.xml Thu Apr 17 
13:36:05 2014
@@ -310,7 +310,7 @@ Header merge Cache-Control no-store env=
  nameHeader/name
  descriptionConfigure HTTP response headers/description
  syntaxHeader [varcondition/var] 
add|append|echo|edit|edit*|merge|set|setifempty|unset|note
-varheader/var [varvalue/var] [varreplacement/var]
+varheader/var [var[expr=]value]/var] [varreplacement/var]
  [early|env=[!]varvariable/var]|expr=varexpression/var]
  /syntax
  contextlistcontextserver config/contextcontextvirtual host/context
@@ -437,9 +437,12 @@ SetIfEmpty and note available in 2.4.7 a
  codeadd/code a varvalue/var is specified as the next argument.
  If varvalue/var
  contains spaces, it should be surrounded by double quotes.
-varvalue/var may be a character string, a string containing format
-specifiers or a combination of both. The following format specifiers
-are supported in varvalue/var:/p
+varvalue/var may be a character string, a string containing
+modulemod_headers/module specific format specifiers (and character
+literals), or an a href=../expr.htmlap_expr/a expression prefixed
+with emexpr=/em/p
+
+p The following format specifiers are supported in varvalue/var:/p
  
  table border=1 style=zebra

  columnspeccolumn width=.25/column width=.75//columnspec






Re: svn commit: r1588244 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS docs/manual/mod/mod_headers.xml modules/metadata/mod_headers.c

2014-04-17 Thread Eric Covener
On Thu, Apr 17, 2014 at 3:30 PM, Marion  Christophe JAILLET
christophe.jail...@wanadoo.fr wrote:
 Hi,

 Changelog entry is about Header and RequestHeader but doc has only been
 updated for the first one.
 Moreover, a compatibility note should be, IMO, added for the updated syntax.

Sorry, I'll handle.


Re: svn commit: r1584896 - /httpd/httpd/trunk/modules/filters/mod_proxy_html.c

2014-04-17 Thread Marion Christophe JAILLET

r1588356

Should you share my analysis and should a CHANGE be useful for what I 
think is a corner case, feel free to add something, or I can do it by 
the end of the week.




Does this fix a crash or a parsing error or ...?  (CHANGES)





Fw:

2014-04-17 Thread tokiley
Hi!   

News:  http://signlanguageforbaby.com/qyib/page.php

 

toki...@aol.com