[collectd-changes] collectd, the system statistics collection daemon: Changes to 'collectd-5.2'

[Florian Forster]

 contrib/upstart.collectd.conf |   47 +++++++++++++++++++++++++++++++++++++++++
 src/apache.c                  |    3 ++-
 src/ascent.c                  |    3 ++-
 src/bind.c                    |    3 ++-
 src/curl.c                    |    3 ++-
 src/curl_json.c               |   11 ++--------
 src/curl_xml.c                |   15 ++++++-------
 src/exec.c                    |    2 +-
 src/mysql.c                   |    4 ++++
 src/nginx.c                   |    3 ++-
 src/plugin.c                  |    3 +++
 src/write_http.c              |    2 +-
 12 files changed, 75 insertions(+), 24 deletions(-)

New commits:
commit 3b51243382501d5f3cdda79d30c7ecf39d22dd87
Merge: 9706a20 d6021a8
Author: Florian Forster <octo at collectd.org>
Date:   Sat Mar 16 13:43:26 2013 +0100

    Merge branch 'collectd-5.1' into collectd-5.2

commit d6021a800b12c89b5a78877af2c5b9abc1a8e609
Merge: e33a2a5 56c7b21
Author: Florian Forster <octo at collectd.org>
Date:   Sat Mar 16 13:40:14 2013 +0100

    Merge branch 'collectd-4.10' into collectd-5.1
    
    Conflicts:
    	src/curl_json.c

commit 56c7b21899e44b57b5031a21ca3652b30f4fc1aa
Author: Dan Fandrich <dan at coneharvesters.com>
Date:   Wed Feb 6 23:35:04 2013 +0100

    curl_xml plugin: Check for a curl_easy_perform() error first
    
    The value of CURLINFO_RESPONSE_CODE isn't valid otherwise.
    Also, use the symbolic name CURLE_OK in all plugins where
    appropriate.
    
    Change-Id: I17ae9c7eea393ee4641296b5484c93809a662dd9
    Signed-off-by: Florian Forster <octo at collectd.org>

commit 61f60a27181027b73181dcb805ce319335a64fb2
Author: Tomas Doran <tomas.doran at timgroup.com>
Date:   Tue Feb 26 12:43:21 2013 +0000

    Fix memory leaks when plugin gets no results
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit c639797924c64912d71cf83cd50c3508671c9088
Author: Florian Forster <octo at collectd.org>
Date:   Thu Feb 21 10:35:59 2013 +0100

    exec plugin: Fix a copy'n'paste mistake in a comment.
    
    Thanks to Robert Riches Jr for the hint.

commit e33a2a5fffa6e57f8cea775ce2201606d49e155f
Author: Dave Cottlehuber <dch at jsonified.com>
Date:   Mon Feb 18 13:31:57 2013 +0100

    Add upstart configuration file for Ubuntu, Debian and RedHat distros
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit 59c22282427eb6c38d6651cdaa205533752284cb
Author: Florian Forster <octo at collectd.org>
Date:   Wed Feb 20 08:36:46 2013 +0100

    curl_json plugin: Call yajl_complete_parse() / yajl_parse_complete() only once.
    
    The cURL callback may be called several times, so we need to call the
    complete() function after perform() returns.

commit a7aec0ae6160be6aa6b1b2b06574bb0dd47497f2
Author: Dan Fandrich <dan at coneharvesters.com>
Date:   Mon Feb 4 23:27:26 2013 +0100

    Add protection from infinite redirect loops to curl-using plugins
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit b0c32ea6b670877e573913139f05d5c110e50861
Author: Dan Fandrich <dan at coneharvesters.com>
Date:   Tue Feb 5 00:02:17 2013 +0100

    curl_xml plugin: Fix potential dereference of NULL pointer.
    
    I managed to get collectd to segfault in a couple of places while
    playing with it a bit. The first is in the curl_xml module when the
    XPATH expression doesn't quite match the input. The crash occurs on line
    407 when instance_node->nodeTab[0] is dereferenced. At this point, all
    members of instance_node are 0, so dereferencing the array isn't a good
    idea. This patch fixes the problem, although I'm not sure if this
    particular case actually deserves its own error message.
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit 26b7959e12217415fd86507476a736e8b4562a99
Author: Florian Forster <octo at collectd.org>
Date:   Sun Feb 3 23:04:17 2013 +0100

    src/plugin.c: Initialize "next_read" field of read callbacks.
    
    Fixes Github issue #230.