On 07/08/2015 10:12 PM, Burton, Ross wrote:
As per our commit guidelines, the commit message needs to start with the
name of the recipe that was modified.

Fixed it, please refer to: [OE-core] [PATCH v2] apr: Fix packet discards HTTP redirect

Thanks
Wenzong


Ross

On 8 July 2015 at 08:32, <wenzong....@windriver.com
<mailto:wenzong....@windriver.com>> wrote:

    From: Li Wang <li.w...@windriver.com <mailto:li.w...@windriver.com>>

    Disconnect the connection by poll() timeout.
    If timeout=0 and apr_wait_for_io_or_timeout()=APR_TIMEUP then
    apr_socket_recv() returns EAGAIN.

    Signed-off-by: Noriaki Yoshitane <yoshitane....@cnt.ncos.nec.co.jp
    <mailto:yoshitane....@cnt.ncos.nec.co.jp>>
    Signed-off-by: Li Wang <li.w...@windriver.com
    <mailto:li.w...@windriver.com>>
    ---
      .../apr/Fix-packet-discards-HTTP-redirect.patch    | 32
    ++++++++++++++++++++++
      meta/recipes-support/apr/apr_1.5.2.bb <http://apr_1.5.2.bb>
           |  1 +
      2 files changed, 33 insertions(+)
      create mode 100644
    meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch

    diff --git
    a/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch
    b/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch
    new file mode 100644
    index 0000000..6805b8b
    --- /dev/null
    +++
    b/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch
    @@ -0,0 +1,32 @@
    +Fix packet discards HTTP redirect.
    +
    +Disconnect the connection by poll() timeout.
    +If timeout=0 and apr_wait_for_io_or_timeout()=APR_TIMEUP then
    +apr_socket_recv() returns EAGAIN.
    +
    +Upstream-Status: Pending
    +
    +Signed-off-by: Noriaki Yoshitane <yoshitane....@cnt.ncos.nec.co.jp
    <mailto:yoshitane....@cnt.ncos.nec.co.jp>>
    +Signed-off-by: Li Wang <li.w...@windriver.com
    <mailto:li.w...@windriver.com>>
    +---
    + network_io/unix/sendrecv.c |    4 ++++
    + 1 file changed, 4 insertions(+)
    +
    +diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c
    +index c133a26..e8faf15 100644
    +--- a/network_io/unix/sendrecv.c
    ++++ b/network_io/unix/sendrecv.c
    +@@ -85,6 +85,10 @@ apr_status_t apr_socket_recv(apr_socket_t *sock,
    char *buf, apr_size_t *len)
    +                       && (sock->timeout > 0)) {
    + do_select:
    +         arv = apr_wait_for_io_or_timeout(NULL, sock, 1);
    ++        if ((arv == APR_TIMEUP) && (sock->timeout == 0)) {
    ++            *len = 0;
    ++            return EAGAIN;
    ++        }
    +         if (arv != APR_SUCCESS) {
    +             *len = 0;
    +             return arv;
    +--
    +1.7.9.5
    +
    diff --git a/meta/recipes-support/apr/apr_1.5.2.bb
    <http://apr_1.5.2.bb> b/meta/recipes-support/apr/apr_1.5.2.bb
    <http://apr_1.5.2.bb>
    index aac6276..c1f7f38 100644
    --- a/meta/recipes-support/apr/apr_1.5.2.bb <http://apr_1.5.2.bb>
    +++ b/meta/recipes-support/apr/apr_1.5.2.bb <http://apr_1.5.2.bb>
    @@ -15,6 +15,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
                 file://configfix.patch \
                 file://run-ptest \
                 file://upgrade-and-fix-1.5.1.patch \
    +           file://Fix-packet-discards-HTTP-redirect.patch \
      "

      SRC_URI[md5sum] = "4e9769f3349fe11fc0a5e1b224c236aa"
    --
    1.9.1

    --
    _______________________________________________
    Openembedded-core mailing list
    Openembedded-core@lists.openembedded.org
    <mailto:Openembedded-core@lists.openembedded.org>
    http://lists.openembedded.org/mailman/listinfo/openembedded-core


--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to