Merge r1700851 from trunk:

mod_negotiation: simplify type-map body tag lookup, and be safe
should it contain a NUL byte.

Submitted by: ylavic
Reviewed/backported by: jim

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

Merge r1602978, r1683044, r1683884, r1673368, r1701717, r1683047 from trunk:

Core filters do not need mod_proxy.h

Small speed optimization when parsing <Limit>, <LimitExcept> and environment variables

Save a few bytes in conf pool

Remove some spaces between some return statements  and ';' + fix a strange formating in a 'for' loop

In order to save a few cycles, delay a hash table lookup which is not necessary needed

Constify + save a few bytes in conf pool
Submitted by: ylavic, jailletc36, jailletc36, jailletc36, jailletc36, jailletc36
Reviewed/backported by: jim

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

Merge r1701436 from trunk:

allow autoindex w/o mod_dir/mod_mime setting the DIR_MAGIC_TYPE.

Submitted by: covener
Reviewed/backported by: jim

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

Merge r1701545 from trunk:

Improve macro definition in order to avoid potential precedence issues.

For example, sparse spotted that the following line was spurious:
        newcond->flags &= ~CONDFLAG_NOCASE;
It this particular case, 2 bits were resetted (instead of only 1). This was harmless because the first bit (i.e. CONDFLAG_NONE) is never tested as-is.
Submitted by: jailletc36
Reviewed/backported by: jim

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

promote

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

vote

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

Votes.

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

Propose mod_slotmem_shm/mpm_winnt fixes.

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

Update easy proposals

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

Easy proposals

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

Rebuild.

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

XML updates.

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

update mod_ssl transformations

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

link to the OpenSSL 1.0.2 version of the SSL_CONF_cmd man page

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

Andy Wang says lots of fishy things here

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

Rebuild

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

Applies patch from info@mathijs.info to use 2.4 authz syntax.

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

propose old trunk patch

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

Merge r1700317, r1700318, r1700319, r1700320, r1700321, r1700322, r1700326, r1700328, r1700330, r1700331, r1700332, r1700334, r1700336, r1700338 from trunk:

Fix some spurious ident spotted by sparse

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting + some minor style issues

Remove useless line

Silence a sparse warning about inconsistent indenting + some minor style issues

Silence a sparse warning about inconsistent indenting + some minor style issues

Silence a sparse warning about inconsistent indenting + some minor style issues

Fix some spurious ident spotted by sparse

Silence a sparse warning about inconsistent indenting + some minor style issues

Silence a sparse warning about inconsistent indenting + some minor style issues
Submitted by: jailletc36
Reviewed/backported by: jim

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

Merge r1696105, r1700418 from trunk:

With the current implementation, it is likely to connect/close a socket with the memcache server for each command sent.
The root cause is a too small idle timeout (600 microseconds).

Add a new directive, 'MemcacheConnTTL',  to control this idle connection timeout with the memcache server(s).
Change the default value from 600 usec (!) to 15 sec as per Yann suggestion.

I've limited accepted values from 1 to 1800 seconds (half an hour) because internaly, the value passed to 'apr_memcache_server_create' is still in mirco-seconds.

PR 58091
~~~~~~~~~~~~~~~~~~~_
Homemade measurement (on a slighly modified version of httpd) shows a +30% in number of processed requests using memcache to cache /index.html.
Comparison made between the 600 usec and 15 sec TTL.

Memcache config:
    default
httpd Config:
    CacheEnable socache /
    CacheSocache memcache:127.0.0.1
    LoadModule mpm_event_module modules/mod_mpm_event.so
httpd compiled with:
    ./configure --enable-mpms-shared=all --with-included-apr --with-mysql --with-libxml2 --enable-modules=reallyall --enable-ssl-ct=no --enable-maintainer-mode --prefix=$HOME/httpd-2.5
httpd and memcache running on the same VM running under Ubuntu 15.04
Load tested using:
    ab -n 20000 http://127.0.0.1/index.html

Creation/closing of connections beetween httpd and memcache confirmed using the telnet connection to memcache and the stats command

Allow 0 as a valid value (never close idle connections)
Increased maximum allowed value to 3600 s (1 hour)
Use 'ap_timeout_parameter_parse' to allow more flexible configuration (i.e. h, min, s, ms suffixes)
Use 'apr_time_from_sec' when applicable.
Submitted by: jailletc36
Reviewed/backported by: jim

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

updated http2 backport proposal with own branch reference

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

Vote.

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

Update proposal

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

vote for alternative fix

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

