From 9390de006d3a122b365407c01650ef242a592053 Mon Sep 17 00:00:00 2001 From: cheese1 Date: Wed, 17 Feb 2021 16:15:45 +0100 Subject: http -> https --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index d71e33c..8330275 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # HIREDIS -Hiredis is a minimalistic C client library for the [Redis](http://redis.io/) database. +Hiredis is a minimalistic C client library for the [Redis](https://redis.io/) database. It is minimalistic because it just adds minimal support for the protocol, but at the same time it uses a high level printf-alike API in order to make it -- cgit v1.2.3 From 0743f57bbae3999206d13cdfd15e35740026698c Mon Sep 17 00:00:00 2001 From: plan-do-break-fix Date: Sat, 24 Apr 2021 02:23:36 -0500 Subject: fix(docs): corrects typos in project README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 8330275..78f6d89 100644 --- a/README.md +++ b/README.md @@ -169,7 +169,7 @@ Hiredis also supports every new `RESP3` data type which are as follows. For mor * **`REDIS_REPLY_MAP`**: * An array with the added invariant that there will always be an even number of elements. - The MAP is functionally equivelant to `REDIS_REPLY_ARRAY` except for the previously mentioned invariant. + The MAP is functionally equivalent to `REDIS_REPLY_ARRAY` except for the previously mentioned invariant. * **`REDIS_REPLY_SET`**: * An array response where each entry is unique. @@ -189,7 +189,7 @@ Hiredis also supports every new `RESP3` data type which are as follows. For mor * **`REDIS_REPLY_VERB`**: * A verbatim string, intended to be presented to the user without modification. - The string payload is stored in the `str` memeber, and type data is stored in the `vtype` member (e.g. `txt` for raw text or `md` for markdown). + The string payload is stored in the `str` member, and type data is stored in the `vtype` member (e.g. `txt` for raw text or `md` for markdown). Replies should be freed using the `freeReplyObject()` function. Note that this function will take care of freeing sub-reply objects -- cgit v1.2.3 From b6f86f38c2bbf0caa63d489174ac3a9777b97807 Mon Sep 17 00:00:00 2001 From: michael-grunder Date: Sun, 23 May 2021 10:44:34 -0700 Subject: Fix README.md Closes #929 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 78f6d89..d309a63 100644 --- a/README.md +++ b/README.md @@ -261,9 +261,9 @@ a single call to `read(2)`): redisReply *reply; redisAppendCommand(context,"SET foo bar"); redisAppendCommand(context,"GET foo"); -redisGetReply(context,(void *)&reply); // reply for SET +redisGetReply(context,(void**)&reply); // reply for SET freeReplyObject(reply); -redisGetReply(context,(void *)&reply); // reply for GET +redisGetReply(context,(void**)&reply); // reply for GET freeReplyObject(reply); ``` This API can also be used to implement a blocking subscriber: -- cgit v1.2.3 From 8d1bfac4640fe90cd6f800d09b7f53e886569b98 Mon Sep 17 00:00:00 2001 From: michael-grunder Date: Mon, 4 Oct 2021 12:25:58 -0700 Subject: Prepare for v1.0.1 GA --- CHANGELOG.md | 10 ++++++++++ README.md | 4 ++++ hiredis.h | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) (limited to 'README.md') diff --git a/CHANGELOG.md b/CHANGELOG.md index 271f1fc..18000ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## [1.0.1](https://github.com/redis/hiredis/tree/v1.0.1) - (2021-10-04) + +Announcing Hiredis v1.0.1, a security release fixing CVE-2021-32765 + +- Fix for [CVE-2021-32765](https://github.com/redis/hiredis/security/advisories/GHSA-hfm9-39pp-55p2) + [commit](https://github.com/redis/hiredis/commit/76a7b10005c70babee357a7d0f2becf28ec7ed1e) + ([Yossi Gottlieb](https://github.com/yossigo)) + +_Thanks to [Yossi Gottlieb](https://github.com/yossigo) for the security fix and to [Microsoft Security Vulnerability Research](https://www.microsoft.com/en-us/msrc/msvr) for finding the bug._ :sparkling_heart: + ## [1.0.0](https://github.com/redis/hiredis/tree/v1.0.0) - (2020-08-03) Announcing Hiredis v1.0.0, which adds support for RESP3, SSL connections, allocator injection, and better Windows support! :tada: diff --git a/README.md b/README.md index 3a22553..f770539 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,10 @@ Redis version >= 1.2.0. The library comes with multiple APIs. There is the *synchronous API*, the *asynchronous API* and the *reply parsing API*. +## Upgrading to `1.0.1` + +Version 1.0.1 is simply 1.0.0 with a fix for [CVE-2021-32765](https://github.com/redis/hiredis/security/advisories/GHSA-hfm9-39pp-55p2). They are otherwise identical. + ## Upgrading to `1.0.0` Version 1.0.0 marks the first stable release of Hiredis. diff --git a/hiredis.h b/hiredis.h index 0622aaa..3d38114 100644 --- a/hiredis.h +++ b/hiredis.h @@ -47,8 +47,8 @@ typedef long long ssize_t; #define HIREDIS_MAJOR 1 #define HIREDIS_MINOR 0 -#define HIREDIS_PATCH 0 -#define HIREDIS_SONAME 1.0.0 +#define HIREDIS_PATCH 1 +#define HIREDIS_SONAME 1.0.1 /* Connection type can be blocking or non-blocking and is set in the * least significant bit of the flags field in redisContext. */ -- cgit v1.2.3 From b731283245f3183af527237166261ad0768ba7d4 Mon Sep 17 00:00:00 2001 From: michael-grunder Date: Thu, 7 Oct 2021 09:52:38 -0700 Subject: Prepare for v1.0.2 GA --- CHANGELOG.md | 9 +++++++++ README.md | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'README.md') diff --git a/CHANGELOG.md b/CHANGELOG.md index 18000ba..2a2bc31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ +## [1.0.2](https://github.com/redis/hiredis/tree/v1.0.2) - (2021-10-07) + +Announcing Hiredis v1.0.2, which fixes CVE-2021-32765 but returns the SONAME to the correct value of `1.0.0`. + +- [Revert SONAME bump](https://github.com/redis/hiredis/commit/d4e6f109a064690cde64765c654e679fea1d3548) + ([Michael Grunder](https://github.com/michael-grunder)) + ## [1.0.1](https://github.com/redis/hiredis/tree/v1.0.1) - (2021-10-04) +This release erroneously bumped the SONAME, please use [1.0.2](https://github.com/redis/hiredis/tree/v1.0.2) + Announcing Hiredis v1.0.1, a security release fixing CVE-2021-32765 - Fix for [CVE-2021-32765](https://github.com/redis/hiredis/security/advisories/GHSA-hfm9-39pp-55p2) diff --git a/README.md b/README.md index f770539..c544d57 100644 --- a/README.md +++ b/README.md @@ -22,9 +22,11 @@ Redis version >= 1.2.0. The library comes with multiple APIs. There is the *synchronous API*, the *asynchronous API* and the *reply parsing API*. -## Upgrading to `1.0.1` +## Upgrading to `1.0.2` -Version 1.0.1 is simply 1.0.0 with a fix for [CVE-2021-32765](https://github.com/redis/hiredis/security/advisories/GHSA-hfm9-39pp-55p2). They are otherwise identical. +NOTE: v1.0.1 erroneously bumped SONAME, which is why it is skipped here. + +Version 1.0.2 is simply 1.0.0 with a fix for [CVE-2021-32765](https://github.com/redis/hiredis/security/advisories/GHSA-hfm9-39pp-55p2). They are otherwise identical. ## Upgrading to `1.0.0` -- cgit v1.2.3 From 0cac8dae1b161f400d81bf789fb3713d6dc2a18e Mon Sep 17 00:00:00 2001 From: michael-grunder Date: Sun, 10 Oct 2021 11:58:19 -0700 Subject: Switch to GitHub actions Since TravisCI.org was deprecated we've been without any tests. This commit adds back basic tests in Ubuntu, CentOS, and MacOS. More sophisticated tests/platforms to come in the future (e.g. 32bit tests). See: #992 --- .github/workflows/build.yml | 65 +++++++++++++++++++++++++++++++++++++++++++++ README.md | 3 ++- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/build.yml (limited to 'README.md') diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..e2d94c5 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,65 @@ +name: Build and test +on: push + +jobs: + ubuntu: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + with: + repository: ${{ env.GITHUB_REPOSITORY }} + ref: ${{ env.GITHUB_HEAD_REF }} + + - name: Install redis-server + run: | + sudo add-apt-repository -y ppa:chris-lea/redis-server + sudo apt-get update + sudo apt-get install -y redis-server + + - name: Build hiredis + run: USE_SSL=1 make + + - name: Run tests + run: $GITHUB_WORKSPACE/test.sh + + centos7: + runs-on: ubuntu-latest + container: centos:7 + steps: + - name: Checkout code + uses: actions/checkout@v2 + with: + repository: ${{ env.GITHUB_REPOSITORY }} + ref: ${{ env.GITHUB_HEAD_REF }} + + - name: Install redis-server + run: | + yum -y install http://rpms.remirepo.net/enterprise/remi-release-7.rpm + yum -y --enablerepo=remi install redis + yum -y install gcc make openssl-devel + + - name: Build hiredis + run: USE_SSL=1 make + + - name: Run tests + run: $GITHUB_WORKSPACE/test.sh + + macos: + runs-on: macos-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + with: + repository: ${{ env.GITHUB_REPOSITORY }} + ref: ${{ env.GITHUB_HEAD_REF }} + + - name: Install dependencies + run: | + brew install openssl redis + + - name: Build hiredis + run: USE_SSL=1 make + + - name: Run tests + run: $GITHUB_WORKSPACE/test.sh diff --git a/README.md b/README.md index b073f8e..ed66220 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -[![Build Status](https://travis-ci.org/redis/hiredis.png)](https://travis-ci.org/redis/hiredis) + +[![Build Status](https://github.com/redis/hiredis/actions/workflows/build.yml/badge.svg)](https://github.com/redis/hiredis/actions/workflows/build.yml) **This Readme reflects the latest changed in the master branch. See [v1.0.0](https://github.com/redis/hiredis/tree/v1.0.0) for the Readme and documentation for the latest release ([API/ABI history](https://abi-laboratory.pro/?view=timeline&l=hiredis)).** -- cgit v1.2.3