diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/php_config.h.in | 2 | ||||
| -rw-r--r-- | main/php_version.h | 4 | ||||
| -rw-r--r-- | main/rfc1867.c | 2 | ||||
| -rw-r--r-- | main/streams/cast.c | 14 | ||||
| -rw-r--r-- | main/streams/xp_socket.c | 2 |
5 files changed, 16 insertions, 8 deletions
diff --git a/main/php_config.h.in b/main/php_config.h.in index bb13d6436..777ee0a0b 100644 --- a/main/php_config.h.in +++ b/main/php_config.h.in @@ -1940,7 +1940,7 @@ /* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */ #undef HAVE_UTIME_NULL -/* Wether struct utsname has domainname */ +/* Whether struct utsname has domainname */ #undef HAVE_UTSNAME_DOMAINNAME /* Define to 1 if you have the `vasprintf' function. */ diff --git a/main/php_version.h b/main/php_version.h index 629634e29..c800da843 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 5 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION "RC3" -#define PHP_VERSION "5.5.0RC3" +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.5.0" #define PHP_VERSION_ID 50500 diff --git a/main/rfc1867.c b/main/rfc1867.c index e3e6e1d1d..ed7ce9c0c 100644 --- a/main/rfc1867.c +++ b/main/rfc1867.c @@ -62,7 +62,7 @@ static void safe_php_register_variable(char *var, char *strval, int val_len, zva #define MAX_SIZE_ANONNAME 33 /* Errors */ -#define UPLOAD_ERROR_OK 0 /* File upload succesful */ +#define UPLOAD_ERROR_OK 0 /* File upload successful */ #define UPLOAD_ERROR_A 1 /* Uploaded file exceeded upload_max_filesize */ #define UPLOAD_ERROR_B 2 /* Uploaded file exceeded MAX_FILE_SIZE */ #define UPLOAD_ERROR_C 3 /* Partially uploaded */ diff --git a/main/streams/cast.c b/main/streams/cast.c index 878b4b52e..da6a293e4 100644 --- a/main/streams/cast.c +++ b/main/streams/cast.c @@ -31,10 +31,18 @@ /* Under BSD, emulate fopencookie using funopen */ #if defined(HAVE_FUNOPEN) && !defined(HAVE_FOPENCOOKIE) + +/* NetBSD 6.0+ uses off_t instead of fpos_t in funopen */ +# if defined(__NetBSD__) && (__NetBSD_Version__ > 600000000) +# define PHP_FPOS_T off_t +# else +# define PHP_FPOS_T fpos_t +# endif + typedef struct { int (*reader)(void *, char *, int); int (*writer)(void *, const char *, int); - fpos_t (*seeker)(void *, fpos_t, int); + PHP_FPOS_T (*seeker)(void *, PHP_FPOS_T, int); int (*closer)(void *); } COOKIE_IO_FUNCTIONS_T; @@ -68,11 +76,11 @@ static int stream_cookie_writer(void *cookie, const char *buffer, int size) return php_stream_write((php_stream *)cookie, (char *)buffer, size); } -static fpos_t stream_cookie_seeker(void *cookie, off_t position, int whence) +static PHP_FPOS_T stream_cookie_seeker(void *cookie, off_t position, int whence) { TSRMLS_FETCH(); - return (fpos_t)php_stream_seek((php_stream *)cookie, position, whence); + return (PHP_FPOS_T)php_stream_seek((php_stream *)cookie, position, whence); } static int stream_cookie_closer(void *cookie) diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c index beffc73e1..a9c050f26 100644 --- a/main/streams/xp_socket.c +++ b/main/streams/xp_socket.c @@ -194,7 +194,7 @@ static int php_sockop_close(php_stream *stream, int close_handle TSRMLS_DC) * Essentially, we are waiting for the socket to become writeable, which means * that all pending data has been sent. * We use a small timeout which should encourage the OS to send the data, - * but at the same time avoid hanging indefintely. + * but at the same time avoid hanging indefinitely. * */ do { n = php_pollfd_for_ms(sock->socket, POLLOUT, 500); |