Merge branch 'maint'

Conflicts:
	osx_write.c

diff --combined http_send.c
index 3959cad4f3b67326d6161a252c5b3a66a74e0394,0c48934aea55747fa9e24e9393b903d0b4754263..6ededb275ac225d8a38d6ccbead967d53877fad4
--- 1/http_send.c
--- 2/http_send.c
+++ b/http_send.c
@@@ -6,10 -6,8 +6,10 @@@
  
  /** \file http_send.c paraslash's http sender */
  
 +#include <regex.h>
  #include <sys/types.h>
  #include <dirent.h>
 +#include <osl.h>
  
  #include "para.h"
  #include "error.h"
@@@ -135,7 -133,7 +135,7 @@@ static void http_post_select(fd_set *rf
        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 -144,9 +146,9 @@@
                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 --combined osx_write.c
index bc11e61aea24a22596c88a3e4e14f5d7b9ad746c,c40428895ece1e8376cd6e58b83a2369eba53fa4..97a7ccf49ba74977718e335f15142306e11c2c91
--- 1/osx_write.c
--- 2/osx_write.c
+++ b/osx_write.c
@@@ -11,10 -11,8 +11,9 @@@
   * <skortze@sourceforge.net>
   */
  
 +#include <regex.h>
  #include <sys/types.h>
  #include <dirent.h>
- #include <CoreAudio/CoreAudio.h>
  
  #include "para.h"
  #include "fd.h"
@@@ -26,10 -24,9 +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 {