uplevel-soname-and-spec-0.3.patch

Signed-off-by: Andy Green <andy@warmcat.com>

diff --git a/configure b/configure
index 4ff42ac..e301a98 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libwebsockets 0.2.
+# Generated by GNU Autoconf 2.68 for libwebsockets 0.3.
 #
 # Report bugs to <andy@warmcat.com>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libwebsockets'
 PACKAGE_TARNAME='libwebsockets'
-PACKAGE_VERSION='0.2'
-PACKAGE_STRING='libwebsockets 0.2'
+PACKAGE_VERSION='0.3'
+PACKAGE_STRING='libwebsockets 0.3'
 PACKAGE_BUGREPORT='andy@warmcat.com'
 PACKAGE_URL=''
 
@@ -1298,7 +1298,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libwebsockets 0.2 to adapt to many kinds of systems.
+\`configure' configures libwebsockets 0.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1368,7 +1368,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libwebsockets 0.2:";;
+     short | recursive ) echo "Configuration of libwebsockets 0.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1474,7 +1474,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libwebsockets configure 0.2
+libwebsockets configure 0.3
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1897,7 +1897,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libwebsockets $as_me 0.2, which was
+It was created by libwebsockets $as_me 0.3, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2716,7 +2716,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libwebsockets'
- VERSION='0.2'
+ VERSION='0.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13030,7 +13030,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libwebsockets $as_me 0.2, which was
+This file was extended by libwebsockets $as_me 0.3, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13096,7 +13096,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libwebsockets config.status 0.2
+libwebsockets config.status 0.3
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 00b69f4..251a49d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.66])
-AC_INIT(libwebsockets, 0.2, andy@warmcat.com)
+AC_INIT(libwebsockets, 0.3, andy@warmcat.com)
 AC_CONFIG_SRCDIR([test-server/test-server.c])
 AC_CONFIG_HEADERS([config.h])
 

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8328c29..3100645 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -13,7 +13,7 @@ dist_libwebsockets_la_SOURCES += md5.c sha-1.c
 endif
 
 libwebsockets_la_CFLAGS:=-rdynamic -fPIC -Wall -Werror -std=gnu99 -pedantic -c -DDATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
-libwebsockets_la_LDFLAGS=-version-info 0:2
+libwebsockets_la_LDFLAGS=-version-info 0:3
 
 all-local:
         ../scripts/kernel-doc -html \

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 775baba..33be33f 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -223,7 +223,7 @@ dist_libwebsockets_la_SOURCES = libwebsockets.c handshake.c parsers.c \
        libwebsockets.h base64-decode.c client-handshake.c \
        private-libwebsockets.h $(am__append_1)
 libwebsockets_la_CFLAGS := -rdynamic -fPIC -Wall -Werror -std=gnu99 -pedantic -c -DDATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
-libwebsockets_la_LDFLAGS = -version-info 0:2
+libwebsockets_la_LDFLAGS = -version-info 0:3
 all: all-am
 
 .SUFFIXES:

diff --git a/libwebsockets.spec b/libwebsockets.spec
index 76e8e3d..de0c003 100644 (file)
--- a/libwebsockets.spec
+++ b/libwebsockets.spec
@@ -44,7 +44,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %attr(755,root,root) /usr/bin/libwebsockets-test-server
 %attr(755,root,root) 
-/%{_libdir}/libwebsockets.so.0.0.2
+/%{_libdir}/libwebsockets.so.0.0.3
 /%{_libdir}/libwebsockets.so.0
 /%{_libdir}/libwebsockets.so
 /%{_libdir}/libwebsockets.la

diff --git a/test-server/test-client.c b/test-server/test-client.c
index 3636951..734aab2 100644 (file)
--- a/test-server/test-client.c
+++ b/test-server/test-client.c
@@ -92,7 +92,7 @@ callback_lws_mirror(struct libwebsocket *wsi,
 
                /*
                 * start the ball rolling,
-                * LWS_CALLBACK_CLIENT_WRITEABLE will come immediately
+                * LWS_CALLBACK_CLIENT_WRITEABLE will come next service
                 */
 
                libwebsocket_callback_on_writable(wsi);
@@ -118,6 +118,12 @@ callback_lws_mirror(struct libwebsocket *wsi,
 
                libwebsocket_callback_on_writable(wsi);
 
+               /*
+                * without at least this delay, we choke the browser
+                * and the connection stalls, despite we now take care about
+                * flow control
+                */
+
                usleep(200);
                break;