← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/php5/gutsy

« back to all changes in this revision

Viewing changes to main/streams/php_stream_transport.h

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt, CVE-2007-0905, CVE-2007-0906, CVE-2007-0909, CVE-2007-0910
  • Date: 2007-02-20 17:54:46 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20070220175446-nudqyuv0dfowel3r
Tags: 5.2.1-0ubuntu1
* New upstream security/bugfix release:
  - safe_mode & open_basedir bypasses inside the session extension
    [CVE-2007-0905]
  - multiple buffer overflows in various extensions and functions
    [CVE-2007-0906]
  - underflow in the internal sapi_header_op() function [CVE-2007-0907]
  - information disclosure in the wddx extension [CVE-2007-0908]
  - string format vulnerability in *print() functions on 64 bit systems
    [CVE-2007-0909]
  - possible clobbering of super-globals in several code paths
    [CVE-2007-0910]
* Adapted patches to new upstream release:
  - 006-debian_quirks.patch
  - 034-apache2_umask_fix.patch
  - 044-strtod_arm_fix.patch
* Drop 109-libdb4.4.patch: Obsolete, upstream now checks for db 4.5 and 4.4.
* Drop 114-zend_alloc.c_m68k_alignment.patch and
  115-zend_alloc.c_memleak.patch: Applied upstream.
* Add debian/patches/000upstream-str_ireplace_offbyone.patch:
  - Fix off-by-one in str_ireplace(), a regression introduced in 5.2.1.
  - Patch taken from upstream CVS:
    http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.630&r2=1.631
  - CVE-2007-0911
* debian/control: Set Ubuntu maintainer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
main/streams/php_stream_transport.h
2
2
  +----------------------------------------------------------------------+
3
3
  | PHP Version 5                                                        |
4
4
  +----------------------------------------------------------------------+
5
 
  | Copyright (c) 1997-2006 The PHP Group                                |
 
5
  | Copyright (c) 1997-2007 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: php_stream_transport.h,v 1.10.2.1 2006/01/01 12:50:18 sniper Exp $ */
 
19
/* $Id: php_stream_transport.h,v 1.10.2.1.2.4 2007/02/05 05:15:16 andi Exp $ */
20
20
 
21
21
#if HAVE_SYS_SOCKET_H
22
22
# include <sys/socket.h>
104
104
 * sending it as OOB data */
105
105
PHPAPI int php_stream_xport_sendto(php_stream *stream, const char *buf, size_t buflen,
106
106
                long flags, void *addr, socklen_t addrlen TSRMLS_DC);
 
107
 
 
108
typedef enum {
 
109
        STREAM_SHUT_RD,
 
110
        STREAM_SHUT_WR,
 
111
        STREAM_SHUT_RDWR
 
112
} stream_shutdown_t;
 
113
 
 
114
/* Similar to shutdown() system call; shut down part of a full-duplex
 
115
 * connection */
 
116
PHPAPI int php_stream_xport_shutdown(php_stream *stream, stream_shutdown_t how TSRMLS_DC);
107
117
END_EXTERN_C()
108
118
 
 
119
 
109
120
/* Structure definition for the set_option interface that the above functions wrap */
110
121
 
111
122
typedef struct _php_stream_xport_param {
116
127
                STREAM_XPORT_OP_GET_NAME,
117
128
                STREAM_XPORT_OP_GET_PEER_NAME,
118
129
                STREAM_XPORT_OP_RECV,
119
 
                STREAM_XPORT_OP_SEND
 
130
                STREAM_XPORT_OP_SEND,
 
131
                STREAM_XPORT_OP_SHUTDOWN
120
132
        } op;
121
133
        unsigned int want_addr:1;
122
134
        unsigned int want_textaddr:1;
123
135
        unsigned int want_errortext:1;
 
136
        unsigned int how:2;
124
137
 
125
138
        struct {
126
139
                char *name;