Commit 8f8cd52e authored by Ondrej Sury's avatar Ondrej Sury

Imported Upstream version 5.3.8

parent f452a2b3
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
23 Aug 2011, PHP 5.3.8
- Core:
. Fixed bug #55439 (crypt() returns only the salt for MD5). (Stas)
- OpenSSL:
. Reverted a change in timeout handling restoring PHP 5.3.6 behavior,
as the new behavior caused mysqlnd SSL connections to hang (#55283).
(Pierre, Andrey, Johannes)
18 Aug 2011, PHP 5.3.7
- Upgraded bundled SQLite to version 3.7.7.1. (Scott)
- Upgraded bundled PCRE to version 8.12. (Scott)
......
This diff is collapsed.
## $Id: configure.in 315066 2011-08-17 13:30:04Z iliaa $ -*- autoconf -*-
## $Id: configure.in 315343 2011-08-23 08:56:29Z johannes $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
......@@ -41,7 +41,7 @@ AC_CONFIG_HEADER(main/php_config.h)
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=3
PHP_RELEASE_VERSION=7
PHP_RELEASE_VERSION=8
PHP_EXTRA_VERSION=""
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
......
......@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
/* $Id: xp_ssl.c 313616 2011-07-23 01:29:44Z scottmac $ */
/* $Id: xp_ssl.c 315339 2011-08-23 08:12:58Z johannes $ */
#include "php.h"
#include "ext/standard/file.h"
......@@ -204,36 +204,6 @@ static size_t php_openssl_sockop_write(php_stream *stream, const char *buf, size
return didwrite;
}
static void php_openssl_stream_wait_for_data(php_stream *stream, php_netstream_data_t *sock TSRMLS_DC)
{
int retval;
struct timeval *ptimeout;
if (sock->socket == -1) {
return;
}
sock->timeout_event = 0;
if (sock->timeout.tv_sec == -1)
ptimeout = NULL;
else
ptimeout = &sock->timeout;
while(1) {
retval = php_pollfd_for(sock->socket, PHP_POLLREADABLE, ptimeout);
if (retval == 0)
sock->timeout_event = 1;
if (retval >= 0)
break;
if (php_socket_errno() != EINTR)
break;
}
}
static size_t php_openssl_sockop_read(php_stream *stream, char *buf, size_t count TSRMLS_DC)
{
php_openssl_netstream_data_t *sslsock = (php_openssl_netstream_data_t*)stream->abstract;
......@@ -243,13 +213,6 @@ static size_t php_openssl_sockop_read(php_stream *stream, char *buf, size_t coun
int retry = 1;
do {
if (sslsock->s.is_blocked) {
php_openssl_stream_wait_for_data(stream, &(sslsock->s) TSRMLS_CC);
if (sslsock->s.timeout_event) {
break;
}
/* there is no guarantee that there is application data available but something is there */
}
nr_bytes = SSL_read(sslsock->ssl_handle, buf, count);
if (nr_bytes <= 0) {
......
/* $Id: php_crypt_r.c 314438 2011-08-07 16:10:34Z rasmus $ */
/* $Id: php_crypt_r.c 315338 2011-08-23 08:09:55Z johannes $ */
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
......@@ -382,7 +382,7 @@ char * php_md5_crypt_r(const char *pw, const char *salt, char *out)
/* Now make the output string */
memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN);
strlcpy(passwd + MD5_MAGIC_LEN, sp, sl + 1);
strlcat(passwd, "$", 1);
strcat(passwd, "$");
PHP_MD5Final(final, &ctx);
......
/* main/php_config.h.in. Generated automatically from configure.in by autoheader. */
/* main/php_config.h.in. Generated automatically from configure.in by autoheader 2.13. */
/* Leave this file alone */
/*
+----------------------------------------------------------------------+
......
......@@ -2,7 +2,7 @@
/* edit configure.in to change version number */
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 3
#define PHP_RELEASE_VERSION 7
#define PHP_RELEASE_VERSION 8
#define PHP_EXTRA_VERSION ""
#define PHP_VERSION "5.3.7"
#define PHP_VERSION_ID 50307
#define PHP_VERSION "5.3.8"
#define PHP_VERSION_ID 50308
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment