date:20100302

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/curl/interface.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/curl/interface.c trunk/ext/curl/interface.c

2010-03-02 Thread Ilia Alshanetsky

iliaaTue, 02 Mar 2010 12:54:23 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=295731

Log:
Fixed bug #51171 (curl_setopt() doesn't output any errors or warnings when an 
invalid option is provided)

Bug: http://bugs.php.net/51171 (error getting bug information)
  
Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_2/ext/curl/interface.c
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/curl/interface.c
U   php/php-src/trunk/ext/curl/interface.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2010-03-02 12:33:45 UTC (rev 295730)
+++ php/php-src/branches/PHP_5_2/NEWS   2010-03-02 12:54:23 UTC (rev 295731)
@@ -1,6 +1,8 @@
 PHPNEWS
 |||
 ?? ??? 2010, PHP 5.2.14
+- Fixed bug #51171 (curl_setopt() doesn't output any errors or warnings when
+  an invalid option is provided). (Ilia)


 25 Feb 2010, PHP 5.2.13

Modified: php/php-src/branches/PHP_5_2/ext/curl/interface.c
===
--- php/php-src/branches/PHP_5_2/ext/curl/interface.c   2010-03-02 12:33:45 UTC 
(rev 295730)
+++ php/php-src/branches/PHP_5_2/ext/curl/interface.c   2010-03-02 12:54:23 UTC 
(rev 295731)
@@ -1772,6 +1772,10 @@
ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);

convert_to_long_ex(zoption);
+   if (Z_LVAL_PP(zoption) = 0) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid curl 
configuration option);
+   RETURN_FALSE;
+   }

if (!_php_curl_setopt(ch, Z_LVAL_PP(zoption), zvalue, return_value 
TSRMLS_CC)) {
RETURN_TRUE;

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2010-03-02 12:33:45 UTC (rev 295730)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-03-02 12:54:23 UTC (rev 295731)
@@ -6,6 +6,8 @@
 - Added stream filter support to mcrypt extension (ported from
   mcrypt_filter). (Stas)

+- Fixed bug #51171 (curl_setopt() doesn't output any errors or warnings when
+  an invalid option is provided). (Ilia)

 ?? ??? 20??, PHP 5.3.2
 - Upgraded bundled sqlite to version 3.6.22. (Ilia)

Modified: php/php-src/branches/PHP_5_3/ext/curl/interface.c
===
--- php/php-src/branches/PHP_5_3/ext/curl/interface.c   2010-03-02 12:33:45 UTC 
(rev 295730)
+++ php/php-src/branches/PHP_5_3/ext/curl/interface.c   2010-03-02 12:54:23 UTC 
(rev 295731)
@@ -2095,6 +2095,11 @@

ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);

+   if (options = 0) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid curl 
configuration option);
+   RETURN_FALSE;
+   }
+
if (!_php_curl_setopt(ch, options, zvalue, return_value TSRMLS_CC)) {
RETURN_TRUE;
} else {

Modified: php/php-src/trunk/ext/curl/interface.c
===
--- php/php-src/trunk/ext/curl/interface.c  2010-03-02 12:33:45 UTC (rev 
295730)
+++ php/php-src/trunk/ext/curl/interface.c  2010-03-02 12:54:23 UTC (rev 
295731)
@@ -2164,6 +2164,11 @@

ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);

