Passed: apache/httpd#1006 (2.4.x - bcd21b2)

2020-07-15 Thread Travis CI 
Build Update for apache/httpd
-

Build: #1006
Status: Passed

Duration: 10 mins and 16 secs
Commit: bcd21b2 (2.4.x)
Author: Graham Leggett
Message: Vote, promote.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879894 
13f79535-47bb-0310-9956-ffa450edef68

View the changeset: 
https://github.com/apache/httpd/compare/ca90af8ee725...bcd21b2a1221

View the full build log and details: 
https://travis-ci.org/github/apache/httpd/builds/708375893?utm_medium=notification&utm_source=email


--

You can unsubscribe from build emails from the apache/httpd repository going to 
https://travis-ci.org/account/preferences/unsubscribe?repository=69847&utm_medium=notification&utm_source=email.
Or unsubscribe from *all* email updating your settings at 
https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notification&utm_source=email.
Or configure specific recipients for build notifications in your .travis.yml 
file. See https://docs.travis-ci.com/user/notifications.

Re: svn commit: r1879591 - in /httpd/httpd/trunk: configure.in server/log.c

2020-07-15 Thread Graham Leggett 
On 15 Jul 2020, at 16:27, Joe Orton  wrote:

>> Looks like ac_cv_func_gettid is no but ap_cv_gettid is yes.
> 
> This is not consistent with what you posted before.  Looking again, the 
> old configure output you posted has:
> 
> checking for gettid()... yes
> 
> note the (), which is only possible if you haven't re-run buildconf.  
> Re-run buildconf and configure, and if the build still fails please 
> provide the full config.log somewhere so I can try to understand what's 
> going on.

Double checked the terminal history, and I had indeed run buildconf - this 
wasn't enough though.

As rpluem suggested "make extraclean” was the secret, this is needed over and 
above the buildconf. The build is now clean.

Regards,
Graham
—

Re: svn commit: r1879888 - in /httpd/httpd/trunk: CHANGES include/ap_mmn.h modules/dav/main/mod_dav.h modules/dav/main/util.c

2020-07-15 Thread Graham Leggett 
On 15 Jul 2020, at 15:33, Greg Stein  wrote:

> Seems these helper functions would be a better fit within apr_xml, rather 
> than httpd.

In the long term, yes.

In the “it must be practical to use this with v2.4” term, I’d rather continue 
with the established pattern, and then move the lot of these functions as a 
future mod_dav cleanup. I don't want to boil the ocean at this point, there has 
already been a lot of change to make things work.

Regards,
Graham
—

Re: svn commit: r1879591 - in /httpd/httpd/trunk: configure.in server/log.c

