← Back to branch summary

~ubuntu-branches/ubuntu/lucid/php5/lucid

« back to all changes in this revision

Viewing changes to main/streams/xp_socket.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-03-16 09:09:50 UTC
  • mfrom: (1.1.18 upstream) (0.3.10 sid)
  • Revision ID: james.westby@ubuntu.com-20100316090950-e36m0pzranoixifd
Tags: 5.3.2-1ubuntu1
* Merge from debian unstable: 
  - debian/control:
    * Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe.
    * Dropped libmysqlclient15-dev, build against mysql 5.1.
    * Dropped libcurl-dev not in the archive.
    * Suggest php5-suhosin rather than recommends.
    * Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions already in
      universe.
    * Dropped libonig-dev and libqgdbm since its in universe. (will be re-added in lucid+1)
    * Dropped locales-all.
  - modulelist: Drop imap, interbase, and mcrypt.
  - debian/rules:
    * Dropped building of mcrypt, imap, and interbase.
    * Install apport hook for php5.
  - Dropped debian/patches/libedit_is_editline.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
main/streams/xp_socket.c
2
2
  +----------------------------------------------------------------------+
3
3
  | PHP Version 5                                                        |
4
4
  +----------------------------------------------------------------------+
5
 
  | Copyright (c) 1997-2009 The PHP Group                                |
 
5
  | Copyright (c) 1997-2010 The PHP Group                                |
6
6
  +----------------------------------------------------------------------+
7
7
  | This source file is subject to version 3.01 of the PHP license,      |
8
8
  | that is bundled with this package in the file LICENSE, and is        |
16
16
  +----------------------------------------------------------------------+
17
17
*/
18
18
 
19
 
/* $Id: xp_socket.c 289416 2009-10-09 14:20:17Z pajoye $ */
 
19
/* $Id: xp_socket.c 294453 2010-02-03 20:21:40Z pajoye $ */
20
20
 
21
21
#include "php.h"
22
22
#include "ext/standard/file.h"
223
223
static int php_sockop_stat(php_stream *stream, php_stream_statbuf *ssb TSRMLS_DC)
224
224
{
225
225
        php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract;
 
226
#if ZEND_WIN32
 
227
        return 0;
 
228
#else
226
229
        return fstat(sock->socket, &ssb->sb);
 
230
#endif
227
231
}
228
232
 
229
233
static inline int sock_sendto(php_netstream_data_t *sock, char *buf, size_t buflen, int flags,
396
400
                                }
397
401
#endif
398
402
                                
 
403
                                case PHP_STREAM_OPTION_WRITE_BUFFER:
 
404
                                        php_stream_set_chunk_size(stream, (ptrparam ? *(size_t *)ptrparam : PHP_SOCK_CHUNK_SIZE));
 
405
                                        return PHP_STREAM_OPTION_RETURN_OK;
 
406
 
399
407
                                default:
400
408
                                        return PHP_STREAM_OPTION_RETURN_NOTIMPL;
401
409
                        }