+   if (options = 0) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid curl 
configuration option);
+   RETURN_FALSE;
+   }
+
if (!_php_curl_setopt(ch, options, zvalue, return_value TSRMLS_CC)) {
RETURN_TRUE;
} else {

-- 
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/ext/dba/tests/dba_optimize.phpt PHP_5_2/ext/dba/tests/dba_split.phpt PHP_5_2/ext/dba/tests/dba_sync.phpt PHP_5_3/ext/dba/tests/dba_optimize.phpt PHP_5_3/e

2010-03-02 Thread William Martin

wimartin Tue, 02 Mar 2010 13:21:25 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=295732

Log:
Added SKIP sections in case extension isn't enabled

Changed paths:
U   php/php-src/branches/PHP_5_2/ext/dba/tests/dba_optimize.phpt
U   php/php-src/branches/PHP_5_2/ext/dba/tests/dba_split.phpt
U   php/php-src/branches/PHP_5_2/ext/dba/tests/dba_sync.phpt
U   php/php-src/branches/PHP_5_3/ext/dba/tests/dba_optimize.phpt
U   php/php-src/branches/PHP_5_3/ext/dba/tests/dba_split.phpt
U   php/php-src/branches/PHP_5_3/ext/dba/tests/dba_sync.phpt

Modified: php/php-src/branches/PHP_5_2/ext/dba/tests/dba_optimize.phpt
===
--- php/php-src/branches/PHP_5_2/ext/dba/tests/dba_optimize.phpt
2010-03-02 12:54:23 UTC (rev 295731)
+++ php/php-src/branches/PHP_5_2/ext/dba/tests/dba_optimize.phpt
2010-03-02 13:21:25 UTC (rev 295732)
@@ -1,6 +1,10 @@
 --TEST--
 DBA Optimize Test
 --SKIPIF--
+?php
+   require_once dirname(__FILE__) .'/skipif.inc';
+   die(info $HND handler used);
+?
 --FILE--
 ?php
 require_once(dirname(__FILE__) .'/test.inc');

Modified: php/php-src/branches/PHP_5_2/ext/dba/tests/dba_split.phpt
===
--- php/php-src/branches/PHP_5_2/ext/dba/tests/dba_split.phpt   2010-03-02 
12:54:23 UTC (rev 295731)
+++ php/php-src/branches/PHP_5_2/ext/dba/tests/dba_split.phpt   2010-03-02 
13:21:25 UTC (rev 295732)
@@ -1,6 +1,10 @@
 --TEST--
 DBA Split Test
 --SKIPIF--
+?php
+   require_once dirname(__FILE__) .'/skipif.inc';
+   die(info $HND handler used);
+?
 --FILE--
 ?php
 var_dump(dba_key_split(key1, name));

Modified: php/php-src/branches/PHP_5_2/ext/dba/tests/dba_sync.phpt
===
--- php/php-src/branches/PHP_5_2/ext/dba/tests/dba_sync.phpt2010-03-02 
12:54:23 UTC (rev 295731)
+++ php/php-src/branches/PHP_5_2/ext/dba/tests/dba_sync.phpt2010-03-02 
13:21:25 UTC (rev 295732)
@@ -1,6 +1,10 @@
 --TEST--
 DBA Sync Test
 --SKIPIF--
+?php
+   require_once dirname(__FILE__) .'/skipif.inc';
+   die(info $HND handler used);
+?
 --FILE--
 ?php
 require_once(dirname(__FILE__) .'/test.inc');

Modified: php/php-src/branches/PHP_5_3/ext/dba/tests/dba_optimize.phpt
===
--- php/php-src/branches/PHP_5_3/ext/dba/tests/dba_optimize.phpt
2010-03-02 12:54:23 UTC (rev 295731)
+++ php/php-src/branches/PHP_5_3/ext/dba/tests/dba_optimize.phpt
2010-03-02 13:21:25 UTC (rev 295732)
@@ -1,6 +1,10 @@
 --TEST--
 DBA Optimize Test
 --SKIPIF--
+?php
+   require_once dirname(__FILE__) .'/skipif.inc';
+   die(info $HND handler used);
+?
 --FILE--
 ?php
 require_once(dirname(__FILE__) .'/test.inc');

Modified: php/php-src/branches/PHP_5_3/ext/dba/tests/dba_split.phpt
===
--- php/php-src/branches/PHP_5_3/ext/dba/tests/dba_split.phpt   2010-03-02 
12:54:23 UTC (rev 295731)
+++ php/php-src/branches/PHP_5_3/ext/dba/tests/dba_split.phpt   2010-03-02 
13:21:25 UTC (rev 295732)
@@ -1,6 +1,10 @@
 --TEST--
 DBA Split Test
 --SKIPIF--
+?php
+   require_once dirname(__FILE__) .'/skipif.inc';
+   die(info $HND handler used);
+?
 --FILE--
 ?php
 var_dump(dba_key_split(key1, name));

Modified: php/php-src/branches/PHP_5_3/ext/dba/tests/dba_sync.phpt
===
--- php/php-src/branches/PHP_5_3/ext/dba/tests/dba_sync.phpt2010-03-02 
12:54:23 UTC (rev 295731)
+++ php/php-src/branches/PHP_5_3/ext/dba/tests/dba_sync.phpt2010-03-02 
13:21:25 UTC (rev 295732)
@@ -1,6 +1,10 @@
 --TEST--
 DBA Sync Test
 --SKIPIF--
+?php
+   require_once dirname(__FILE__) .'/skipif.inc';
+   die(info $HND handler used);
+?
 --FILE--
 ?php
 require_once(dirname(__FILE__) .'/test.inc');

-- 
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/ext/dba/tests/dba010.phpt branches/PHP_5_3/ext/dba/tests/dba010.phpt trunk/ext/dba/tests/dba010.phpt

2010-03-02 Thread Christopher Jones

sixd Tue, 02 Mar 2010 17:00:18 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=295741

Log:
make portable

Changed paths:
U   php/php-src/branches/PHP_5_2/ext/dba/tests/dba010.phpt
U   php/php-src/branches/PHP_5_3/ext/dba/tests/dba010.phpt
U   php/php-src/trunk/ext/dba/tests/dba010.phpt

Modified: php/php-src/branches/PHP_5_2/ext/dba/tests/dba010.phpt
===
--- php/php-src/branches/PHP_5_2/ext/dba/tests/dba010.phpt  2010-03-02 
16:48:08 UTC (rev 295740)
+++ php/php-src/branches/PHP_5_2/ext/dba/tests/dba010.phpt  2010-03-02 
17:00:18 UTC (rev 295741)
@@ -37,5 +37,5 @@

 ?
 --EXPECTF--
-database handler: flatfile
+database handler: %s
 6YY
\ No newline at end of file

Modified: php/php-src/branches/PHP_5_3/ext/dba/tests/dba010.phpt
===
--- php/php-src/branches/PHP_5_3/ext/dba/tests/dba010.phpt  2010-03-02 
16:48:08 UTC (rev 295740)
+++ php/php-src/branches/PHP_5_3/ext/dba/tests/dba010.phpt  2010-03-02 
17:00:18 UTC (rev 295741)
@@ -37,5 +37,5 @@

 ?
 --EXPECTF--
-database handler: flatfile
+database handler: %s
 6YY
\ No newline at end of file

Modified: php/php-src/trunk/ext/dba/tests/dba010.phpt
===
--- php/php-src/trunk/ext/dba/tests/dba010.phpt 2010-03-02 16:48:08 UTC (rev 
295740)
+++ php/php-src/trunk/ext/dba/tests/dba010.phpt 2010-03-02 17:00:18 UTC (rev 
295741)
@@ -37,5 +37,5 @@

 ?
 --EXPECTF--
-database handler: flatfile
+database handler: %s
 6YY
\ No newline at end of file

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /SVNROOT/ httpd.conf

2010-03-02 Thread Rasmus Lerdorf

rasmus   Tue, 02 Mar 2010 17:21:12 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=295742

Log:
A real cert for svn

Changed paths:
U   SVNROOT/httpd.conf

Modified: SVNROOT/httpd.conf
===
--- SVNROOT/httpd.conf  2010-03-02 17:00:18 UTC (rev 295741)
+++ SVNROOT/httpd.conf  2010-03-02 17:21:12 UTC (rev 295742)
@@ -46,8 +46,8 @@
 VirtualHost *:443
 SSLEngine On
 SSLCipherSuite 
ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
-SSLCertificateFile /local/this-box/php.net.crt
-SSLCertificateKeyFile  /local/this-box/php.net.key
+SSLCertificateFile /local/this-box/svn_php_net.crt
+SSLCertificateKeyFile  /local/this-box/svn_php_net.key

 ServerName svn.php.net
 CustomLog |/local/bin/rotatelogs /home/svn/logs/svn-ssl-svn_log.%Y%m%d 
86400 %t %u %{SVN-ACTION}e env=SVN-ACTION

-- 
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/ext/reflection/php_reflection.c branches/PHP_5_3/ext/reflection/php_reflection.c trunk/ext/reflection/php_reflection.c

2010-03-02 Thread Hannes Magnusson

bjoriTue, 02 Mar 2010 22:16:24 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=295750

Log:
- The ctor requires both arguments
- Sync/fix ctor and export arguments to 5_2

Changed paths:
U   php/php-src/branches/PHP_5_2/ext/reflection/php_reflection.c
U   php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
U   php/php-src/trunk/ext/reflection/php_reflection.c

Modified: php/php-src/branches/PHP_5_2/ext/reflection/php_reflection.c
===
--- php/php-src/branches/PHP_5_2/ext/reflection/php_reflection.c
2010-03-02 22:13:44 UTC (rev 295749)
+++ php/php-src/branches/PHP_5_2/ext/reflection/php_reflection.c
2010-03-02 22:16:24 UTC (rev 295750)
@@ -4750,13 +4750,15 @@


 static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_property_export, 0, 0, 1)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_property_export, 0, 0, 2)
