[PHP-CVS] com php-src: 5.4.17 RC1: NEWS configure.in main/php_version.h
Commit:e9b22042a799befa2f5d42c7f0a34fa8294666c9 Author:Stanislav Malyshev s...@php.net Tue, 18 Jun 2013 22:57:07 -0700 Parents: 2ce4bd7f2d44016ba05aae32e10b8ea5d6293034 Branches: PHP-5.4.17 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e9b22042a799befa2f5d42c7f0a34fa8294666c9 Log: 5.4.17 RC1 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index 6fd2bf2..7af962c 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2013, PHP 5.4.17 +20 Jun 2013, PHP 5.4.17 RC1 - Core: . Fixed bug #64988 (Class loading order affects E_STRICT warning). (Laruence) diff --git a/configure.in b/configure.in index c1db370..9947b14 100644 --- a/configure.in +++ b/configure.in @@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=4 PHP_RELEASE_VERSION=17 -PHP_EXTRA_VERSION=-dev +PHP_EXTRA_VERSION=RC1 PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff --git a/main/php_version.h b/main/php_version.h index 055d14d..a7f80bc 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 17 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.4.17-dev +#define PHP_EXTRA_VERSION RC1 +#define PHP_VERSION 5.4.17RC1 #define PHP_VERSION_ID 50417 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: sync NEWS: NEWS
Commit:e2bb74ab4f90ca2b840e44b96125c4c1633e0a14 Author:Stanislav Malyshev s...@php.net Tue, 18 Jun 2013 23:06:20 -0700 Parents: dda3f404ecbbef399acae56855fc8bc4e0e24905 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e2bb74ab4f90ca2b840e44b96125c4c1633e0a14 Log: sync NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 5fd1fae..46fa7f0 100644 --- a/NEWS +++ b/NEWS @@ -34,6 +34,12 @@ PHP NEWS . Fixed bug #64808 (FreeTDS PDO getColumnMeta on a prepared but not executed statement crashes). (Stanley Sufficool) +- PDO_firebird: + . Fixed bug #64037 (Firebird return wrong value for numeric field). +(Matheus Degiovani, Matteo) + . Fixed bug #62024 (Cannot insert second row with null using parametrized +query). (patch by ja...@kenjim.com, Matheus Degiovani, Matteo) + - PDO_mysql: . Fixed bug #48724 (getColumnMeta() doesn't return native_type for BIT, TINYINT and YEAR). (Antony, Daniel Beardsley) @@ -41,6 +47,9 @@ PHP NEWS - PDO_pgsql: . Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error). (Remi) +- pgsql: + . Fixed bug #64609 (pg_convert enum type support). (Matteo) + - Readline: . Implement FR #55694 (Expose additional readline variable to prevent default filename completion). (Hartmel) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: sync NEWS: NEWS
Commit:f432141cd9a9cad004373a8de9d8e8be52482afd Author:Stanislav Malyshev s...@php.net Tue, 18 Jun 2013 23:08:56 -0700 Parents: e9b22042a799befa2f5d42c7f0a34fa8294666c9 Branches: PHP-5.4.17 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f432141cd9a9cad004373a8de9d8e8be52482afd Log: sync NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 7af962c..adfe837 100644 --- a/NEWS +++ b/NEWS @@ -32,6 +32,12 @@ PHP NEWS . Fixed bug #64808 (FreeTDS PDO getColumnMeta on a prepared but not executed statement crashes). (Stanley Sufficool) +- PDO_firebird: + . Fixed bug #64037 (Firebird return wrong value for numeric field). +(Matheus Degiovani, Matteo) + . Fixed bug #62024 (Cannot insert second row with null using parametrized +query). (patch by ja...@kenjim.com, Matheus Degiovani, Matteo) + - PDO_mysql: . Fixed bug #48724 (getColumnMeta() doesn't return native_type for BIT, TINYINT and YEAR). (Antony, Daniel Beardsley) @@ -39,6 +45,9 @@ PHP NEWS - PDO_pgsql: . Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error). (Remi) +- pgsql: + . Fixed bug #64609 (pg_convert enum type support). (Matteo) + - Readline: . Implement FR #55694 (Expose additional readline variable to prevent default filename completion). (Hartmel) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] tag php-src: create tag php-5.4.17RC1
Tag php-5.4.17RC1 in php-src.git was created Tag: 32838075fb831b136e9cc764895838a2d832c99e Tagger: Stanislav Malyshevs...@php.net Tue Jun 18 23:10:57 2013 -0700 Log: 5.4.17 RC1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (Darwin) iF4EABEIAAYFAlHBS3YACgkQL3lWvF2gS13nEwD9FOWOQ3bNh+2Pi/xSL4Bo9eu1 GiD3stQJGH0LUe2q+R0A/1n/A1fcUO0WC1xABiblN/P+HzIIgLu2eMC2Jfc2f/NS =wVGM -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=32838075fb831b136e9cc764895838a2d832c99e Target: f432141cd9a9cad004373a8de9d8e8be52482afd Author: Stanislav Malyshev s...@php.net Tue, 18 Jun 2013 23:08:56 -0700 Parents: e9b22042a799befa2f5d42c7f0a34fa8294666c9 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f432141cd9a9cad004373a8de9d8e8be52482afd Target log: sync NEWS Changed paths: M NEWS -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Remove broken client version checking: ext/pgsql/tests/skipif.inc
Commit:25e9aa6b0a86b2b3b098949b0fe866a5edeff02f
Author:Matteo Beccati mbecc...@php.net Wed, 19 Jun 2013 08:34:48
+0200
Parents: 5edd53051169c0765479fc34d709814c8a0a0bda
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=25e9aa6b0a86b2b3b098949b0fe866a5edeff02f
Log:
Remove broken client version checking
Changed paths:
M ext/pgsql/tests/skipif.inc
Diff:
diff --git a/ext/pgsql/tests/skipif.inc b/ext/pgsql/tests/skipif.inc
index 7c5153e..59bd5a3 100644
--- a/ext/pgsql/tests/skipif.inc
+++ b/ext/pgsql/tests/skipif.inc
@@ -17,15 +17,11 @@ if (!is_resource($conn)) {
die(skip could not connect\n);
}
-function skip_server_version($version, $op = '') { _skip_version('server',
$version, $op); }
-function skip_client_version($version, $op = '') { _skip_version('client',
$version, $op); }
-
-
-function _skip_version($type, $version, $op)
+function skip_server_version($version, $op = '')
{
- $pg = pg_parameter_status($type.'_version');
+ $pg = pg_parameter_status('server_version');
if (version_compare($pg, $version, $op)) {
- die(skip {$type} version {$pg} is {$op} {$version}\n);
+ die(skip Server version {$pg} is {$op} {$version}\n);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed bug #65047 (Test skip on client / server version): ext/pdo_pgsql/tests/bug46274.phpt ext/pdo_pgsql/tests/bug46274_2.phpt ext/pgsql/tests/08escape.phpt ext/pgsql/tests/10pg
Commit:c666239265048abd3cc0b2c48493a5db1eacc28e
Author:Matteo Beccati mbecc...@php.net Wed, 19 Jun 2013 11:46:11
+0200
Parents: 25e9aa6b0a86b2b3b098949b0fe866a5edeff02f
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=c666239265048abd3cc0b2c48493a5db1eacc28e
Log:
Fixed bug #65047 (Test skip on client / server version)
Bugs:
https://bugs.php.net/65047
Changed paths:
M ext/pdo_pgsql/tests/bug46274.phpt
M ext/pdo_pgsql/tests/bug46274_2.phpt
M ext/pgsql/tests/08escape.phpt
M ext/pgsql/tests/10pg_convert.phpt
D ext/pgsql/tests/10pg_convert_85.phpt
A ext/pgsql/tests/10pg_convert_9.phpt
M ext/pgsql/tests/12pg_insert.phpt
D ext/pgsql/tests/12pg_insert_85.phpt
A ext/pgsql/tests/12pg_insert_9.phpt
D ext/pgsql/tests/13pg_select_85.phpt
A ext/pgsql/tests/13pg_select_9.phpt
M ext/pgsql/tests/14pg_update.phpt
D ext/pgsql/tests/14pg_update_85.phpt
A ext/pgsql/tests/14pg_update_9.phpt
D ext/pgsql/tests/18pg_escape_bytea.phpt
A ext/pgsql/tests/18pg_escape_bytea_before.phpt
A ext/pgsql/tests/18pg_escape_bytea_esc.phpt
A ext/pgsql/tests/18pg_escape_bytea_hex.phpt
M ext/pgsql/tests/bug37100.phpt
D ext/pgsql/tests/bug37100_85.phpt
A ext/pgsql/tests/bug37100_9.phpt
M ext/pgsql/tests/skipif.inc
diff --git a/ext/pdo_pgsql/tests/bug46274.phpt
b/ext/pdo_pgsql/tests/bug46274.phpt
index c34839a..8a85c9f 100644
--- a/ext/pdo_pgsql/tests/bug46274.phpt
+++ b/ext/pdo_pgsql/tests/bug46274.phpt
@@ -14,6 +14,11 @@ $db = PDOTest::test_factory(dirname(__FILE__) .
'/common.phpt');
$db-setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
+try {
+ $db-query(SET bytea_output = 'escape');
+} catch (Exception $e) {
+}
+
$db-query('CREATE TABLE test_one_blob (id SERIAL NOT NULL, blob1 BYTEA)');
$stmt = $db-prepare(INSERT INTO test_one_blob (blob1) VALUES (:foo));
diff --git a/ext/pdo_pgsql/tests/bug46274_2.phpt
b/ext/pdo_pgsql/tests/bug46274_2.phpt
index eb675af..317160c 100644
--- a/ext/pdo_pgsql/tests/bug46274_2.phpt
+++ b/ext/pdo_pgsql/tests/bug46274_2.phpt
@@ -14,6 +14,11 @@ $db = PDOTest::test_factory(dirname(__FILE__) .
'/common.phpt');
$db-setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
+try {
+$db-query(SET bytea_output = 'escape');
+} catch (Exception $e) {
+}
+
$db-query('CREATE TABLE test_one_blob (id SERIAL NOT NULL, blob1 BYTEA)');
$stmt = $db-prepare(INSERT INTO test_one_blob (blob1) VALUES (:foo));
diff --git a/ext/pgsql/tests/08escape.phpt b/ext/pgsql/tests/08escape.phpt
index 90b4ed8..1bea35b 100644
--- a/ext/pgsql/tests/08escape.phpt
+++ b/ext/pgsql/tests/08escape.phpt
@@ -48,15 +48,24 @@ $sql = INSERT INTO .$table_name. (num, bin) VALUES
(-, CAST ('.$escaped_
pg_query($db, $sql);
// Retrieve binary from DB
-$sql = SELECT bin::bytea FROM .$table_name. WHERE num = -;
-$result = pg_query($db, $sql);
-$row = pg_fetch_array($result, 0, PGSQL_ASSOC);
+for ($i = 0; $i 2; $i++) {
+ $sql = SELECT bin::bytea FROM .$table_name. WHERE num = -;
+ $result = pg_query($db, $sql);
+ $row = pg_fetch_array($result, 0, PGSQL_ASSOC);
-if ($data === pg_unescape_bytea($row['bin'])) {
- echo pg_escape_bytea() actually works with database\n;
-}
-else {
- echo pg_escape_bytea() is broken\n;
+ if ($data === pg_unescape_bytea($row['bin'])) {
+ echo pg_escape_bytea() actually works with database\n;
+ break;
+ }
+ elseif (!$i) {
+ // Force bytea escaping and retry
+ @pg_query($db, SET bytea_output = 'escape');
+ }
+ else {
+ $result = pg_query($db, $sql);
+ echo pg_escape_bytea() is broken\n;
+ break;
+ }
}
// pg_escape_literal/pg_escape_identifier
@@ -92,4 +101,4 @@ pg_escape_string() is Ok
pg_escape_bytea() is Ok
pg_escape_bytea() actually works with database
pg_escape_literal() is Ok
-pg_escape_identifier() is Ok
\ No newline at end of file
+pg_escape_identifier() is Ok
diff --git a/ext/pgsql/tests/10pg_convert.phpt
b/ext/pgsql/tests/10pg_convert.phpt
index 73bf2b6..fde4c67 100644
--- a/ext/pgsql/tests/10pg_convert.phpt
+++ b/ext/pgsql/tests/10pg_convert.phpt
@@ -3,7 +3,7 @@ PostgreSQL pg_convert()
--SKIPIF--
?php
include(skipif.inc);
-skip_server_version('8.5dev', '=');
+skip_bytea_not_escape();
?
--FILE--
?php
diff --git a/ext/pgsql/tests/10pg_convert_85.phpt
b/ext/pgsql/tests/10pg_convert_85.phpt
deleted file mode 100644
index 8b1cc8f..000
--- a/ext/pgsql/tests/10pg_convert_85.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-PostgreSQL pg_convert() (8.5+)
---SKIPIF--
-?php
-include(skipif.inc);
-skip_server_version('8.5dev', '');
-?
---FILE--
-?php
-error_reporting(E_ALL);
-
-include 'config.inc';
-
-$db = pg_connect($conn_str);
-pg_query($db, SET standard_conforming_strings = 0);
-
-$fields = array('num'='1234', 'str'='AAA', 'bin'='BBB');
-$converted = pg_convert($db, $table_name,
[PHP-CVS] com php-src: Clean up leftover file after the test: ext/pgsql/tests/80_bug36625.phpt
Commit:5edd53051169c0765479fc34d709814c8a0a0bda Author:Matteo Beccati mbecc...@php.net Wed, 19 Jun 2013 08:28:47 +0200 Parents: e2bb74ab4f90ca2b840e44b96125c4c1633e0a14 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5edd53051169c0765479fc34d709814c8a0a0bda Log: Clean up leftover file after the test Changed paths: M ext/pgsql/tests/80_bug36625.phpt Diff: diff --git a/ext/pgsql/tests/80_bug36625.phpt b/ext/pgsql/tests/80_bug36625.phpt index a95cea7..9cc8a1d 100644 --- a/ext/pgsql/tests/80_bug36625.phpt +++ b/ext/pgsql/tests/80_bug36625.phpt @@ -37,6 +37,8 @@ array_walk($trace, 'search_trace_file'); var_dump($found 0); var_dump(file_exists($tracefile)); +@unlink($tracefile); + ? ===DONE=== --CLEAN-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Related to bug #65047 (Test skip on client / server version): ext/pdo_pgsql/tests/bug46274.phpt ext/pdo_pgsql/tests/bug46274_2.phpt ext/pdo_pgsql/tests/bug_49985.phpt
Commit:67bde2f8ac4a6c5a8d36f7aebfd2a4a1621142d0
Author:Remi Collet r...@php.net Wed, 19 Jun 2013 12:26:21 +0200
Parents: c666239265048abd3cc0b2c48493a5db1eacc28e
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=67bde2f8ac4a6c5a8d36f7aebfd2a4a1621142d0
Log:
Related to bug #65047 (Test skip on client / server version)
bug46274.phpt and bug46274_2.phpt
Make query silent (when server don't know bytea_output option)
bug_49985.phpt
Make result locale independent
Bugs:
https://bugs.php.net/65047
https://bugs.php.net/46274
Changed paths:
M ext/pdo_pgsql/tests/bug46274.phpt
M ext/pdo_pgsql/tests/bug46274_2.phpt
M ext/pdo_pgsql/tests/bug_49985.phpt
Diff:
diff --git a/ext/pdo_pgsql/tests/bug46274.phpt
b/ext/pdo_pgsql/tests/bug46274.phpt
index 8a85c9f..40706ec 100644
--- a/ext/pdo_pgsql/tests/bug46274.phpt
+++ b/ext/pdo_pgsql/tests/bug46274.phpt
@@ -15,7 +15,7 @@ $db = PDOTest::test_factory(dirname(__FILE__) .
'/common.phpt');
$db-setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
try {
- $db-query(SET bytea_output = 'escape');
+ @$db-query(SET bytea_output = 'escape');
} catch (Exception $e) {
}
diff --git a/ext/pdo_pgsql/tests/bug46274_2.phpt
b/ext/pdo_pgsql/tests/bug46274_2.phpt
index 317160c..df60f34 100644
--- a/ext/pdo_pgsql/tests/bug46274_2.phpt
+++ b/ext/pdo_pgsql/tests/bug46274_2.phpt
@@ -15,7 +15,7 @@ $db = PDOTest::test_factory(dirname(__FILE__) .
'/common.phpt');
$db-setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
try {
-$db-query(SET bytea_output = 'escape');
+@$db-query(SET bytea_output = 'escape');
} catch (Exception $e) {
}
diff --git a/ext/pdo_pgsql/tests/bug_49985.phpt
b/ext/pdo_pgsql/tests/bug_49985.phpt
index 26dcfc6..e1d7df8 100644
--- a/ext/pdo_pgsql/tests/bug_49985.phpt
+++ b/ext/pdo_pgsql/tests/bug_49985.phpt
@@ -30,6 +30,6 @@ for ($i = 0; $i 3; $i++) {
?
--EXPECTF--
bool(true)
-SQLSTATE[23505]: %stest_pkey
-SQLSTATE[23505]: %stest_pkey
+SQLSTATE[23505]: %stest_pkey%s
+SQLSTATE[23505]: %stest_pkey%s
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] tag php-src: create tag php-5.3.27RC1
Tag php-5.3.27RC1 in php-src.git was created Tag: a264dfaed7209bdd3a883e7a0be718993a85b0e1 Tagger: Johannes Schlüterjohan...@php.net Wed Jun 19 14:57:39 2013 +0200 Log: PHP 5.3.27RC1 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJRwarRAAoJEH3sTmn8nIPX5FcH/2rphk26c0LGWQRQ4+yxBu7c L+ELbRnpAa57p0U3hXoyXEAzD315G6iry96e0p/YSSr0w5lXdJOUdRjXYLrErQkq wqHfaoHrZiqqM7fg71ksLWf82ENZJmcZwe9WAHTzZewXvAllWg/de0OkueWyjmG3 XVPwDJQi77r9ZOxh6tvzn9dsPyo1jj5LVHYEX6kAzXT/SmkEmOQEBnB1RHmZdfYe ey7bJUC8Mzakr3edmFh7YGPFgPZBU+NkC8tKNtc9r2wFUFEl0xgUd6tWeYQ6y5Rf gSaLsBM4RglUOaaKZzxs5k9aOMXY9aibW+pxuZyB9i+9OqGY2y82T5y5H2YrvHE= =7jsy -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=a264dfaed7209bdd3a883e7a0be718993a85b0e1 Target: 825bd97c6840bb8464a330142751600c093e8b8a Author: Johannes Schlüter johan...@php.net Wed, 19 Jun 2013 14:57:16 +0200 Parents: 6238dd6f3257bed9efe60a39978376862668e71c Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=825bd97c6840bb8464a330142751600c093e8b8a Target log: PHP 5.3.27RC1 Changed paths: M NEWS M configure.in M main/php_version.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: This will be PHP 5.3.28: NEWS configure.in main/php_version.h
Commit:f0eaa02f6f773bd383e403fd5b9699cea7a8f457 Author:Johannes Schlüter johan...@php.net Wed, 19 Jun 2013 15:08:02 +0200 Parents: 6238dd6f3257bed9efe60a39978376862668e71c Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f0eaa02f6f773bd383e403fd5b9699cea7a8f457 Log: This will be PHP 5.3.28 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index a0f9e2b..d006da0 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,14 @@ PHPNEWS ||| +?? ??? 2013, PHP 5.3.28 + ?? ??? 2013, PHP 5.3.27 +### +### DO NOT ADD ENTRIES HERE +### All entries go to 5.3.28 +### + - Core: . Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC). (Laruence) . Fixed bug #64960 (Segfault in gc_zval_possible_root). (Laruence) diff --git a/configure.in b/configure.in index 0d9eff8..8a0aa45 100644 --- a/configure.in +++ b/configure.in @@ -41,7 +41,7 @@ AC_CONFIG_HEADER(main/php_config.h) PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 -PHP_RELEASE_VERSION=27 +PHP_RELEASE_VERSION=28 PHP_EXTRA_VERSION=-dev PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff --git a/main/php_version.h b/main/php_version.h index 1903611..bddf0bc 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -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 27 +#define PHP_RELEASE_VERSION 28 #define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.3.27-dev -#define PHP_VERSION_ID 50327 +#define PHP_VERSION 5.3.28-dev +#define PHP_VERSION_ID 50328 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: PHP 5.3.27RC1: NEWS configure.in main/php_version.h
Commit:825bd97c6840bb8464a330142751600c093e8b8a Author:Johannes Schlüter johan...@php.net Wed, 19 Jun 2013 14:57:16 +0200 Parents: 6238dd6f3257bed9efe60a39978376862668e71c Branches: PHP-5.3.27 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=825bd97c6840bb8464a330142751600c093e8b8a Log: PHP 5.3.27RC1 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index a0f9e2b..66ffe87 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2013, PHP 5.3.27 +20 Jun 2013, PHP 5.3.27RC1 - Core: . Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC). (Laruence) diff --git a/configure.in b/configure.in index 0d9eff8..b8004ea 100644 --- a/configure.in +++ b/configure.in @@ -42,7 +42,7 @@ AC_CONFIG_HEADER(main/php_config.h) PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 PHP_RELEASE_VERSION=27 -PHP_EXTRA_VERSION=-dev +PHP_EXTRA_VERSION=RC1 PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff --git a/main/php_version.h b/main/php_version.h index 1903611..4a28e50 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 27 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.3.27-dev +#define PHP_EXTRA_VERSION RC1 +#define PHP_VERSION 5.3.27RC1 #define PHP_VERSION_ID 50327 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: added some tests based on bug #64395: ext/standard/tests/network/ip2long_variation1.phpt ext/standard/tests/network/ip2long_variation2.phpt ext/standard/tests/network/ip2long_va
Commit:2873b5b6eb4acb0c7b7e355936e2ac16d31b17b9
Author:Anatol Belski a...@php.net Wed, 19 Jun 2013 16:24:30 +0200
Parents: c6b8d992bad736963ac11b3b8d8ac5133ac346fc
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=2873b5b6eb4acb0c7b7e355936e2ac16d31b17b9
Log:
added some tests based on bug #64395
Bugs:
https://bugs.php.net/64395
Changed paths:
M ext/standard/tests/network/ip2long_variation1.phpt
A ext/standard/tests/network/ip2long_variation2.phpt
A ext/standard/tests/network/ip2long_variation2_x64.phpt
Diff:
diff --git a/ext/standard/tests/network/ip2long_variation1.phpt
b/ext/standard/tests/network/ip2long_variation1.phpt
index ca67aa4..b228c9b 100644
--- a/ext/standard/tests/network/ip2long_variation1.phpt
+++ b/ext/standard/tests/network/ip2long_variation1.phpt
@@ -1,10 +1,5 @@
--TEST--
-Test ip2long() function : usage variation
---SKIPIF--
-?php
-if(substr(PHP_OS, 0, 3) == WIN)
- die(skip. Windows is more compliant (like 0 for localhost, etc.));
-?
+Test ip2long() function : usage variation 1
--FILE--
?php
/* Prototype : int ip2long(string ip_address)
@@ -201,4 +196,4 @@ bool(false)
--resource--
Error: 2 - ip2long() expects parameter 1 to be string, resource given, %s(%d)
NULL
-===DONE===
\ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/network/ip2long_variation2.phpt
b/ext/standard/tests/network/ip2long_variation2.phpt
new file mode 100644
index 000..7529563
--- /dev/null
+++ b/ext/standard/tests/network/ip2long_variation2.phpt
@@ -0,0 +1,39 @@
+--TEST--
+Test ip2long() function : usage variation 2, 32 bit
+--SKIPIF--
+?php if(PHP_INT_SIZE != 4) {die('skip 32 bit only');} ?
+--FILE--
+?php
+/* Prototype : int ip2long(string ip_address)
+ * Description: Converts a string containing an (IPv4) Internet Protocol
dotted address into a proper address
+ * Source code: ext/standard/basic_functions.c
+ * Alias to functions:
+ */
+
+$ips = array(
+ 1.1.011.011,
+ 127.0.0.1,
+ 1.1.071.071,
+ 0.0.0.0,
+ 1.1.081.081,
+ 192.168.0.0,
+ 256.0.0.1,
+ 192.168.0xa.5,
+);
+
+foreach($ips as $ip) {
+ var_dump(ip2long($ip));
+}
+
+?
+===DONE===
+--EXPECT--
+bool(false)
+int(2130706433)
+bool(false)
+int(0)
+bool(false)
+int(-1062731776)
+bool(false)
+bool(false)
+===DONE===
diff --git a/ext/standard/tests/network/ip2long_variation2_x64.phpt
b/ext/standard/tests/network/ip2long_variation2_x64.phpt
new file mode 100644
index 000..d4b62fb
--- /dev/null
+++ b/ext/standard/tests/network/ip2long_variation2_x64.phpt
@@ -0,0 +1,39 @@
+--TEST--
+Test ip2long() function : usage variation 2, 64 bit
+--SKIPIF--
+?php if(PHP_INT_SIZE != 8) {die('skip 64 bit only');} ?
+--FILE--
+?php
+/* Prototype : int ip2long(string ip_address)
+ * Description: Converts a string containing an (IPv4) Internet Protocol
dotted address into a proper address
+ * Source code: ext/standard/basic_functions.c
+ * Alias to functions:
+ */
+
+$ips = array(
+ 1.1.011.011,
+ 127.0.0.1,
+ 1.1.071.071,
+ 0.0.0.0,
+ 1.1.081.081,
+ 192.168.0.0,
+ 256.0.0.1,
+ 192.168.0xa.5,
+);
+
+foreach($ips as $ip) {
+ var_dump(ip2long($ip));
+}
+
+?
+===DONE===
+--EXPECT--
+bool(false)
+int(2130706433)
+bool(false)
+int(0)
+bool(false)
+int(3232235520)
+bool(false)
+bool(false)
+===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: add notes about opcache windows issue and migration from APC: UPGRADING
Commit:0a6ec7a2c96589a6a7922137907173f3640c3e9c Author:Pierre Joye pierre@gmail.com Wed, 19 Jun 2013 17:57:08 +0200 Parents: 2873b5b6eb4acb0c7b7e355936e2ac16d31b17b9 Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0a6ec7a2c96589a6a7922137907173f3640c3e9c Log: add notes about opcache windows issue and migration from APC Changed paths: M UPGRADING Diff: diff --git a/UPGRADING b/UPGRADING index 6c6368b..7bd0b0c 100755 --- a/UPGRADING +++ b/UPGRADING @@ -385,6 +385,10 @@ PHP 5.5 UPGRADE NOTES - opcache.preferred_memory_model (default ) - opcache.protect_memory (default 0) - opcache.mmap_base (Windows-only) + - If APC or WinCache was used before, the user cache APIs can be replaced by: +- APCu, all supported OSes (http://pecl.php.net/package/APCu, Windows: http://windows.php.net/downloads/pecl/releases/apcu/) + - WinCache, windows only (http://pecl.php.net/package/WinCache), a version with the ability to use only the user + cache will be released shortly after 5.5.0 final 11. Windows Support @@ -392,6 +396,18 @@ PHP 5.5 UPGRADE NOTES - Apache 2.4 handler is supported as of PHP 5.5.0 +- OpCache + Error like 'unable to reattach to base address' could happen in many common setups. + It is due to some technical and design restriction in the engine and cannot be fixed + easily before 5.5.0 final was released. + + A possible fix is to tweak the opcache.mmap_base INI setting by forcing the 1st address + to be tried. + + For x86 version, the following addreses can be tried: + . 0x2000, 0x2100, 0x3000, 0x3100, 0x5000 + and for x64 (still expiremental): + . 0x1000, 0x2000, 0x3000, 0x7000 12. Other Changes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Update credits: ext/standard/credits_ext.h
Commit:c1b8fbc1127a7a6d6cda1bb4d12f0645dcbecea4 Author:David Soria Parra d...@php.net Wed, 19 Jun 2013 22:03:02 +0200 Parents: 8547628fec43c53fe964847a3ec2bb69d393a4c3 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c1b8fbc1127a7a6d6cda1bb4d12f0645dcbecea4 Log: Update credits Changed paths: M ext/standard/credits_ext.h Diff: diff --git a/ext/standard/credits_ext.h b/ext/standard/credits_ext.h index 382e70e..2770d16 100644 --- a/ext/standard/credits_ext.h +++ b/ext/standard/credits_ext.h @@ -42,8 +42,8 @@ CREDIT_LINE(MS SQL, Frank M. Kromann); 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(MySQLi, Zak Greant, Georg Richter, Andrey Hristov, Ulf Wendel); -CREDIT_LINE(MySQLnd, Andrey Hristov, Ulf Wendel, Georg Richter); -CREDIT_LINE(MySQL, Zeev Suraski, Zak Greant, Georg Richter); +CREDIT_LINE(MySQLnd, Andrey Hristov, Ulf Wendel, Georg Richter, Johannes Schlueter); +CREDIT_LINE(MySQL, Zeev Suraski, Zak Greant, Georg Richter, Andrey Hristov); 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); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Bump version: configure.in main/php_version.h
Commit:83fc53acb9e8056ec3a6d9f97cf0c911944dcfe7 Author:David Soria Parra d...@php.net Wed, 19 Jun 2013 22:11:52 +0200 Parents: c1b8fbc1127a7a6d6cda1bb4d12f0645dcbecea4 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=83fc53acb9e8056ec3a6d9f97cf0c911944dcfe7 Log: Bump version Changed paths: M configure.in M main/php_version.h Diff: diff --git a/configure.in b/configure.in index f531beb..f3a2622 100644 --- a/configure.in +++ b/configure.in @@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=5 -PHP_RELEASE_VERSION=0 +PHP_RELEASE_VERSION=1 PHP_EXTRA_VERSION=-dev PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff --git a/main/php_version.h b/main/php_version.h index 1995834..d4d4fe0 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 5 -#define PHP_RELEASE_VERSION 0 +#define PHP_RELEASE_VERSION 1 #define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.5.0-dev -#define PHP_VERSION_ID 50500 +#define PHP_VERSION 5.5.1-dev +#define PHP_VERSION_ID 50501 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge NEWS from PHP 5.4 branch: NEWS
Commit:8547628fec43c53fe964847a3ec2bb69d393a4c3 Author:David Soria Parra d...@php.net Wed, 19 Jun 2013 21:54:34 +0200 Parents: 2bac1ff137b0186d79ac7db6d2a60e496f7953bb Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8547628fec43c53fe964847a3ec2bb69d393a4c3 Log: Merge NEWS from PHP 5.4 branch Changed paths: M NEWS Diff: Diff exceeded maximum size -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Reorder NEWS for PHP 5.5.0 final: NEWS
Commit:2bac1ff137b0186d79ac7db6d2a60e496f7953bb Author:David Soria Parra d...@php.net Wed, 19 Jun 2013 21:50:05 +0200 Parents: 0a6ec7a2c96589a6a7922137907173f3640c3e9c Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2bac1ff137b0186d79ac7db6d2a60e496f7953bb Log: Reorder NEWS for PHP 5.5.0 final Changed paths: M NEWS diff --git a/NEWS b/NEWS index ffb73a5..5d64b84 100644 --- a/NEWS +++ b/NEWS @@ -1,195 +1,81 @@ PHPNEWS ||| -?? ??? 2013, PHP 5.5.0 Release Candidate 4 +20 Jun 2013, PHP 5.5.0 - Core: + . Added Zend Opcache extension and enable building it by default. +More details here: https://wiki.php.net/rfc/optimizerplus. (Dmitry) + . Added generators and coroutines (https://wiki.php.net/rfc/generators). +(Nikita Popov) + . Added finally keyword (https://wiki.php.net/rfc/finally). (Laruence) + . Added simplified password hashing API +(https://wiki.php.net/rfc/password_hash). (Anthony Ferrara) + . Added support for constant array/string dereferencing. (Laruence) + . Added array_column function which returns a column in a multidimensional +array. https://wiki.php.net/rfc/array_column. (Ben Ramsey) + . Added boolval(). (Jille Timmermans) + . Added Z option to pack/unpack. (Gustavo) + . Added Generator::throw() method. (Nikita Popov) + . Added Class Name Resolution As Scalar Via class Keyword. +(Ralph Schindler, Nikita Popov, Lars) + . Added optional second argument for assert() to specify custom message. Patch +by Lonny Kapelushnik (lo...@lonnylot.com). (Lars) + . Added support for using empty() on the result of function calls and +other expressions (https://wiki.php.net/rfc/empty_isset_exprs). +(Nikita Popov) + . Added support for non-scalar Iterator keys in foreach +(https://wiki.php.net/rfc/foreach-non-scalar-keys). (Nikita Popov) + . Added support for list in foreach (https://wiki.php.net/rfc/foreachlist). +(Laruence) + . Added support for changing the process's title in CLI/CLI-Server SAPIs. +The implementation is more robust that the proctitle PECL module. More +details here: https://wiki.php.net/rfc/cli_process_title. (Keyur) + . Added ARMv7/v8 versions of various Zend arithmetic functions that are +implemented using inline assembler (Ard Biesheuvel) + . Added systemtap support by enabling systemtap compatible dtrace probes on +linux. (David Soria Parra) + . Optimized access to temporary and compiled VM variables. 8% less memory +reads. (Dmitry) + . The VM stacks for passing function arguments and syntaticaly nested calls +were merged into a single stack. The stack size needed for op_array +execution is calculated at compile time and preallocated at once. As result +all the stack push operatins don't require checks for stack overflow +any more. (Dmitry) + . Improve set_exception_handler while doing reset. (Laruence) + . Return previous handler when passing NULL to set_error_handler and +set_exception_handler. (Nikita Popov) + . Remove php_logo_guid(), php_egg_logo_guid(), php_real_logo_guid(), +zend_logo_guid(). (Adnrew Faulds) + . Drop Windows XP and 2003 support. (Pierre) + . Implemented FR #64175 (Added HTTP codes as of RFC 6585). (Jonh Wendell) + . Implemented FR #60738 (Allow 'set_error_handler' to handle NULL). +(Laruence, Nikita Popov) + . Implemented FR #60524 (specify temp dir by php.ini). (ALeX Kazik). + . Implemented FR #46487 (Dereferencing process-handles no longer waits on +those processes). (Jille Timmermans) + . Fixed bug #65051 (count() off by one inside unset()). (Nikita) . Fixed bug #64988 (Class loading order affects E_STRICT warning). (Laruence) . Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC). (Laruence) + . Fixed bug #64960 (Segfault in gc_zval_possible_root). (Laruence) . Fixed bug #64936 (doc comments picked up from previous scanner run). (Stas, Jonathan Oddy) . Fixed bug #64934 (Apache2 TS crash with get_browser()). (Anatol) - . Fixed bug #64166 (quoted-printable-encode stream filter incorrectly -discarding whitespace). (Michael M Slusarz) - . Fixed bug #65051 (count() off by one inside unset()). (Nikita) - -- FPM: - . Implemented FR #64764 (add support for FPM init.d script). (Lior Kaplan) - -- PDO: - . Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to -the same db server). (Laruence) - -- PDO_mysql: - . Fixed bug #48724 (getColumnMeta() doesn't return native_type for BIT, -TINYINT and YEAR). (Antony, Daniel Beardsley) - -- Readline: - . Implement FR #55694 (Expose additional readline variable to prevent -default filename completion). (Hartmel) - -- SPL: - . Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on -64-bits systems). (Laruence) -
[PHP-CVS] tag php-src: create tag php-5.5.0
Tag php-5.5.0 in php-src.git was created Tag: 2d8b190d9b63187d38b5b4115c3986d0b8b5e007 Tagger: David Soria Parrad...@php.net Wed Jun 19 22:09:03 2013 +0200 Log: PHP 5.5.0 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJRwg/jAAoJEME8cLhyZ7UtupQP/jWK8RvRsiRECFdJ+752N8YT Pr6PjXq+ompDjqwXT5s4a9D04Xmpz9e4k8AQk0aaJzdLVe3fA8byU9nw2QWvW5/X 4xbiFqZUJveZe3zumgRN9bZbIm4EFPrzHGp9GYAGcCetVp+uIZGb8zvq1ra+wfAw NuEqUkWyS3wf3jQVSeH1LVulFb0RmTVQ5lfh3+1KQq+xNIAUF/F6P4aSaDjfoKRw /QzC1vjpxBpsagc2/qqczIM0u+Oj+md9wpkBwQBPmNC5lmJDi0o6VzCKKWPKQPcB HDlqjoIq07TuVakTiNn3pzbLbZfz0e9R/dyeuWEDC7Ca+1vJh/Wv8azP5UdjBYzs hSMopKOwyjbYRPS/LKVe/YtYMQnetqmthgSQ/9fJsr+tZ8daUHhxH+OEHA9zr1Vp Z8BzUnndPW21kXGwn4eXGq95rD7yW5kQArFslSaDKjNWt7VYtbYku+nypQ+EEhye iXrhBOmJsSLytiYYk+uI/CKm2F9r5Q1ikUouqlHt8J47ui0a3FIg2Y3AnhtUkdVY Cy0KjWjz+fX+orjApY5JnRCFtGDOFaeCPeQ49w58euJtjasC/5HBO6/smOHXMpvj cebSMqO1ZuXyd9NHV+IaRGJTE1zcKqTOfNxZC/cJ7ow8U7dgzWYnMa+LJDMpO77T 5+P8xGCZ72Is5R26sApp =2tB3 -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=2d8b190d9b63187d38b5b4115c3986d0b8b5e007 Target: 4ed24e1e18a5546aa68b641cb8081233ec27ebd4 Author: David Soria Parra d...@php.net Wed, 19 Jun 2013 22:00:41 +0200 Parents: c1b8fbc1127a7a6d6cda1bb4d12f0645dcbecea4 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4ed24e1e18a5546aa68b641cb8081233ec27ebd4 Target log: PHP 5.5.0 Changed paths: M configure.in M main/php_version.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
