[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/run-tests.php branches/PHP_5_3/run-tests.php trunk/run-tests.php
jani Fri, 11 Dec 2009 07:34:06 +
Revision: http://svn.php.net/viewvc?view=revision&revision=291972
Log:
- Fix problem with SKIPIF failing to skip in some cases (deprecated warnings
f.e.)
Changed paths:
U php/php-src/branches/PHP_5_2/run-tests.php
U php/php-src/branches/PHP_5_3/run-tests.php
U php/php-src/trunk/run-tests.php
Modified: php/php-src/branches/PHP_5_2/run-tests.php
===
--- php/php-src/branches/PHP_5_2/run-tests.php 2009-12-11 06:57:12 UTC (rev
291971)
+++ php/php-src/branches/PHP_5_2/run-tests.php 2009-12-11 07:34:06 UTC (rev
291972)
@@ -1426,7 +1426,7 @@
$env['USE_ZEND_ALLOC'] = '1';
}
- $output = system_with_timeout("$extra $php
$pass_options -q $ini_settings $test_skipif", $env);
+ $output = system_with_timeout("$extra $php
$pass_options -q $ini_settings -d display_errors=0 $test_skipif", $env);
if (!$cfg['keep']['skip']) {
@unlink($test_skipif);
Modified: php/php-src/branches/PHP_5_3/run-tests.php
===
--- php/php-src/branches/PHP_5_3/run-tests.php 2009-12-11 06:57:12 UTC (rev
291971)
+++ php/php-src/branches/PHP_5_3/run-tests.php 2009-12-11 07:34:06 UTC (rev
291972)
@@ -1426,7 +1426,7 @@
$env['USE_ZEND_ALLOC'] = '1';
}
- $output = system_with_timeout("$extra $php
$pass_options -q $ini_settings $test_skipif", $env);
+ $output = system_with_timeout("$extra $php
$pass_options -q $ini_settings -d display_errors=0 $test_skipif", $env);
if (!$cfg['keep']['skip']) {
@unlink($test_skipif);
Modified: php/php-src/trunk/run-tests.php
===
--- php/php-src/trunk/run-tests.php 2009-12-11 06:57:12 UTC (rev 291971)
+++ php/php-src/trunk/run-tests.php 2009-12-11 07:34:06 UTC (rev 291972)
@@ -1140,7 +1140,6 @@
global $leak_check, $temp_source, $temp_target, $cfg, $environment;
global $no_clean;
global $valgrind_version;
-
$temp_filenames = null;
$org_file = $file;
@@ -1427,7 +1426,7 @@
$env['USE_ZEND_ALLOC'] = '1';
}
- $output = system_with_timeout("$extra $php
$pass_options -q $ini_settings $test_skipif", $env);
+ $output = system_with_timeout("$extra $php
$pass_options -q $ini_settings -d display_errors=0 $test_skipif", $env);
if (!$cfg['keep']['skip']) {
@unlink($test_skipif);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/http_fopen_wrapper.c trunk/ext/standard/http_fopen_wrapper.c
We are too close to the 5.2 release, I'll merge it after the final
release into the 5.2 branch.
On 09-12-10 2:05 AM, Jani Taskinen wrote:
It happens in PHP_5_2 as well, why not fix that too? :)
--Jani
On 12/10/2009 05:23 AM, Ilia Alshanetsky wrote:
iliaaThu, 10 Dec 2009 03:23:05 +
Revision: http://svn.php.net/viewvc?view=revision&revision=291938
Log:
Fixed bug #49851 (http wrapper breaks on 1024 char long headers).
Bug: http://bugs.php.net/49851 (Open) http wrapper breaks on 1024
char long headers
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
U php/php-src/trunk/ext/standard/http_fopen_wrapper.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS2009-12-10 02:25:47 UTC (rev
291937)
+++ php/php-src/branches/PHP_5_3/NEWS2009-12-10 03:23:05 UTC (rev
291938)
@@ -95,6 +95,7 @@
- Fixed bug #49866 (Making reference on string offsets crashes
PHP). (Dmitry)
- Fixed bug #49855 (import_request_variables() always returns
NULL). (Ilia,
sjoerd at php dot net)
+- Fixed bug #49851 (http wrapper breaks on 1024 char long headers).
(Ilia)
- Fixed bug #49800 (SimpleXML allow (un)serialize() calls without
warning).
(Ilia, wmeler at wp-sa dot pl)
- Fixed bug #49719 (ReflectionClass::hasProperty returns true for a
private
Modified: php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
2009-12-10 02:25:47 UTC (rev 291937)
+++ php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
2009-12-10 03:23:05 UTC (rev 291938)
@@ -610,6 +610,10 @@
size_t http_header_line_length;
if (php_stream_get_line(stream, http_header_line,
HTTP_HEADER_BLOCK_SIZE,&http_header_line_length)&& *http_header_line
!= '\n'&& *http_header_line != '\r') {
char *e = http_header_line + http_header_line_length - 1;
+if (*e != '\n') { /* partial header */
+php_stream_get_line(stream, http_header_line,
HTTP_HEADER_BLOCK_SIZE,&http_header_line_length);
+continue;
+}
while (*e == '\n' || *e == '\r') {
e--;
}
Modified: php/php-src/trunk/ext/standard/http_fopen_wrapper.c
===
--- php/php-src/trunk/ext/standard/http_fopen_wrapper.c2009-12-10
02:25:47 UTC (rev 291937)
+++ php/php-src/trunk/ext/standard/http_fopen_wrapper.c2009-12-10
03:23:05 UTC (rev 291938)
@@ -653,6 +653,10 @@
size_t http_header_line_length;
if (php_stream_get_line(stream, ZSTR(http_header_line),
HTTP_HEADER_BLOCK_SIZE,&http_header_line_length)&& *http_header_line
!= '\n'&& *http_header_line != '\r') {
char *e = http_header_line + http_header_line_length - 1;
+if (*e != '\n') { /* partial header */
+php_stream_get_line(stream, http_header_line,
HTTP_HEADER_BLOCK_SIZE,&http_header_line_length);
+continue;
+}
while (*e == '\n' || *e == '\r') {
e--;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/oci8/tests/conn_attr.inc branches/PHP_5_3/ext/oci8/tests/driver_name.phpt branches/PHP_5_3/ext/oci8/tests/fetch_all5.phpt trunk/ext/oci8/tests/conn_at
sixd Thu, 10 Dec 2009 19:07:08 +
Revision: http://svn.php.net/viewvc?view=revision&revision=291962
Log:
Add new 'fetch' test and make several small test fixes
Changed paths:
U php/php-src/branches/PHP_5_3/ext/oci8/tests/conn_attr.inc
U php/php-src/branches/PHP_5_3/ext/oci8/tests/driver_name.phpt
A php/php-src/branches/PHP_5_3/ext/oci8/tests/fetch_all5.phpt
U php/php-src/trunk/ext/oci8/tests/conn_attr.inc
U php/php-src/trunk/ext/oci8/tests/driver_name.phpt
A php/php-src/trunk/ext/oci8/tests/fetch_all5.phpt
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/conn_attr.inc
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/conn_attr.inc 2009-12-10 18:24:53 UTC (rev 291961)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/conn_attr.inc 2009-12-10 19:07:08 UTC (rev 291962)
@@ -36,6 +36,7 @@
$m = oci_error($s);
if (!in_array($m['code'], array( // ignore expected errors
942 // table or view does not exist
+ , 1918 // user does not exist
, 2289 // sequence does not exist
, 4080 // trigger does not exist
, 38802 // edition does not exist
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/driver_name.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/driver_name.phpt 2009-12-10 18:24:53 UTC (rev 291961)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/driver_name.phpt 2009-12-10 19:07:08 UTC (rev 291962)
@@ -14,7 +14,7 @@
ob_start();
phpinfo(INFO_MODULES);
$phpinfo = ob_get_clean();
-$iv = preg_match('/Oracle .*Version => (11.2|12)\./', $phpinfo);
+$iv = preg_match('/Oracle .*Version => (11.2|12)/', $phpinfo);
if ($iv != 1) {
die ("skip test expected to work only with Oracle 11g or greater version of client");
}
Added: php/php-src/branches/PHP_5_3/ext/oci8/tests/fetch_all5.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/fetch_all5.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/fetch_all5.phpt 2009-12-10 19:07:08 UTC (rev 291962)
@@ -0,0 +1,127 @@
+--TEST--
+Test oci_fetch_all with 0 and -1 skip & maxrows
+--SKIPIF--
+
+--FILE--
+
+===DONE===
+
+--EXPECTF--
+Test 1
+int(3)
+array(2) {
+ [%u|b%"MYCOL1"]=>
+ array(3) {
+[0]=>
+%unicode|string%(1) "1"
+[1]=>
+%unicode|string%(1) "2"
+[2]=>
+%unicode|string%(1) "3"
+ }
+ [%u|b%"MYCOL2"]=>
+ array(3) {
+[0]=>
+%unicode|string%(3) "abc"
+[1]=>
+%unicode|string%(3) "def"
+[2]=>
+%unicode|string%(3) "ghi"
+ }
+}
+Test 1
+int(3)
+array(2) {
+ [%u|b%"MYCOL1"]=>
+ array(3) {
+[0]=>
+%unicode|string%(1) "1"
+[1]=>
+%unicode|string%(1) "2"
+[2]=>
+%unicode|string%(1) "3"
+ }
+ [%u|b%"MYCOL2"]=>
+ array(3) {
+[0]=>
+%unicode|string%(3) "abc"
+[1]=>
+%unicode|string%(3) "def"
+[2]=>
+%unicode|string%(3) "ghi"
+ }
+}
+Test 3
+int(0)
+array(0) {
+}
+===DONE===
Property changes on: php/php-src/branches/PHP_5_3/ext/oci8/tests/fetch_all5.phpt
___
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Modified: php/php-src/trunk/ext/oci8/tests/conn_attr.inc
===
--- php/php-src/trunk/ext/oci8/tests/conn_attr.inc 2009-12-10 18:24:53 UTC (rev 291961)
+++ php/php-src/trunk/ext/oci8/tests/conn_attr.inc 2009-12-10 19:07:08 UTC (rev 291962)
@@ -36,6 +36,7 @@
$m = oci_error($s);
if (!in_array($m['code'], array( // ignore expected errors
942 // table or view does not exist
+ , 1918 // user does not exist
, 2289 // sequence does not exist
, 4080 // trigger does not exist
, 38802 // edition does not exist
Modified: php/php-src/trunk/ext/oci8/tests/driver_name.phpt
===
--- php/php-src/trunk/ext/oci8/tests/driver_name.phpt 2009-12-10 18:24:53 UTC (rev 291961)
+++ php/php-src/trunk/ext/oci8/tests/driver_name.phpt 2009-12-10 19:07:08 UTC (rev 291962)
@@ -14,7 +14,7 @@
ob_start();
phpinfo(INFO_MODULES);
$phpinfo = ob_get_clean();
-$iv = preg_match('/Oracle .*Version => (11.2|12)\./', $phpinfo);
+$iv = preg_match('/Oracle .*Version => (11.2|12)/', $phpinfo);
if ($iv != 1) {
die ("skip test expected to work only with Oracle 11g or greater version of client");
}
Added: php/php-src/trunk/ext/oci8/tests/fetch_all5.phpt
===
--- php/php-src/trunk/ext/oci8/tests/fetch_all5.phpt
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/oci8/README trunk/ext/oci8/README
sixd Thu, 10 Dec 2009 17:28:19 + Revision: http://svn.php.net/viewvc?view=revision&revision=291958 Log: Remove text recently merged to online doc Changed paths: U php/php-src/branches/PHP_5_3/ext/oci8/README U php/php-src/trunk/ext/oci8/README Modified: php/php-src/branches/PHP_5_3/ext/oci8/README === --- php/php-src/branches/PHP_5_3/ext/oci8/README 2009-12-10 17:13:14 UTC (rev 291957) +++ php/php-src/branches/PHP_5_3/ext/oci8/README 2009-12-10 17:28:19 UTC (rev 291958) @@ -1,454 +1,12 @@ -Installing OCI8 +The OCI8 Extension +-- -0. Overview -1. Common requirements -2. Installing as a shared extension -3. Installing as a statically compiled extension -4. Installing from PECL to an existing PHP -5. Testing OCI8 -6. Oracle DRCP and FAN Support +The OCI8 extension allows PHP to access Oracle databases. It can be +built using Oracle 9.2, 10, or 11 client libraries. It allows Oracle's +standard cross-version connectivity, for example PHP using Oracle 10.2 +libraries can connect to Oracle Database 9.2 onwards. +This release of OCI8 can be used with PHP versions 4.3.9 to 5.x. -0. Overview - -The OCI8 extension allows you to access Oracle databases. It can be -built using Oracle 9.2, 10.2, 11.1 or 11.2 client libraries, and -allows Oracle's standard cross-version connectivity. This release can -be used with PHP versions 4.3.9 to 5.x. - -The OCI8 extension is not related to, or used by, PDO_OCI, the PHP -Data Objects (PDO) extension for Oracle. - -1. Common requirements --- - -This version of PHP OCI8: - - - Will build with Oracle 9.2 (or more recent) client libraries. The -same (or more recent) version of Oracle libraries used when -building OCI8 must also be used at runtime. - - - Can be used with PHP versions 4.3.9 to 5.x. - -If you build PHP with the "ORACLE_HOME" Oracle database or full Oracle -client libraries: - - - you MUST set at least the ORACLE_HOME environment variable and -make it visible for your web server BEFORE it starts. - - - the Oracle software must be readable by the web server. With -Oracle 10.2, see the $ORACLE_HOME/install/changePerm.sh script -included in patch releases. - -If you build PHP with Oracle Instant Client libraries from -http://www.oracle.com/technology/tech/oci/instantclient/index.html - - - either the "basic" or "basic-lite" package is required. - - - the "devel" package is required. - - - you don't have to set ORACLE_HOME and many of the other -environment variables to build PHP with OCI8 support. - -For both ORACLE_HOME and Instant Client installs you may have to set: - - - LD_LIBRARY_PATH: it must include the $ORACLE_HOME/lib or Instant -Client library directory - - - NLS_LANG: if you want to change the default encoding used during -interaction with Oracle servers - -The most appropriate places to add the environment variables are: - - /etc/profile - /etc/profile.local - /etc/profile.d - - -2. Installing as a shared extension - -Configure OCI8 using one of the the following configure options: - - a) if you use an Oracle server or Oracle Client installation: - - ./configure --with-oci8=shared,$ORACLE_HOME - - b) with Oracle Instant Client: - - ./configure --with-oci8=shared,instantclient,/path/to/instant/client/lib - -If you use an RPM-based installation of Oracle Instant Client, -your configure line will look like this: - - ./configure --with-oci8=shared,instantclient,/usr/lib/oracle//client/lib - -Follow the usual building procedure, e.g. "make install". The OCI8 -shared extension oci8.so will be created. It may need to be manually -moved to the PHP extension directory, specified by the extension_dir -option in your php.ini file. - -Edit php.ini file and add the line: - - extension=oci8.so - - -3. Installing as a statically compiled extension - - -Configure OCI8 using one of the the following configure options: - - a) with a common Oracle server or full Oracle client installation - - ./configure --with-oci8=$ORACLE_HOME - - b) with Oracle Instant Client - - ./configure --with-oci8=instantclient,/path/to/instant/client/lib - -Run "make install". - -After successful compile, you do not need to add oci8.so to php.ini. -The module will be usable without any additional actions. - - -4. Installing from PECL to an existing PHP --- - -The OCI8 extension is also available as a PECL module on -http://pecl.php.net/package/oci8. - -Install using either (a) or (b) below. - - a) Do an automated download and install: - -Set PEARs proxy, if necessary: - - pear config-set http_proxy http://my-proxy.example.com:80/ - -Run - - pecl install oci8 - -When prompted, enter eithe
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/config.w32.h.in trunk/win32/build/config.w32.h.in
pajoye Thu, 10 Dec 2009 14:08:19 + Revision: http://svn.php.net/viewvc?view=revision&revision=291951 Log: - #50334, add define on win as well Bug: http://bugs.php.net/50334 (Closed) crypt ignores sha512 prefix Changed paths: U php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in U php/php-src/trunk/win32/build/config.w32.h.in Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in === --- php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in2009-12-10 13:16:23 UTC (rev 291950) +++ php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in2009-12-10 14:08:19 UTC (rev 291951) @@ -28,6 +28,8 @@ #define PHP_EXT_DES_CRYPT 1 #define PHP_MD5_CRYPT 1 #define PHP_BLOWFISH_CRYPT 1 +#define PHP_SHA512_CRYPT 1 +#define PHP_SHA256_CRYPT 1 /* PHP Runtime Configuration */ #define PHP_URL_FOPEN 1 Modified: php/php-src/trunk/win32/build/config.w32.h.in === --- php/php-src/trunk/win32/build/config.w32.h.in 2009-12-10 13:16:23 UTC (rev 291950) +++ php/php-src/trunk/win32/build/config.w32.h.in 2009-12-10 14:08:19 UTC (rev 291951) @@ -28,6 +28,8 @@ #define PHP_EXT_DES_CRYPT 1 #define PHP_MD5_CRYPT 1 #define PHP_BLOWFISH_CRYPT 1 +#define PHP_SHA512_CRYPT 1 +#define PHP_SHA256_CRYPT 1 /* PHP Runtime Configuration */ #define PHP_URL_FOPEN 1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS configure.in main/php_version.h
iliaaThu, 10 Dec 2009 13:16:23 + Revision: http://svn.php.net/viewvc?view=revision&revision=291950 Log: Back to dev Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_2/main/php_version.h Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-12-10 13:12:03 UTC (rev 291949) +++ php/php-src/branches/PHP_5_2/NEWS 2009-12-10 13:16:23 UTC (rev 291950) @@ -1,5 +1,7 @@ PHPNEWS ||| +?? Dec 2009, PHP 5.2.12RC5 + 10 Dec 2009, PHP 5.2.12RC4 - Added LIBXML_PARSEHUGE constant to overrides the maximum text size of a single text node when using libxml2.7.3+. (Kalle) Modified: php/php-src/branches/PHP_5_2/configure.in === --- php/php-src/branches/PHP_5_2/configure.in 2009-12-10 13:12:03 UTC (rev 291949) +++ php/php-src/branches/PHP_5_2/configure.in 2009-12-10 13:16:23 UTC (rev 291950) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 PHP_RELEASE_VERSION=12 -PHP_EXTRA_VERSION="RC4" +PHP_EXTRA_VERSION="RC5-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` Modified: php/php-src/branches/PHP_5_2/main/php_version.h === --- php/php-src/branches/PHP_5_2/main/php_version.h 2009-12-10 13:12:03 UTC (rev 291949) +++ php/php-src/branches/PHP_5_2/main/php_version.h 2009-12-10 13:16:23 UTC (rev 291950) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 12 -#define PHP_EXTRA_VERSION "RC4" -#define PHP_VERSION "5.2.12RC4" +#define PHP_EXTRA_VERSION "RC5-dev" +#define PHP_VERSION "5.2.12RC5-dev" #define PHP_VERSION_ID 50212 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/tags/
iliaaThu, 10 Dec 2009 13:12:03 + Revision: http://svn.php.net/viewvc?view=revision&revision=291949 Log: 5.2.12RC4 Changed paths: A + php/php-src/tags/php_5_2_12RC4/ (from php/php-src/branches/PHP_5_2/:r291948) Property changes on: php/php-src/tags/php_5_2_12RC4 ___ Added: svn:ignore + Makefile.objects Makefile.fragments Makefile acconfig.h aclocal.m4 autom4te.cache bsd_converted buildmk.stamp buildconf.stamp config.h.in config.cache config.log config.status config_vars.mk configuration-parser.c configuration-parser.h configuration-parser.output configuration-scanner.c configure conftest conftest.c generated_lists meta_cc meta_ccld mkinstalldirs missing install-sh internal_functions.c libtool shlibtool php php5.spec stamp-h test.php3 *.lo *.la libs modules php-*.tar.gz want_dependencies deps config.nice php_version.h *.plg *.opt *.ncb Release Release_inline Debug Release_TS Release_TSDbg Release_TS_inline Debug_TS results.txt libs _libs include autom4te.cache FBCIndex FBCLockFolder debug.log confdefs.h configure.js config.nice.bat ZendEngine1 php_test_results_*.txt *.gcda *.gcno lcov_data lcov_html php_lcov.info tmp-php.ini Added: svn:mergeinfo + /php/php-src/branches/PHP_5_3:284120,288260,288273 /php/php-src/trunk:284726 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS configure.in main/php_version.h
iliaaThu, 10 Dec 2009 13:07:39 + Revision: http://svn.php.net/viewvc?view=revision&revision=291948 Log: 5.2.12RC4 Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_2/main/php_version.h Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-12-10 11:59:14 UTC (rev 291947) +++ php/php-src/branches/PHP_5_2/NEWS 2009-12-10 13:07:39 UTC (rev 291948) @@ -1,6 +1,6 @@ PHPNEWS ||| -?? Dec 2009, PHP 5.2.12RC4 +10 Dec 2009, PHP 5.2.12RC4 - Added LIBXML_PARSEHUGE constant to overrides the maximum text size of a single text node when using libxml2.7.3+. (Kalle) - Added protection for $_SESSION from interrupt corruption and improved Modified: php/php-src/branches/PHP_5_2/configure.in === --- php/php-src/branches/PHP_5_2/configure.in 2009-12-10 11:59:14 UTC (rev 291947) +++ php/php-src/branches/PHP_5_2/configure.in 2009-12-10 13:07:39 UTC (rev 291948) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 PHP_RELEASE_VERSION=12 -PHP_EXTRA_VERSION="RC4-dev" +PHP_EXTRA_VERSION="RC4" 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` Modified: php/php-src/branches/PHP_5_2/main/php_version.h === --- php/php-src/branches/PHP_5_2/main/php_version.h 2009-12-10 11:59:14 UTC (rev 291947) +++ php/php-src/branches/PHP_5_2/main/php_version.h 2009-12-10 13:07:39 UTC (rev 291948) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 12 -#define PHP_EXTRA_VERSION "RC4-dev" -#define PHP_VERSION "5.2.12RC4-dev" +#define PHP_EXTRA_VERSION "RC4" +#define PHP_VERSION "5.2.12RC4" #define PHP_VERSION_ID 50212 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.h trunk/ext/mysqlnd/mysqlnd.h
andrey Thu, 10 Dec 2009 11:59:14 + Revision: http://svn.php.net/viewvc?view=revision&revision=291947 Log: bump version number Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h U php/php-src/trunk/ext/mysqlnd/mysqlnd.h Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h === --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h 2009-12-10 11:18:05 UTC (rev 291946) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h 2009-12-10 11:59:14 UTC (rev 291947) @@ -22,8 +22,8 @@ #ifndef MYSQLND_H #define MYSQLND_H -#define MYSQLND_VERSION "mysqlnd 5.0.6-dev - 091022 - $Revision$" -#define MYSQLND_VERSION_ID 50006 +#define MYSQLND_VERSION "mysqlnd 5.0.7-dev - 091210 - $Revision$" +#define MYSQLND_VERSION_ID 50007 /* This forces inlining of some accessor functions */ #define MYSQLND_USE_OPTIMISATIONS 0 Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.h === --- php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2009-12-10 11:18:05 UTC (rev 291946) +++ php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2009-12-10 11:59:14 UTC (rev 291947) @@ -22,8 +22,8 @@ #ifndef MYSQLND_H #define MYSQLND_H -#define MYSQLND_VERSION "mysqlnd 5.0.6-dev - 091022 - $Revision$" -#define MYSQLND_VERSION_ID 50006 +#define MYSQLND_VERSION "mysqlnd 5.0.7-dev - 091210 - $Revision$" +#define MYSQLND_VERSION_ID 50007 /* This forces inlining of some accessor functions */ #define MYSQLND_USE_OPTIMISATIONS 0 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.h branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c trunk/ext/mysqlnd/mysqlnd.h trunk/ext/mysqln
andrey Thu, 10 Dec 2009 11:18:05 +
Revision: http://svn.php.net/viewvc?view=revision&revision=291946
Log:
Add plugin storage for MYSQLND_STMT too
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h 2009-12-10 11:09:15 UTC
(rev 291945)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h 2009-12-10 11:18:05 UTC
(rev 291946)
@@ -71,7 +71,10 @@
PHPAPI void ** _mysqlnd_plugin_get_plugin_result_data(const MYSQLND_RES *
result, unsigned int plugin_id TSRMLS_DC);
#define mysqlnd_plugin_get_plugin_result_data(r, p_id)
_mysqlnd_plugin_get_plugin_result_data((r), (p_id) TSRMLS_CC)
+PHPAPI void ** _mysqlnd_plugin_get_plugin_stmt_data(const MYSQLND_STMT * stmt,
unsigned int plugin_id TSRMLS_DC);
+#define mysqlnd_plugin_get_plugin_stmt_data(s, p_id)
_mysqlnd_plugin_get_plugin_stmt_data((s), (p_id) TSRMLS_CC)
+
PHPAPI struct st_mysqlnd_conn_methods * mysqlnd_conn_get_methods();
PHPAPI void mysqlnd_conn_set_methods(struct st_mysqlnd_conn_methods *methods);
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c 2009-12-10
11:09:15 UTC (rev 291945)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c 2009-12-10
11:18:05 UTC (rev 291946)
@@ -2081,7 +2081,8 @@
/* {{{ _mysqlnd_stmt_init */
MYSQLND_STMT * _mysqlnd_stmt_init(MYSQLND * const conn TSRMLS_DC)
{
- MYSQLND_STMT *stmt = mnd_ecalloc(1, sizeof(MYSQLND_STMT));
+ size_t alloc_size = sizeof(MYSQLND_STMT) + mysqlnd_plugin_count() *
sizeof(void *);
+ MYSQLND_STMT *stmt = mnd_ecalloc(1, alloc_size);
DBG_ENTER("_mysqlnd_stmt_init");
DBG_INF_FMT("stmt=%p", stmt);
@@ -2107,6 +2108,19 @@
/* }}} */
+/* {{{ _mysqlnd_plugin_get_plugin_stmt_data */
+PHPAPI void ** _mysqlnd_plugin_get_plugin_stmt_data(const MYSQLND_STMT * stmt,
unsigned int plugin_id TSRMLS_DC)
+{
+ DBG_ENTER("_mysqlnd_plugin_get_plugin_stmt_data");
+ DBG_INF_FMT("plugin_id=%u", plugin_id);
+ if (!stmt || plugin_id >= mysqlnd_plugin_count()) {
+ return NULL;
+ }
+ DBG_RETURN((void *)((char *)stmt + sizeof(MYSQLND_STMT) + plugin_id *
sizeof(void *)));
+}
+/* }}} */
+
+
/* {{{ mysqlnd_efree_param_bind_dtor */
PHPAPI void
mysqlnd_efree_param_bind_dtor(MYSQLND_PARAM_BIND * param_bind TSRMLS_DC)
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2009-12-10
11:09:15 UTC (rev 291945)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2009-12-10
11:18:05 UTC (rev 291946)
@@ -1585,7 +1585,7 @@
if (!result || plugin_id >= mysqlnd_plugin_count()) {
return NULL;
}
- DBG_RETURN((void *)(result + sizeof(MYSQLND_RES) + plugin_id *
sizeof(void *)));
+ DBG_RETURN((void *)((char *)result + sizeof(MYSQLND_RES) + plugin_id *
sizeof(void *)));
}
/* }}} */
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2009-12-10 11:09:15 UTC (rev
291945)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2009-12-10 11:18:05 UTC (rev
291946)
@@ -71,7 +71,10 @@
PHPAPI void ** _mysqlnd_plugin_get_plugin_result_data(const MYSQLND_RES *
result, unsigned int plugin_id TSRMLS_DC);
#define mysqlnd_plugin_get_plugin_result_data(r, p_id)
_mysqlnd_plugin_get_plugin_result_data((r), (p_id) TSRMLS_CC)
+PHPAPI void ** _mysqlnd_plugin_get_plugin_stmt_data(const MYSQLND_STMT * stmt,
unsigned int plugin_id TSRMLS_DC);
+#define mysqlnd_plugin_get_plugin_stmt_data(s, p_id)
_mysqlnd_plugin_get_plugin_stmt_data((s), (p_id) TSRMLS_CC)
+
PHPAPI struct st_mysqlnd_conn_methods * mysqlnd_conn_get_methods();
PHPAPI void mysqlnd_conn_set_methods(struct st_mysqlnd_conn_methods *methods);
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c 2009-12-10 11:09:15 UTC (rev
291945)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c 2009-12-10 11:18:05 UTC (rev
291946)
@@ -2081,7 +2081,8 @@
/* {{{ _mysqlnd_stmt_init */
MYSQLND_STMT * _mysqlnd_stmt_init(MYSQLND * const conn TSRMLS_DC)
{
- MYSQLND_STMT *stmt = mnd_ecalloc(1, sizeof(MYSQLND_STMT));
+
[PHP-CVS] svn: /php/php-src/trunk/ext/standard/ http_fopen_wrapper.c
felipe Thu, 10 Dec 2009 10:46:33 +
Revision: http://svn.php.net/viewvc?view=revision&revision=291944
Log:
- Fix build
Changed paths:
U php/php-src/trunk/ext/standard/http_fopen_wrapper.c
Modified: php/php-src/trunk/ext/standard/http_fopen_wrapper.c
===
--- php/php-src/trunk/ext/standard/http_fopen_wrapper.c 2009-12-10 10:38:46 UTC
(rev 291943)
+++ php/php-src/trunk/ext/standard/http_fopen_wrapper.c 2009-12-10 10:46:33 UTC
(rev 291944)
@@ -654,7 +654,7 @@
if (php_stream_get_line(stream, ZSTR(http_header_line),
HTTP_HEADER_BLOCK_SIZE, &http_header_line_length) && *http_header_line != '\n'
&& *http_header_line != '\r') {
char *e = http_header_line + http_header_line_length -
1;
if (*e != '\n') { /* partial header */
- php_stream_get_line(stream, http_header_line,
HTTP_HEADER_BLOCK_SIZE, &http_header_line_length);
+ php_stream_get_line(stream,
ZSTR(http_header_line), HTTP_HEADER_BLOCK_SIZE, &http_header_line_length);
continue;
}
while (*e == '\n' || *e == '\r') {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h trunk/ext/pdo_mysql/mysql_drive
andrey Thu, 10 Dec 2009 09:35:10 +
Revision: http://svn.php.net/viewvc?view=revision&revision=291942
Log:
Fix pdo build, forgot to remove the zval caching from pdo-mysql
Changed paths:
U php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c
U php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c
U php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h
U php/php-src/trunk/ext/pdo_mysql/mysql_driver.c
U php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c
U php/php-src/trunk/ext/pdo_mysql/php_pdo_mysql_int.h
Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c 2009-12-10
09:23:06 UTC (rev 291941)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c 2009-12-10
09:35:10 UTC (rev 291942)
@@ -731,7 +731,7 @@
}
if (mysqlnd_connect(H->server, host, dbh->username, dbh->password,
password_len, dbname, dbname_len,
- port, unix_socket,
connect_opts, PDO_MYSQL_G(mysqlnd_thd_zval_cache) TSRMLS_CC) == NULL) {
+ port, unix_socket, connect_opts
TSRMLS_CC) == NULL) {
#else
if (mysql_real_connect(H->server, host, dbh->username, dbh->password,
dbname, port, unix_socket, connect_opts) == NULL) {
#endif
Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c 2009-12-10
09:23:06 UTC (rev 291941)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c 2009-12-10
09:35:10 UTC (rev 291942)
@@ -57,17 +57,12 @@
#if PDO_DBG_ENABLED
STD_PHP_INI_ENTRY("pdo_mysql.debug",NULL, PHP_INI_SYSTEM,
OnUpdateString, debug, zend_pdo_mysql_globals, pdo_mysql_globals)
#endif
- STD_PHP_INI_ENTRY("pdo_mysql.cache_size", "2000",
PHP_INI_SYSTEM, OnUpdateLong, cache_size,
zend_pdo_mysql_globals, pdo_mysql_globals)
PHP_INI_END()
/* }}} */
#endif
-/* true global environment */
-#ifdef PDO_USE_MYSQLND
-static MYSQLND_ZVAL_PCACHE *pdo_mysqlnd_zval_cache;
-#endif
+/* true global environment */
-
/* {{{ PHP_MINIT_FUNCTION
*/
static PHP_MINIT_FUNCTION(pdo_mysql)
@@ -89,10 +84,6 @@
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_FOUND_ROWS",
(long)PDO_MYSQL_ATTR_FOUND_ROWS);
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_IGNORE_SPACE",
(long)PDO_MYSQL_ATTR_IGNORE_SPACE);
-#ifdef PDO_USE_MYSQLND
- pdo_mysqlnd_zval_cache =
mysqlnd_palloc_init_cache(PDO_MYSQL_G(cache_size));
-#endif
-
return php_pdo_register_driver(&pdo_mysql_driver);
}
/* }}} */
@@ -103,7 +94,6 @@
{
php_pdo_unregister_driver(&pdo_mysql_driver);
#if PDO_USE_MYSQLND
- mysqlnd_palloc_free_cache(pdo_mysqlnd_zval_cache);
UNREGISTER_INI_ENTRIES();
#endif
@@ -120,20 +110,6 @@
php_info_print_table_header(2, "PDO Driver for MySQL", "enabled");
php_info_print_table_row(2, "Client API version",
mysql_get_client_info());
-#ifdef PDO_USE_MYSQLND
- {
- zval values;
-
- php_info_print_table_header(2, "Persistent cache",
pdo_mysqlnd_zval_cache ? "enabled":"disabled");
-
- if (pdo_mysqlnd_zval_cache) {
- /* Now report cache status */
- mysqlnd_palloc_stats(pdo_mysqlnd_zval_cache, &values);
- mysqlnd_minfo_print_hash(&values);
- zval_dtor(&values);
- }
- }
-#endif
php_info_print_table_end();
#ifdef PDO_USE_MYSQLND
@@ -147,9 +123,7 @@
/* {{{ PHP_RINIT_FUNCTION
*/
static PHP_RINIT_FUNCTION(pdo_mysql)
-{
- PDO_MYSQL_G(mysqlnd_thd_zval_cache) =
mysqlnd_palloc_rinit(pdo_mysqlnd_zval_cache);
-
+{
#if PDO_DBG_ENABLED
if (PDO_MYSQL_G(debug)) {
MYSQLND_DEBUG *dbg = mysqlnd_debug_init(TSRMLS_C);
@@ -170,8 +144,6 @@
*/
static PHP_RSHUTDOWN_FUNCTION(pdo_mysql)
{
- mysqlnd_palloc_rshutdown(PDO_MYSQL_G(mysqlnd_thd_zval_cache));
-
#if PDO_DBG_ENABLED
MYSQLND_DEBUG *dbg = PDO_MYSQL_G(dbg);
PDO_DBG_ENTER("RSHUTDOWN");
@@ -190,8 +162,6 @@
*/
static PHP_GINIT_FUNCTION(pdo_mysql)
{
- pdo_mysql_globals->mysqlnd_thd_zval_cache = NULL; /* zval cache */
- pdo_mysql_globals->cache_size = 0;
#ifndef PHP_WIN32
pdo_mysql_globals->default_socket = NULL;
#endif
Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h
===
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h
2009-12-10 09:23:06 UTC (rev 291941)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h
2009-12-10 09:35:10 UTC (rev 291942)
@@ -
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/tests/network/ define_syslog_variables_variation-win32.phpt
jani Thu, 10 Dec 2009 09:23:06 + Revision: http://svn.php.net/viewvc?view=revision&revision=291941 Log: - not needed anymore Changed paths: D php/php-src/branches/PHP_5_3/ext/standard/tests/network/define_syslog_variables_variation-win32.phpt Deleted: php/php-src/branches/PHP_5_3/ext/standard/tests/network/define_syslog_variables_variation-win32.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/network/define_syslog_variables_variation-win32.phpt 2009-12-10 09:22:54 UTC (rev 291940) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/network/define_syslog_variables_variation-win32.phpt 2009-12-10 09:23:06 UTC (rev 291941) @@ -1,97 +0,0 @@ ---TEST-- -Test define_syslog_variables() function : variation ---INI-- -define_syslog_variables = true ---SKIPIF-- - ---FILE-- - -===DONE=== ---EXPECT-- -*** Testing define_syslog_variables() : variation *** -PASSED -===DONE=== -Warning: Directive 'define_syslog_variables' is deprecated in PHP 5.3 and greater in Unknown on line 0 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/tests/network/ define_syslog_variables_variation.phpt
jani Thu, 10 Dec 2009 09:22:54 + Revision: http://svn.php.net/viewvc?view=revision&revision=291940 Log: - Fix test mess (testing the deprecated ini option is pointless when using the func does same thing) Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/network/define_syslog_variables_variation.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/network/define_syslog_variables_variation.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/network/define_syslog_variables_variation.phpt 2009-12-10 07:11:52 UTC (rev 291939) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/network/define_syslog_variables_variation.phpt 2009-12-10 09:22:54 UTC (rev 291940) @@ -1,12 +1,5 @@ --TEST-- Test define_syslog_variables() function : variation ---SKIPIF-- - ---INI-- -define_syslog_variables = true --FILE-- ===DONE=== ---EXPECT-- -Warning: Directive 'define_syslog_variables' is deprecated in PHP 5.3 and greater in Unknown on line 0 +--EXPECTF-- +Deprecated: Function define_syslog_variables() is deprecated in %s on line %d *** Testing define_syslog_variables() : variation *** PASSED ===DONE=== -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