+   ZEND_ARG_INFO(0, class)
ZEND_ARG_INFO(0, argument)
ZEND_ARG_INFO(0, return)
 ZEND_END_ARG_INFO()

 static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_property___construct, 0)
+   ZEND_ARG_INFO(0, class)
ZEND_ARG_INFO(0, argument)
 ZEND_END_ARG_INFO()

@@ -4766,7 +4768,7 @@
 ZEND_END_ARG_INFO()

 static
-ZEND_BEGIN_ARG_INFO(arginfo_reflection_property_setValue, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_property_setValue, 0, 0, 1)
ZEND_ARG_INFO(0, object)
ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()

Modified: php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
===
--- php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
2010-03-02 22:13:44 UTC (rev 295749)
+++ php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
2010-03-02 22:16:24 UTC (rev 295750)
@@ -5285,7 +5285,7 @@
ZEND_ARG_INFO(0, return)
 ZEND_END_ARG_INFO()

-ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_property___construct, 0, 0, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_property___construct, 0, 0, 2)
ZEND_ARG_INFO(0, class)
ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()

Modified: php/php-src/trunk/ext/reflection/php_reflection.c
===
--- php/php-src/trunk/ext/reflection/php_reflection.c   2010-03-02 22:13:44 UTC 
(rev 295749)
+++ php/php-src/trunk/ext/reflection/php_reflection.c   2010-03-02 22:16:24 UTC 
(rev 295750)
@@ -5531,7 +5531,7 @@
ZEND_ARG_INFO(0, return)
 ZEND_END_ARG_INFO()

-ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_property___construct, 0, 0, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_property___construct, 0, 0, 2)
ZEND_ARG_INFO(0, class)
ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /SVNROOT/ global_avail

2010-03-02 Thread Johannes Schlüter

johannes Tue, 02 Mar 2010 22:20:33 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=295752

Log:
Give seld access to web/php/branches/PROTOTYPE_2010, approved by bjori

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2010-03-02 22:20:21 UTC (rev 295751)
+++ SVNROOT/global_avail2010-03-02 22:20:33 UTC (rev 295752)
@@ -56,7 +56,7 @@

 avail|degeberg|web/php-bugs

-avail|stewartlord,dragoonis|web/php/branches/PROTOTYPE_2010
+avail|stewartlord,dragoonis,seld|web/php/branches/PROTOTYPE_2010

 # The PHP Presentation Group has access to the presentations on the
 # conf.php.net site.

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /SVNROOT/ commit-bugs.php

2010-03-02 Thread Rasmus Lerdorf

rasmus   Tue, 02 Mar 2010 22:42:43 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=295759

Log:
dns has caught up now and the rpc connection is working

Changed paths:
U   SVNROOT/commit-bugs.php

Modified: SVNROOT/commit-bugs.php
===
--- SVNROOT/commit-bugs.php 2010-03-02 22:41:46 UTC (rev 295758)
+++ SVNROOT/commit-bugs.php 2010-03-02 22:42:43 UTC (rev 295759)
@@ -12,7 +12,7 @@
 'php' = 'http://bugs.php.net',
 '' = 'http://bugs.php.net',
 );
