[OpenSRF-GIT] OpenSRF branch rel_2_5 updated. osrf_rel_2_5_0-beta-1-g838aed4
Evergreen Git
git at git.evergreen-ils.org
Wed Mar 1 10:50:38 EST 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSRF".
The branch, rel_2_5 has been updated
via 838aed4e78a69f5fef7a55f018f2659b0236f5ac (commit)
via b9b50e4802e9c6aad257d1ed6085c7ab252062f4 (commit)
via cf6a373f0c3f5e60dc72f4de44b11866d5b986af (commit)
via 5d552226c08385bda3ece8ac308329ba423af76b (commit)
from 3d1aae3f88a547fb76754085e062de3f139246ba (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 838aed4e78a69f5fef7a55f018f2659b0236f5ac
Author: Bill Erickson <berickxx at gmail.com>
Date: Wed Feb 22 16:05:25 2017 -0500
LP#1667091 Remove non-SSL websockets sample configs
All WebSockets communication occurs via SSL in the sample configuration
files. Non-SSL communication is still an option if required with local
configuration.
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/examples/apache2/websockets/apache2.conf b/examples/apache2/websockets/apache2.conf
index b04f3d7..7afa8f0 100644
--- a/examples/apache2/websockets/apache2.conf
+++ b/examples/apache2/websockets/apache2.conf
@@ -57,15 +57,6 @@ NameVirtualHost *:7682
SSLCertificateKeyFile /etc/apache2/ssl/server.key
</VirtualHost>
-# WebSockets via non-SSL
-Listen 7680
-NameVirtualHost *:7680
-<VirtualHost *:7680>
- ServerName localhost:7680
- ServerAlias 127.0.0.1:7680
- DocumentRoot /var/www
-</VirtualHost>
-
# OpenSRF WebSockets gateway
<Location /osrf-websocket-translator>
SetHandler websocket-handler
diff --git a/examples/apache_24/websockets/apache2.conf b/examples/apache_24/websockets/apache2.conf
index 64e6a4c..8bf3657 100644
--- a/examples/apache_24/websockets/apache2.conf
+++ b/examples/apache_24/websockets/apache2.conf
@@ -63,14 +63,6 @@ Listen 7682
SSLCertificateKeyFile /etc/apache2/ssl/server.key
</VirtualHost>
-# WebSockets via non-SSL
-Listen 7680
-<VirtualHost *:7680>
- ServerName localhost:7680
- ServerAlias 127.0.0.1:7680
- DocumentRoot /var/www
-</VirtualHost>
-
# OpenSRF WebSockets gateway
<Location /osrf-websocket-translator>
SetHandler websocket-handler
diff --git a/examples/nginx/osrf-ws-http-proxy b/examples/nginx/osrf-ws-http-proxy
index efa929c..d079230 100644
--- a/examples/nginx/osrf-ws-http-proxy
+++ b/examples/nginx/osrf-ws-http-proxy
@@ -35,7 +35,7 @@ server {
}
location /osrf-websocket-translator {
- proxy_pass http://localhost:7680;
+ proxy_pass https://localhost:7682;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
commit b9b50e4802e9c6aad257d1ed6085c7ab252062f4
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Tue Feb 21 17:27:33 2017 -0500
update changelog for 2.5.0-beta
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/ChangeLog b/ChangeLog
index 8c8cc0f..10d93c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,135 +1,79 @@
-commit 88c8970c3dea26c72bc3173b18041e29538c4d8c
+commit cf6a373f0c3f5e60dc72f4de44b11866d5b986af
Author: Galen Charlton <gmc at equinoxinitiative.org>
-Date: Thu Feb 16 15:16:21 2017 -0500
+Date: Tue Feb 21 17:26:20 2017 -0500
- update version numbers for 2.5.0-alpha2
+ udpate version stamps for 2.5.0-beta
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
7 7 README
-1 1 src/perl/lib/OpenSRF.pm
+2 2 src/perl/lib/OpenSRF.pm
1 1 src/python/setup.py
1 1 version.m4
-commit 9df9c484031e313d3c6f1f85951d6b67b931f536
+commit 5d552226c08385bda3ece8ac308329ba423af76b
Author: Galen Charlton <gmc at equinoxinitiative.org>
-Date: Thu Feb 16 15:13:17 2017 -0500
+Date: Tue Feb 21 17:25:00 2017 -0500
- update release notes for 2.5.0-alpha2
+ update release notes for 2.5-beta
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
-16 2 doc/RELEASE_NOTES.txt
+13 2 doc/RELEASE_NOTES.txt
-commit 4744d1a42b709a2c7aa778565c0c32a1962e0e2c
+commit 3d1aae3f88a547fb76754085e062de3f139246ba
Author: Galen Charlton <gmc at equinoxinitiative.org>
-Date: Wed Feb 15 16:58:06 2017 -0500
+Date: Tue Feb 21 16:21:23 2017 -0500
- LP#1652382: more improvements to cache key munging
+ LP#1666706: add --with-websockets-port configure option
- - teach osrfCacheRemove to clean keys
- - fix implict declaration compilation warning
- - account for fact that iscntrl('\0') returns true
+ This patch adds the ability to specify the WebSockets
+ port as a configure option, avoiding the need to manually
+ edit a couple JavaScript files if one chooses to proxy
+ WS traffic.
- Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
- Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
-
-5 2 src/libopensrf/osrf_cache.c
-
-commit 7ec6c1a4b3fc99f10bd1b3c9b07a0008672cf3f6
-Author: Galen Charlton <gmc at equinoxinitiative.org>
-Date: Wed Feb 15 14:12:34 2017 -0500
-
- LP#1652382: handle cases where supplied key is longer than 250 bytes
-
- With this patch, if cache clients want to use a key longer
- than the memcached text protocol limit of 250 bytes, the
- key is normalized to 'shortened_' + md5_hex(normalized_key).
+ This patch also cleans up the set of JavaScript files that
+ are installed so that some test case files are not installed
+ by default.
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
- Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
-10 1 src/libopensrf/osrf_cache.c
-4 0 src/perl/lib/OpenSRF/Utils/Cache.pm
-
-commit e58f20fd69b1fb2e94765a2bf9067ba1cbb9d2d9
+2 0 .gitignore
+7 1 README
+8 0 configure.ac
+1 2 src/Makefile.am
+0 104 src/javascript/opensrf_ws.js
+104 0 src/javascript/opensrf_ws.js.in
+0 248 src/javascript/opensrf_ws_shared.js
+248 0 src/javascript/opensrf_ws_shared.js.in
+ delete mode 100644 src/javascript/opensrf_ws.js
+ create mode 100644 src/javascript/opensrf_ws.js.in
+ delete mode 100644 src/javascript/opensrf_ws_shared.js
+ create mode 100644 src/javascript/opensrf_ws_shared.js.in
+
+commit 21c1412b408943cc4425dce2e9cc9222faf4fa78
Author: Mike Rylander <mrylander at gmail.com>
-Date: Mon Jan 30 12:54:10 2017 -0500
+Date: Thu Aug 4 08:57:44 2016 -0400
- LP#1652382: Make use of the clean key just created
+ LP#1616501: teach mod_perl handlers how to detect client disconnects
- Signed-off-by: Mike Rylander <mrylander at gmail.com>
- Signed-off-by: Kathy Lussier <klussier at masslnc.org>
- Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
- Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
-
-1 1 src/libopensrf/osrf_cache.c
-
-commit 8f31413ba4334ee3f695f84a810eccbe94351f77
-Author: Mike Rylander <mrylander at gmail.com>
-Date: Fri Jan 27 15:25:05 2017 -0500
-
- LP#1652382: normalization of memcache keys in C code
+ This patch provides an API so that mod_perl handlers
+ that act as OpenSRF clients have a way to specify that
+ if the browser disconnects, to stop trying to receive
+ results from an XMPP request.
- Memcache does not allow spaces in keys, so here we will actively strip them
- from any key we get from a caller. Some callers are not very proactive about
- sending clean keys, and this patch prevents issues that can poison C-based
- OpenSRF service backends.
+ To invoke it, mod_perl handlers can add the following:
- Signed-off-by: Mike Rylander <mrylander at gmail.com>
- Signed-off-by: Kathy Lussier <klussier at masslnc.org>
- Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
- Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
-
-20 2 src/libopensrf/osrf_cache.c
-
-commit 22e2c7729b6caf265b27ff14126fe5595e87cdca
-Author: Mike Rylander <mrylander at gmail.com>
-Date: Tue Jan 10 15:30:18 2017 -0500
-
- LP#1655449: Bundling/chunking limits for SubRquests
-
- We need to teach subrequests to inherit parent request bundling/chunking
- parameters so they don't cause overruns in dispatch mode.
+ use OpenSRF;
+ ...
+ sub hander {
+ ...
+ my $r = shift;
+ OpenSRF->OSRF_APACHE_REQUEST_OBJ($r);
+ ...
Signed-off-by: Mike Rylander <mrylander at gmail.com>
- Signed-off-by: Jason Stephenson <jason at sigio.com>
-
-5 1 src/perl/lib/OpenSRF/AppSession.pm
-17 3 src/perl/lib/OpenSRF/Application.pm
-
-commit b6fe0b1c9917d3d188ff8053f5fc3611ef878b3a
-Author: Galen Charlton <gmc at esilibrary.com>
-Date: Thu Dec 22 15:53:12 2016 +0500
-
- LP#1652122: fix infinite recursion in opensrf.system.method.all
-
- Under certain circumstances, calling opensrf.system.method.all on a
- Perl service can result in an infinite recursion when attempting to
- serialize an OpenSRF::Application object to JSON. In particular,
- this was observed to happen when doing an introspection of
- the opensrf.settings service.
-
- This patch avoids the infinite recursion (and consequent memory
- leak) by ensuring that the 'session' key is slated for exclusion
- from serialization from OpenSRF::Application objects during
- bootstrapping.
-
- Note that the problem does not affect all Perl services; if a
- Perl service declares at least one streaming method, the auto-registration
- of the .atomic method will result in 'session'-stripping.
-
- This patch fixes a regression introduced in bug 1350457.
-
- To test
- -------
- [1] Run 'introspect opensrf.settings' via srfsh; observe
- that it never returns and that the opensrf.settings drone
- will grow in memory sized until killed.
- [2] Apply the patch, then repeat step 1. This time, the
- request should succeed.
-
- Signed-off-by: Galen Charlton <gmc at esilibrary.com>
- Signed-off-by: Mike Rylander <mrylander at gmail.com>
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
-1 1 src/perl/lib/OpenSRF/System.pm
+17 0 src/perl/lib/OpenSRF.pm
+25 1 src/perl/lib/OpenSRF/Transport/SlimJabber/XMPPReader.pm
commit cf6a373f0c3f5e60dc72f4de44b11866d5b986af
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Tue Feb 21 17:26:20 2017 -0500
udpate version stamps for 2.5.0-beta
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/README b/README
index 1755a6d..248c8ec 100644
--- a/README
+++ b/README
@@ -29,7 +29,7 @@ Issue the following commands as the *user* Linux account.
+
[source, bash]
------------------------------------------------------------------------------
-wget https://evergreen-ils.org/downloads/opensrf-2.5.0-alpha2.tar.gz
+wget https://evergreen-ils.org/downloads/opensrf-2.5.0-beta.tar.gz
------------------------------------------------------------------------------
+
[NOTE]
@@ -40,8 +40,8 @@ http://git.evergreen-ils.org/?p=OpenSRF.git
+
[source, bash]
------------------------------------------------------------------------------
-tar -xvf opensrf-2.5.0-alpha2.tar.gz
-cd opensrf-2.5.0-alpha2/
+tar -xvf opensrf-2.5.0-beta.tar.gz
+cd opensrf-2.5.0-beta/
------------------------------------------------------------------------------
Installing prerequisites
@@ -469,14 +469,14 @@ a2dismod websocket
.(Debian)
[source, bash]
---------------------------------------------------------------------------
-cd /path/to/opensrf-2.5.0-alpha2
+cd /path/to/opensrf-2.5.0-beta
cp examples/apache2/websockets/apache2.conf /etc/apache2-websockets/
---------------------------------------------------------------------------
+
.(Ubuntu Trusty / Xenial)
[source, bash]
---------------------------------------------------------------------------
-cd /path/to/opensrf-2.5.0-alpha2
+cd /path/to/opensrf-2.5.0-beta
cp examples/apache_24/websockets/apache2.conf /etc/apache2-websockets/
---------------------------------------------------------------------------
+
@@ -548,7 +548,7 @@ apt-get install nginx
+
[source, bash]
---------------------------------------------------------------------------
-cd /path/to/opensrf-2.5.0-alpha2
+cd /path/to/opensrf-2.5.0-beta
cp examples/nginx/osrf-ws-http-proxy /etc/nginx/sites-available/
ln -s /etc/nginx/sites-available/osrf-ws-http-proxy /etc/nginx/sites-enabled/osrf-ws-http-proxy
---------------------------------------------------------------------------
@@ -603,7 +603,7 @@ apt-get install haproxy
+
[source, bash]
---------------------------------------------------------------------------
-cd /path/to/opensrf-2.5.0-alpha2
+cd /path/to/opensrf-2.5.0-beta
cat examples/haproxy/osrf-ws-http-proxy >> /etc/haproxy/haproxy.cfg
---------------------------------------------------------------------------
+
diff --git a/src/perl/lib/OpenSRF.pm b/src/perl/lib/OpenSRF.pm
index 1560cca..9f4d147 100644
--- a/src/perl/lib/OpenSRF.pm
+++ b/src/perl/lib/OpenSRF.pm
@@ -12,11 +12,11 @@ OpenSRF - Top level class for OpenSRF perl modules.
=head1 VERSION
-Version 2.1.2
+Version 2.5.0-beta
=cut
-our $VERSION = "2.50_2";
+our $VERSION = "2.50_3";
=head1 METHODS
diff --git a/src/python/setup.py b/src/python/setup.py
index 836d174..97901d8 100644
--- a/src/python/setup.py
+++ b/src/python/setup.py
@@ -3,7 +3,7 @@
from setuptools import setup
setup(name='OpenSRF',
- version='2.5.0-alpha2',
+ version='2.5.0-beta',
install_requires=[
'dnspython', # required by pyxmpp
'python-memcached',
diff --git a/version.m4 b/version.m4
index 5767869..b55c254 100644
--- a/version.m4
+++ b/version.m4
@@ -1 +1 @@
-m4_define([VERSION_NUMBER],[2.5.0-alpha2])
+m4_define([VERSION_NUMBER],[2.5.0-beta])
commit 5d552226c08385bda3ece8ac308329ba423af76b
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Tue Feb 21 17:25:00 2017 -0500
update release notes for 2.5-beta
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/doc/RELEASE_NOTES.txt b/doc/RELEASE_NOTES.txt
index e3fa202..889b005 100644
--- a/doc/RELEASE_NOTES.txt
+++ b/doc/RELEASE_NOTES.txt
@@ -1,5 +1,5 @@
-Release notes for OpenSRF 2.5.0-alpha2
-======================================
+Release notes for OpenSRF 2.5.0-beta
+====================================
Supported platforms
-------------------
@@ -9,6 +9,17 @@ The following Linux distributions are supported:
* Fedora 17, 18
* Ubuntu 14.04 (Trusty Tahr) and 16.04 LTS (Xenial Xerus)
+Changes in 2.5.0-beta
+---------------------
+OpenSRF 2.5.0-beta includes the following additions since 2.5.0-alpha2:
+
+* LP#1666706: a new configure option, `--with-websockets-port`, to allow
+installers to specify the WebSockets port that clients should use.
+* LP#1616501: add a way for mod_perl handlers that are OpenSRF clients
+to detect when the web browser has disconnected, and in turn stop listening
+for results from XMPP requests pending when the browser disconnect
+happened.
+
Changes in 2.5.0-alpha2
-----------------------
OpenSRF 2.5.0-alpha2 is a security release; testers of OpenSRF 2.5.x
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 154 +++++++++-------------------
README | 14 ++--
doc/RELEASE_NOTES.txt | 15 +++-
examples/apache2/websockets/apache2.conf | 9 --
examples/apache_24/websockets/apache2.conf | 8 --
examples/nginx/osrf-ws-http-proxy | 2 +-
src/perl/lib/OpenSRF.pm | 4 +-
src/python/setup.py | 2 +-
version.m4 | 2 +-
9 files changed, 74 insertions(+), 136 deletions(-)
hooks/post-receive
--
OpenSRF
More information about the opensrf-commits
mailing list