Commit 096b2f82 authored by Ondrej Sury's avatar Ondrej Sury

Imported Upstream version 5.4.0

parent f89bb30d
......@@ -12,7 +12,8 @@ php_lcov.info: lcov-test
@rm -rf lcov_data/
@$(mkinstalldirs) lcov_data/
@echo
-@find . -name \*.gcda -o -name \*.gcno -o -name \*.da -o -name \*.h | sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | uniq | while read x; do \
-@files=`find . -name \*.gcda -o -name \*.gcno -o -name \*.da -o -name \*.h | sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | uniq` ;\
for x in $$files; do \
echo -n . ;\
y=`echo $$x | sed -e 's!\.libs/!!'`; \
dir=lcov_data/`dirname $$x`; \
......
This source diff could not be displayed because it is too large. You can view the blob instead.
--TEST--
Bug #34199 (if($obj)/if(!$obj) inconsistency because of cast handler)
--SKIPIF--
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
<?php if (!extension_loaded("simplexml")) print "skip SimpleXML extension required"; ?>
--FILE--
<?php
$xml = "<root></root>";
......
--TEST--
Bug #39602 (Invalid session.save_handler crashes PHP)
--SKIPIF--
<?php if (!extension_loaded("session")) die("skip"); ?>
<?php if (!extension_loaded("session")) die("skip session extension required"); ?>
--INI--
session.save_handler=qwerty
error_reporting=0
......
--TEST--
Bug #42819 (namespaces in indexes of constant arrays)
--SKIPIF--
<?php if (!extension_loaded("spl")) print "skip"; ?>
<?php if (!extension_loaded("spl")) print "skip SPL extension required"; ?>
--FILE--
<?php
namespace foo\foo;
......
--TEST--
Bug #43918 (Segmentation fault in garbage collector)
--SKIPIF--
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
<?php if (!extension_loaded("simplexml")) print "skip SimpleXML extension required"; ?>
--FILE--
<?php
$xmlstr = <<<XML
......
--TEST--
Bug #50174 (Incorrectly matched docComment)
--SKIPIF--
<?php if (!extension_loaded('reflection') || !extension_loaded('spl')) print "skip"; ?>
<?php if (!extension_loaded('reflection') || !extension_loaded('spl')) print "skip SPL and reflection extensions required"; ?>
--FILE--
<?php
......
--TEST--
Bug #61095 (Lexing 0x00*+<NUM> incorectly)
--FILE--
<?php
echo 0x00+2;
echo "\n";
?>
--EXPECT--
2
......@@ -3,7 +3,7 @@ GC 024: GC and objects with non-standard handlers
--INI--
zend.enable_gc=1
--SKIPIF--
<?php if (!extension_loaded("spl")) print "skip"; ?>
<?php if (!extension_loaded("spl")) print "skip SPL extension required"; ?>
--FILE--
<?php
$a = new ArrayObject();
......
--TEST--
unset() CV 10 (unset() of global variable in ArrayObject::offsetUnset($GLOBALS))
--SKIPIF--
<?php if (!extension_loaded("spl")) print "skip"; ?>
<?php if (!extension_loaded("spl")) print "skip SPL extension required"; ?>
--FILE--
<?php
$a = new ArrayObject($GLOBALS);
......
This diff is collapsed.
......@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
/* $Id: zend_language_scanner.l 322378 2012-01-17 08:09:13Z dmitry $ */
/* $Id: zend_language_scanner.l 323394 2012-02-20 18:28:57Z colder $ */
#if 0
# define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c)
......@@ -1523,7 +1523,11 @@ NEWLINE ("\r"|"\n"|"\r\n")
}
if (len < SIZEOF_LONG * 2 || (len == SIZEOF_LONG * 2 && *hex <= '7')) {
zendlval->value.lval = strtol(hex, NULL, 16);
if (len == 0) {
zendlval->value.lval = 0;
} else {
zendlval->value.lval = strtol(hex, NULL, 16);
}
zendlval->type = IS_LONG;
return T_LNUMBER;
} else {
......
/* Generated by re2c 0.13.5 on Mon Jan 16 14:45:55 2012 */
/* Generated by re2c 0.13.5 on Wed Feb 15 17:48:20 2012 */
#line 3 "Zend/zend_language_scanner_defs.h"
enum YYCONDTYPE {
......
......@@ -3637,7 +3637,7 @@ ac_config_headers="$ac_config_headers main/php_config.h"
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=4
PHP_RELEASE_VERSION=0
PHP_EXTRA_VERSION="RC8"
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`
## $Id: configure.in 323247 2012-02-16 07:45:08Z stas $ -*- autoconf -*-
## $Id: configure.in 323657 2012-02-29 07:22:43Z stas $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
dnl include Zend specific macro definitions first
......@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=4
PHP_RELEASE_VERSION=0
PHP_EXTRA_VERSION="RC8"
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: php_fileinfo.h 321634 2012-01-01 13:15:04Z felipe $ */
/* $Id: php_fileinfo.h 323634 2012-02-28 18:43:44Z stas $ */
#ifndef PHP_FILEINFO_H
#define PHP_FILEINFO_H
......@@ -24,7 +24,7 @@
extern zend_module_entry fileinfo_module_entry;
#define phpext_fileinfo_ptr &fileinfo_module_entry
#define PHP_FILEINFO_VERSION "1.0.5-dev"
#define PHP_FILEINFO_VERSION "1.0.5"
#ifdef PHP_WIN32
#define PHP_FILEINFO_API __declspec(dllexport)
......
......@@ -17,12 +17,12 @@
| Georg Richter <georg@mysql.com> |
+----------------------------------------------------------------------+
*/
/* $Id: mysqlnd.h 321634 2012-01-01 13:15:04Z felipe $ */
/* $Id: mysqlnd.h 323634 2012-02-28 18:43:44Z stas $ */
#ifndef MYSQLND_H
#define MYSQLND_H
#define MYSQLND_VERSION "mysqlnd 5.0.10-dev - 20111026 - $Revision: 321634 $"
#define MYSQLND_VERSION "mysqlnd 5.0.10 - 20111026 - $Revision: 323634 $"
#define MYSQLND_VERSION_ID 50010
#define MYSQLND_PLUGIN_API_VERSION 1
......
......@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
/* $Id: openssl.c 321634 2012-01-01 13:15:04Z felipe $ */
/* $Id: openssl.c 323440 2012-02-23 01:26:46Z scottmac $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
......@@ -4803,6 +4803,10 @@ PHP_FUNCTION(openssl_decrypt)
if (!(options & OPENSSL_RAW_DATA)) {
base64_str = (char*)php_base64_decode((unsigned char*)data, data_len, &base64_str_len);
if (!base64_str) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to base64 decode the input");
RETURN_FALSE;
}
data_len = base64_str_len;
data = base64_str;
}
......
--TEST--
Bug #61124: Segmentation fault with openssl_decrypt
--SKIPIF--
<?php
if (!extension_loaded("openssl")) die("skip");
--FILE--
<?php
var_dump(openssl_decrypt('kzo w2RMExUTYQXW2Xzxmg==', 'aes-128-cbc', 'pass', false, 'pass'));
--EXPECTF--
Warning: openssl_decrypt(): Failed to base64 decode the input in %s on line %s
bool(false)
\ No newline at end of file
......@@ -8,7 +8,7 @@ if (extension_loaded("openssl")) {
when openssl loaded, tcp stream is less verbose, so some error messages are missing
so let's skip the test in this case
*/
die("skip");
die("skip OpenSSL extension required");
}
?>
--FILE--
......
--TEST--
SPL: IteratorIterator and SimpleXMlElement
--SKIPIF--
<?php if (!extension_loaded('simplexml')) print "skip"; ?>
<?php if (!extension_loaded('simplexml')) print "skip SimpleXML required"; ?>
--FILE--
<?php
......
......@@ -16,12 +16,12 @@
+----------------------------------------------------------------------+
*/
/* $Id: php_sqlite3.h 321634 2012-01-01 13:15:04Z felipe $ */
/* $Id: php_sqlite3.h 323634 2012-02-28 18:43:44Z stas $ */
#ifndef PHP_SQLITE3_H
#define PHP_SQLITE3_H
#define PHP_SQLITE3_VERSION "0.7-dev"
#define PHP_SQLITE3_VERSION "0.7"
extern zend_module_entry sqlite3_module_entry;
#define phpext_sqlite3_ptr &sqlite3_module_entry
......
......@@ -43,7 +43,7 @@ CREDIT_LINE("Multibyte String Functions", "Tsukada Takuya, Rui Hirokawa");
CREDIT_LINE("MySQL driver for PDO", "George Schlossnagle, Wez Furlong, Ilia Alshanetsky, Johannes Schlueter");
CREDIT_LINE("MySQL", "Zeev Suraski, Zak Greant, Georg Richter");
CREDIT_LINE("MySQLi", "Zak Greant, Georg Richter, Andrey Hristov, Ulf Wendel");
CREDIT_LINE("MySQLnd", "Georg Richter, Andrey Hristov, Ulf Wendel");
CREDIT_LINE("MySQLnd", "Andrey Hristov, Ulf Wendel, Georg Richter");
CREDIT_LINE("OCI8", "Stig Bakken, Thies C. Arntzen, Andy Sautins, David Benson, Maxim Maletsky, Harald Radi, Antony Dovgal, Andi Gutmans, Wez Furlong, Christopher Jones, Oracle Corporation");
CREDIT_LINE("ODBC driver for PDO", "Wez Furlong");
CREDIT_LINE("ODBC", "Stig Bakken, Andreas Karajannis, Frank M. Kromann, Daniel R. Kalowsky");
......@@ -69,7 +69,7 @@ CREDIT_LINE("SOAP", "Brad Lafountain, Shane Caraveo, Dmitry Stogov");
CREDIT_LINE("Sockets", "Chris Vandomelen, Sterling Hughes, Daniel Beulshausen, Jason Greene");
CREDIT_LINE("SPL", "Marcus Boerger, Etienne Kneuss");
CREDIT_LINE("SQLite 3.x driver for PDO", "Wez Furlong");
CREDIT_LINE("SQLite3", "Scott MacVicar, Ilia Alshanetsky");
CREDIT_LINE("SQLite3", "Scott MacVicar, Ilia Alshanetsky, Brad Dewar");
CREDIT_LINE("Sybase-CT", "Zeev Suraski, Tom May, Timm Friebe");
CREDIT_LINE("System V Message based IPC", "Wez Furlong");
CREDIT_LINE("System V Semaphores", "Tom May");
......
--TEST--
Bug #47997 (stream_copy_to_stream returns 1 on empty streams)
--INI--
allow_url_fopen=1
--FILE--
<?php
......
......@@ -3,7 +3,7 @@ stream_get_line() on non-blocking stream
--SKIPIF--
<?php
$sockets = @stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, 0);
if (!$sockets) die("skip");
if (!$sockets) die("skip stream_socket_pair() should work");
fclose($sockets[0]);
fclose($sockets[1]);
?>
......
......@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
/* $Id: var_unserializer.c 321634 2012-01-01 13:15:04Z felipe $ */
/* $Id: var_unserializer.c 323633 2012-02-28 18:36:10Z pajoye $ */
#include "php.h"
#include "ext/standard/php_var.h"
......@@ -373,6 +373,9 @@ static inline long object_common1(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
return elements;
}
#ifdef PHP_WIN32
# pragma optimize("", off)
#endif
static inline int object_common2(UNSERIALIZE_PARAMETER, long elements)
{
zval *retval_ptr = NULL;
......@@ -397,6 +400,9 @@ static inline int object_common2(UNSERIALIZE_PARAMETER, long elements)
return finish_nested_data(UNSERIALIZE_PASSTHRU);
}
#ifdef PHP_WIN32
# pragma optimize("", on)
#endif
PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
{
......
......@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
/* $Id: var_unserializer.re 321634 2012-01-01 13:15:04Z felipe $ */
/* $Id: var_unserializer.re 323633 2012-02-28 18:36:10Z pajoye $ */
#include "php.h"
#include "ext/standard/php_var.h"
......@@ -379,6 +379,9 @@ static inline long object_common1(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
return elements;
}
#ifdef PHP_WIN32
# pragma optimize("", off)
#endif
static inline int object_common2(UNSERIALIZE_PARAMETER, long elements)
{
zval *retval_ptr = NULL;
......@@ -403,6 +406,9 @@ static inline int object_common2(UNSERIALIZE_PARAMETER, long elements)
return finish_nested_data(UNSERIALIZE_PASSTHRU);
}
#ifdef PHP_WIN32
# pragma optimize("", on)
#endif
PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
{
......
......@@ -2,7 +2,7 @@
XMLReader: Expand into existing DOM documet
--SKIPIF--
<?php if (!extension_loaded("xmlreader")) print "skip";
if (!extension_loaded("dom")) print "skip";
if (!extension_loaded("dom")) print "skip DOM extension required";
$reader = new XMLReader();
if (!method_exists($reader, 'expand')) print "skip";
?>
......
......@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 4
#define PHP_RELEASE_VERSION 0
#define PHP_EXTRA_VERSION "RC8"
#define PHP_VERSION "5.4.0RC8"
#define PHP_EXTRA_VERSION ""
#define PHP_VERSION "5.4.0"
#define PHP_VERSION_ID 50400
......@@ -4,7 +4,7 @@ show information about function
<?php
include "skipif.inc";
if (!extension_loaded("reflection")) {
die("skip");
die("skip reflection extension required");
}
?>
--FILE--
......
......@@ -4,7 +4,7 @@ show information about class
<?php
include "skipif.inc";
if (!extension_loaded("reflection")) {
die("skip");
die("skip reflection extension required");
}
?>
--FILE--
......
......@@ -4,7 +4,7 @@ show information about extension
<?php
include "skipif.inc";
if (!extension_loaded("reflection") || !extension_loaded("session")) {
die("skip");
die("skip reflection and session extensions required");
}
?>
--INI--
......
--TEST--
Bug #60282 (Segfault when using ob_gzhandler() with open buffers)
--SKIPIF--
<?php if (!extension_loaded("zlib")) print "skip"; ?>
<?php if (!extension_loaded("zlib")) print "skip Zlib extension required"; ?>
--FILE--
<?php
ob_start();
......
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