-$bug_rpc_url = 'http://bugs-beta.php.net/rpc.php';
+$bug_rpc_url = 'http://bugs.php.net/rpc.php';
 $viewvc_url_prefix = 'http://svn.php.net/viewvc/?view=revisionrevision=';

 // 
-

-- 
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/NEWS branches/PHP_5_3/Zend/tests/bug46665.phpt branches/PHP_5_3/Zend/zend_execute_API.c trunk/Zend/tests/bug46665.phpt trunk/Zend/zend_execute_API.c

2010-03-02 Thread Felipe Pena

felipe   Wed, 03 Mar 2010 00:15:34 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=295763

Log:
- Fixed bug #50731 (Inconsistent namespaces sent to functions registered with 
spl_autoload_register)

Bug: http://bugs.php.net/50731 (Open) Inconsistent namespaces sent to functions 
registered with spl_autoload_register
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/Zend/tests/bug46665.phpt
U   php/php-src/branches/PHP_5_3/Zend/zend_execute_API.c
U   php/php-src/trunk/Zend/tests/bug46665.phpt
U   php/php-src/trunk/Zend/zend_execute_API.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2010-03-02 23:27:25 UTC (rev 295762)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-03-03 00:15:34 UTC (rev 295763)
@@ -96,6 +96,8 @@
   (hiroaki dot kawai at gmail dot com, Ilia)
 - Fixed bug #50756 (CURLOPT_FTP_SKIP_PASV_IP does not exist). (Sriram)
 - Fixed bug #50732 (exec() adds single byte twice to $output array). (Ilia)
+- Fixed bug #50731 (Inconsistent namespaces sent to functions registered with
+  spl_autoload_register). (Felipe)
 - Fixed bug #50728 (All PDOExceptions hardcode 'code' property to 0).
   (Joey, Ilia)
 - Fixed bug #50723 (Bug in garbage collector causes crash). (Dmitry)

Modified: php/php-src/branches/PHP_5_3/Zend/tests/bug46665.phpt
===
--- php/php-src/branches/PHP_5_3/Zend/tests/bug46665.phpt   2010-03-02 
23:27:25 UTC (rev 295762)
+++ php/php-src/branches/PHP_5_3/Zend/tests/bug46665.phpt   2010-03-03 
00:15:34 UTC (rev 295763)
@@ -12,4 +12,4 @@

 ?
 --EXPECTF--
-%string|unicode%(12) \Foo\Bar\Baz
+%string|unicode%(11) Foo\Bar\Baz

Modified: php/php-src/branches/PHP_5_3/Zend/zend_execute_API.c
===
--- php/php-src/branches/PHP_5_3/Zend/zend_execute_API.c2010-03-02 
23:27:25 UTC (rev 295762)
+++ php/php-src/branches/PHP_5_3/Zend/zend_execute_API.c2010-03-03 
00:15:34 UTC (rev 295763)
@@ -1076,7 +1076,11 @@

ALLOC_ZVAL(class_name_ptr);
INIT_PZVAL(class_name_ptr);
-   ZVAL_STRINGL(class_name_ptr, name, name_length, 1);
+   if (name[0] == '\\') {
+   ZVAL_STRINGL(class_name_ptr, name+1, name_length-1, 1);
+   } else {
+   ZVAL_STRINGL(class_name_ptr, name, name_length, 1);
+   }

args[0] = class_name_ptr;


Modified: php/php-src/trunk/Zend/tests/bug46665.phpt
===
--- php/php-src/trunk/Zend/tests/bug46665.phpt  2010-03-02 23:27:25 UTC (rev 
295762)
+++ php/php-src/trunk/Zend/tests/bug46665.phpt  2010-03-03 00:15:34 UTC (rev 
295763)
@@ -12,4 +12,4 @@

 ?
 --EXPECTF--
-%string|unicode%(12) \Foo\Bar\Baz
+%string|unicode%(11) Foo\Bar\Baz

