[svn-commits] mmichelson: branch 1.6.0 r134126 - in /branches/1.6.0: ./ main/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Mon Jul 28 14:55:44 2008
New Revision: 134126

URL: http://svn.digium.com/view/asterisk?view=rev&rev=134126
Log:
Merged revisions 134125 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r134125 | mmichelson | 2008-07-28 14:53:56 -0500 (Mon, 28 Jul 2008) | 27 lines

This commit compensates for buggy poll(2)
implementations. Asterisk has, for a long time,
had its own implementation of poll(2) which
just used the input arguments to call select(2).
In 1.4, this internal implementation was used
for Darwin systems. This was removed in Asterisk
trunk at some point, but it seems as though this
was not the right move to make.

On Mac OS X, it appears as though the poll used
to gather CLI input does not respond properly
when connecting via a remote Asterisk console.
Reverting to the use of Asterisk's poll fixed
the issue.

Also, there is now an option for the configure
script, --enable-internal-poll, which will allow
for anyone to use Asterisk's internal poll
implementation in case they suspect that their
system's poll implementation is buggy.

closes issue #11928)
Reported by: adriavidal
Patches:
      1.6.0-configurev2.patch uploaded by putnopvut (license 60)


........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/CHANGES
    branches/1.6.0/configure
    branches/1.6.0/configure.ac
    branches/1.6.0/main/Makefile

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/CHANGES
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/CHANGES?view=diff&rev=134126&r1=134125&r2=134126
==============================================================================
--- branches/1.6.0/CHANGES (original)
+++ branches/1.6.0/CHANGES Mon Jul 28 14:55:44 2008
@@ -566,3 +566,9 @@
      turned on, via the CHANNEL(trace) dialplan function.  Could be useful for
      dialplan debugging.
   * iLBC source code no longer included (see UPGRADE.txt for details)
+  * A new option for the configure script, --enable-internal-poll, has been added
+    for use with systems which may have a buggy implementation of the poll system
+	call. If you notice odd behavior such as the CLI being unresponsive on remote
+	consoles, you may want to try using this option. This option is enabled by default
+	on Darwin systems since it is known that the Darwin poll() implementation has
+	odd issues.

Modified: branches/1.6.0/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configure.ac?view=diff&rev=134126&r1=134125&r2=134126
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Mon Jul 28 14:55:44 2008
@@ -326,7 +326,17 @@
    [HAS_POLL=1]
    AC_DEFINE([HAVE_SYS_POLL_H], 1, [Define to 1 if your system has working sys/poll.h]),
    )
+
+AC_ARG_ENABLE(internal-poll,
+	[  --enable-internal-poll	Use Asterisk's poll implementation],
+	[case "${enableval}" in
+		y|ye|yes) HAS_POLL="";;
+		n|no) HAS_POLL="${HAS_POLL}" ;;
+		*) AC_MSG_ERROR(bad value ${enableval} for --enable-internal-poll) ;;
+	esac])
 AC_SUBST(HAS_POLL)
+
+
 
 # https support (in main/http.c) uses funopen on BSD systems,
 # fopencookie on linux

Modified: branches/1.6.0/main/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/Makefile?view=diff&rev=134126&r1=134125&r2=134126
==============================================================================
--- branches/1.6.0/main/Makefile (original)
+++ branches/1.6.0/main/Makefile Mon Jul 28 14:55:44 2008
@@ -42,8 +42,13 @@
 AST_LIBS += $(SSL_LIB)
 AST_LIBS += $(BKTR_LIB)
 
+
 ifeq ($(POLL_AVAILABLE),)
   OBJS+=poll.o
+else
+  ifneq ($(findstring darwin,$(OSARCH)),)
+    OBJS+=poll.o
+  endif
 endif
 
 ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc linux-gnueabi ),)