remove old flavor of ALPN proposal, new ALPN/Protols is now proposed.

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

some easy votes/promotes

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

Add CHANGES entry

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

autoindex fix w/o mod_mime and mod_dir

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

Merge r1597352 from trunk:

* Give ap_proxy_post_request as chance to act correctly on the status code
  by setting r->status temporarily to access_status. r->status might be
  different than access_status e.g. r->status could be HTTP_OK if e.g. we
  override the error page on the proxy or if the error was not generated
  by the backend itself but by the proxy e.g. a bad gateway.

Submitted by: rpluem
Reviewed/backported by: jim

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

  *) mod_session_dbd: fix lifetime of Request notes.
       trunk: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/session/mod_session_dbd.c?r1=1679181&r2=1687087&view=patch
            2.4.x: trunk patch applies.
                 +1: niq, ylavic, jim

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

Merge r1693963 from trunk:

Allow cookies set by mod_rewrite to contain ':' by accepting
';' as an alternate separator.  PR47241.

Submitted By: <bugzilla schermesser com>, covener
Committed By: covener

Submitted by: covener
Reviewed/backported by: jim

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

Merge r1693919 from trunk:

Add HTTPD_VERSION and HTTPD_MMN to the variables available with apxs -q

PR58202.

Submitted By: Daniel Shahaf
Committed By: covener

Submitted by: covener
Reviewed/backported by: jim

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

promote

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

ok

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

Merge r1695170 from trunk:

Avoid a crash when lacking correct DB access permissions. PR 57868.
Submitted by: jailletc36
Reviewed/backported by: jim

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

Merge r1688660 from trunk:

mod_authz_dbd: Avoid a crash when lacking correct DB access permissions. PR 57868.

Submitted by: Jose Kahan <jose w3.org>

Submitted by: ylavic
Reviewed/backported by: jim

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

Fix typo (r1701349 in trunk)

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

Fix commits URLs ('r' prefix).

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

updated backport proposal for protocols+mod_h2, updated patches

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

proposed backport of mod_h2

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

updated protocols patch with latest changes and the missing NPN removal

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

Vote.

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

Vote, comment.

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

Easy proposals

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

Update proposal

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

Move proposal to PATCHES/ISSUES THAT ARE BEING WORKED
Remove Eric vote as the patch will be tweaked.

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

vote for memcache change

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

backport http://svn.apache.org/r1695583 from trunk:

mod_dir: when we bail out of fixups, make sure Content-Type is not still
httpd/unix-directory.  This only happens when the generator sets
no content-type which is more common w/ no DefaultType in 2.4.

Submitted By: covener
Reviewed By: ylavic, niq

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

pull proposal

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

add FallbackResource / PR58292 fix

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

adding changeset for ap_array_index start parameter and ap_array_contains function

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

Withdraw mod_proxy_balancer proposal (reverted).

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

adding r1698116 to core-protocols.patch to clarify new api

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

added r1693918 to change list for protocols backport, updated core-protocols.patch

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

proposing Protocols patch for backport

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

arg, reverting the merge info

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

proposing Protocols patch for backport

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

Add warning about reaching the balancer[-member] growth limit.

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

Still +1 with the new change.

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

* Add patch for better cleanup and reset vote

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

* Comments

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

Rebuild.

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

XML update.

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

Status review: vote, promote, comment.

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

Update SubstituteInheritBefore proposal to v5.

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

Votes.

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

* Add proposal

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

Propose fix for PR 58024.

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

Generated doc changes

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

Restructure ProxyPass directive documentation

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

Propose backports

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

Generated doc changes

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

Grammar corrections

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

Generated doc changes

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

Grammar corrections

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

propose

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

propose fix for tricky stackoveflow.com bug

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

Propose

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

merge r1694936
remove space after the \

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

Merge r1694903
Add include path for NetWare build.
Submitted by: normw gknw net.

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

Merge r1642099
Add include path for NetWare build.

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

Add missing proxy export symbol.

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

propose old rewrite/cookie fix

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

propose apxs -q additions

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

Record approval/staging date

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

tag the not-released versions to synch up with STATUS, recommended
by Julian Foad.  2.2.x CHANGES has this for a recent not-released
version.

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

* Add proposal

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

property cleanup

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

Rebuild.

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

XML update.

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

Rebuild.

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

XML update.

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

revert r1691722, I thought I was in a private tree.

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

remove socache

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

Rebuild.

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

XML updates.

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

Rebuild.

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

XML updates.

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

Rebuild and only leave outdated the translated files that already were outdated

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

Backport r1690137.
Doc and comment fix only

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