2020-07-15 Thread Joe Orton 
On Wed, Jul 15, 2020 at 04:03:41PM +0200, Graham Leggett wrote:
> On 15 Jul 2020, at 15:35, Joe Orton  wrote:
> 
> >> checking for gettid()... yes
> > 
> > Interesting, can you provide the config.log and "rpm -q glibc"?  With a 
> > RHEL8 vm here it does not detect gettid (as I'd expect for glibc 2.28) 
> > and builds fine.
> 
> A quick and dirty search across config.log shows this:
> 
> [minfrin@bob httpd-trunk]$ cat config.log | grep gettid
> configure:8059: checking for gettid
> conftest.c:(.text+0xa): undefined reference to `gettid'
> | /* Define gettid to an innocuous variant, in case  declares 
> gettid.
> | #define gettid innocuous_gettid
> | which can conflict with char gettid (); below.
> | #undef gettid
> | char gettid ();
> | #if defined __stub_gettid || defined __stub___gettid
> | return gettid ();
> configure:8107: checking for gettid() via syscall
> ac_cv_func_gettid=no
> ap_cv_gettid=yes
> 
> Looks like ac_cv_func_gettid is no but ap_cv_gettid is yes.

This is not consistent with what you posted before.  Looking again, the 
old configure output you posted has:

checking for gettid()... yes

note the (), which is only possible if you haven't re-run buildconf.  
Re-run buildconf and configure, and if the build still fails please 
provide the full config.log somewhere so I can try to understand what's 
going on.

Re: svn commit: r1879889 - in /httpd/httpd/trunk: CHANGES include/ap_mmn.h modules/dav/main/mod_dav.h modules/dav/main/props.c

2020-07-15 Thread Graham Leggett 
On 15 Jul 2020, at 16:18, Greg Stein  wrote:

> You're already changing the API ... why not simply introduce insert_prop_v2() 
> with the appropriate parameters? This concept of "pass parameters via the 
> pool" is very disturbing.

Changes to these provider APIs can’t be backported, thus the pool.

Separately I’d like to change the signature of insert_prop(), but that’s a 
separate patch. Not seeing any point in insert_prop_v2() if backporting isn't 
possible, rather keep it clean and have one API that does the right thing in 
v2.6 onwards.

Regards,
Graham
—

Re: svn commit: r1879591 - in /httpd/httpd/trunk: configure.in server/log.c

2020-07-15 Thread Ruediger Pluem 



On 7/15/20 4:03 PM, Graham Leggett wrote:
> On 15 Jul 2020, at 15:35, Joe Orton  > wrote:
> 
>>> checking for gettid()... yes
>>
>> Interesting, can you provide the config.log and "rpm -q glibc"?  With a 
>> RHEL8 vm here it does not detect gettid (as I'd expect for glibc 2.28) 
>> and builds fine.
> 
> A quick and dirty search across config.log shows this:
> 
> [minfrin@bob httpd-trunk]$ cat config.log | grep gettid
> configure:8059: checking for gettid
> conftest.c:(.text+0xa): undefined reference to `gettid'
> | /* Define gettidto an innocuous variant, in case  declares gettid.
> | #define gettidinnocuous_gettid
> |     which can conflict with char gettid(); below.
> | #undef gettid
> | char gettid();
> | #if defined __stub_gettid|| defined __stub___gettid
> | return gettid();
> configure:8107: checking for gettid() via syscall
> ac_cv_func_gettid=no
> ap_cv_gettid=yes
> 
> Looks like ac_cv_func_gettid is no but ap_cv_gettid is yes.
> 
> [minfrin@bob httpd-trunk]$ rpm -q glibc
> glibc-2.28-72.el8_1.1.x86_64
> 
> A search for what ends up in the ap_config_auto.h shows this:
> 
> [minfrin@bob httpd-trunk]$ grep -r GETTID include/
> include/ap_config_auto.h:#define HAVE_GETTID1
> include/ap_config_auto.h.in:#undef HAVE_GETTID
> include/ap_config_auto.h.in:#undef HAVE_SYS_GETTID
> 

Stupid question: Did you try a make extraclean; ./buildconf before doing your 
build that fails?

Regards

Rüdiger

Re: svn commit: r1879889 - in /httpd/httpd/trunk: CHANGES include/ap_mmn.h modules/dav/main/mod_dav.h modules/dav/main/props.c

2020-07-15 Thread Greg Stein 
You're already changing the API ... why not simply introduce
insert_prop_v2() with the appropriate parameters? This concept of "pass
parameters via the pool" is very disturbing.

Cheers,
-g

On Wed, Jul 15, 2020 at 8:56 AM  wrote:

> Author: minfrin
> Date: Wed Jul 15 13:56:55 2020
> New Revision: 1879889
>
> URL: http://svn.apache.org/viewvc?rev=1879889&view=rev
> Log:
> mod_dav: Some DAV extensions, like CalDAV, specify both document
> elements and property elements that need to be taken into account
> when generating a property. The document element and property element
> are made available in the dav_liveprop_elem structure under the
> DAV_PROP_ELEMENT key in the resource pool.
>
> Modified:
> httpd/httpd/trunk/CHANGES
> httpd/httpd/trunk/include/ap_mmn.h
> httpd/httpd/trunk/modules/dav/main/mod_dav.h
> httpd/httpd/trunk/modules/dav/main/props.c
>
> Modified: httpd/httpd/trunk/CHANGES
> URL:
> http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1879889&r1=1879888&r2=1879889&view=diff
>
> ==
> --- httpd/httpd/trunk/CHANGES [utf-8] (original)
> +++ httpd/httpd/trunk/CHANGES [utf-8] Wed Jul 15 13:56:55 2020
> @@ -1,6 +1,12 @@
>   -*- coding:
> utf-8 -*-
>  Changes with Apache 2.5.1
>
> +  *) mod_dav: Some DAV extensions, like CalDAV, specify both document
> + elements and property elements that need to be taken into account
> + when generating a property. The document element and property element
> + are made available in the dav_liveprop_elem structure under the
> + DAV_PROP_ELEMENT key in the resource pool. [Graham Leggett]
> +
>*) mod_dav: Add utility functions dav_validate_root_ns(),
>   dav_find_child_ns(), dav_find_next_ns(), dav_find_attr_ns() and
>   dav_find_attr() so that other modules get to play too.
>
> Modified: httpd/httpd/trunk/include/ap_mmn.h
> URL:
> http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=1879889&r1=1879888&r2=1879889&view=diff
>
> ==
> --- httpd/httpd/trunk/include/ap_mmn.h (original)
> +++ httpd/httpd/trunk/include/ap_mmn.h Wed Jul 15 13:56:55 2020
> @@ -657,6 +657,8 @@
>   * 20200705.1 (2.5.1-dev)  Add dav_validate_root_ns(),
> dav_find_child_ns(),
>   * dav_find_next_ns(), dav_find_attr_ns() and
>   * dav_find_attr().
> + * 20200705.2 (2.5.1-dev)  Add dav_liveprop_elem structure and
> + * DAV_PROP_ELEMENT key.
>   */
>
>  #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
> @@ -664,7 +666,7 @@
>  #ifndef MODULE_MAGIC_NUMBER_MAJOR
>  #define MODULE_MAGIC_NUMBER_MAJOR 20200705
>  #endif
> -#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */
> +#define MODULE_MAGIC_NUMBER_MINOR 2 /* 0...n */
>
>  /**
>   * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
>
> Modified: httpd/httpd/trunk/modules/dav/main/mod_dav.h
> URL:
> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/main/mod_dav.h?rev=1879889&r1=1879888&r2=1879889&view=diff
>
> ==
> --- httpd/httpd/trunk/modules/dav/main/mod_dav.h (original)
> +++ httpd/httpd/trunk/modules/dav/main/mod_dav.h Wed Jul 15 13:56:55 2020
> @@ -913,6 +913,14 @@ struct dav_hooks_liveprop
>  ** property, and does not want it handled as a dead property, it
> should
>  ** return DAV_PROP_INSERT_NOTSUPP.
>  **
> +** Some DAV extensions, like CalDAV, specify both document elements
> +** and property elements that need to be taken into account when
> +** generating a property. The document element and property element
> +** are made available in the dav_liveprop_elem structure under the
> +** DAV_PROP_ELEMENT key in the resource pool, accessible as follows:
> +**
> +** apr_pool_userdata_get(&elem, DAV_PROP_ELEMENT, resource->pool);
> +**
>  ** Returns one of DAV_PROP_INSERT_* based on what happened.
>  **
>  ** ### we may need more context... ie. the lock database
> @@ -1061,6 +1069,20 @@ DAV_DECLARE(void) dav_add_all_liveprop_x
>   apr_text_header *phdr);
>
>  /*
> + ** When calling insert_prop(), the request element is associated with
> + ** the pool userdata attached to the resource. Access as follows:
> + **
> + ** apr_pool_userdata_get(&elem, DAV_PROP_ELEMENT, resource->pool);
> + **
> + */
> +#define DAV_PROP_ELEMENT "mod_dav-element"
> +
> +typedef struct {
> +const apr_xml_doc *doc;
> +const apr_xml_elem *elem;
> +} dav_liveprop_elem;
> +
> +/*
>  ** The following three functions are part of mod_dav's internal handling
>  ** for the core WebDAV properties. They are not part of mod_dav's API.
>  */
>
> Modified: httpd/httpd/trunk/modules/dav/main/props.c
> URL:
> http://

Re: svn commit: r1879591 - in /httpd/httpd/trunk: configure.in server/log.c

2020-07-15 Thread Graham Leggett 
On 15 Jul 2020, at 15:35, Joe Orton  wrote:

>> checking for gettid()... yes
> 
> Interesting, can you provide the config.log and "rpm -q glibc"?  With a 
> RHEL8 vm here it does not detect gettid (as I'd expect for glibc 2.28) 
> and builds fine.

A quick and dirty search across config.log shows this:

[minfrin@bob httpd-trunk]$ cat config.log | grep gettid
configure:8059: checking for gettid
conftest.c:(.text+0xa): undefined reference to `gettid'
| /* Define gettid to an innocuous variant, in case  declares gettid.
| #define gettid innocuous_gettid
| which can conflict with char gettid (); below.
| #undef gettid
| char gettid ();
| #if defined __stub_gettid || defined __stub___gettid
| return gettid ();
configure:8107: checking for gettid() via syscall
ac_cv_func_gettid=no
ap_cv_gettid=yes

Looks like ac_cv_func_gettid is no but ap_cv_gettid is yes.

[minfrin@bob httpd-trunk]$ rpm -q glibc
glibc-2.28-72.el8_1.1.x86_64

A search for what ends up in the ap_config_auto.h shows this:

[minfrin@bob httpd-trunk]$ grep -r GETTID include/
include/ap_config_auto.h:#define HAVE_GETTID 1
include/ap_config_auto.h.in:#undef HAVE_GETTID
include/ap_config_auto.h.in:#undef HAVE_SYS_GETTID

Regards,
Graham
—

Re: svn commit: r1879591 - in /httpd/httpd/trunk: configure.in server/log.c

2020-07-15 Thread Ruediger Pluem 



On 7/15/20 3:52 PM, Ruediger Pluem wrote:
> 
> 
> On 7/15/20 2:58 PM, Graham Leggett wrote:
>> On 07 Jul 2020, at 15:40, jor...@apache.org  wrote:
>>
>>> Author: jorton
>>> Date: Tue Jul  7 13:40:15 2020
>>> New Revision: 1879591
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1879591&view=rev
>>> Log:
>>> Check for and use gettid() directly if available; glibc 2.30 and later
>>> provides a wrapper for the system call:
>>>
>>> * configure.in: Check for gettid() and define HAVE_SYS_GETTID if
>>>  gettid() is only usable via syscall().
>>>
>>> * server/log.c (log_tid): Use gettid() directly if available.
>>
>> This is not working for me on CentOS8.
>>
>> ./configure says this:
>>
>> checking for gettid()... yes
>>
>> but the build fails like this:
>>
>> log.c: In function 'log_tid':
>> log.c:544:21: warning: implicit declaration of function 'gettid'; did you 
>> mean getgid'? [-Wimplicit-function-declaration]
>>          pid_t tid = gettid();
>>                      ^~
>>                      getgid
>>
>> Is there maybe a missing header file needed somewhere?
> 
> I guess we need to include either
> 
> linux/unistd.h
> 
> or keep including
> 
> sys/syscall.h

Scratch that. Both cause the syscall stuff to be included not a glibc function.

Regards

Rüdiger

Re: svn commit: r1879591 - in /httpd/httpd/trunk: configure.in server/log.c

2020-07-15 Thread Ruediger Pluem 



On 7/15/20 2:58 PM, Graham Leggett wrote:
> On 07 Jul 2020, at 15:40, jor...@apache.org  wrote:
> 
>> Author: jorton
>> Date: Tue Jul  7 13:40:15 2020
>> New Revision: 1879591
>>
>> URL: http://svn.apache.org/viewvc?rev=1879591&view=rev
>> Log:
>> Check for and use gettid() directly if available; glibc 2.30 and later
>> provides a wrapper for the system call:
>>
>> * configure.in: Check for gettid() and define HAVE_SYS_GETTID if
>>  gettid() is only usable via syscall().
>>
>> * server/log.c (log_tid): Use gettid() directly if available.
> 
> This is not working for me on CentOS8.
> 
> ./configure says this:
> 
> checking for gettid()... yes
> 
> but the build fails like this:
> 
> log.c: In function 'log_tid':
> log.c:544:21: warning: implicit declaration of function 'gettid'; did you 
> mean getgid'? [-Wimplicit-function-declaration]
>          pid_t tid = gettid();
>                      ^~
>                      getgid
> 
> Is there maybe a missing header file needed somewhere?

I guess we need to include either

linux/unistd.h

or keep including

sys/syscall.h


Regards

Rüdiger

Re: svn commit: r1879591 - in /httpd/httpd/trunk: configure.in server/log.c

2020-07-15 Thread Joe Orton 
On Wed, Jul 15, 2020 at 02:58:43PM +0200, Graham Leggett wrote:
> On 07 Jul 2020, at 15:40, jor...@apache.org wrote:
> > Author: jorton
> > Date: Tue Jul  7 13:40:15 2020
> > New Revision: 1879591
> > 
> > URL: http://svn.apache.org/viewvc?rev=1879591&view=rev
> > Log:
> > Check for and use gettid() directly if available; glibc 2.30 and later
> > provides a wrapper for the system call:
> > 
> > * configure.in: Check for gettid() and define HAVE_SYS_GETTID if
> >  gettid() is only usable via syscall().
> > 
> > * server/log.c (log_tid): Use gettid() directly if available.
> 
> This is not working for me on CentOS8.
> 
> ./configure says this:
> 
> checking for gettid()... yes

Interesting, can you provide the config.log and "rpm -q glibc"?  With a 
RHEL8 vm here it does not detect gettid (as I'd expect for glibc 2.28) 
and builds fine.

Regards, Joe

Re: svn commit: r1879888 - in /httpd/httpd/trunk: CHANGES include/ap_mmn.h modules/dav/main/mod_dav.h modules/dav/main/util.c

2020-07-15 Thread Greg Stein 
Seems these helper functions would be a better fit within apr_xml, rather
than httpd.


On Wed, Jul 15, 2020 at 8:16 AM  wrote:

> Author: minfrin
> Date: Wed Jul 15 13:16:19 2020
> New Revision: 1879888
>
> URL: http://svn.apache.org/viewvc?rev=1879888&view=rev
> Log:
> mod_dav: Add utility functions dav_validate_root_ns(),
> dav_find_child_ns(), dav_find_next_ns(), dav_find_attr_ns() and
> dav_find_attr() so that other modules get to play too.
>
> Modified:
> httpd/httpd/trunk/CHANGES
> httpd/httpd/trunk/include/ap_mmn.h
> httpd/httpd/trunk/modules/dav/main/mod_dav.h
> httpd/httpd/trunk/modules/dav/main/util.c
>
> Modified: httpd/httpd/trunk/CHANGES
> URL:
> http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1879888&r1=1879887&r2=1879888&view=diff
>
> ==
> --- httpd/httpd/trunk/CHANGES [utf-8] (original)
> +++ httpd/httpd/trunk/CHANGES [utf-8] Wed Jul 15 13:16:19 2020
> @@ -1,6 +1,10 @@
>   -*- coding:
> utf-8 -*-
>  Changes with Apache 2.5.1
>
> +  *) mod_dav: Add utility functions dav_validate_root_ns(),
> + dav_find_child_ns(), dav_find_next_ns(), dav_find_attr_ns() and
> + dav_find_attr() so that other modules get to play too.
> + [Graham Leggett]
>
>*) mod_http2:
>   Fixes :
>
> Modified: httpd/httpd/trunk/include/ap_mmn.h
> URL:
> http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=1879888&r1=1879887&r2=1879888&view=diff
>
> ==
> --- httpd/httpd/trunk/include/ap_mmn.h (original)
> +++ httpd/httpd/trunk/include/ap_mmn.h Wed Jul 15 13:16:19 2020
> @@ -654,6 +654,9 @@
>   * 20200703.0 (2.5.1-dev)  Remove ap_md5digest(), ap_md5contextTo64(),
>   * ContentDigest directive.
>   * 20200705.0 (2.5.1-dev)  Update method_precondition hook.
> + * 20200705.1 (2.5.1-dev)  Add dav_validate_root_ns(),
> dav_find_child_ns(),
> + * dav_find_next_ns(), dav_find_attr_ns() and
> + * dav_find_attr().
>   */
>
>  #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
> @@ -661,7 +664,7 @@
>  #ifndef MODULE_MAGIC_NUMBER_MAJOR
>  #define MODULE_MAGIC_NUMBER_MAJOR 20200705
>  #endif
> -#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */
> +#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */
>
>  /**
>   * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
>
> Modified: httpd/httpd/trunk/modules/dav/main/mod_dav.h
> URL:
> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/main/mod_dav.h?rev=1879888&r1=1879887&r2=1879888&view=diff
>
> ==
> --- httpd/httpd/trunk/modules/dav/main/mod_dav.h (original)
> +++ httpd/httpd/trunk/modules/dav/main/mod_dav.h Wed Jul 15 13:16:19 2020
> @@ -583,8 +583,22 @@ DAV_DECLARE(int) dav_get_depth(request_r
>
>  DAV_DECLARE(int) dav_validate_root(const apr_xml_doc *doc,
> const char *tagname);
> +DAV_DECLARE(int) dav_validate_root_ns(const apr_xml_doc *doc,
> +  int ns, const char *tagname);
>  DAV_DECLARE(apr_xml_elem *) dav_find_child(const apr_xml_elem *elem,
> const char *tagname);
> +DAV_DECLARE(apr_xml_elem *) dav_find_child_ns(const apr_xml_elem *elem,
> +  int ns, const char
> *tagname);
> +DAV_DECLARE(apr_xml_elem *) dav_find_next_ns(const apr_xml_elem *elem,
> + int ns, const char *tagname);
> +
> +/* find and return the attribute with a name in the given namespace */
> +DAV_DECLARE(apr_xml_attr *) dav_find_attr_ns(const apr_xml_elem *elem,
> + int ns, const char
> *attrname);
> +
> +/* find and return the attribute with a given DAV: tagname */
> +DAV_DECLARE(apr_xml_attr *) dav_find_attr(const apr_xml_elem *elem,
> +  const char *attrname);
>
>  /* gather up all the CDATA into a single string */
>  DAV_DECLARE(const char *) dav_xml_get_cdata(const apr_xml_elem *elem,
> apr_pool_t *pool,
>
> Modified: httpd/httpd/trunk/modules/dav/main/util.c
> URL:
> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/main/util.c?rev=1879888&r1=1879887&r2=1879888&view=diff
>
> ==
> --- httpd/httpd/trunk/modules/dav/main/util.c (original)
> +++ httpd/httpd/trunk/modules/dav/main/util.c Wed Jul 15 13:16:19 2020
> @@ -316,26 +316,71 @@ DAV_DECLARE(dav_lookup_result) dav_looku
>  */
>
>  /* validate that the root element uses a given DAV: tagname (TRUE==valid)
> */
> -DAV_DECLARE(int) dav_validate_root(const apr_xml_doc *doc,
> -

Re: svn commit: r1879591 - in /httpd/httpd/trunk: configure.in server/log.c

2020-07-15 Thread Graham Leggett 
On 07 Jul 2020, at 15:40, jor...@apache.org wrote:

> Author: jorton
> Date: Tue Jul  7 13:40:15 2020
> New Revision: 1879591
> 
> URL: http://svn.apache.org/viewvc?rev=1879591&view=rev
> Log:
> Check for and use gettid() directly if available; glibc 2.30 and later
> provides a wrapper for the system call:
> 
> * configure.in: Check for gettid() and define HAVE_SYS_GETTID if
>  gettid() is only usable via syscall().
> 
> * server/log.c (log_tid): Use gettid() directly if available.

This is not working for me on CentOS8.

./configure says this:

checking for gettid()... yes

but the build fails like this:

log.c: In function 'log_tid':
log.c:544:21: warning: implicit declaration of function 'gettid'; did you mean 
getgid'? [-Wimplicit-function-declaration]
 pid_t tid = gettid();
 ^~
 getgid

Is there maybe a missing header file needed somewhere?

MacOS says this and works:

checking for gettid()... no

Regards,
Graham
—

Re: svn commit: r1879641 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS server/util_script.c

2020-07-15 Thread Ruediger Pluem 


On 7/15/20 9:06 AM, Luca Toscano wrote:
> Hi everybody,
> 
> getting back on this. I checked mergeinfo and r1879253 r1879348 are
> not listed, what is the best path forward to fix this? (Asking because
> I have never merged from trunk, and I am not sure what is the best
> path forward).

Try

svn merge --record-only -c 1879253,1879348 
https://svn.apache.org/repos/asf/httpd/httpd/trunk .

in a freshly svn up'ed working copy of 2.4.x.

Regards

Rüdiger

Re: svn commit: r1879641 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS server/util_script.c

2020-07-15 Thread Luca Toscano 
Hi everybody,

getting back on this. I checked mergeinfo and r1879253 r1879348 are
not listed, what is the best path forward to fix this? (Asking because
I have never merged from trunk, and I am not sure what is the best
path forward).

Thanks in advance,

Luca

On Wed, Jul 8, 2020 at 11:20 PM Luca Toscano  wrote:
>
> Hi Christophe,
>
> Thanks a lot for spotting this, good catch. I haven't proposed a
> backport in months and the first one ends up in a little mess, really
> sorry :(
>
> So judging from the diff, I think that it is missing the last two commits:
>
> http://svn.apache.org/viewvc?view=revision&revision=1879253
> http://svn.apache.org/viewvc?view=revision&revision=1879348
>
> The svn merge command contains a typo (didn't see it when committing),
> namely r1879348 at the end (extra r), maybe this was the issue?
>
> svn merge -c 
> 1748379,1750747,1750749,1750953,1751138,1751139,1751139,1757818,1879253,r1879348
> ^/httpd/httpd/trunk .
>
> Luca
>
> On Wed, Jul 8, 2020 at 10:11 PM Christophe JAILLET
>  wrote:
> >
> > Le 08/07/2020 à 13:39, minf...@apache.org a écrit :
> > > Author: minfrin
> > > Date: Wed Jul  8 11:39:12 2020
> > > New Revision: 1879641
> > >
> > > URL: http://svn.apache.org/viewvc?rev=1879641&view=rev
> > > Log:
> > >*) core: Drop an invalid Last-Modified header value coming
> > >   from a (F)CGI script instead of replacing it with Unix epoch.
> > >   Warn the users about Last-Modified header value replacements
> > >   and violations of the RFC.
> > >   trunk patch: http://svn.apache.org/r1748379
> > >http://svn.apache.org/r1750747
> > >http://svn.apache.org/r1750749
> > >http://svn.apache.org/r1750953
> > >http://svn.apache.org/r1751138
> > >http://svn.apache.org/r1751139
> > >http://svn.apache.org/r1751147
> > >http://svn.apache.org/r1757818
> > >http://svn.apache.org/r1879253
> > >http://svn.apache.org/r1879348
> > >   2.4.x: trunk patches work, final view:
> > >  
> > > http://home.apache.org/~elukey/httpd-2.4.x-core-last_modified_tz_logging.patch
> > >  svn merge -c 
> > > 1748379,1750747,1750749,1750953,1751138,1751139,1751139,1757818,1879253,r1879348
> > >  ^/httpd/httpd/trunk .
> > >   The code has been tested with a simple PHP script returning 
> > > different Last-Modified
> > >   headers (GMT now, GMT now Europe/Paris, GMT tomorrow, GMT 
> > > yesterday, PST now).
> > >   +1: elukey, jorton, jim
> > >   jorton: +1 though I'd say log at WARN or INFO for the APR_BAD_DATE 
> > > case
> > >   rather than "silently" (at normal log-level) dropping the 
> > > parsed header?
> > >   [also nit: wrapping a lone ap_log_rerror(,APLOG_X) call in
> > >   if (APLOGrX(..) is unnecessary/redundant]
> > >
> > > Modified:
> > >  httpd/httpd/branches/2.4.x/   (props changed)
> > >  httpd/httpd/branches/2.4.x/CHANGES
> > >  httpd/httpd/branches/2.4.x/STATUS
> > >  httpd/httpd/branches/2.4.x/server/util_script.c
> > >
> > > Propchange: httpd/httpd/branches/2.4.x/
> > > --
> > >Merged /httpd/httpd/trunk:r1748379
> > >
> > > Modified: httpd/httpd/branches/2.4.x/CHANGES
> > > URL: 
> > > http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1879641&r1=1879640&r2=1879641&view=diff
> > > ==
> > > --- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
> > > +++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Wed Jul  8 11:39:12 2020
> > > @@ -1,6 +1,10 @@
> > >-*- coding: 
> > > utf-8 -*-
> > >   Changes with Apache 2.4.44
> > >
> > > +  *) core: Drop an invalid Last-Modified header value coming
> > > + from a FCGI/CGI script instead of replacing it with Unix epoch.
> > > + [Luca Toscano]
> > > +
> > > *) Add support for strict content-length parsing through addition of
> > >ap_parse_strict_length() [Yann Ylavic]
> > >
> > >
> > > Modified: httpd/httpd/branches/2.4.x/STATUS
> > > URL: 
> > > http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1879641&r1=1879640&r2=1879641&view=diff
> > > ==
> > > --- httpd/httpd/branches/2.4.x/STATUS (original)
> > > +++ httpd/httpd/branches/2.4.x/STATUS Wed Jul  8 11:39:12 2020
> > > @@ -135,31 +135,6 @@ RELEASE SHOWSTOPPERS:
> > >   PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
> > > [ start all new proposals below, under PATCHES PROPOSED. ]
> > >
> > > -  *) core: Drop an invalid Last-Modified header value coming
> > > - from a (F)CGI script instead of replacing it with Unix epoch.
> > > - Warn the users about Last-Modified header v