[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_wireprotocol.c
pajoye Thu Jun 11 14:36:48 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_wireprotocol.c
Log:
- silent warning and make it less ambiguous
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.4.2.27&r2=1.4.2.28&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.27
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.28
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.27 Thu Jun 11 08:35:47 2009
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c Thu Jun 11 14:36:48 2009
@@ -611,7 +611,7 @@
/* pad2 */
p+= 13;
- if (p - buf < packet->header.size) {
+ if ((size_t)(p - buf) < packet->header.size) {
/* scramble_buf is split into two parts */
memcpy(packet->scramble_buf + SCRAMBLE_LENGTH_323,
p, SCRAMBLE_LENGTH - SCRAMBLE_LENGTH_323);
@@ -625,7 +625,7 @@
DBG_INF_FMT("server_capabilities=%d charset_no=%d server_status=%d",
packet->server_capabilities,
packet->charset_no, packet->server_status);
- if (p - begin > packet->header.size) {
+ if ((size_t)(p - begin) > packet->header.size) {
DBG_ERR_FMT("GREET packet %d bytes shorter than expected", p -
begin - packet->header.size);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "GREET packet
"MYSQLND_SZ_T_SPEC" bytes shorter than expected",
p - begin -
packet->header.size);
@@ -810,7 +810,7 @@
p+= 2;
/* There is a message */
- if (packet->header.size > p - buf && (i =
php_mysqlnd_net_field_length(&p))) {
+ if (packet->header.size > (size_t) (p - buf) && (i =
php_mysqlnd_net_field_length(&p))) {
packet->message = pestrndup((char *)p, MIN(i, sizeof(buf) - (p
- buf)), conn->persistent);
packet->message_len = i;
} else {
@@ -821,7 +821,7 @@
packet->affected_rows, packet->last_insert_id,
packet->server_status,
packet->warning_count);
- if (p - begin > packet->header.size) {
+ if ((size_t)(p - begin) > packet->header.size) {
DBG_ERR_FMT("OK packet %d bytes shorter than expected", p -
begin - packet->header.size);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "OK packet
"MYSQLND_SZ_T_SPEC" bytes shorter than expected",
p - begin -
packet->header.size);
@@ -894,7 +894,7 @@
packet->server_status = 0;
}
- if (p - begin > packet->header.size) {
+ if ((size_t)(p - begin) > packet->header.size) {
DBG_ERR_FMT("EOF packet %d bytes shorter than expected", p -
begin - packet->header.size);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "EOF packet
"MYSQLND_SZ_T_SPEC" bytes shorter than expected",
p - begin -
packet->header.size);
@@ -1044,7 +1044,7 @@
packet->warning_count = uint2korr(p);
p+=2;
/* Check for additional textual data */
- if (packet->header.size > (p - buf) && (len =
php_mysqlnd_net_field_length(&p))) {
+ if (packet->header.size > (size_t) (p - buf) && (len =
php_mysqlnd_net_field_length(&p))) {
packet->info_or_local_file = mnd_pemalloc(len +
1, conn->persistent);
memcpy(packet->info_or_local_file, p, len);
packet->info_or_local_file[len] = '\0';
@@ -1059,7 +1059,7 @@
/* Result set */
break;
}
- if (p - begin > packet->header.size) {
+ if ((size_t)(p - begin) > packet->header.size) {
DBG_ERR_FMT("RSET_HEADER packet %d bytes shorter than
expected", p - begin - packet->header.size);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "GREET packet
"MYSQLND_SZ_T_SPEC" bytes shorter than expected",
p - begin -
packet->header.size);
@@ -1187,7 +1187,7 @@
NULL_LENGTH (0xFB) comes from COM_FIELD_LIST when the default value
is NULL.
Otherwise the string is length encoded.
*/
- if (packet->header.size > (p - buf) &&
+ if (packet->header.size > (size_t)(p - buf) &&
(len = php_mysqlnd_net_field_length(&p)) &&
len != MYSQLND_NULL_LENGTH)
{
@@ -1199,7 +1199,7 @@
p += len;
}
- if (p - begin > packet->header.size) {
+ if ((size_t)(p - begin) > packet->header.size) {
DBG_ERR_FMT("RSET field packet %d bytes shorter than expected",
p - begin - packet->header.size);
[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build Makefile mkdist.php
cellog Thu Jun 11 14:39:37 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/buildMakefile mkdist.php
Log:
add phar.phar creation on windows
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.35.2.1.2.6.2.12&r2=1.35.2.1.2.6.2.13&diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.35.2.1.2.6.2.12
php-src/win32/build/Makefile:1.35.2.1.2.6.2.13
--- php-src/win32/build/Makefile:1.35.2.1.2.6.2.12 Wed May 27 01:46:48 2009
+++ php-src/win32/build/MakefileThu Jun 11 14:39:37 2009
@@ -14,7 +14,7 @@
# | Author: Wez Furlong|
# +--+
#
-# $Id: Makefile,v 1.35.2.1.2.6.2.12 2009/05/27 01:46:48 kalle Exp $
+# $Id: Makefile,v 1.35.2.1.2.6.2.13 2009/06/11 14:39:37 cellog Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
@@ -128,7 +128,7 @@
-del /f /q
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
-del /f /q
$(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
-del /f /q
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
- $(BUILD_DIR)\php.exe -d date.timezone=UTC -n win32/build/mkdist.php
"$(BUILD_DIR)" "$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS)
$(PHP_EXTRA_DIST_FILES)" "$(PECL_TARGETS) $(PECL_EXTRA_DIST_FILES)"
"$(SNAPSHOT_TEMPLATE)"
+ $(BUILD_DIR)\php.exe -d date.timezone=UTC -n -dphar.readonly=0
win32/build/mkdist.php "$(BUILD_DIR)" "$(PHPDLL)" "$(SAPI_TARGETS)"
"$(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES)" "$(PECL_TARGETS)
$(PECL_EXTRA_DIST_FILES)" "$(SNAPSHOT_TEMPLATE)"
cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-$(ZIP) -9 -q -r
..\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
.
cd ..\..
http://cvs.php.net/viewvc.cgi/php-src/win32/build/mkdist.php?r1=1.13.4.1.2.11&r2=1.13.4.1.2.12&diff_format=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.13.4.1.2.11
php-src/win32/build/mkdist.php:1.13.4.1.2.12
--- php-src/win32/build/mkdist.php:1.13.4.1.2.11Wed Jun 3 01:14:58 2009
+++ php-src/win32/build/mkdist.php Thu Jun 11 14:39:37 2009
@@ -1,4 +1,4 @@
-isDir() || $file == 'phar.php') continue;
+echo 'adding ', $file, "\n";
+$phar[(string) $file] = file_get_contents($path_to_phar. '/phar/' .
$file);
+ }
+ $phar->setSignatureAlgorithm(Phar::SHA1);
+ $stub = file($path_to_phar . '/phar/phar.php');
+ unset($stub[0]); // remove hashbang
+ $phar->setStub(implode('', $stub));
+
+ echo "Creating phar.phar.bat\n";
+ file_put_contents($path_to_php . '/phar.phar.bat', "%~dp0php.exe
%~dp0pharcommand.phar %1 %2 %3 %4 %5 %6 %7 %8 %9\r\n");
+}
+
if (!is_dir($test_dir)) {
mkdir($test_dir);
}
@@ -489,4 +510,5 @@
echo "WARNING: you don't have a snapshot template, your dist will not
be complete\n";
}
+make_phar_dot_phar($dist_dir);
?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring config.w32
kalle Thu Jun 11 23:37:51 2009 UTC
Modified files:
/php-src/ext/mbstring config.w32
Log:
Fixed static build of mbstring on Windows (makes static build of exif
possible too)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.w32?r1=1.16&r2=1.17&diff_format=u
Index: php-src/ext/mbstring/config.w32
diff -u php-src/ext/mbstring/config.w32:1.16
php-src/ext/mbstring/config.w32:1.17
--- php-src/ext/mbstring/config.w32:1.16Mon Apr 20 17:06:00 2009
+++ php-src/ext/mbstring/config.w32 Thu Jun 11 23:37:51 2009
@@ -1,18 +1,18 @@
-// $Id: config.w32,v 1.16 2009/04/20 17:06:00 jani Exp $
+// $Id: config.w32,v 1.17 2009/06/11 23:37:51 kalle Exp $
// vim:ft=javascript
ARG_ENABLE("mbstring", "multibyte string functions", "no");
ARG_ENABLE("mbregex", "multibyte regex support", "no");
ARG_ENABLE("mbregex-backtrack", "check multibyte regex backtrack", "yes");
-if (PHP_MBSTRING == "yes") {
+if (PHP_MBSTRING != "no") {
FSO.CopyFile("ext\\mbstring\\libmbfl\\config.h.vc6",
"ext\\mbstring\\libmbfl\\config.h", true);
FSO.CopyFile("ext\\mbstring\\oniguruma\\win32\\config.h",
"ext\\mbstring\\oniguruma\\config.h", true);
- EXTENSION("mbstring", "mbstring.c php_unicode.c mb_gpc.c", true,
+ EXTENSION("mbstring", "mbstring.c php_unicode.c mb_gpc.c",
PHP_MBSTRING_SHARED,
"-Iext/mbstring/libmbfl -Iext/mbstring/libmbfl/mbfl \
-Iext/mbstring/oniguruma /D NOT_RUBY=1 /D LIBMBFL_EXPORTS=1 \
/D HAVE_STDARG_PROTOTYPES=1 /D HAVE_CONFIG_H /D HAVE_STDLIB_H \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/posix/tests posix_strerror_error_basic.phpt
wharmby Thu Jun 11 23:04:37 2009 UTC Removed files: (Branch: PHP_5_2) /php-src/ext/posix/testsposix_strerror_error_basic.phpt Log: Delete duplicate test -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/posix/tests posix_strerror_error_basic.phpt
wharmby Thu Jun 11 23:04:36 2009 UTC Removed files: /php-src/ext/posix/testsposix_strerror_error_basic.phpt Log: Delete duplicate test -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/posix/tests posix_strerror_error_basic.phpt
wharmby Thu Jun 11 23:04:35 2009 UTC Removed files: (Branch: PHP_5_3) /php-src/ext/posix/testsposix_strerror_error_basic.phpt Log: Delete duplicate test -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/general_functions intval.phpt intval_variation1.phpt intval_variation2.phpt
wharmby Thu Jun 11 22:26:57 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/general_functions intval_variation2.phpt intval_variation1.phpt Modified files: /php-src/ext/standard/tests/general_functions intval.phpt Log: New intval() tests. Tested on Windows, Linux and linux 64 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/intval.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/general_functions/intval.phpt diff -u php-src/ext/standard/tests/general_functions/intval.phpt:1.1.2.2 php-src/ext/standard/tests/general_functions/intval.phpt:1.1.2.3 --- php-src/ext/standard/tests/general_functions/intval.phpt:1.1.2.2Sun May 27 14:30:06 2007 +++ php-src/ext/standard/tests/general_functions/intval.phptThu Jun 11 22:26:57 2009 @@ -256,8 +256,8 @@ int(-10) int(10) int(105) -int(5) -int(6) +int(%d) +int(%d) int(0) int(1) int(1) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/intval_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/general_functions/intval_variation2.phpt +++ php-src/ext/standard/tests/general_functions/intval_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/intval_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/general_functions/intval_variation1.phpt +++ php-src/ext/standard/tests/general_functions/intval_variation1.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/general_functions intval.phpt intval_variation1.phpt intval_variation2.phpt
wharmby Thu Jun 11 22:26:54 2009 UTC
Modified files:
/php-src/ext/standard/tests/general_functions
intval_variation2.phpt
intval_variation1.phpt
intval.phpt
Log:
New intval() tests. Tested on Windows, Linux and linux 64
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/intval_variation2.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/general_functions/intval_variation2.phpt
diff -u /dev/null
php-src/ext/standard/tests/general_functions/intval_variation2.phpt:1.2
--- /dev/null Thu Jun 11 22:26:54 2009
+++ php-src/ext/standard/tests/general_functions/intval_variation2.phpt Thu Jun
11 22:26:54 2009
@@ -0,0 +1,195 @@
+--TEST--
+Test intval() function : usage variation
+--FILE--
+ 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+ // float data
+ 'float 10.5' => 10.5,
+ 'float -10.5' => -10.5,
+ 'float 12.3456789000e10' => 12.3456789000e10,
+ 'float -12.3456789000e10' => -12.3456789000e10,
+ 'float .5' => .5,
+
+ // array data
+ 'empty array' => array(),
+ 'int indexed array' => $index_array,
+ 'associative array' => $assoc_array,
+ 'nested arrays' => array('foo', $index_array, $assoc_array),
+
+ // null data
+ 'uppercase NULL' => NULL,
+ 'lowercase null' => null,
+
+ // boolean data
+ 'lowercase true' => true,
+ 'lowercase false' =>false,
+ 'uppercase TRUE' =>TRUE,
+ 'uppercase FALSE' =>FALSE,
+
+ // empty data
+ 'empty string DQ' => "",
+ 'empty string SQ' => '',
+
+ // string data
+ 'string DQ' => "string",
+ 'string SQ' => 'string',
+ 'mixed case string' => "sTrInG",
+ 'heredoc' => $heredoc,
+
+ // object data
+ 'instance of classWithToString' => new classWithToString(),
+ 'instance of classWithoutToString' => new classWithoutToString(),
+
+ // undefined data
+ 'undefined var' => @$undefined_var,
+
+ // unset data
+ 'unset var' => @$unset_var,
+);
+
+// loop through each element of the array for base
+
+foreach($inputs as $key =>$value) {
+ echo "\n--$key--\n";
+ var_dump( intval($var, $value) );
+};
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing intval() : usage variation ***
+
+--float 10.5--
+int(1)
+
+--float -10.5--
+int(1)
+
+--float 12.3456789000e10--
+int(1)
+
+--float -12.3456789000e10--
+int(1)
+
+--float .5--
+int(1)
+
+--empty array--
+Error: 2 - intval() expects parameter 2 to be long, array given, %s(%d)
+NULL
+
+--int indexed array--
+Error: 2 - intval() expects parameter 2 to be long, array given, %s(%d)
+NULL
+
+--associative array--
+Error: 2 - intval() expects parameter 2 to be long, array given, %s(%d)
+NULL
+
+--nested arrays--
+Error: 2 - intval() expects parameter 2 to be long, array given, %s(%d)
+NULL
+
+--uppercase NULL--
+int(1)
+
+--lowercase null--
+int(1)
+
+--lowercase true--
+int(1)
+
+--lowercase false--
+int(1)
+
+--uppercase TRUE--
+int(1)
+
+--uppercase FALSE--
+int(1)
+
+--empty string DQ--
+Error: 2 - intval() expects parameter 2 to be long, Unicode string given,
%s(%d)
+NULL
+
+--empty string SQ--
+Error: 2 - intval() expects parameter 2 to be long, Unicode string given,
%s(%d)
+NULL
+
+--string DQ--
+Error: 2 - intval() expects parameter 2 to be long, Unicode string given,
%s(%d)
+NULL
+
+--string SQ--
+Error: 2 - intval() expects parameter 2 to be long, Unicode string given,
%s(%d)
+NULL
+
+--mixed case string--
+Error: 2 - intval() expects parameter 2 to be long, Unicode string given,
%s(%d)
+NULL
+
+--heredoc--
+Error: 2 - intval() expects parameter 2 to be long, Unicode string given,
%s(%d)
+NULL
+
+--instance of classWithToString--
+Error: 2 - intval() expects parameter 2 to be long, object given, %s(%d)
+NULL
+
+--instance of classWithoutToString--
+Error: 2 - intval() expects parameter 2 to be long, object given, %s(%d)
+NULL
+
+--undefined var--
+int(1)
+
+--unset var--
+int(1)
+===DONE===
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/intval_variation1.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/general_functions/intval_variation1.phpt
diff -u /dev/null
php-src/ext/standard/tests/general_functions/intval_variation1.phpt:1.2
--- /dev/null Thu Jun 11 22:26:54 2009
+++ php-src/ext/standard/tests/general_functions/intval_variation1.phpt Thu Jun
11 22:26:54 2009
@@ -0,0 +1,203 @@
+--TEST--
+Test intval() function : usage variation
+--FILE--
+ 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+ // int data
+ 'int 0' => 0,
+ 'int 1' => 1,
+ 'int 12345' => 12345,
+ 'int -12345' => -2345,
+
+ // float data
+ 'float 10.5' => 10.5,
+ 'float -10.5' => -10.5,
+ '
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/general_functions intval.phpt intval_variation1.phpt intval_variation2.phpt
wharmby Thu Jun 11 22:26:51 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/general_functions intval_variation2.phpt intval_variation1.phpt Modified files: /php-src/ext/standard/tests/general_functions intval.phpt Log: New intval() tests. Tested on Windows, Linux and linux 64 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/intval.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/standard/tests/general_functions/intval.phpt diff -u php-src/ext/standard/tests/general_functions/intval.phpt:1.1.2.2 php-src/ext/standard/tests/general_functions/intval.phpt:1.1.2.2.2.1 --- php-src/ext/standard/tests/general_functions/intval.phpt:1.1.2.2Sun May 27 14:30:06 2007 +++ php-src/ext/standard/tests/general_functions/intval.phptThu Jun 11 22:26:51 2009 @@ -256,8 +256,8 @@ int(-10) int(10) int(105) -int(5) -int(6) +int(%d) +int(%d) int(0) int(1) int(1) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/intval_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/general_functions/intval_variation2.phpt +++ php-src/ext/standard/tests/general_functions/intval_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/intval_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/general_functions/intval_variation1.phpt +++ php-src/ext/standard/tests/general_functions/intval_variation1.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/math abs_basiclong_64bit.phpt acos_basiclong_64bit.phpt acosh_basiclong_64bit.phpt asin_basiclong_64bit.phpt asinh_basiclong_64bit.phpt atan2_basicl
wharmby Thu Jun 11 21:17:10 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/mathcosh_basiclong_64bit.phpt dechex_basiclong_64bit.phpt hexdec_basiclong_64bit.phpt decbin_basiclong_64bit.phpt floor_basiclong_64bit.phpt ceil_basiclong_64bit.phpt decoct_basiclong_64bit.phpt exp_basiclong_64bit.phpt abs_basiclong_64bit.phpt octdec_basiclong_64bit.phpt fmod_basiclong_64bit.phpt acosh_basiclong_64bit.phpt deg2rad_basiclong_64bit.phpt tan_basiclong_64bit.phpt rad2deg_basiclong_64bit.phpt hypot_basiclong_64bit.phpt is_infinite_basiclong_64bit.phpt is_nan_basiclong_64bit.phpt log1p_basiclong_64bit.phpt asinh_basiclong_64bit.phpt cos_basiclong_64bit.phpt asin_basiclong_64bit.phpt pow_basiclong_64bit.phpt is_finite_basiclong_64bit.phpt atanh_basiclong_64bit.phpt round_basiclong_64bit.phpt expm1_basiclong_64bit.phpt atan2_basiclong_64bit.phpt log_basiclong_64bit.phpt bindec_basiclong_64bit.phpt sqrt_basiclong_64bit.phpt sin_basiclong_64bit.phpt atan_basiclong_64bit.phpt log10_basiclong_64bit.phpt tanh_basiclong_64bit.phpt acos_basiclong_64bit.phpt sinh_basiclong_64bit.phpt Log: New 64 bit math tests. Tested on Windows, Linux and Linux 64 bit. Tests authored by Dave Kelsey http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/cosh_basiclong_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/math/cosh_basiclong_64bit.phpt +++ php-src/ext/standard/tests/math/cosh_basiclong_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/dechex_basiclong_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/math/dechex_basiclong_64bit.phpt +++ php-src/ext/standard/tests/math/dechex_basiclong_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/hexdec_basiclong_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/math/hexdec_basiclong_64bit.phpt +++ php-src/ext/standard/tests/math/hexdec_basiclong_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/decbin_basiclong_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/math/decbin_basiclong_64bit.phpt +++ php-src/ext/standard/tests/math/decbin_basiclong_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/floor_basiclong_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/math/floor_basiclong_64bit.phpt +++ php-src/ext/standard/tests/math/floor_basiclong_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/ceil_basiclong_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/math/ceil_basiclong_64bit.phpt +++ php-src/ext/standard/tests/math/ceil_basiclong_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/decoct_basiclong_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/math/decoct_basiclong_64bit.phpt +++ php-src/ext/standard/tests/math/decoct_basiclong_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/exp_basiclong_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/math/exp_basiclong_64bit.phpt +++ php-src/ext/standard/tests/math/exp_basiclong_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/abs_basiclong_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/math/abs_basiclong_64bit.phpt +++ php-src/ext/standard/tests/math/abs_basiclong_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/octdec_basiclong_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standar
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/math abs_basiclong_64bit.phpt acos_basiclong_64bit.phpt acosh_basiclong_64bit.phpt asin_basiclong_64bit.phpt asinh_basiclong_64bit.phpt atan2_basicl
wharmby Thu Jun 11 21:17:00 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/mathlog10_basiclong_64bit.phpt dechex_basiclong_64bit.phpt expm1_basiclong_64bit.phpt tan_basiclong_64bit.phpt sqrt_basiclong_64bit.phpt ceil_basiclong_64bit.phpt floor_basiclong_64bit.phpt asinh_basiclong_64bit.phpt log_basiclong_64bit.phpt cosh_basiclong_64bit.phpt exp_basiclong_64bit.phpt is_finite_basiclong_64bit.phpt atanh_basiclong_64bit.phpt decbin_basiclong_64bit.phpt octdec_basiclong_64bit.phpt hypot_basiclong_64bit.phpt tanh_basiclong_64bit.phpt rad2deg_basiclong_64bit.phpt bindec_basiclong_64bit.phpt hexdec_basiclong_64bit.phpt cos_basiclong_64bit.phpt decoct_basiclong_64bit.phpt sin_basiclong_64bit.phpt pow_basiclong_64bit.phpt acos_basiclong_64bit.phpt abs_basiclong_64bit.phpt atan2_basiclong_64bit.phpt asin_basiclong_64bit.phpt sinh_basiclong_64bit.phpt is_infinite_basiclong_64bit.phpt atan_basiclong_64bit.phpt fmod_basiclong_64bit.phpt round_basiclong_64bit.phpt log1p_basiclong_64bit.phpt deg2rad_basiclong_64bit.phpt is_nan_basiclong_64bit.phpt acosh_basiclong_64bit.phpt Log: New 64 bit math tests. Tested on Windows, Linux and Linux 64 bit. Tests authored by Dave Kelsey http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/log10_basiclong_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/math/log10_basiclong_64bit.phpt +++ php-src/ext/standard/tests/math/log10_basiclong_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/dechex_basiclong_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/math/dechex_basiclong_64bit.phpt +++ php-src/ext/standard/tests/math/dechex_basiclong_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/expm1_basiclong_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/math/expm1_basiclong_64bit.phpt +++ php-src/ext/standard/tests/math/expm1_basiclong_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/tan_basiclong_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/math/tan_basiclong_64bit.phpt +++ php-src/ext/standard/tests/math/tan_basiclong_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/sqrt_basiclong_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/math/sqrt_basiclong_64bit.phpt +++ php-src/ext/standard/tests/math/sqrt_basiclong_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/ceil_basiclong_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/math/ceil_basiclong_64bit.phpt +++ php-src/ext/standard/tests/math/ceil_basiclong_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/floor_basiclong_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/math/floor_basiclong_64bit.phpt +++ php-src/ext/standard/tests/math/floor_basiclong_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/asinh_basiclong_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/math/asinh_basiclong_64bit.phpt +++ php-src/ext/standard/tests/math/asinh_basiclong_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/log_basiclong_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/math/log_basiclong_64bit.phpt +++ php-src/ext/standard/tests/math/log_basiclong_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/cosh_basiclong_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/mat
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl/tests bug45161.phpt bug46711.phpt bug46739.phpt bug48203.phpt
wharmby Thu Jun 11 21:11:23 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/curl/tests bug48203.phpt bug46711.phpt bug46739.phpt bug45161.phpt Log: Add/Fix SKIPIF sections of cURL tests http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug48203.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/curl/tests/bug48203.phpt diff -u php-src/ext/curl/tests/bug48203.phpt:1.1.4.2 php-src/ext/curl/tests/bug48203.phpt:1.1.4.3 --- php-src/ext/curl/tests/bug48203.phpt:1.1.4.2Tue May 26 17:19:35 2009 +++ php-src/ext/curl/tests/bug48203.phptThu Jun 11 21:11:23 2009 @@ -1,5 +1,14 @@ --TEST-- Bug #48203 (Crash when CURLOPT_STDERR is set to regular file) +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug46711.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u Index: php-src/ext/curl/tests/bug46711.phpt diff -u php-src/ext/curl/tests/bug46711.phpt:1.2.2.2 php-src/ext/curl/tests/bug46711.phpt:1.2.2.3 --- php-src/ext/curl/tests/bug46711.phpt:1.2.2.2Thu Apr 30 10:41:32 2009 +++ php-src/ext/curl/tests/bug46711.phptThu Jun 11 21:11:23 2009 @@ -1,5 +1,14 @@ --TEST-- Bug #46711 (lost memory when foreach is used for values passed to curl_setopt()) +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug46739.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u Index: php-src/ext/curl/tests/bug46739.phpt diff -u php-src/ext/curl/tests/bug46739.phpt:1.2.2.2 php-src/ext/curl/tests/bug46739.phpt:1.2.2.3 --- php-src/ext/curl/tests/bug46739.phpt:1.2.2.2Wed Dec 17 14:05:52 2008 +++ php-src/ext/curl/tests/bug46739.phptThu Jun 11 21:11:23 2009 @@ -1,5 +1,14 @@ --TEST-- Bug #46739 (array returned by curl_getinfo should contain content_type key) +--SKIPIF-- + --FILE-- http://127.0.0.1:9/'); http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug45161.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u Index: php-src/ext/curl/tests/bug45161.phpt diff -u php-src/ext/curl/tests/bug45161.phpt:1.1.4.3 php-src/ext/curl/tests/bug45161.phpt:1.1.4.4 --- php-src/ext/curl/tests/bug45161.phpt:1.1.4.3Thu Apr 30 10:41:32 2009 +++ php-src/ext/curl/tests/bug45161.phptThu Jun 11 21:11:23 2009 @@ -1,7 +1,21 @@ --TEST-- Bug #45161 (Reusing a curl handle leaks memory) --SKIPIF-- -= 7.17.0"); ?> += 7.17.0"); +} +?> --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl/tests bug45161.phpt bug46711.phpt bug46739.phpt bug48203.phpt
wharmby Thu Jun 11 21:11:22 2009 UTC Modified files: /php-src/ext/curl/tests bug45161.phpt bug46711.phpt bug48203.phpt bug46739.phpt Log: Add/Fix SKIPIF sections of cURL tests http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug45161.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/curl/tests/bug45161.phpt diff -u php-src/ext/curl/tests/bug45161.phpt:1.2 php-src/ext/curl/tests/bug45161.phpt:1.3 --- php-src/ext/curl/tests/bug45161.phpt:1.2Thu Apr 30 10:41:09 2009 +++ php-src/ext/curl/tests/bug45161.phptThu Jun 11 21:11:22 2009 @@ -1,7 +1,21 @@ --TEST-- Bug #45161 (Reusing a curl handle leaks memory) --SKIPIF-- -= 7.17.0"); ?> += 7.17.0"); +} +?> --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug46711.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/curl/tests/bug46711.phpt diff -u php-src/ext/curl/tests/bug46711.phpt:1.2 php-src/ext/curl/tests/bug46711.phpt:1.3 --- php-src/ext/curl/tests/bug46711.phpt:1.2Thu Apr 30 10:41:09 2009 +++ php-src/ext/curl/tests/bug46711.phptThu Jun 11 21:11:22 2009 @@ -1,5 +1,14 @@ --TEST-- Bug #46711 (lost memory when foreach is used for values passed to curl_setopt()) +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug48203.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/curl/tests/bug48203.phpt diff -u php-src/ext/curl/tests/bug48203.phpt:1.1 php-src/ext/curl/tests/bug48203.phpt:1.2 --- php-src/ext/curl/tests/bug48203.phpt:1.1Tue May 26 17:19:09 2009 +++ php-src/ext/curl/tests/bug48203.phptThu Jun 11 21:11:22 2009 @@ -1,5 +1,14 @@ --TEST-- Bug #48203 (Crash when CURLOPT_STDERR is set to regular file) +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug46739.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/curl/tests/bug46739.phpt diff -u php-src/ext/curl/tests/bug46739.phpt:1.2 php-src/ext/curl/tests/bug46739.phpt:1.3 --- php-src/ext/curl/tests/bug46739.phpt:1.2Wed Dec 17 14:00:07 2008 +++ php-src/ext/curl/tests/bug46739.phptThu Jun 11 21:11:22 2009 @@ -1,5 +1,14 @@ --TEST-- Bug #46739 (array returned by curl_getinfo should contain content_type key) +--SKIPIF-- + --FILE-- http://127.0.0.1:9/'); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/curl/tests bug45161.phpt bug46711.phpt bug46739.phpt bug48203.phpt
wharmby Thu Jun 11 21:11:20 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/curl/tests bug45161.phpt bug46739.phpt bug46711.phpt bug48203.phpt Log: Add/Fix SKIPIF sections of cURL tests http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug45161.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/curl/tests/bug45161.phpt diff -u php-src/ext/curl/tests/bug45161.phpt:1.1.2.3 php-src/ext/curl/tests/bug45161.phpt:1.1.2.4 --- php-src/ext/curl/tests/bug45161.phpt:1.1.2.3Thu Apr 30 10:41:54 2009 +++ php-src/ext/curl/tests/bug45161.phptThu Jun 11 21:11:20 2009 @@ -1,7 +1,21 @@ --TEST-- Bug #45161 (Reusing a curl handle leaks memory) --SKIPIF-- -= 7.17.0"); ?> += 7.17.0"); +} +?> --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug46739.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/curl/tests/bug46739.phpt diff -u php-src/ext/curl/tests/bug46739.phpt:1.1.2.3 php-src/ext/curl/tests/bug46739.phpt:1.1.2.4 --- php-src/ext/curl/tests/bug46739.phpt:1.1.2.3Wed Dec 17 14:00:20 2008 +++ php-src/ext/curl/tests/bug46739.phptThu Jun 11 21:11:20 2009 @@ -1,5 +1,14 @@ --TEST-- Bug #46739 (array returned by curl_getinfo should contain content_type key) +--SKIPIF-- + --FILE-- http://127.0.0.1:9/'); http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug46711.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/curl/tests/bug46711.phpt diff -u php-src/ext/curl/tests/bug46711.phpt:1.1.2.2 php-src/ext/curl/tests/bug46711.phpt:1.1.2.3 --- php-src/ext/curl/tests/bug46711.phpt:1.1.2.2Thu Apr 30 10:41:54 2009 +++ php-src/ext/curl/tests/bug46711.phptThu Jun 11 21:11:20 2009 @@ -1,5 +1,14 @@ --TEST-- Bug #46711 (lost memory when foreach is used for values passed to curl_setopt()) +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug48203.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/curl/tests/bug48203.phpt diff -u php-src/ext/curl/tests/bug48203.phpt:1.1.2.2 php-src/ext/curl/tests/bug48203.phpt:1.1.2.3 --- php-src/ext/curl/tests/bug48203.phpt:1.1.2.2Tue May 26 17:19:23 2009 +++ php-src/ext/curl/tests/bug48203.phptThu Jun 11 21:11:20 2009 @@ -1,5 +1,14 @@ --TEST-- Bug #48203 (Crash when CURLOPT_STDERR is set to regular file) +--SKIPIF-- + --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_palloc.c mysqlnd_wireprotocol.c
Hi Pierre, Pierre Joye wrote: hi Andrey, On Thu, Jun 11, 2009 at 7:25 PM, Andrey Hristov wrote: Hi Pierre, Pierre Joye wrote: hi, This change sounds wrong. The obj pointer is being used without being initialized: ext\mysqlnd\mysqlnd_wireprotocol.c(1632) : warning C4700: uninitialized local variable 'obj' used Cheers, Check with your eyes, the compiler is wrong. obj is touched only if allocated is FALSE but it is never FALSE if the zval cache has been switched off. Please read http://www.thefreedictionary.com/seems Now that the meaning of this word has been cleared :), can you add a ifdef around that code then? thanks for the quick reply, no :) But you can send the case to your colleagues at the compiler team so they can analyze why the compiler failed to recognize it :) I like the MS compiler, it gives more warnings than gcc, but in this case was wrong :( I am curious why it does complain about one line although there are few places where obj is used and guarded by that allocated variable. Best, Andrey -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_wireprotocol.c
thanks! :)
On Thu, Jun 11, 2009 at 7:54 PM, Andrey Hristov wrote:
> andrey Thu Jun 11 17:54:04 2009 UTC
>
> Modified files: (Branch: PHP_5_3)
> /php-src/ext/mysqlnd mysqlnd_wireprotocol.c
> Log:
> Put these in an ifdef because they are not used at all if the zval cache
> is off.
>
>
> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.4.2.28&r2=1.4.2.29&diff_format=u
> Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
> diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.28
> php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.29
> --- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.28 Thu Jun 11 14:36:48
> 2009
> +++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c Thu Jun 11 17:54:04 2009
> @@ -1362,8 +1362,10 @@
> zend_uchar *null_ptr, bit;
> zval **current_field, **end_field, **start_field;
> zend_bool as_unicode = conn->options.numeric_and_datetime_as_unicode;
> +#ifdef USE_ZVAL_CACHE
> zend_bool allocated;
> void *obj = NULL;
> +#endif
>
> DBG_ENTER("php_mysqlnd_rowp_read_binary_protocol");
>
>
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>
--
Pierre
http://blog.thepimp.net | http://www.libgd.org
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_wireprotocol.c
andrey Thu Jun 11 17:54:04 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_wireprotocol.c
Log:
Put these in an ifdef because they are not used at all if the zval cache
is off.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.4.2.28&r2=1.4.2.29&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.28
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.29
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.28 Thu Jun 11 14:36:48 2009
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c Thu Jun 11 17:54:04 2009
@@ -1362,8 +1362,10 @@
zend_uchar *null_ptr, bit;
zval **current_field, **end_field, **start_field;
zend_bool as_unicode = conn->options.numeric_and_datetime_as_unicode;
+#ifdef USE_ZVAL_CACHE
zend_bool allocated;
void *obj = NULL;
+#endif
DBG_ENTER("php_mysqlnd_rowp_read_binary_protocol");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd_wireprotocol.c
andrey Thu Jun 11 17:53:14 2009 UTC
Modified files:
/php-src/ext/mysqlndmysqlnd_wireprotocol.c
Log:
Revert by adding an ifdef
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.30&r2=1.31&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.30
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.31
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.30 Thu Jun 11 17:16:35 2009
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c Thu Jun 11 17:53:13 2009
@@ -1363,7 +1363,10 @@
zend_uchar *null_ptr, bit;
zval **current_field, **end_field, **start_field;
zend_bool as_unicode = conn->options.numeric_and_datetime_as_unicode;
+#ifdef USE_ZVAL_CACHE
zend_bool allocated;
+ void *obj = NULL;
+#endif
DBG_ENTER("php_mysqlnd_rowp_read_binary_protocol");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd_wireprotocol.c
Hi Pierre,
Pierre-Alain Joye wrote:
pajoye Thu Jun 11 17:16:35 2009 UTC
Modified files:
/php-src/ext/mysqlnd mysqlnd_wireprotocol.c
Log:
- nuke unused var
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.29&r2=1.30&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.29
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.30
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.29 Thu Jun 11 17:14:34 2009
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c Thu Jun 11 17:16:35 2009
@@ -1364,7 +1364,6 @@
zval **current_field, **end_field, **start_field;
zend_bool as_unicode = conn->options.numeric_and_datetime_as_unicode;
zend_bool allocated;
- void *obj;
DBG_ENTER("php_mysqlnd_rowp_read_binary_protocol");
I don't like the change and will revert it. In any case, next time you
do a change to mysqlnd please merge it with the other branch. In this
case change was in HEAD and not merged into PHP5_3. This is not the
first time I see this happening. mysqlnd in 5_3 and HEAD _should_ be in
sync - exactly the same code except for the cvs tags. This makes the
life easier.
Andrey
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd_wireprotocol.c
On Thu, Jun 11, 2009 at 7:47 PM, Andrey Hristov wrote: > I don't like the change and will revert it. In any case, next time you do a > change to mysqlnd please merge it with the other branch. In this case change > was in HEAD and not merged into PHP5_3. This is not the first time I see > this happening. mysqlnd in 5_3 and HEAD _should_ be in sync - exactly the > same code except for the cvs tags. This makes the life easier. My last commits have nothing to do with this warning. However, all branches should indeed be synced :) Cheers, -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_palloc.c mysqlnd_wireprotocol.c
On Thu, Jun 11, 2009 at 7:42 PM, Andrey Hristov wrote: > no :) Why not? it is clearly pointless when ZVAL_CACHE is not set. > But you can send the case to your colleagues at the compiler team so > they can analyze why the compiler failed to recognize it :) already sent :) > I like the MS > compiler, it gives more warnings than gcc, Yeah, me too :) I would like to run some more analyzes tools as well, one of these days :) > but in this case was wrong :( I > am curious why it does complain about one line although there are few places > where obj is used and guarded by that allocated variable. Cheers, -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_palloc.c mysqlnd_wireprotocol.c
hi Andrey, On Thu, Jun 11, 2009 at 7:25 PM, Andrey Hristov wrote: > Hi Pierre, > Pierre Joye wrote: >> >> hi, >> >> This change sounds wrong. The obj pointer is being used without being >> initialized: >> >> ext\mysqlnd\mysqlnd_wireprotocol.c(1632) : warning C4700: >> uninitialized local variable 'obj' used >> >> Cheers, > > Check with your eyes, the compiler is wrong. > obj is touched only if allocated is FALSE but it is never FALSE if the zval > cache has been switched off. Please read http://www.thefreedictionary.com/seems Now that the meaning of this word has been cleared :), can you add a ifdef around that code then? thanks for the quick reply, Cheers, -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_palloc.c mysqlnd_wireprotocol.c
Hi Lukas, On Mon, Jun 8, 2009 at 7:31 PM, Lukas Kahwe Smith wrote: On 08.06.2009, at 12:20, Andrey Hristov wrote: andrey Mon Jun 8 10:20:27 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqlnd mysqlnd_palloc.c mysqlnd_wireprotocol.c Log: Merge with HEAD. Someone committed changes to HEAD and did not merge back to the branch. Also switch off the zval cache, for now. puh .. you are aware that we want to do a commit freeze tonight? and release RC3, which should hopefully become the stable release for 5.3? since 2-3 weeks there is a constant stream of patches that seem to do pretty fundamental changes and design choices. regards, Lukas Kahwe Smith m...@pooteeweet.org The zval cache is a feature which has been switched off. Why do you think I switch off a feature? Because there was a bug report which was few months old affecting all 5_3 versions including RC1 and RC2. The problem was manifesting itself on Windows only under load. I switched the feature and the problem is gone, according to the user. Andrey -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_palloc.c mysqlnd_wireprotocol.c
Hi Pierre, Pierre Joye wrote: hi, This change sounds wrong. The obj pointer is being used without being initialized: ext\mysqlnd\mysqlnd_wireprotocol.c(1632) : warning C4700: uninitialized local variable 'obj' used Cheers, Check with your eyes, the compiler is wrong. obj is touched only if allocated is FALSE but it is never FALSE if the zval cache has been switched off. Andrey On Mon, Jun 8, 2009 at 7:31 PM, Lukas Kahwe Smith wrote: On 08.06.2009, at 12:20, Andrey Hristov wrote: andrey Mon Jun 8 10:20:27 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqlnd mysqlnd_palloc.c mysqlnd_wireprotocol.c Log: Merge with HEAD. Someone committed changes to HEAD and did not merge back to the branch. Also switch off the zval cache, for now. puh .. you are aware that we want to do a commit freeze tonight? and release RC3, which should hopefully become the stable release for 5.3? since 2-3 weeks there is a constant stream of patches that seem to do pretty fundamental changes and design choices. regards, Lukas Kahwe Smith m...@pooteeweet.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- Andrey Hristov, Connectors Software Developer, Database Group Sun Microsystems GmbH, Sonnenallee 1, 85551 Kirchheim-Heimstetten Amtsgericht Muenchen: HRB161028 Geschaeftsfuehrer: Thomas Schroeder, Wolfgang Engels, Wolf Frenkel Vorsitzender des Aufsichtsrates: Martin Haering -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_palloc.c mysqlnd_wireprotocol.c
hi, This change sounds wrong. The obj pointer is being used without being initialized: ext\mysqlnd\mysqlnd_wireprotocol.c(1632) : warning C4700: uninitialized local variable 'obj' used Cheers, On Mon, Jun 8, 2009 at 7:31 PM, Lukas Kahwe Smith wrote: > > On 08.06.2009, at 12:20, Andrey Hristov wrote: > >> andrey Mon Jun 8 10:20:27 2009 UTC >> >> Modified files: (Branch: PHP_5_3) >> /php-src/ext/mysqlnd mysqlnd_palloc.c mysqlnd_wireprotocol.c >> Log: >> Merge with HEAD. Someone committed changes to HEAD and did not merge back >> to >> the branch. >> Also switch off the zval cache, for now. > > > puh .. you are aware that we want to do a commit freeze tonight? and release > RC3, which should hopefully become the stable release for 5.3? > since 2-3 weeks there is a constant stream of patches that seem to do pretty > fundamental changes and design choices. > > regards, > Lukas Kahwe Smith > m...@pooteeweet.org > > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > > -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd_wireprotocol.c
pajoye Thu Jun 11 17:16:35 2009 UTC
Modified files:
/php-src/ext/mysqlndmysqlnd_wireprotocol.c
Log:
- nuke unused var
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.29&r2=1.30&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.29
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.30
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.29 Thu Jun 11 17:14:34 2009
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c Thu Jun 11 17:16:35 2009
@@ -1364,7 +1364,6 @@
zval **current_field, **end_field, **start_field;
zend_bool as_unicode = conn->options.numeric_and_datetime_as_unicode;
zend_bool allocated;
- void *obj;
DBG_ENTER("php_mysqlnd_rowp_read_binary_protocol");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd_wireprotocol.c
pajoye Thu Jun 11 17:14:34 2009 UTC
Modified files:
/php-src/ext/mysqlndmysqlnd_wireprotocol.c
Log:
- MF53: silent warning and make it less ambiguous
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.28&r2=1.29&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.28
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.29
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.28 Thu Jun 11 08:32:34 2009
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c Thu Jun 11 17:14:34 2009
@@ -612,7 +612,7 @@
/* pad2 */
p+= 13;
- if (p - buf < packet->header.size) {
+ if ((size_t)(p - buf) < packet->header.size) {
/* scramble_buf is split into two parts */
memcpy(packet->scramble_buf + SCRAMBLE_LENGTH_323,
p, SCRAMBLE_LENGTH - SCRAMBLE_LENGTH_323);
@@ -626,7 +626,7 @@
DBG_INF_FMT("server_capabilities=%d charset_no=%d server_status=%d",
packet->server_capabilities,
packet->charset_no, packet->server_status);
- if (p - begin > packet->header.size) {
+ if ((size_t)(p - begin) > packet->header.size) {
DBG_ERR_FMT("GREET packet %d bytes shorter than expected", p -
begin - packet->header.size);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "GREET packet
"MYSQLND_SZ_T_SPEC" bytes shorter than expected",
p - begin -
packet->header.size);
@@ -811,7 +811,7 @@
p+= 2;
/* There is a message */
- if (packet->header.size > p - buf && (i =
php_mysqlnd_net_field_length(&p))) {
+ if (packet->header.size > (size_t)(p - buf) && (i =
php_mysqlnd_net_field_length(&p))) {
packet->message = pestrndup((char *)p, MIN(i, sizeof(buf) - (p
- buf)), conn->persistent);
packet->message_len = i;
} else {
@@ -822,7 +822,7 @@
packet->affected_rows, packet->last_insert_id,
packet->server_status,
packet->warning_count);
- if (p - begin > packet->header.size) {
+ if ((size_t)(p - begin) > packet->header.size) {
DBG_ERR_FMT("OK packet %d bytes shorter than expected", p -
begin - packet->header.size);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "OK packet
"MYSQLND_SZ_T_SPEC" bytes shorter than expected",
p - begin -
packet->header.size);
@@ -895,7 +895,7 @@
packet->server_status = 0;
}
- if (p - begin > packet->header.size) {
+ if ((size_t)(p - begin) > packet->header.size) {
DBG_ERR_FMT("EOF packet %d bytes shorter than expected", p -
begin - packet->header.size);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "EOF packet
"MYSQLND_SZ_T_SPEC" bytes shorter than expected",
p - begin -
packet->header.size);
@@ -1045,7 +1045,7 @@
packet->warning_count = uint2korr(p);
p+=2;
/* Check for additional textual data */
- if (packet->header.size > (p - buf) && (len =
php_mysqlnd_net_field_length(&p))) {
+ if (packet->header.size > (size_t)(p - buf) && (len =
php_mysqlnd_net_field_length(&p))) {
packet->info_or_local_file = mnd_pemalloc(len +
1, conn->persistent);
memcpy(packet->info_or_local_file, p, len);
packet->info_or_local_file[len] = '\0';
@@ -1060,7 +1060,7 @@
/* Result set */
break;
}
- if (p - begin > packet->header.size) {
+ if ((size_t)(p - begin) > packet->header.size) {
DBG_ERR_FMT("RSET_HEADER packet %d bytes shorter than
expected", p - begin - packet->header.size);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "GREET packet
"MYSQLND_SZ_T_SPEC" bytes shorter than expected",
p - begin -
packet->header.size);
@@ -1188,7 +1188,7 @@
NULL_LENGTH (0xFB) comes from COM_FIELD_LIST when the default value
is NULL.
Otherwise the string is length encoded.
*/
- if (packet->header.size > (p - buf) &&
+ if (packet->header.size > (size_t)(p - buf) &&
(len = php_mysqlnd_net_field_length(&p)) &&
len != MYSQLND_NULL_LENGTH)
{
@@ -1200,7 +1200,7 @@
p += len;
}
- if (p - begin > packet->header.size) {
+ if ((size_t)(p - begin) > packet->header.size) {
DBG_ERR_FMT("RSET field packet %d bytes shorter than expected",
p - begin - packet->header.size);
php_error_docref(NULL
Re: [PHP-CVS] cvs: php-src /ext/posix/tests posix_getcwd_basic.phpt posix_getgrgid_basic.phpt posix_getgrnam_basic.phpt posix_getgroups_basic.phpt posix_getpgid_basic.phpt posix_getpgrp_basic.phpt p
Hi Hannes Sure. I have had a quick look at the tests and a number are failing on php6. I will look at fixing up the tests and dropping to cvs when I get a few spare moments. Regards Andy Andy Wharmby IBM United Kingdom Limited Winchester, England SO21 2JN Tel: 01962 818692 (External) or 248692 (Internal) E-mail: andy_whar...@uk.ibm.com Hannes Magnusson 11/06/2009 14:46 To andy wharmby cc php-cvs Subject Re: [PHP-CVS] cvs: php-src /ext/posix/tests posix_getcwd_basic.phpt posix_getgrgid_basic.phpt posix_getgrnam_basic.phpt posix_getgroups_basic.phpt posix_getpgid_basic.phpt posix_getpgrp_basic.phpt posix_getpid_basic.phpt posix_getppid_basic.phpt posi 2009/6/11 andy wharmby : > wharmby Thu Jun 11 12:30:59 2009 UTC > > Modified files: >/php-src/ext/posix/testsposix_getppid_basic.phpt >posix_getpwuid_basic.phpt >posix_mknod_basic.phpt >posix_getgrgid_basic.phpt >posix_getpgid_basic.phpt >posix_getpwnam_basic.phpt >posix_times_basic.phpt >posix_getrlimit_basic.phpt >posix_initgroups_basic.phpt >posix_getcwd_basic.phpt >posix_uname_basic.phpt >posix_kill_basic.phpt >posix_strerror_error_basic.phpt >posix_getgrnam_basic.phpt >posix_getgroups_basic.phpt >posix_getpgrp_basic.phpt >posix_getpid_basic.phpt >posix_getsid_basic.phpt > Log: > New POISX tests. Tested on Windows (all test SKIP), Linux and Linux 64 I think there are some posix tests in the testfest repo, could you look at those? -Hannes Unless stated otherwise above: IBM United Kingdom Limited - Registered in England and Wales with number 741598. Registered office: PO Box 41, North Harbour, Portsmouth, Hampshire PO6 3AU
[PHP-CVS] cvs: php-src /win32/build Makefile mkdist.php
cellog Thu Jun 11 14:43:03 2009 UTC
Modified files:
/php-src/win32/buildMakefile mkdist.php
Log:
MFB: add phar.phar generation to windows
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.54&r2=1.55&diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.54 php-src/win32/build/Makefile:1.55
--- php-src/win32/build/Makefile:1.54 Wed May 27 01:46:27 2009
+++ php-src/win32/build/MakefileThu Jun 11 14:43:03 2009
@@ -14,7 +14,7 @@
# | Author: Wez Furlong|
# +--+
#
-# $Id: Makefile,v 1.54 2009/05/27 01:46:27 kalle Exp $
+# $Id: Makefile,v 1.55 2009/06/11 14:43:03 cellog Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
@@ -128,7 +128,7 @@
-del /f /q
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
-del /f /q
$(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
-del /f /q
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
- $(BUILD_DIR)\php.exe -d date.timezone=UTC -n win32/build/mkdist.php
"$(BUILD_DIR)" "$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS)
$(PHP_EXTRA_DIST_FILES)" "$(PECL_TARGETS) $(PECL_EXTRA_DIST_FILES)"
"$(SNAPSHOT_TEMPLATE)"
+ $(BUILD_DIR)\php.exe -d date.timezone=UTC -n -dphar.readonly=0
win32/build/mkdist.php "$(BUILD_DIR)" "$(PHPDLL)" "$(SAPI_TARGETS)"
"$(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES)" "$(PECL_TARGETS)
$(PECL_EXTRA_DIST_FILES)" "$(SNAPSHOT_TEMPLATE)"
cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-$(ZIP) -9 -q -r
..\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
.
cd ..\..
http://cvs.php.net/viewvc.cgi/php-src/win32/build/mkdist.php?r1=1.24&r2=1.25&diff_format=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.24 php-src/win32/build/mkdist.php:1.25
--- php-src/win32/build/mkdist.php:1.24 Wed Jun 3 01:13:37 2009
+++ php-src/win32/build/mkdist.php Thu Jun 11 14:43:03 2009
@@ -1,4 +1,4 @@
-isDir() || $file == 'phar.php') continue;
+echo 'adding ', $file, "\n";
+$phar[(string) $file] = file_get_contents($path_to_phar. '/phar/' .
$file);
+ }
+ $phar->setSignatureAlgorithm(Phar::SHA1);
+ $stub = file($path_to_phar . '/phar/phar.php');
+ unset($stub[0]); // remove hashbang
+ $phar->setStub(implode('', $stub));
+
+ echo "Creating phar.phar.bat\n";
+ file_put_contents($path_to_php . '/phar.phar.bat', "%~dp0php.exe
%~dp0pharcommand.phar %1 %2 %3 %4 %5 %6 %7 %8 %9\r\n");
+}
+
if (!is_dir($test_dir)) {
mkdir($test_dir);
}
@@ -491,4 +512,5 @@
echo "WARNING: you don't have a snapshot template, your dist will not
be complete\n";
}
+make_phar_dot_phar($dist_dir);
?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
cellog Thu Jun 11 14:40:43 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: update NEWS about phar.phar on windows http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.622&r2=1.2027.2.547.2.965.2.623&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.622 php-src/NEWS:1.2027.2.547.2.965.2.623 --- php-src/NEWS:1.2027.2.547.2.965.2.622 Wed Jun 10 18:39:15 2009 +++ php-src/NEWSThu Jun 11 14:40:43 2009 @@ -1,7 +1,7 @@ PHPNEWS ||| ?? ??? 2009, PHP 5.3.0 RC 4 - +- Added phar.phar generation for Windows. (Greg) 11 Jun 2009, PHP 5.3.0 RC 3 - Upgraded bundled sqlite to version 3.6.14.2. (Scott, Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/posix/tests posix_getcwd_basic.phpt posix_getgrgid_basic.phpt posix_getgrnam_basic.phpt posix_getgroups_basic.phpt posix_getpgid_basic.phpt posix_getpgrp_basic.phpt p
2009/6/11 andy wharmby : > wharmby Thu Jun 11 12:30:59 2009 UTC > > Modified files: > /php-src/ext/posix/tests posix_getppid_basic.phpt > posix_getpwuid_basic.phpt > posix_mknod_basic.phpt > posix_getgrgid_basic.phpt > posix_getpgid_basic.phpt > posix_getpwnam_basic.phpt > posix_times_basic.phpt > posix_getrlimit_basic.phpt > posix_initgroups_basic.phpt > posix_getcwd_basic.phpt > posix_uname_basic.phpt > posix_kill_basic.phpt > posix_strerror_error_basic.phpt > posix_getgrnam_basic.phpt > posix_getgroups_basic.phpt > posix_getpgrp_basic.phpt > posix_getpid_basic.phpt > posix_getsid_basic.phpt > Log: > New POISX tests. Tested on Windows (all test SKIP), Linux and Linux 64 I think there are some posix tests in the testfest repo, could you look at those? -Hannes
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/posix/tests posix_getcwd_basic.phpt posix_getgrgid_basic.phpt posix_getgrnam_basic.phpt posix_getgroups_basic.phpt posix_getpgid_basic.phpt posix_getpgrp_basic.php
wharmby Thu Jun 11 12:31:01 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/posix/testsposix_strerror_error_basic.phpt posix_getppid_basic.phpt posix_getcwd_basic.phpt posix_getpgrp_basic.phpt posix_mknod_basic.phpt posix_times_basic.phpt posix_getgrgid_basic.phpt posix_getgrnam_basic.phpt posix_getsid_basic.phpt posix_uname_basic.phpt posix_getpid_basic.phpt posix_getrlimit_basic.phpt posix_getpwnam_basic.phpt posix_kill_basic.phpt posix_getpgid_basic.phpt posix_getpwuid_basic.phpt posix_getgroups_basic.phpt posix_initgroups_basic.phpt Log: New POISX tests. Tested on Windows (all test SKIP), Linux and Linux 64 http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_strerror_error_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_strerror_error_basic.phpt +++ php-src/ext/posix/tests/posix_strerror_error_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getppid_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getppid_basic.phpt +++ php-src/ext/posix/tests/posix_getppid_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getcwd_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getcwd_basic.phpt +++ php-src/ext/posix/tests/posix_getcwd_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getpgrp_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getpgrp_basic.phpt +++ php-src/ext/posix/tests/posix_getpgrp_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_mknod_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_mknod_basic.phpt +++ php-src/ext/posix/tests/posix_mknod_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_times_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_times_basic.phpt +++ php-src/ext/posix/tests/posix_times_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getgrgid_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getgrgid_basic.phpt +++ php-src/ext/posix/tests/posix_getgrgid_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getgrnam_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getgrnam_basic.phpt +++ php-src/ext/posix/tests/posix_getgrnam_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getsid_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getsid_basic.phpt +++ php-src/ext/posix/tests/posix_getsid_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_uname_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_uname_basic.phpt +++ php-src/ext/posix/tests/posix_uname_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getpid_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getpid_basic.phpt +++ php-src/ext/posix/tests/posix_getpid_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getrlimit_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getrlimit_basic.phpt +++ php-src/ext/posix/tests/posix_getrlimit_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getpwnam_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getpwnam_basic.phpt +++ php-src/ext/posix/tests/posix_getpwnam_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_kill_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_kill_basic.phpt +++ php-src/ext/posix/tests/posix_kill_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getpgid_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getpgid_basic.phpt +++ php-src/ext/posix/tests/posix_getpgid_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getpwuid_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getpwuid_basic.phpt +++ php-src/ext/posix/tests/posix_getpwuid_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getgroups_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getgroups_basic.phpt +++ php-src/ext/posix/tests/posix_getgroups_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_initgroups_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_initgroups_basic.phpt +++ php-src/ext/posix/tests/posix_initgroups_ba
[PHP-CVS] cvs: php-src /ext/posix/tests posix_getcwd_basic.phpt posix_getgrgid_basic.phpt posix_getgrnam_basic.phpt posix_getgroups_basic.phpt posix_getpgid_basic.phpt posix_getpgrp_basic.phpt posix_g
wharmby Thu Jun 11 12:30:59 2009 UTC Modified files: /php-src/ext/posix/testsposix_getppid_basic.phpt posix_getpwuid_basic.phpt posix_mknod_basic.phpt posix_getgrgid_basic.phpt posix_getpgid_basic.phpt posix_getpwnam_basic.phpt posix_times_basic.phpt posix_getrlimit_basic.phpt posix_initgroups_basic.phpt posix_getcwd_basic.phpt posix_uname_basic.phpt posix_kill_basic.phpt posix_strerror_error_basic.phpt posix_getgrnam_basic.phpt posix_getgroups_basic.phpt posix_getpgrp_basic.phpt posix_getpid_basic.phpt posix_getsid_basic.phpt Log: New POISX tests. Tested on Windows (all test SKIP), Linux and Linux 64 http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getppid_basic.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/posix/tests/posix_getppid_basic.phpt diff -u /dev/null php-src/ext/posix/tests/posix_getppid_basic.phpt:1.2 --- /dev/null Thu Jun 11 12:30:59 2009 +++ php-src/ext/posix/tests/posix_getppid_basic.phptThu Jun 11 12:30:59 2009 @@ -0,0 +1,21 @@ +--TEST-- +Test posix_getppid() function : basic functionality +--SKIPIF-- + +--FILE-- + +===DONE +--EXPECTF-- +Basic test of POSIX getppid function +int(%d) +===DONE + \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getpwuid_basic.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/posix/tests/posix_getpwuid_basic.phpt diff -u /dev/null php-src/ext/posix/tests/posix_getpwuid_basic.phpt:1.2 --- /dev/null Thu Jun 11 12:30:59 2009 +++ php-src/ext/posix/tests/posix_getpwuid_basic.phpt Thu Jun 11 12:30:59 2009 @@ -0,0 +1,30 @@ +--TEST-- +Test posix_getpwuid() function : basic functionality +--SKIPIF-- + +--FILE-- + +===DONE +--EXPECTREGEX-- +Basic test of POSIX getpwuid +Array +\( +\[name\] => [^\r\n]+ +\[passwd\] => [^\r\n]+ +\[uid\] => [0-9]+ +\[gid\] => [0-9]+ +\[gecos\] => [^\r\n]* +\[dir\] => [^\r\n]+ +\[shell\] => [^\r\n]+ +\) +===DONE \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_mknod_basic.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/posix/tests/posix_mknod_basic.phpt diff -u /dev/null php-src/ext/posix/tests/posix_mknod_basic.phpt:1.2 --- /dev/null Thu Jun 11 12:30:59 2009 +++ php-src/ext/posix/tests/posix_mknod_basic.phpt Thu Jun 11 12:30:59 2009 @@ -0,0 +1,18 @@ +--TEST-- +posix_mknod(): Basic tests +--SKIPIF-- + +--FILE-- + +===DONE +--EXPECT-- +Basic test of POSIX posix_mknod function +bool(false) +===DONE \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getgrgid_basic.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/posix/tests/posix_getgrgid_basic.phpt diff -u /dev/null php-src/ext/posix/tests/posix_getgrgid_basic.phpt:1.2 --- /dev/null Thu Jun 11 12:30:59 2009 +++ php-src/ext/posix/tests/posix_getgrgid_basic.phpt Thu Jun 11 12:30:59 2009 @@ -0,0 +1,30 @@ +--TEST-- +Test posix_getgrgid() function : basic functionality +--SKIPIF-- + +--FILE-- + +===DONE=== +--EXPECTF-- +Basic test of POSIX getgid and getgrid fucntions +Array +( +[name] => %s +[passwd] => %s +[members] => Array +%a + +[gid] => %d +) +===DONE=== + \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getpgid_basic.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/posix/tests/posix_getpgid_basic.phpt diff -u /dev/null php-src/ext/posix/tests/posix_getpgid_basic.phpt:1.2 --- /dev/null Thu Jun 11 12:30:59 2009 +++ php-src/ext/posix/tests/posix_getpgid_basic.phptThu Jun 11 12:30:59 2009 @@ -0,0 +1,23 @@ +--TEST-- +Test posix_getpgid() function : basic functionality +--SKIPIF-- + +--FILE-- + +===DONE +--EXPECTF-- +Basic test of posix_getpgid function +int(%d) +===DONE + + \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getpwnam_basic.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/posix/tests/posix_getpwnam_basic.phpt diff -u /dev/null php-src/ext/posix/tests/posix_getpwnam_basic.phpt:1.2 --- /dev/null Thu Jun 11 12:30:59 2009 +++ php-src/ext/posix/tests/posix_getpwnam_basic.phpt Thu Jun 11 12:30:59 2009 @@ -0,0 +1,23 @@ +--TEST-- +posix_getpwnam(): Basic tests +--SKIPIF-- + +--FILE-- + +===DONE +--EXPECT-- +Basic test of POSIX posix_getpwnam function +bool(false) +bool(false) +bool(false) +===DONE http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_ti
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/posix/tests posix_getcwd_basic.phpt posix_getgrgid_basic.phpt posix_getgrnam_basic.phpt posix_getgroups_basic.phpt posix_getpgid_basic.phpt posix_getpgrp_basic.php
wharmby Thu Jun 11 12:30:57 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/posix/testsposix_getcwd_basic.phpt posix_getpwuid_basic.phpt posix_getpid_basic.phpt posix_getpgrp_basic.phpt posix_getrlimit_basic.phpt posix_times_basic.phpt posix_uname_basic.phpt posix_getppid_basic.phpt posix_kill_basic.phpt posix_getpgid_basic.phpt posix_getpwnam_basic.phpt posix_getgrgid_basic.phpt posix_mknod_basic.phpt posix_strerror_error_basic.phpt posix_initgroups_basic.phpt posix_getgrnam_basic.phpt posix_getgroups_basic.phpt posix_getsid_basic.phpt Log: New POISX tests. Tested on Windows (all test SKIP), Linux and Linux 64 http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getcwd_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getcwd_basic.phpt +++ php-src/ext/posix/tests/posix_getcwd_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getpwuid_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getpwuid_basic.phpt +++ php-src/ext/posix/tests/posix_getpwuid_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getpid_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getpid_basic.phpt +++ php-src/ext/posix/tests/posix_getpid_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getpgrp_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getpgrp_basic.phpt +++ php-src/ext/posix/tests/posix_getpgrp_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getrlimit_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getrlimit_basic.phpt +++ php-src/ext/posix/tests/posix_getrlimit_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_times_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_times_basic.phpt +++ php-src/ext/posix/tests/posix_times_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_uname_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_uname_basic.phpt +++ php-src/ext/posix/tests/posix_uname_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getppid_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getppid_basic.phpt +++ php-src/ext/posix/tests/posix_getppid_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_kill_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_kill_basic.phpt +++ php-src/ext/posix/tests/posix_kill_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getpgid_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getpgid_basic.phpt +++ php-src/ext/posix/tests/posix_getpgid_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getpwnam_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getpwnam_basic.phpt +++ php-src/ext/posix/tests/posix_getpwnam_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getgrgid_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getgrgid_basic.phpt +++ php-src/ext/posix/tests/posix_getgrgid_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_mknod_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_mknod_basic.phpt +++ php-src/ext/posix/tests/posix_mknod_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_strerror_error_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_strerror_error_basic.phpt +++ php-src/ext/posix/tests/posix_strerror_error_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_initgroups_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_initgroups_basic.phpt +++ php-src/ext/posix/tests/posix_initgroups_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getgrnam_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getgrnam_basic.phpt +++ php-src/ext/posix/tests/posix_getgrnam_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getgroups_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getgroups_basic.phpt +++ php-src/ext/posix/tests/posix_getgroups_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_getsid_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/posix/tests/posix_getsid_basic.phpt +++ php-src/ext/posix/tests/posix_getsid_ba
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS configure.in /main php_version.h
iliaa Thu Jun 11 12:13:55 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS configure.in /php-src/main php_version.h Log: Back to dev http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1553&r2=1.2027.2.547.2.1554&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1553 php-src/NEWS:1.2027.2.547.2.1554 --- php-src/NEWS:1.2027.2.547.2.1553Thu Jun 11 12:12:43 2009 +++ php-src/NEWSThu Jun 11 12:13:54 2009 @@ -1,5 +1,7 @@ PHPNEWS ||| +?? Jun 2009, PHP 5.2.10 + 11 Jun 2009, PHP 5.2.10RC2 - Updated timezone database to version 2009.9 (2009i) (Derick) - Added "ignore_errors" option to http fopen wrapper. (David Zulke, Sara) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.137&r2=1.579.2.52.2.138&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.137 php-src/configure.in:1.579.2.52.2.138 --- php-src/configure.in:1.579.2.52.2.137 Thu Jun 11 12:10:43 2009 +++ php-src/configure.inThu Jun 11 12:13:54 2009 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.137 2009/06/11 12:10:43 iliaa Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.138 2009/06/11 12:13:54 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 PHP_RELEASE_VERSION=10 -PHP_EXTRA_VERSION="RC2" +PHP_EXTRA_VERSION="RC3-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` http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.95&r2=1.112.2.37.2.96&diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.37.2.95 php-src/main/php_version.h:1.112.2.37.2.96 --- php-src/main/php_version.h:1.112.2.37.2.95 Thu Jun 11 12:10:43 2009 +++ php-src/main/php_version.h Thu Jun 11 12:13:55 2009 @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 10 -#define PHP_EXTRA_VERSION "RC2" -#define PHP_VERSION "5.2.10RC2" +#define PHP_EXTRA_VERSION "RC3-dev" +#define PHP_VERSION "5.2.10RC3-dev" #define PHP_VERSION_ID 50210 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
iliaa Thu Jun 11 12:12:43 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: RC2 not final http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1552&r2=1.2027.2.547.2.1553&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1552 php-src/NEWS:1.2027.2.547.2.1553 --- php-src/NEWS:1.2027.2.547.2.1552Thu Jun 11 12:10:43 2009 +++ php-src/NEWSThu Jun 11 12:12:43 2009 @@ -1,6 +1,6 @@ PHPNEWS ||| -11 Jun 2009, PHP 5.2.10 +11 Jun 2009, PHP 5.2.10RC2 - Updated timezone database to version 2009.9 (2009i) (Derick) - Added "ignore_errors" option to http fopen wrapper. (David Zulke, Sara) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS configure.in /main php_version.h
iliaa Thu Jun 11 12:10:43 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS configure.in /php-src/main php_version.h Log: 5.2.10RC2 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1551&r2=1.2027.2.547.2.1552&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1551 php-src/NEWS:1.2027.2.547.2.1552 --- php-src/NEWS:1.2027.2.547.2.1551Thu Jun 11 09:49:57 2009 +++ php-src/NEWSThu Jun 11 12:10:43 2009 @@ -1,6 +1,6 @@ -PHP NEWS +PHPNEWS ||| -?? Jun 2009, PHP 5.2.10 +11 Jun 2009, PHP 5.2.10 - Updated timezone database to version 2009.9 (2009i) (Derick) - Added "ignore_errors" option to http fopen wrapper. (David Zulke, Sara) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.136&r2=1.579.2.52.2.137&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.136 php-src/configure.in:1.579.2.52.2.137 --- php-src/configure.in:1.579.2.52.2.136 Wed May 27 13:51:16 2009 +++ php-src/configure.inThu Jun 11 12:10:43 2009 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.136 2009/05/27 13:51:16 iliaa Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.137 2009/06/11 12:10:43 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 PHP_RELEASE_VERSION=10 -PHP_EXTRA_VERSION="RC2-dev" +PHP_EXTRA_VERSION="RC2" 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` http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.94&r2=1.112.2.37.2.95&diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.37.2.94 php-src/main/php_version.h:1.112.2.37.2.95 --- php-src/main/php_version.h:1.112.2.37.2.94 Wed May 27 13:51:16 2009 +++ php-src/main/php_version.h Thu Jun 11 12:10:43 2009 @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 10 -#define PHP_EXTRA_VERSION "RC2-dev" -#define PHP_VERSION "5.2.10RC2-dev" +#define PHP_EXTRA_VERSION "RC2" +#define PHP_VERSION "5.2.10RC2" #define PHP_VERSION_ID 50210 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd.h
johannesThu Jun 11 10:18:08 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqlndmysqlnd.h Log: MFH: Use a better extension version http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.h?r1=1.3.2.24&r2=1.3.2.25&diff_format=u Index: php-src/ext/mysqlnd/mysqlnd.h diff -u php-src/ext/mysqlnd/mysqlnd.h:1.3.2.24 php-src/ext/mysqlnd/mysqlnd.h:1.3.2.25 --- php-src/ext/mysqlnd/mysqlnd.h:1.3.2.24 Thu Jun 11 08:30:08 2009 +++ php-src/ext/mysqlnd/mysqlnd.h Thu Jun 11 10:18:08 2009 @@ -18,13 +18,13 @@ +--+ */ -/* $Id: mysqlnd.h,v 1.3.2.24 2009/06/11 08:30:08 andrey Exp $ */ +/* $Id: mysqlnd.h,v 1.3.2.25 2009/06/11 10:18:08 johannes Exp $ */ #ifndef MYSQLND_H #define MYSQLND_H -#define MYSQLND_VERSION "mysqlnd 5.0.5-dev - 081106 - $Revision: 1.3.2.24 $" -#define MYSQLND_VERSION_ID 50005 +#define MYSQLND_VERSION PHP_VERSION " $Revision: 1.3.2.25 $" +#define MYSQLND_VERSION_ID PHP_VERSION_ID /* This forces inlining of some accessor functions */ #define MYSQLND_USE_OPTIMISATIONS 1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd.h
johannesThu Jun 11 10:08:09 2009 UTC Modified files: /php-src/ext/mysqlndmysqlnd.h Log: Use a better extension version http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.h?r1=1.27&r2=1.28&diff_format=u Index: php-src/ext/mysqlnd/mysqlnd.h diff -u php-src/ext/mysqlnd/mysqlnd.h:1.27 php-src/ext/mysqlnd/mysqlnd.h:1.28 --- php-src/ext/mysqlnd/mysqlnd.h:1.27 Thu Jun 11 08:31:09 2009 +++ php-src/ext/mysqlnd/mysqlnd.h Thu Jun 11 10:08:09 2009 @@ -18,13 +18,13 @@ +--+ */ -/* $Id: mysqlnd.h,v 1.27 2009/06/11 08:31:09 andrey Exp $ */ +/* $Id: mysqlnd.h,v 1.28 2009/06/11 10:08:09 johannes Exp $ */ #ifndef MYSQLND_H #define MYSQLND_H -#define MYSQLND_VERSION "mysqlnd 5.0.5-dev - 081106 - $Revision: 1.27 $" -#define MYSQLND_VERSION_ID 50005 +#define MYSQLND_VERSION PHP_VERSION " $Revision: 1.28 $" +#define MYSQLND_VERSION_ID PHP_VERSION_ID /* This forces inlining of some accessor functions */ #define MYSQLND_USE_OPTIMISATIONS 1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/curl interface.c
tony2001Thu Jun 11 09:49:57 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/curl interface.c
Log:
MFH: fix bug #48518 (curl crashes when writing into invalid file handle)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1550&r2=1.2027.2.547.2.1551&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1550 php-src/NEWS:1.2027.2.547.2.1551
--- php-src/NEWS:1.2027.2.547.2.1550Tue Jun 9 14:04:28 2009
+++ php-src/NEWSThu Jun 11 09:49:57 2009
@@ -4,6 +4,7 @@
- Updated timezone database to version 2009.9 (2009i) (Derick)
- Added "ignore_errors" option to http fopen wrapper. (David Zulke, Sara)
+- Fixed bug #48518 (curl crashes when writing into invalid file handle). (Tony)
- Fixed bug #48469 (ldap_get_entries() leaks memory on empty search results).
(Patrick)
- Fixed bug #48456 (CPPFLAGS not restored properly in phpize.m4).
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.54&r2=1.62.2.14.2.55&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.54
php-src/ext/curl/interface.c:1.62.2.14.2.55
--- php-src/ext/curl/interface.c:1.62.2.14.2.54 Wed Jun 10 11:10:19 2009
+++ php-src/ext/curl/interface.cThu Jun 11 09:49:57 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.62.2.14.2.54 2009/06/10 11:10:19 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.55 2009/06/11 09:49:57 tony2001 Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1437,6 +1437,7 @@
switch (option) {
case CURLOPT_FILE:
if (((php_stream *) what)->mode[0] !=
'r') {
+
zend_list_addref(Z_LVAL_PP(zvalue));
ch->handlers->write->fp = fp;
ch->handlers->write->method =
PHP_CURL_FILE;
} else {
@@ -1447,6 +1448,7 @@
break;
case CURLOPT_WRITEHEADER:
if (((php_stream *) what)->mode[0] !=
'r') {
+
zend_list_addref(Z_LVAL_PP(zvalue));
ch->handlers->write_header->fp
= fp;
ch->handlers->write_header->method = PHP_CURL_FILE;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/curl interface.c
tony2001Thu Jun 11 09:46:43 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/curl interface.c
Log:
MFH: fix bug #48518 (curl crashes when writing into invalid file handle)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.54&r2=1.62.2.14.2.27.2.55&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.54
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.55
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.54Thu Jun 11 09:43:59 2009
+++ php-src/ext/curl/interface.cThu Jun 11 09:46:43 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.62.2.14.2.27.2.54 2009/06/11 09:43:59 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.55 2009/06/11 09:46:43 tony2001 Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1650,6 +1650,7 @@
switch (option) {
case CURLOPT_FILE:
if (((php_stream *) what)->mode[0] !=
'r') {
+
zend_list_addref(Z_LVAL_PP(zvalue));
ch->handlers->write->fp = fp;
ch->handlers->write->method =
PHP_CURL_FILE;
} else {
@@ -1660,6 +1661,7 @@
break;
case CURLOPT_WRITEHEADER:
if (((php_stream *) what)->mode[0] !=
'r') {
+
zend_list_addref(Z_LVAL_PP(zvalue));
ch->handlers->write_header->fp
= fp;
ch->handlers->write_header->method = PHP_CURL_FILE;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl interface.c
tony2001Thu Jun 11 09:46:28 2009 UTC
Modified files:
/php-src/ext/curl interface.c
Log:
fix bug #48518 (curl crashes when writing into invalid file handle)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.170&r2=1.171&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.170 php-src/ext/curl/interface.c:1.171
--- php-src/ext/curl/interface.c:1.170 Wed Jun 10 11:09:48 2009
+++ php-src/ext/curl/interface.cThu Jun 11 09:46:27 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.170 2009/06/10 11:09:48 tony2001 Exp $ */
+/* $Id: interface.c,v 1.171 2009/06/11 09:46:27 tony2001 Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1666,6 +1666,7 @@
switch (option) {
case CURLOPT_FILE:
if (((php_stream *) what)->mode[0] !=
'r') {
+
zend_list_addref(Z_LVAL_PP(zvalue));
ch->handlers->write->fp = fp;
ch->handlers->write->method =
PHP_CURL_FILE;
} else {
@@ -1676,6 +1677,7 @@
break;
case CURLOPT_WRITEHEADER:
if (((php_stream *) what)->mode[0] !=
'r') {
+
zend_list_addref(Z_LVAL_PP(zvalue));
ch->handlers->write_header->fp
= fp;
ch->handlers->write_header->method = PHP_CURL_FILE;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/curl interface.c
tony2001Thu Jun 11 09:44:00 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/curl interface.c Log: reapply the fix http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.53&r2=1.62.2.14.2.27.2.54&diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.53 php-src/ext/curl/interface.c:1.62.2.14.2.27.2.54 --- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.53Wed Jun 10 11:53:58 2009 +++ php-src/ext/curl/interface.cThu Jun 11 09:43:59 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: interface.c,v 1.62.2.14.2.27.2.53 2009/06/10 11:53:58 tony2001 Exp $ */ +/* $Id: interface.c,v 1.62.2.14.2.27.2.54 2009/06/11 09:43:59 tony2001 Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -278,7 +278,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_curl_multi_info_read, 0, 0, 1) ZEND_ARG_INFO(0, mh) - ZEND_ARG_INFO(0, msgs_in_queue) + ZEND_ARG_INFO(1, msgs_in_queue) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_curl_multi_close, 0) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml simplexml.c
bjori Thu Jun 11 09:41:15 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/simplexml simplexml.c
Log:
MFH: Mark spl as required and fix extension loading order
# Not needed in 5.2 as the simplexmliterator is part of spl there
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35.2.31&r2=1.151.2.22.2.35.2.32&diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.31
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.32
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.31 Tue Feb 3
21:42:35 2009
+++ php-src/ext/simplexml/simplexml.c Thu Jun 11 09:41:15 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.35.2.31 2009/02/03 21:42:35 davidc Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.35.2.32 2009/06/11 09:41:15 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2470,6 +2470,7 @@
static const zend_module_dep simplexml_deps[] = { /* {{{ */
ZEND_MOD_REQUIRED("libxml")
+ ZEND_MOD_REQUIRED("spl")
{NULL, NULL, NULL}
};
/* }}} */
@@ -2555,7 +2556,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision:
1.151.2.22.2.35.2.31 $");
+ php_info_print_table_row(2, "Revision", "$Revision:
1.151.2.22.2.35.2.32 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_block_alloc.c
andrey Thu Jun 11 08:52:06 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_block_alloc.c
Log:
MFH:
Protect the code when variable is NULL, which should never happen, but
anyway, you know about "never happens" :)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_block_alloc.c?r1=1.1.2.5&r2=1.1.2.6&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_block_alloc.c
diff -u php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.1.2.5
php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.1.2.6
--- php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.1.2.5 Wed Dec 31 11:15:39 2008
+++ php-src/ext/mysqlnd/mysqlnd_block_alloc.c Thu Jun 11 08:52:06 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_block_alloc.c,v 1.1.2.5 2008/12/31 11:15:39 sebastian Exp $ */
+/* $Id: mysqlnd_block_alloc.c,v 1.1.2.6 2009/06/11 08:52:06 andrey Exp $ */
#include "php.h"
#include "mysqlnd.h"
@@ -183,10 +183,12 @@
mysqlnd_mempool_destroy(MYSQLND_MEMORY_POOL * pool TSRMLS_DC)
{
DBG_ENTER("mysqlnd_mempool_destroy");
- /* mnd_free will reference LOCK_access and might crash, depending on
the caller...*/
- mysqlnd_mempool_free_contents(pool TSRMLS_CC);
- mnd_free(pool->arena);
- mnd_free(pool);
+ if (pool) {
+ /* mnd_free will reference LOCK_access and might crash,
depending on the caller...*/
+ mysqlnd_mempool_free_contents(pool TSRMLS_CC);
+ mnd_free(pool->arena);
+ mnd_free(pool);
+ }
DBG_VOID_RETURN;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd_block_alloc.c
andrey Thu Jun 11 08:51:20 2009 UTC
Modified files:
/php-src/ext/mysqlndmysqlnd_block_alloc.c
Log:
Protect the code when variable is NULL, which should never happen, but
anyway, you know about "never happens"
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_block_alloc.c?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_block_alloc.c
diff -u php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.8
php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.9
--- php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.8 Wed Dec 31 11:12:33 2008
+++ php-src/ext/mysqlnd/mysqlnd_block_alloc.c Thu Jun 11 08:51:20 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_block_alloc.c,v 1.8 2008/12/31 11:12:33 sebastian Exp $ */
+/* $Id: mysqlnd_block_alloc.c,v 1.9 2009/06/11 08:51:20 andrey Exp $ */
#include "php.h"
#include "mysqlnd.h"
@@ -183,10 +183,12 @@
mysqlnd_mempool_destroy(MYSQLND_MEMORY_POOL * pool TSRMLS_DC)
{
DBG_ENTER("mysqlnd_mempool_destroy");
- /* mnd_free will reference LOCK_access and might crash, depending on
the caller...*/
- mysqlnd_mempool_free_contents(pool TSRMLS_CC);
- mnd_free(pool->arena);
- mnd_free(pool);
+ if (pool) {
+ /* mnd_free will reference LOCK_access and might crash,
depending on the caller...*/
+ mysqlnd_mempool_free_contents(pool TSRMLS_CC);
+ mnd_free(pool->arena);
+ mnd_free(pool);
+ }
DBG_VOID_RETURN;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_wireprotocol.c
andrey Thu Jun 11 08:35:47 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_wireprotocol.c
Log:
MFH:
Check the pointer before calling a function on it, or we will crash.
This is a very rare situation where the server is totally broken.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.4.2.26&r2=1.4.2.27&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.26
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.27
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.26 Thu Jun 11 08:30:08 2009
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c Thu Jun 11 08:35:47 2009
@@ -1343,7 +1343,7 @@
break;
}
}
- if (ret == FAIL) {
+ if (ret == FAIL && (*buffer)) {
(*buffer)->free_chunk((*buffer), TRUE TSRMLS_CC);
*buffer = NULL;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd_wireprotocol.c
andrey Thu Jun 11 08:32:34 2009 UTC
Modified files:
/php-src/ext/mysqlndmysqlnd_wireprotocol.c
Log:
Check the pointer before calling a function on it, or we will crash.
This is a very rare situation where the server is totally broken.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.27&r2=1.28&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.27
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.28
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.27 Mon Jun 8 10:19:29 2009
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c Thu Jun 11 08:32:34 2009
@@ -1344,7 +1344,7 @@
break;
}
}
- if (ret == FAIL) {
+ if (ret == FAIL && (*buffer)) {
(*buffer)->free_chunk((*buffer), TRUE TSRMLS_CC);
*buffer = NULL;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd.h mysqlnd_palloc.c
andrey Thu Jun 11 08:31:10 2009 UTC
Modified files:
/php-src/ext/mysqlndmysqlnd.h mysqlnd_palloc.c
Log:
MFB: Reference decrement in own function. Make a function which is not
called externally static, from PHPAPI.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.h?r1=1.26&r2=1.27&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.h
diff -u php-src/ext/mysqlnd/mysqlnd.h:1.26 php-src/ext/mysqlnd/mysqlnd.h:1.27
--- php-src/ext/mysqlnd/mysqlnd.h:1.26 Thu May 28 11:47:15 2009
+++ php-src/ext/mysqlnd/mysqlnd.h Thu Jun 11 08:31:09 2009
@@ -18,12 +18,12 @@
+--+
*/
-/* $Id: mysqlnd.h,v 1.26 2009/05/28 11:47:15 andrey Exp $ */
+/* $Id: mysqlnd.h,v 1.27 2009/06/11 08:31:09 andrey Exp $ */
#ifndef MYSQLND_H
#define MYSQLND_H
-#define MYSQLND_VERSION "mysqlnd 5.0.5-dev - 081106 - $Revision: 1.26 $"
+#define MYSQLND_VERSION "mysqlnd 5.0.5-dev - 081106 - $Revision: 1.27 $"
#define MYSQLND_VERSION_ID 50005
/* This forces inlining of some accessor functions */
@@ -318,11 +318,9 @@
PHPAPI void
_mysqlnd_palloc_rshutdown(MYSQLND_THD_ZVAL_PCACHE * cache TSRMLS_DC);
-#define mysqlnd_palloc_init_thd_cache(cache)
_mysqlnd_palloc_init_thd_cache((cache) TSRMLS_CC)
#define mysqlnd_palloc_free_thd_cache_reference(cache)
_mysqlnd_palloc_free_thd_cache_reference((cache) TSRMLS_CC)
#define mysqlnd_palloc_get_thd_cache_reference(cache)
_mysqlnd_palloc_get_thd_cache_reference((cache) TSRMLS_CC)
-PHPAPI MYSQLND_THD_ZVAL_PCACHE*
_mysqlnd_palloc_init_thd_cache(MYSQLND_ZVAL_PCACHE * const cache TSRMLS_DC);
MYSQLND_THD_ZVAL_PCACHE*
_mysqlnd_palloc_get_thd_cache_reference(MYSQLND_THD_ZVAL_PCACHE * const cache
TSRMLS_DC);
PHPAPI void
_mysqlnd_palloc_free_thd_cache_reference(MYSQLND_THD_ZVAL_PCACHE **cache
TSRMLS_DC);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_palloc.c?r1=1.18&r2=1.19&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_palloc.c
diff -u php-src/ext/mysqlnd/mysqlnd_palloc.c:1.18
php-src/ext/mysqlnd/mysqlnd_palloc.c:1.19
--- php-src/ext/mysqlnd/mysqlnd_palloc.c:1.18 Thu May 28 16:35:16 2009
+++ php-src/ext/mysqlnd/mysqlnd_palloc.cThu Jun 11 08:31:10 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_palloc.c,v 1.18 2009/05/28 16:35:16 andrey Exp $ */
+/* $Id: mysqlnd_palloc.c,v 1.19 2009/06/11 08:31:10 andrey Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_priv.h"
@@ -82,6 +82,7 @@
/* {{{ mysqlnd_palloc_get_cache_reference */
+static inline
MYSQLND_ZVAL_PCACHE* mysqlnd_palloc_get_cache_reference(MYSQLND_ZVAL_PCACHE *
const cache)
{
if (cache) {
@@ -94,6 +95,20 @@
/* }}} */
+/* {{{ mysqlnd_palloc_release_cache_reference */
+static inline
+MYSQLND_ZVAL_PCACHE*
mysqlnd_palloc_release_cache_reference(MYSQLND_ZVAL_PCACHE * const cache)
+{
+ if (cache) {
+ LOCK_PCACHE(cache);
+ cache->references--;
+ UNLOCK_PCACHE(cache);
+ }
+ return cache;
+}
+/* }}} */
+
+
/* {{{ mysqlnd_palloc_free_cache */
/*
As this call will happen on MSHUTDOWN(), then we don't need to copy the
zvals with
@@ -122,7 +137,7 @@
/* {{{ _mysqlnd_palloc_init_thd_cache */
-PHPAPI MYSQLND_THD_ZVAL_PCACHE*
_mysqlnd_palloc_init_thd_cache(MYSQLND_ZVAL_PCACHE * const cache TSRMLS_DC)
+MYSQLND_THD_ZVAL_PCACHE* mysqlnd_palloc_init_thd_cache(MYSQLND_ZVAL_PCACHE *
const cache TSRMLS_DC)
{
MYSQLND_THD_ZVAL_PCACHE *ret = calloc(1,
sizeof(MYSQLND_THD_ZVAL_PCACHE));
DBG_ENTER("_mysqlnd_palloc_init_thd_cache");
@@ -163,17 +178,18 @@
{
DBG_ENTER("_mysqlnd_palloc_get_thd_cache_reference");
if (cache) {
- ++cache->references;
DBG_INF_FMT("cache=%p new_refc=%d gc_list.canary1=%p
gc_list.canary2=%p",
cache, cache->references,
cache->gc_list.canary1, cache->gc_list.canary2);
mysqlnd_palloc_get_cache_reference(cache->parent);
+ /* No concurrency here, we are in the same thread */
+ ++cache->references;
}
DBG_RETURN(cache);
}
/* }}} */
-/* {{{ mysqlnd_palloc_free_cache */
+/* {{{ mysqlnd_palloc_free_thd_cache */
/*
As this call will happen on MSHUTDOWN(), then we don't need to copy the
zvals with
copy_ctor but scrap what they point to with zval_dtor() and then just free
our
@@ -230,7 +246,7 @@
{
DBG_ENTER("_mysqlnd_palloc_free_thd_cache_reference");
if (*cache) {
- --(*cache)->parent->references;
+ mysqlnd_palloc_release_cache_reference((*cache)->parent);
DBG_INF_FMT("cache=%p references_left=%d canary1=%p canary2=%p",
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd.h mysqlnd_palloc.c mysqlnd_wireprotocol.c php_mysqlnd.c
andrey Thu Jun 11 08:30:08 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd.h mysqlnd_palloc.c
mysqlnd_wireprotocol.c php_mysqlnd.c
Log:
Sync with PHP6 - TSRMLS_FETCH
Extract reference decrement in own function
Remove PHPAPI of a function and make it static as it is not called
externally
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.h?r1=1.3.2.23&r2=1.3.2.24&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.h
diff -u php-src/ext/mysqlnd/mysqlnd.h:1.3.2.23
php-src/ext/mysqlnd/mysqlnd.h:1.3.2.24
--- php-src/ext/mysqlnd/mysqlnd.h:1.3.2.23 Thu May 28 11:47:48 2009
+++ php-src/ext/mysqlnd/mysqlnd.h Thu Jun 11 08:30:08 2009
@@ -18,12 +18,12 @@
+--+
*/
-/* $Id: mysqlnd.h,v 1.3.2.23 2009/05/28 11:47:48 andrey Exp $ */
+/* $Id: mysqlnd.h,v 1.3.2.24 2009/06/11 08:30:08 andrey Exp $ */
#ifndef MYSQLND_H
#define MYSQLND_H
-#define MYSQLND_VERSION "mysqlnd 5.0.5-dev - 081106 - $Revision: 1.3.2.23 $"
+#define MYSQLND_VERSION "mysqlnd 5.0.5-dev - 081106 - $Revision: 1.3.2.24 $"
#define MYSQLND_VERSION_ID 50005
/* This forces inlining of some accessor functions */
@@ -318,11 +318,9 @@
PHPAPI void
_mysqlnd_palloc_rshutdown(MYSQLND_THD_ZVAL_PCACHE * cache TSRMLS_DC);
-#define mysqlnd_palloc_init_thd_cache(cache)
_mysqlnd_palloc_init_thd_cache((cache) TSRMLS_CC)
#define mysqlnd_palloc_free_thd_cache_reference(cache)
_mysqlnd_palloc_free_thd_cache_reference((cache) TSRMLS_CC)
#define mysqlnd_palloc_get_thd_cache_reference(cache)
_mysqlnd_palloc_get_thd_cache_reference((cache) TSRMLS_CC)
-PHPAPI MYSQLND_THD_ZVAL_PCACHE*
_mysqlnd_palloc_init_thd_cache(MYSQLND_ZVAL_PCACHE * const cache TSRMLS_DC);
MYSQLND_THD_ZVAL_PCACHE*
_mysqlnd_palloc_get_thd_cache_reference(MYSQLND_THD_ZVAL_PCACHE * const cache
TSRMLS_DC);
PHPAPI void
_mysqlnd_palloc_free_thd_cache_reference(MYSQLND_THD_ZVAL_PCACHE **cache
TSRMLS_DC);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_palloc.c?r1=1.2.2.17&r2=1.2.2.18&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_palloc.c
diff -u php-src/ext/mysqlnd/mysqlnd_palloc.c:1.2.2.17
php-src/ext/mysqlnd/mysqlnd_palloc.c:1.2.2.18
--- php-src/ext/mysqlnd/mysqlnd_palloc.c:1.2.2.17 Mon Jun 8 10:20:27 2009
+++ php-src/ext/mysqlnd/mysqlnd_palloc.cThu Jun 11 08:30:08 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_palloc.c,v 1.2.2.17 2009/06/08 10:20:27 andrey Exp $ */
+/* $Id: mysqlnd_palloc.c,v 1.2.2.18 2009/06/11 08:30:08 andrey Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_priv.h"
@@ -82,6 +82,7 @@
/* {{{ mysqlnd_palloc_get_cache_reference */
+static inline
MYSQLND_ZVAL_PCACHE* mysqlnd_palloc_get_cache_reference(MYSQLND_ZVAL_PCACHE *
const cache)
{
if (cache) {
@@ -94,6 +95,20 @@
/* }}} */
+/* {{{ mysqlnd_palloc_release_cache_reference */
+static inline
+MYSQLND_ZVAL_PCACHE*
mysqlnd_palloc_release_cache_reference(MYSQLND_ZVAL_PCACHE * const cache)
+{
+ if (cache) {
+ LOCK_PCACHE(cache);
+ cache->references--;
+ UNLOCK_PCACHE(cache);
+ }
+ return cache;
+}
+/* }}} */
+
+
/* {{{ mysqlnd_palloc_free_cache */
/*
As this call will happen on MSHUTDOWN(), then we don't need to copy the
zvals with
@@ -122,7 +137,7 @@
/* {{{ _mysqlnd_palloc_init_thd_cache */
-PHPAPI MYSQLND_THD_ZVAL_PCACHE*
_mysqlnd_palloc_init_thd_cache(MYSQLND_ZVAL_PCACHE * const cache TSRMLS_DC)
+MYSQLND_THD_ZVAL_PCACHE* mysqlnd_palloc_init_thd_cache(MYSQLND_ZVAL_PCACHE *
const cache TSRMLS_DC)
{
MYSQLND_THD_ZVAL_PCACHE *ret = calloc(1,
sizeof(MYSQLND_THD_ZVAL_PCACHE));
DBG_ENTER("_mysqlnd_palloc_init_thd_cache");
@@ -163,17 +178,18 @@
{
DBG_ENTER("_mysqlnd_palloc_get_thd_cache_reference");
if (cache) {
- ++cache->references;
DBG_INF_FMT("cache=%p new_refc=%d gc_list.canary1=%p
gc_list.canary2=%p",
cache, cache->references,
cache->gc_list.canary1, cache->gc_list.canary2);
mysqlnd_palloc_get_cache_reference(cache->parent);
+ /* No concurrency here, we are in the same thread */
+ ++cache->references;
}
DBG_RETURN(cache);
}
/* }}} */
-/* {{{ mysqlnd_palloc_free_cache */
+/* {{{ mysqlnd_palloc_free_thd_cache */
/*
As this call will happen on MSHUTDOWN(), then we don't need to copy the
zvals with
copy_ctor but scrap what they point to with zval_dtor() and then just free
our
@@ -230,7 +246,7 @@
{
DBG_ENTER("_mysqlnd_palloc_free_thd_cache_reference");
if (*cache) {
- --(*cache)->parent->
[PHP-CVS] cvs: CVSROOT / avail
philip Thu Jun 11 08:18:14 2009 UTC Modified files: /CVSROOTavail Log: - PHP Documentation (phpdoc) karma for Peter Cowburn (salathe) http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1535&r2=1.1536&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1535 CVSROOT/avail:1.1536 --- CVSROOT/avail:1.1535Tue Jun 2 17:44:41 2009 +++ CVSROOT/avail Thu Jun 11 08:18:14 2009 @@ -41,7 +41,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|mgdm,lucas,jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,frogger,coldocean,fleaslob,torben,lynch,kk,ted,paul,mbritton,bibi,mrobinso,perugini,tzwenny,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,danbeck,sli,jmcastagnetto,mohrt,samesch,soneca,ronabop,glace,latoserver,rafael,jcmeloni,chrullrich,mk,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zimt,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,hakan,chief977,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,c! k,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,jippie,antonio,ahxiao,akcakayaa,allhibi,aner,black,class007,digo,dima,dorons,eshare,hpop1,itay,juppie,mrmatrix,saad,thomasgm,xbite,tobsn,jome,analytik,outsider,heymarcel,asmodean,bader,elmaystro,sp,truelight,gnuhacker,_batman_,sachat,dallas,dejan,zer0fill,steve3d,lm92,bradmssw,tahani,victor,erica,simonh,phpman,mrphp,notarius,joseph,mmkhajah,mohammed,proton,klootz,takashima,leoca,ahmad,abobader,fboudot,wurm,hakawy,felix,ahmedss,mahrous2020,yorgo,gal_ga,abodive,ama,andras,hassen,jkhdk,okamura,popov,xman,fernandoc,avenger,hwin,tix,alrehawi_,liuming,ramysaweres,astone,shiflett,jaenecke,bdensley,adamchan,! jingfs,murphy,potatotsang,the_q,jsheets,xelis,equerci,phpcatala,tofani ni,umut,kriga,ray,royhuggins,logician,almanar,alexws,gonik,haiaw,lkwang_cn,shadowwulf,telecart,pongsakorn,naveed,shivas,tularis,angela,decorj,hitcho,kevinkee,nmee,thx1140,crotalus,didou,novotnyr,sil,traduim,gui,mgf,ivanr,michal,tsirman,momo,cysoft,firefox,kouber,mipac,muslem,tomysk,vemarkov,garth,lord_lele,stone,laacz,retnug,ernestyang,hatem,house,luisdaniel,nizar,nvivo,seth,tomh,danguer,adam,nio,wassago,beeven,colacino,zvaranka,cesarguru,chubu,dark2907,portoban,reven,wizzard,sywr,koendw83,rylin,webstudio,jsjohnst,dmanusset,et,pitiphan,mbr,cdalar,alrashoudi,hafid,enough,zhouhao007,jnorbi,lorenzohgh,denisr,coder03,jcclaros,thomas,freeman,rioter,jschultz,davey,belleto,jtacon,yuw,elfyn,noam,nathan,salman,cheezy,ene,rezaiqbal,purnomo,dufiga_php,ftp_geo,udhien,prio,luckyguy354,maf,handi,meme,satiri,maddankara,rildo,hd,ali,lpj,adhitama,engkongs,preilly,dave,marcelo,curt,fd,javi,mrmaster,fa,vrana,apaxx,pjotrik,marduk,narcotia1234,enloma,trizo,xmadda,redshift,alifikri,coder,dodol_ma! niac,eflorin,adywarna,kyokpae,milans,lovchy,spermwhale,phaze,baoengb,derek,yannick,daan,xxiengb,ott,mg,kennyt,tomsommer,poz,zamolxe,bishmila,ph1,irchtml,rogamer,bortolini,sapfir,guru,ahmed,robinhood,sohli,amt,romain,hlecuanda,thessoro,nforbes,jolan,laze,bagilevi,young,shakaali,chokobo,portalufpa,teecee,blindman,holst,schst,mnv,sodhi,aidan,jellybob,lauer,shenkong,jad,robert,peterhuewe,ogre,techtonik,narigone,realtebo,krid,mclay,dasch,miwaniec,abdshomad,sammywg,aeoris,mez,jed,hsc,luckec,dmytton,choudesh,phpvcn,simp,michael,grantc,atex,katja,sthulbourn,mikl,kevinsz,roast,tessus,gavinfo,rant,ramsey,arkadius,erinet,omar,oliver,rquadling,timo,shadda,joeaccord,ezyang,ljbuesch,knut,asonge,ron,nicobn,jacques,void,mcbrown,simionea,preinheimer,stanprog,msaraujo,asbjornit,philippe,sezer,rmlr,hradtke,alan,danielc,danbrown,alexxed,psalehpoor,loudi,abedford,morgue,nilgun,saltybeagle,dedemorton,eniac2008,jawed,ch,ericstewart,mager,keito,juxecl|phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da! ,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa,phpdoc-fi,phpdoc-fr,phpdoc-he ,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no,phd,docweb,doc-editor +avail|mgdm,lucas,jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,frogger,coldocean,fleaslob,torben,lync
