Merge branch 'maint'

Conflicts:
	osx_write.c

diff --git a/http_send.c b/http_send.c
index 3959cad4f3b67326d6161a252c5b3a66a74e0394..6ededb275ac225d8a38d6ccbead967d53877fad4 100644 (file)
--- a/http_send.c
+++ b/http_send.c
@@ -135,7 +135,7 @@ static void http_post_select(fd_set *rfds, __a_unused fd_set *wfds)
        phsd->status = HTTP_CONNECTED;
 }
 
-static void http_pre_select(int *max_fileno, fd_set *rfds, __a_unused fd_set *wfds)
+static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
 {
        struct sender_client *sc, *tmp;
 
@@ -146,6 +146,9 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, __a_unused fd_set *wf
                struct private_http_sender_data *phsd = sc->private_data;
                if (phsd->status == HTTP_CONNECTED) /* need to recv get request */
                        para_fd_set(sc->fd, rfds, max_fileno);
+               if (phsd->status == HTTP_GOT_GET_REQUEST ||
+                               phsd->status == HTTP_INVALID_GET_REQUEST)
+                       para_fd_set(sc->fd, wfds, max_fileno);
        }
 }
 

diff --git a/osx_write.c b/osx_write.c
index bc11e61aea24a22596c88a3e4e14f5d7b9ad746c..97a7ccf49ba74977718e335f15142306e11c2c91 100644 (file)
--- a/osx_write.c
+++ b/osx_write.c
@@ -14,7 +14,6 @@
 #include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
-#include <CoreAudio/CoreAudio.h>
 
 #include "para.h"
 #include "fd.h"
@@ -26,10 +25,9 @@
 #include "osx_write.cmdline.h"
 #include "error.h"
 
-
-#include <CoreAudio/CoreAudio.h>
+#include <CoreServices/CoreServices.h>
 #include <AudioUnit/AudioUnit.h>
-#include <AudioToolbox/DefaultAudioOutput.h>
+#include <AudioToolbox/AudioToolbox.h>
 
 /** describes one input buffer for the osx writer */
 struct osx_buffer {