Modified: php/php-src/trunk/Zend/zend_execute_API.c
===
--- php/php-src/trunk/Zend/zend_execute_API.c   2010-03-02 23:27:25 UTC (rev 
295762)
+++ php/php-src/trunk/Zend/zend_execute_API.c   2010-03-03 00:15:34 UTC (rev 
295763)
@@ -1070,7 +1070,7 @@
zval *retval_ptr = NULL;
int retval;
unsigned int lc_name_len;
-   zstr lc_name, lc_free;
+   zstr lc_name, lc_free, name_p;
char dummy = 1;
zend_fcall_info fcall_info;
zend_fcall_info_cache fcall_cache;
@@ -1133,7 +1133,15 @@

ALLOC_ZVAL(class_name_ptr);
INIT_PZVAL(class_name_ptr);
-   ZVAL_ZSTRL(class_name_ptr, type, autoload_name, name_length, 1);
+   name_p.v = autoload_name.v;
+   if (name_length != lc_name_len) {
+   if (type == IS_UNICODE) {
+   name_p.u++;
+   } else if (type == IS_STRING) {
+   name_p.s++;
+   }
+   }
+   ZVAL_ZSTRL(class_name_ptr, type, name_p, lc_name_len, 1);

args[0] = class_name_ptr;


-- 
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/dba/dba.c trunk/ext/dba/dba.c

2010-03-02 Thread Felipe Pena

felipe   Wed, 03 Mar 2010 00:29:38 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=295764

Log:
- Possible fix for bug #50999

Bug: http://bugs.php.net/50999 (Open) unaligned memory access in Zend/zend_API.c
  
Changed paths:
U   php/php-src/branches/PHP_5_3/ext/dba/dba.c
U   php/php-src/trunk/ext/dba/dba.c

Modified: php/php-src/branches/PHP_5_3/ext/dba/dba.c
===
--- php/php-src/branches/PHP_5_3/ext/dba/dba.c  2010-03-03 00:15:34 UTC (rev 
295763)
+++ php/php-src/branches/PHP_5_3/ext/dba/dba.c  2010-03-03 00:29:38 UTC (rev 
295764)
@@ -250,7 +250,7 @@
zval *key;  
\
char *key_str, *key_free;   
\
size_t key_len; 
\
-   int skip = 0;   
\
+   long skip = 0;  
\
switch(ac) {
\
case 2: 
\
if (zend_parse_parameters(ac TSRMLS_CC, zr, key, id) == 
FAILURE) { \

Modified: php/php-src/trunk/ext/dba/dba.c
===
--- php/php-src/trunk/ext/dba/dba.c 2010-03-03 00:15:34 UTC (rev 295763)
+++ php/php-src/trunk/ext/dba/dba.c 2010-03-03 00:29:38 UTC (rev 295764)
@@ -251,7 +251,7 @@
zval *key;  
\
char *key_str, *key_free;   
\
size_t key_len; 
\
-   int skip = 0;   
\
+   long skip = 0;  
\
switch(ac) {
\
case 2: 
\
if (zend_parse_parameters(ac TSRMLS_CC, zr, key, id) == 
FAILURE) { \

-- 
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 branches/PHP_5_2/ext/curl/interface.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/curl/interface.c trunk/ext/curl/interface.c

[PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/ext/dba/tests/dba_optimize.phpt PHP_5_2/ext/dba/tests/dba_split.phpt PHP_5_2/ext/dba/tests/dba_sync.phpt PHP_5_3/ext/dba/tests/dba_optimize.phpt PHP_5_3/e

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/dba/tests/dba010.phpt branches/PHP_5_3/ext/dba/tests/dba010.phpt trunk/ext/dba/tests/dba010.phpt

[PHP-CVS] svn: /SVNROOT/ httpd.conf

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/reflection/php_reflection.c branches/PHP_5_3/ext/reflection/php_reflection.c trunk/ext/reflection/php_reflection.c

[PHP-CVS] svn: /SVNROOT/ global_avail

[PHP-CVS] svn: /SVNROOT/ commit-bugs.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/Zend/tests/bug46665.phpt branches/PHP_5_3/Zend/zend_execute_API.c trunk/Zend/tests/bug46665.phpt trunk/Zend/zend_execute_API.c

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/dba/dba.c trunk/ext/dba/dba.c

9 matches

Site Navigation

Mail list logo

Footer information