[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/TSRM/tsrm_win32.c branches/PHP_5_3_1/TSRM/tsrm_win32.c trunk/TSRM/tsrm_win32.c
pajoye Tue, 03 Nov 2009 10:48:12 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290166
Log:
- fix lenght for alloc and cpy (Kanwal)
Changed paths:
U php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c
U php/php-src/branches/PHP_5_3_1/TSRM/tsrm_win32.c
U php/php-src/trunk/TSRM/tsrm_win32.c
Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c 2009-11-03 05:16:21 UTC
(rev 290165)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c 2009-11-03 10:48:12 UTC
(rev 290166)
@@ -111,7 +111,7 @@
char *bucket_key = NULL;
if (!pSid) {
- bucket_key = (char *)HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, strlen(pathname));
+ bucket_key = (char *)HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, strlen(pathname) + 1);
if (!bucket_key) {
return NULL;
}
@@ -123,14 +123,14 @@
return NULL;
}
- bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
strlen(pathname) + strlen(ptcSid));
+ bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
strlen(pathname) + strlen(ptcSid) + 1);
if (!bucket_key) {
LocalFree(ptcSid);
return NULL;
}
memcpy(bucket_key, ptcSid, strlen(ptcSid));
- memcpy(bucket_key + strlen(ptcSid), pathname, strlen(pathname));
+ memcpy(bucket_key + strlen(ptcSid), pathname, strlen(pathname) + 1);
LocalFree(ptcSid);
return bucket_key;
Modified: php/php-src/branches/PHP_5_3_1/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_3_1/TSRM/tsrm_win32.c2009-11-03 05:16:21 UTC
(rev 290165)
+++ php/php-src/branches/PHP_5_3_1/TSRM/tsrm_win32.c2009-11-03 10:48:12 UTC
(rev 290166)
@@ -111,7 +111,7 @@
char *bucket_key = NULL;
if (!pSid) {
- bucket_key = (char *)HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, strlen(pathname));
+ bucket_key = (char *)HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, strlen(pathname) + 1);
if (!bucket_key) {
return NULL;
}
@@ -123,14 +123,14 @@
return NULL;
}
- bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
strlen(pathname) + strlen(ptcSid));
+ bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
strlen(pathname) + strlen(ptcSid) + 1);
if (!bucket_key) {
LocalFree(ptcSid);
return NULL;
}
memcpy(bucket_key, ptcSid, strlen(ptcSid));
- memcpy(bucket_key + strlen(ptcSid), pathname, strlen(pathname));
+ memcpy(bucket_key + strlen(ptcSid), pathname, strlen(pathname) + 1);
LocalFree(ptcSid);
return bucket_key;
Modified: php/php-src/trunk/TSRM/tsrm_win32.c
===
--- php/php-src/trunk/TSRM/tsrm_win32.c 2009-11-03 05:16:21 UTC (rev 290165)
+++ php/php-src/trunk/TSRM/tsrm_win32.c 2009-11-03 10:48:12 UTC (rev 290166)
@@ -111,7 +111,7 @@
char *bucket_key = NULL;
if (!pSid) {
- bucket_key = (char *)HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, strlen(pathname));
+ bucket_key = (char *)HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, strlen(pathname) + 1);
if (!bucket_key) {
return NULL;
}
@@ -123,14 +123,14 @@
return NULL;
}
- bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
strlen(pathname) + strlen(ptcSid));
+ bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
strlen(pathname) + strlen(ptcSid) + 1);
if (!bucket_key) {
LocalFree(ptcSid);
return NULL;
}
memcpy(bucket_key, ptcSid, strlen(ptcSid));
- memcpy(bucket_key + strlen(ptcSid), pathname, strlen(pathname));
+ memcpy(bucket_key + strlen(ptcSid), pathname, strlen(pathname) + 1);
LocalFree(ptcSid);
return bucket_key;
--
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_1/ NEWS Zend/tests/bug49908.phpt Zend/zend_vm_def.h Zend/zend_vm_execute.h tests/security/open_basedir_parse_ini_file.phpt
pajoye Mon, 02 Nov 2009 18:11:33 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290152
Log:
- Merge 290129, Fixed bug #49908 (throwing exception in __autoload crashes when
interface is not defined)
Bug: http://bugs.php.net/49908 (Closed) throwing exception in __autoload
crashes when interface is not defined
Changed paths:
_U php/php-src/branches/PHP_5_3_1/
UU php/php-src/branches/PHP_5_3_1/NEWS
A + php/php-src/branches/PHP_5_3_1/Zend/tests/bug49908.phpt
(from php/php-src/branches/PHP_5_3/Zend/tests/bug49908.phpt:r290129)
U php/php-src/branches/PHP_5_3_1/Zend/zend_vm_def.h
U php/php-src/branches/PHP_5_3_1/Zend/zend_vm_execute.h
_U php/php-src/branches/PHP_5_3_1/ext/mysql/
_U php/php-src/branches/PHP_5_3_1/ext/mysqli/
_U php/php-src/branches/PHP_5_3_1/ext/mysqlnd/
_U php/php-src/branches/PHP_5_3_1/ext/pdo_mysql/
_U php/php-src/branches/PHP_5_3_1/ext/tidy/tests/
_U
php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt
Property changes on: php/php-src/branches/PHP_5_3_1
___
Modified: svn:mergeinfo
- /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779,289987,289990,290029
/php/php-src/trunk:284726
+ /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779,289987,289990,290029,290129,290147
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_1/NEWS
===
--- php/php-src/branches/PHP_5_3_1/NEWS 2009-11-02 17:56:20 UTC (rev 290151)
+++ php/php-src/branches/PHP_5_3_1/NEWS 2009-11-02 18:11:33 UTC (rev 290152)
@@ -7,6 +7,8 @@
- Fixed crash in com_print_typeinfo when an invalid typelib is given. (Pierre)
+- Fixed bug #49908 (throwing exception in __autoload crashes when interface
+ is not defined). (Felipe)
- Fixed bug #49142 (crash when exception thrown from __tostring()).
(David Soria Parra)
- Fixed bug #49986 (Missing ICU DLLs on windows package). (Pierre)
Property changes on: php/php-src/branches/PHP_5_3_1/NEWS
___
Modified: svn:mergeinfo
- /php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779,289987,289990,290029
/php/php-src/trunk/NEWS:284726
+ /php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779,289987,289990,290029,290129,290147
/php/php-src/trunk/NEWS:284726
Copied: php/php-src/branches/PHP_5_3_1/Zend/tests/bug49908.phpt (from rev 290129, php/php-src/branches/PHP_5_3/Zend/tests/bug49908.phpt)
===
--- php/php-src/branches/PHP_5_3_1/Zend/tests/bug49908.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3_1/Zend/tests/bug49908.phpt 2009-11-02 18:11:33 UTC (rev 290152)
@@ -0,0 +1,28 @@
+--TEST--
+Bug #49908 (throwing exception in __autoload crashes when interface is not defined)
+--FILE--
+?php
+
+function __autoload($className) {
+ var_dump($className);
+
+ if ($className == 'Foo') {
+ class Foo implements Bar {};
+ } else {
+ throw new Exception($className);
+ }
+}
+
+new Foo;
+
+?
+--EXPECTF--
+%unicode|string%(3) Foo
+%unicode|string%(3) Bar
+
+Fatal error: Uncaught exception 'Exception' with message 'Bar'
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/php_crypt_r.c branches/PHP_5_3/ext/standard/tests/strings/bug50052.phpt branches/PHP_5_3_1/NEWS branches/PHP_5_3_1/ext/standard/php_crypt_r.c
pajoye Mon, 02 Nov 2009 20:46:52 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290154
Log:
- Fixed #50052, Different Hashes on Windows and Linux on wrong Salt size
Bug: http://bugs.php.net/50052 (Assigned) Crypt - Different Hashes on Windows
and Linux on wrong Salt size
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/php_crypt_r.c
A php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug50052.phpt
U php/php-src/branches/PHP_5_3_1/NEWS
U php/php-src/branches/PHP_5_3_1/ext/standard/php_crypt_r.c
A php/php-src/branches/PHP_5_3_1/ext/standard/tests/strings/bug50052.phpt
U php/php-src/trunk/ext/standard/php_crypt_r.c
A php/php-src/trunk/ext/standard/tests/strings/bug50052.phpt
Modified: php/php-src/branches/PHP_5_3/ext/standard/php_crypt_r.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/php_crypt_r.c 2009-11-02
20:10:03 UTC (rev 290153)
+++ php/php-src/branches/PHP_5_3/ext/standard/php_crypt_r.c 2009-11-02
20:46:52 UTC (rev 290154)
@@ -208,6 +208,7 @@
if (strncpy_s(passwd + MD5_MAGIC_LEN, MD5_HASH_MAX_LEN - MD5_MAGIC_LEN,
sp, sl + 1) != 0) {
goto _destroyCtx1;
}
+ passwd[MD5_MAGIC_LEN + sl] = '\0';
strcat_s(passwd, MD5_HASH_MAX_LEN, $);
#else
/* VC6 version doesn't have strcat_s or strncpy_s */
Added: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug50052.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug50052.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug50052.phpt
2009-11-02 20:46:52 UTC (rev 290154)
@@ -0,0 +1,12 @@
+--TEST--
+Bug #50052 (Different Hashes on Windows and Linux on wrong Salt size)
+--FILE--
+?php
+$salt = '$1$f+uslYF01$';
+$password = 'test';
+echo $salt . \n;
+echo crypt($password,$salt) . \n;
+?
+--EXPECT--
+$1$f+uslYF01$
+$1$f+uslYF0$orVloNmKSLvOeswusE0bY.
Modified: php/php-src/branches/PHP_5_3_1/NEWS
===
--- php/php-src/branches/PHP_5_3_1/NEWS 2009-11-02 20:10:03 UTC (rev 290153)
+++ php/php-src/branches/PHP_5_3_1/NEWS 2009-11-02 20:46:52 UTC (rev 290154)
@@ -7,6 +7,8 @@
- Fixed crash in com_print_typeinfo when an invalid typelib is given. (Pierre)
+- Fuxed bug #50052 (Different Hashes on Windows and Linux on wrong Salt size).
+ (Pierre)
- Fixed bug #49908 (throwing exception in __autoload crashes when interface
is not defined). (Felipe)
- Fixed bug #49142 (crash when exception thrown from __tostring()).
Modified: php/php-src/branches/PHP_5_3_1/ext/standard/php_crypt_r.c
===
--- php/php-src/branches/PHP_5_3_1/ext/standard/php_crypt_r.c 2009-11-02
20:10:03 UTC (rev 290153)
+++ php/php-src/branches/PHP_5_3_1/ext/standard/php_crypt_r.c 2009-11-02
20:46:52 UTC (rev 290154)
@@ -208,6 +208,7 @@
if (strncpy_s(passwd + MD5_MAGIC_LEN, MD5_HASH_MAX_LEN - MD5_MAGIC_LEN,
sp, sl + 1) != 0) {
goto _destroyCtx1;
}
+ passwd[MD5_MAGIC_LEN + sl] = '\0';
strcat_s(passwd, MD5_HASH_MAX_LEN, $);
#else
/* VC6 version doesn't have strcat_s or strncpy_s */
Added: php/php-src/branches/PHP_5_3_1/ext/standard/tests/strings/bug50052.phpt
===
--- php/php-src/branches/PHP_5_3_1/ext/standard/tests/strings/bug50052.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3_1/ext/standard/tests/strings/bug50052.phpt
2009-11-02 20:46:52 UTC (rev 290154)
@@ -0,0 +1,12 @@
+--TEST--
+Bug #20934 (html_entity_decode() crash when is passed)
+--FILE--
+?php
+$salt = '$1$f+uslYF01$';
+$password = 'test';
+echo $salt . \n;
+echo crypt($password,$salt) . \n;
+?
+--EXPECT--
+$1$f+uslYF01$
+$1$f+uslYF0$orVloNmKSLvOeswusE0bY.
Modified: php/php-src/trunk/ext/standard/php_crypt_r.c
===
--- php/php-src/trunk/ext/standard/php_crypt_r.c2009-11-02 20:10:03 UTC
(rev 290153)
+++ php/php-src/trunk/ext/standard/php_crypt_r.c2009-11-02 20:46:52 UTC
(rev 290154)
@@ -208,6 +208,7 @@
if (strncpy_s(passwd + MD5_MAGIC_LEN, MD5_HASH_MAX_LEN - MD5_MAGIC_LEN,
sp, sl + 1) != 0) {
goto _destroyCtx1;
}
+ passwd[MD5_MAGIC_LEN + sl] = '\0';
strcat_s(passwd, MD5_HASH_MAX_LEN, $);
#else
/* VC6 version doesn't have strcat_s or strncpy_s */
Added: php/php-src/trunk/ext/standard/tests/strings/bug50052.phpt
===
--- php/php-src/trunk/ext/standard/tests/strings/bug50052.phpt
(rev 0)
+++ php/php-src/trunk/ext/standard/tests/strings/bug50052.phpt
[PHP-CVS] svn: /php/php-src/trunk/ext/standard/ php_crypt_r.c
pajoye Mon, 02 Nov 2009 23:02:16 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290155
Log:
- WS
Changed paths:
U php/php-src/trunk/ext/standard/php_crypt_r.c
Modified: php/php-src/trunk/ext/standard/php_crypt_r.c
===
--- php/php-src/trunk/ext/standard/php_crypt_r.c2009-11-02 20:46:52 UTC
(rev 290154)
+++ php/php-src/trunk/ext/standard/php_crypt_r.c2009-11-02 23:02:16 UTC
(rev 290155)
@@ -205,11 +205,11 @@
memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN);
#if _MSC_VER = 1500
- if (strncpy_s(passwd + MD5_MAGIC_LEN, MD5_HASH_MAX_LEN - MD5_MAGIC_LEN,
sp, sl + 1) != 0) {
- goto _destroyCtx1;
- }
+ if (strncpy_s(passwd + MD5_MAGIC_LEN, MD5_HASH_MAX_LEN - MD5_MAGIC_LEN,
sp, sl + 1) != 0) {
+ goto _destroyCtx1;
+ }
passwd[MD5_MAGIC_LEN + sl] = '\0';
- strcat_s(passwd, MD5_HASH_MAX_LEN, $);
+ strcat_s(passwd, MD5_HASH_MAX_LEN, $);
#else
/* VC6 version doesn't have strcat_s or strncpy_s */
if (strncpy(passwd + MD5_MAGIC_LEN, sp, sl + 1) sl) {
--
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/main/ php_version.h
pajoye Sat, 31 Oct 2009 09:45:53 + Revision: http://svn.php.net/viewvc?view=revisionrevision=290098 Log: - back to dev #2 and fix snap :) Bug: http://bugs.php.net/2 (Closed) hash_environment Changed paths: U php/php-src/branches/PHP_5_2/main/php_version.h Modified: php/php-src/branches/PHP_5_2/main/php_version.h === --- php/php-src/branches/PHP_5_2/main/php_version.h 2009-10-31 06:02:32 UTC (rev 290097) +++ php/php-src/branches/PHP_5_2/main/php_version.h 2009-10-31 09:45:53 UTC (rev 290098) @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 -#define PHP_RELEASE_VERSION 11 +#define PHP_RELEASE_VERSION 12 #define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.2.11-dev -#define PHP_VERSION_ID 50211 +#define PHP_VERSION 5.2.12-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: /SVNROOT/ global_avail
pajoye Thu, 29 Oct 2009 22:31:35 + Revision: http://svn.php.net/viewvc?view=revisionrevision=290066 Log: - Pierrick karma for pecl/stomp Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2009-10-29 22:23:12 UTC (rev 290065) +++ SVNROOT/global_avail2009-10-29 22:31:35 UTC (rev 290066) @@ -307,6 +307,7 @@ avail|devour|pecl/geoip avail|iekpo|pecl/solr,phpdoc avail|ruslany,ksingla,donraman|pecl/wincache,phpdoc +avail|pierrick|pecl/stomp,phpdoc # Objective-C bridge avail|wez,jan|php/php-objc -- 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_1/ NEWS main/main.c main/rfc1867.c php.ini-development php.ini-production tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 28 Oct 2009 11:03:36 + Revision: http://svn.php.net/viewvc?view=revisionrevision=290025 Log: - Merge revision 289990, introduce new INI setting max_file_uploads [DOC] added to 5.2 as well Changed paths: _U php/php-src/branches/PHP_5_3_1/ UU php/php-src/branches/PHP_5_3_1/NEWS _U php/php-src/branches/PHP_5_3_1/ext/mysql/ _U php/php-src/branches/PHP_5_3_1/ext/mysqli/ _U php/php-src/branches/PHP_5_3_1/ext/mysqlnd/ _U php/php-src/branches/PHP_5_3_1/ext/pdo_mysql/ _U php/php-src/branches/PHP_5_3_1/ext/tidy/tests/ U php/php-src/branches/PHP_5_3_1/main/main.c U php/php-src/branches/PHP_5_3_1/main/rfc1867.c U php/php-src/branches/PHP_5_3_1/php.ini-development U php/php-src/branches/PHP_5_3_1/php.ini-production _U php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt Property changes on: php/php-src/branches/PHP_5_3_1 ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779 /php/php-src/trunk:284726 + /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779,289990 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_1/NEWS === --- php/php-src/branches/PHP_5_3_1/NEWS 2009-10-28 10:14:29 UTC (rev 290024) +++ php/php-src/branches/PHP_5_3_1/NEWS 2009-10-28 11:03:36 UTC (rev 290025) @@ -1,6 +1,10 @@ PHPNEWS ||| ?? ??? 2009, PHP 5.3.1 RC3 +- Added max_file_uploads INI directive, which can be set to limit the + number of file uploads per-request to 100 by default, to prevent possible + DOS via temporary file exhaustion. (Ilia) + - Fixed crash in com_print_typeinfo when an invalid typelib is given. (Pierre) - Fixed bug #49986 (Missing ICU DLLs on windows package). (Pierre) Property changes on: php/php-src/branches/PHP_5_3_1/NEWS ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779 /php/php-src/trunk/NEWS:284726 + /php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779,289990 /php/php-src/trunk/NEWS:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysql ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779 /php/php-src/trunk/ext/mysql:284726 + /php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289990 /php/php-src/trunk/ext/mysql:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqli ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779 /php/php-src/trunk/ext/mysqli:284726 +
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/ NEWS Zend/zend.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 28 Oct 2009 11:08:33 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290026
Log:
- Merge revision 289987, Fixed bug #49142 (crash when exception thrown from
__tostring())
Bug: http://bugs.php.net/49142 (Closed) crash when exception thrown from
__tostring() (PHP_5_3 only!)
Changed paths:
_U php/php-src/branches/PHP_5_3_1/
UU php/php-src/branches/PHP_5_3_1/NEWS
U php/php-src/branches/PHP_5_3_1/Zend/zend.c
_U php/php-src/branches/PHP_5_3_1/ext/mysql/
_U php/php-src/branches/PHP_5_3_1/ext/mysqli/
_U php/php-src/branches/PHP_5_3_1/ext/mysqlnd/
_U php/php-src/branches/PHP_5_3_1/ext/pdo_mysql/
_U php/php-src/branches/PHP_5_3_1/ext/tidy/tests/
_U
php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt
Property changes on: php/php-src/branches/PHP_5_3_1
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779,289990
/php/php-src/trunk:284726
+
/php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779,289987,289990
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_1/NEWS
===
--- php/php-src/branches/PHP_5_3_1/NEWS 2009-10-28 11:03:36 UTC (rev 290025)
+++ php/php-src/branches/PHP_5_3_1/NEWS 2009-10-28 11:08:33 UTC (rev 290026)
@@ -7,6 +7,8 @@
- Fixed crash in com_print_typeinfo when an invalid typelib is given. (Pierre)
+- Fixed bug #49142 (crash when exception thrown from __tostring()).
+ (David Soria Parra)
- Fixed bug #49986 (Missing ICU DLLs on windows package). (Pierre)
- Fixed bug #48752 (Crash during date parsing with invalid date). (Pierre)
Property changes on: php/php-src/branches/PHP_5_3_1/NEWS
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779,289990
/php/php-src/trunk/NEWS:284726
+
/php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779,289987,289990
/php/php-src/trunk/NEWS:284726
Modified: php/php-src/branches/PHP_5_3_1/Zend/zend.c
===
--- php/php-src/branches/PHP_5_3_1/Zend/zend.c 2009-10-28 11:03:36 UTC (rev
290025)
+++ php/php-src/branches/PHP_5_3_1/Zend/zend.c 2009-10-28 11:08:33 UTC (rev
290026)
@@ -1067,10 +1067,16 @@
if (!EG(active_symbol_table)) {
zend_rebuild_symbol_table(TSRMLS_C);
}
- Z_ARRVAL_P(z_context) = EG(active_symbol_table);
- Z_TYPE_P(z_context) = IS_ARRAY;
- zval_copy_ctor(z_context);
+ /* during shutdown the symbol table table can be still
null */
+ if (!EG(active_symbol_table)) {
+ Z_TYPE_P(z_context) = IS_NULL;
+ } else {
+ Z_ARRVAL_P(z_context) = EG(active_symbol_table);
+ Z_TYPE_P(z_context) = IS_ARRAY;
+ zval_copy_ctor(z_context);
+ }
+
params = (zval ***)
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/ NEWS main/main.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Wed, 28 Oct 2009 15:19:32 + Revision: http://svn.php.net/viewvc?view=revisionrevision=290034 Log: - Merge 290029, Lower the max upload default to 20 Changed paths: _U php/php-src/branches/PHP_5_3_1/ _U php/php-src/branches/PHP_5_3_1/NEWS _U php/php-src/branches/PHP_5_3_1/ext/mysql/ _U php/php-src/branches/PHP_5_3_1/ext/mysqli/ _U php/php-src/branches/PHP_5_3_1/ext/mysqlnd/ _U php/php-src/branches/PHP_5_3_1/ext/pdo_mysql/ _U php/php-src/branches/PHP_5_3_1/ext/tidy/tests/ U php/php-src/branches/PHP_5_3_1/main/main.c _U php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt Property changes on: php/php-src/branches/PHP_5_3_1 ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779,289987,289990 /php/php-src/trunk:284726 + /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779,289987,289990,290029 /php/php-src/trunk:284726 Property changes on: php/php-src/branches/PHP_5_3_1/NEWS ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779,289987,289990 /php/php-src/trunk/NEWS:284726 + /php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779,289987,289990,290029 /php/php-src/trunk/NEWS:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysql ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289987,289990 /php/php-src/trunk/ext/mysql:284726 + /php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289987,289990,290029 /php/php-src/trunk/ext/mysql:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqli ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289987,289990 /php/php-src/trunk/ext/mysqli:284726 + /php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289987,289990,290029 /php/php-src/trunk/ext/mysqli:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqlnd ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289987,289990 /php/php-src/trunk/ext/mysqlnd:284726 + /php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289987,289990,290029 /php/php-src/trunk/ext/mysqlnd:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/pdo_mysql ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/pdo_mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289987,289990
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/date/php_date.c branches/PHP_5_3/ext/date/php_date.c branches/PHP_5_3_1/ext/date/php_date.c trunk/ext/date/php_date.c
pajoye Tue, 27 Oct 2009 10:41:45 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289981
Log:
- #48752, crash during date parsing with invalid date
Bug: http://bugs.php.net/48752 (Assigned) SIGSEGV during date parsing with new
timelib
Changed paths:
U php/php-src/branches/PHP_5_2/ext/date/php_date.c
U php/php-src/branches/PHP_5_3/ext/date/php_date.c
U php/php-src/branches/PHP_5_3_1/ext/date/php_date.c
U php/php-src/trunk/ext/date/php_date.c
Modified: php/php-src/branches/PHP_5_2/ext/date/php_date.c
===
--- php/php-src/branches/PHP_5_2/ext/date/php_date.c2009-10-27 10:35:32 UTC
(rev 289980)
+++ php/php-src/branches/PHP_5_2/ext/date/php_date.c2009-10-27 10:41:45 UTC
(rev 289981)
@@ -371,6 +371,7 @@
}
DATEG(timezone) = NULL;
DATEG(tzcache) = NULL;
+ DATEG(last_errors) = NULL;
return SUCCESS;
}
@@ -388,6 +389,11 @@
FREE_HASHTABLE(DATEG(tzcache));
DATEG(tzcache) = NULL;
}
+ if (DATEG(last_errors)) {
+ timelib_error_container_dtor(DATEG(last_errors));
+ DATEG(last_errors) = NULL;
+ }
+
return SUCCESS;
}
/* }}} */
Modified: php/php-src/branches/PHP_5_3/ext/date/php_date.c
===
--- php/php-src/branches/PHP_5_3/ext/date/php_date.c2009-10-27 10:35:32 UTC
(rev 289980)
+++ php/php-src/branches/PHP_5_3/ext/date/php_date.c2009-10-27 10:41:45 UTC
(rev 289981)
@@ -619,6 +619,7 @@
}
DATEG(timezone) = NULL;
DATEG(tzcache) = NULL;
+ DATEG(last_errors) = NULL;
return SUCCESS;
}
@@ -636,6 +637,11 @@
FREE_HASHTABLE(DATEG(tzcache));
DATEG(tzcache) = NULL;
}
+ if (DATEG(last_errors)) {
+ timelib_error_container_dtor(DATEG(last_errors));
+ DATEG(last_errors) = NULL;
+ }
+
return SUCCESS;
}
/* }}} */
@@ -777,7 +783,6 @@
php_date_global_timezone_db = NULL;
php_date_global_timezone_db_enabled = 0;
-
DATEG(last_errors) = NULL;
return SUCCESS;
}
Modified: php/php-src/branches/PHP_5_3_1/ext/date/php_date.c
===
--- php/php-src/branches/PHP_5_3_1/ext/date/php_date.c 2009-10-27 10:35:32 UTC
(rev 289980)
+++ php/php-src/branches/PHP_5_3_1/ext/date/php_date.c 2009-10-27 10:41:45 UTC
(rev 289981)
@@ -619,6 +619,7 @@
}
DATEG(timezone) = NULL;
DATEG(tzcache) = NULL;
+ DATEG(last_errors) = NULL;
return SUCCESS;
}
@@ -636,6 +637,11 @@
FREE_HASHTABLE(DATEG(tzcache));
DATEG(tzcache) = NULL;
}
+ if (DATEG(last_errors)) {
+ timelib_error_container_dtor(DATEG(last_errors));
+ DATEG(last_errors) = NULL;
+ }
+
return SUCCESS;
}
/* }}} */
@@ -777,7 +783,6 @@
php_date_global_timezone_db = NULL;
php_date_global_timezone_db_enabled = 0;
-
DATEG(last_errors) = NULL;
return SUCCESS;
}
Modified: php/php-src/trunk/ext/date/php_date.c
===
--- php/php-src/trunk/ext/date/php_date.c 2009-10-27 10:35:32 UTC (rev
289980)
+++ php/php-src/trunk/ext/date/php_date.c 2009-10-27 10:41:45 UTC (rev
289981)
@@ -622,6 +622,7 @@
}
DATEG(timezone) = NULL;
DATEG(tzcache) = NULL;
+ DATEG(last_errors) = NULL;
return SUCCESS;
}
@@ -639,6 +640,11 @@
FREE_HASHTABLE(DATEG(tzcache));
DATEG(tzcache) = NULL;
}
+ if (DATEG(last_errors)) {
+ timelib_error_container_dtor(DATEG(last_errors));
+ DATEG(last_errors) = NULL;
+ }
+
return SUCCESS;
}
/* }}} */
--
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 PHP_5_3_1/NEWS
pajoye Tue, 27 Oct 2009 10:44:11 + Revision: http://svn.php.net/viewvc?view=revisionrevision=289982 Log: - #48752 Bug: http://bugs.php.net/48752 (Assigned) SIGSEGV during date parsing with new timelib Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_3_1/NEWS Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-10-27 10:41:45 UTC (rev 289981) +++ php/php-src/branches/PHP_5_2/NEWS 2009-10-27 10:44:11 UTC (rev 289982) @@ -27,6 +27,7 @@ (Moriyoshi, hello at iwamot dot com) - Fixed bug #49757 (long2ip() can return wrong value in a multi-threaded applications). (Ilia, Florian Anderiasch) +- Fixed bug #48752 (Crash during date parsing with invalid date). (Pierre) - Fixed bug #49738 (calling mcrypt() after mcrypt_generic_deinit() crashes). (Sriram Natarajan) - Fixed bug #49698 (Unexpected change in strnatcasecmp()). (Rasmus) Modified: php/php-src/branches/PHP_5_3_1/NEWS === --- php/php-src/branches/PHP_5_3_1/NEWS 2009-10-27 10:41:45 UTC (rev 289981) +++ php/php-src/branches/PHP_5_3_1/NEWS 2009-10-27 10:44:11 UTC (rev 289982) @@ -1,7 +1,8 @@ PHPNEWS ||| ?? ??? 2009, PHP 5.3.1 RC3 -- #49986 (Missing ICU DLLs on windows package). (Pierre) +- Fixed bug #49986 (Missing ICU DLLs on windows package). (Pierre) +- Fixed bug #48752 (Crash during date parsing with invalid date). (Pierre) 20 Oct 2009, PHP 5.3.1 RC2 - Upgraded bundled sqlite to version 3.6.19. (Scott) -- 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/com_dotnet/com_typeinfo.c branches/PHP_5_3/ext/com_dotnet/com_typeinfo.c branches/PHP_5_3_1/NEWS branches/PHP_5_3_1/ext/com_dotn
pajoye Tue, 27 Oct 2009 19:16:55 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289996
Log:
- Fixed crash in com_print_typeinfo when an invalid typelib is given
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/com_dotnet/com_typeinfo.c
U php/php-src/branches/PHP_5_3/ext/com_dotnet/com_typeinfo.c
U php/php-src/branches/PHP_5_3_1/NEWS
U php/php-src/branches/PHP_5_3_1/ext/com_dotnet/com_typeinfo.c
U php/php-src/trunk/ext/com_dotnet/com_typeinfo.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2009-10-27 19:14:53 UTC (rev 289995)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-10-27 19:16:55 UTC (rev 289996)
@@ -6,6 +6,8 @@
- Introduced a max_file_uploads INI setting, which is set to limit the
number of file uploads per-request to 100 by default, to prevent possible
DOS via temporary file exhaustion. (Ilia)
+
+- Fixed crash in com_print_typeinfo when an invalid typelib is given
- Fixed a safe_mode bypass in tempnam() identified by Grzegorz Stachowiak.
(Rasmus)
- Fixed a open_basedir bypass in posix_mkfifo() identified by Grzegorz
Modified: php/php-src/branches/PHP_5_2/ext/com_dotnet/com_typeinfo.c
===
--- php/php-src/branches/PHP_5_2/ext/com_dotnet/com_typeinfo.c 2009-10-27
19:14:53 UTC (rev 289995)
+++ php/php-src/branches/PHP_5_2/ext/com_dotnet/com_typeinfo.c 2009-10-27
19:16:55 UTC (rev 289996)
@@ -309,7 +309,7 @@
}
} else if (typelibname) {
/* Fetch the typelibrary and use that to look things up */
- typelib = php_com_load_typelib(typelibname, obj-code_page
TSRMLS_CC);
+ typelib = php_com_load_typelib(typelibname, CP_THREAD_ACP
TSRMLS_CC);
}
if (!gotguid dispname typelib) {
Modified: php/php-src/branches/PHP_5_3/ext/com_dotnet/com_typeinfo.c
===
--- php/php-src/branches/PHP_5_3/ext/com_dotnet/com_typeinfo.c 2009-10-27
19:14:53 UTC (rev 289995)
+++ php/php-src/branches/PHP_5_3/ext/com_dotnet/com_typeinfo.c 2009-10-27
19:16:55 UTC (rev 289996)
@@ -309,7 +309,7 @@
}
} else if (typelibname) {
/* Fetch the typelibrary and use that to look things up */
- typelib = php_com_load_typelib(typelibname, obj-code_page
TSRMLS_CC);
+ typelib = php_com_load_typelib(typelibname, CP_THREAD_ACP
TSRMLS_CC);
}
if (!gotguid dispname typelib) {
Modified: php/php-src/branches/PHP_5_3_1/NEWS
===
--- php/php-src/branches/PHP_5_3_1/NEWS 2009-10-27 19:14:53 UTC (rev 289995)
+++ php/php-src/branches/PHP_5_3_1/NEWS 2009-10-27 19:16:55 UTC (rev 289996)
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? ??? 2009, PHP 5.3.1 RC3
+- Fixed crash in com_print_typeinfo when an invalid typelib is given. (Pierre)
+
- Fixed bug #49986 (Missing ICU DLLs on windows package). (Pierre)
- Fixed bug #48752 (Crash during date parsing with invalid date). (Pierre)
Modified: php/php-src/branches/PHP_5_3_1/ext/com_dotnet/com_typeinfo.c
===
--- php/php-src/branches/PHP_5_3_1/ext/com_dotnet/com_typeinfo.c
2009-10-27 19:14:53 UTC (rev 289995)
+++ php/php-src/branches/PHP_5_3_1/ext/com_dotnet/com_typeinfo.c
2009-10-27 19:16:55 UTC (rev 289996)
@@ -309,7 +309,7 @@
}
} else if (typelibname) {
/* Fetch the typelibrary and use that to look things up */
- typelib = php_com_load_typelib(typelibname, obj-code_page
TSRMLS_CC);
+ typelib = php_com_load_typelib(typelibname, CP_THREAD_ACP
TSRMLS_CC);
}
if (!gotguid dispname typelib) {
Modified: php/php-src/trunk/ext/com_dotnet/com_typeinfo.c
===
--- php/php-src/trunk/ext/com_dotnet/com_typeinfo.c 2009-10-27 19:14:53 UTC
(rev 289995)
+++ php/php-src/trunk/ext/com_dotnet/com_typeinfo.c 2009-10-27 19:16:55 UTC
(rev 289996)
@@ -309,7 +309,7 @@
}
} else if (typelibname) {
/* Fetch the typelibrary and use that to look things up */
- typelib = php_com_load_typelib(typelibname, obj-code_page
TSRMLS_CC);
+ typelib = php_com_load_typelib(typelibname, CP_THREAD_ACP
TSRMLS_CC);
}
if (!gotguid dispname typelib) {
--
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/win32/build/mkdist.php PHP_5_3_1/NEWS PHP_5_3_1/win32/build/mkdist.php
pajoye Sat, 24 Oct 2009 19:52:23 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289905
Log:
- #49986, fix ICU DLLs path
Bug: http://bugs.php.net/49986 (Assigned) intl extension missing/DLLs for intl
extension missing
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/mkdist.php
U php/php-src/branches/PHP_5_3_1/NEWS
U php/php-src/branches/PHP_5_3_1/win32/build/mkdist.php
Modified: php/php-src/branches/PHP_5_3/win32/build/mkdist.php
===
--- php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2009-10-24 10:10:38 UTC
(rev 289904)
+++ php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2009-10-24 19:52:23 UTC
(rev 289905)
@@ -315,7 +315,7 @@
deps. For example, libenchant.dll loads libenchant_myspell.dll or
libenchant_ispell.dll
*/
-$ICU_DLLS = $php_build_dir . '/icu*.dll';
+$ICU_DLLS = $php_build_dir . '/bin/icu*.dll';
foreach (glob($ICU_DLLS) as $filename) {
copy($filename, $dist_dir/ . basename($filename));
}
Modified: php/php-src/branches/PHP_5_3_1/NEWS
===
--- php/php-src/branches/PHP_5_3_1/NEWS 2009-10-24 10:10:38 UTC (rev 289904)
+++ php/php-src/branches/PHP_5_3_1/NEWS 2009-10-24 19:52:23 UTC (rev 289905)
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? 2009, PHP 5.3.1 RC3
+- #49986 (Missing ICU DLLs on windows package). (Pierre)
20 Oct 2009, PHP 5.3.1 RC2
- Upgraded bundled sqlite to version 3.6.19. (Scott)
Modified: php/php-src/branches/PHP_5_3_1/win32/build/mkdist.php
===
--- php/php-src/branches/PHP_5_3_1/win32/build/mkdist.php 2009-10-24
10:10:38 UTC (rev 289904)
+++ php/php-src/branches/PHP_5_3_1/win32/build/mkdist.php 2009-10-24
19:52:23 UTC (rev 289905)
@@ -315,7 +315,7 @@
deps. For example, libenchant.dll loads libenchant_myspell.dll or
libenchant_ispell.dll
*/
-$ICU_DLLS = $php_build_dir . '/icu*.dll';
+$ICU_DLLS = $php_build_dir . '/bin/icu*.dll';
foreach (glob($ICU_DLLS) as $filename) {
copy($filename, $dist_dir/ . basename($filename));
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
pajoye Thu, 22 Oct 2009 06:58:05 + Revision: http://svn.php.net/viewvc?view=revisionrevision=289846 Log: - pecl/wincache for Ruslan, Don and Kanwal Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2009-10-22 05:46:25 UTC (rev 289845) +++ SVNROOT/global_avail2009-10-22 06:58:05 UTC (rev 289846) @@ -306,6 +306,7 @@ avail|basantk|pecl/memsession avail|devour|pecl/geoip avail|iekpo|pecl/solr,phpdoc +avail|ruslany,ksingla,donraman|pecl/wincache,phpdoc # Objective-C bridge avail|wez,jan|php/php-objc -- 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/ext/standard/dl.c trunk/ext/standard/dl.c
pajoye Wed, 21 Oct 2009 06:42:08 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289821
Log:
- fix leak in DL on error (windows)
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/standard/dl.c
U php/php-src/trunk/ext/standard/dl.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-10-21 06:03:12 UTC (rev 289820)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-10-21 06:42:08 UTC (rev 289821)
@@ -8,6 +8,9 @@
- Implemented FR #49253 (added support for libcurl's CERTINFO option).
(Linus Nielsen Feltzing li...@haxx.se)
+- Fixed memory leak in extension loading when an error occurs on Windows.
+ (Pierre)
+
- Fixed bug #49855 (import_request_variables() always returns NULL). (Ilia,
sjoerd at php dot net)
- Fixed bug #49800 (SimpleXML allow (un)serialize() calls without warning).
Modified: php/php-src/branches/PHP_5_3/ext/standard/dl.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/dl.c 2009-10-21 06:03:12 UTC
(rev 289820)
+++ php/php-src/branches/PHP_5_3/ext/standard/dl.c 2009-10-21 06:42:08 UTC
(rev 289821)
@@ -146,8 +146,18 @@
/* load dynamic symbol */
handle = DL_LOAD(libpath);
if (!handle) {
+#if PHP_WIN32
+ char *err = GET_DL_ERROR();
+ if (err) {
+ php_error_docref(NULL TSRMLS_CC, error_type, Unable to
load dynamic library '%s' - %s, libpath, err);
+ LocalFree(err);
+ } else {
+ php_error_docref(NULL TSRMLS_CC, error_type, Unable to
load dynamic library '%s' - %s, libpath, Unknown reason);
+ }
+#else
php_error_docref(NULL TSRMLS_CC, error_type, Unable to load
dynamic library '%s' - %s, libpath, GET_DL_ERROR());
GET_DL_ERROR(); /* free the buffer storing the error */
+#endif
efree(libpath);
return FAILURE;
}
Modified: php/php-src/trunk/ext/standard/dl.c
===
--- php/php-src/trunk/ext/standard/dl.c 2009-10-21 06:03:12 UTC (rev 289820)
+++ php/php-src/trunk/ext/standard/dl.c 2009-10-21 06:42:08 UTC (rev 289821)
@@ -139,8 +139,18 @@
/* load dynamic symbol */
handle = DL_LOAD(libpath);
if (!handle) {
+#if PHP_WIN32
+ char *err = GET_DL_ERROR();
+ if (err) {
+ php_error_docref(NULL TSRMLS_CC, error_type, Unable to
load dynamic library '%s' - %s, libpath, err);
+ LocalFree(err);
+ } else {
+ php_error_docref(NULL TSRMLS_CC, error_type, Unable to
load dynamic library '%s' - %s, libpath, Unknown reason);
+ }
+#else
php_error_docref(NULL TSRMLS_CC, error_type, Unable to load
dynamic library '%s' - %s, libpath, GET_DL_ERROR());
GET_DL_ERROR(); /* free the buffer storing the error */
+#endif
efree(libpath);
return 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_3_1/ sapi/cgi/cgi_main.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Mon, 19 Oct 2009 17:04:44 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289757
Log:
- Merge: improve fix for #49767 and #47627 - make PHP report 'no script' on 404
again
Bugs: http://bugs.php.net/49767 (Closed) estrdup crash
http://bugs.php.net/47627 (Bogus) No input file specified causing crash
Changed paths:
_U php/php-src/branches/PHP_5_3_1/
_U php/php-src/branches/PHP_5_3_1/ext/mysql/
_U php/php-src/branches/PHP_5_3_1/ext/mysqli/
_U php/php-src/branches/PHP_5_3_1/ext/mysqlnd/
_U php/php-src/branches/PHP_5_3_1/ext/pdo_mysql/
_U php/php-src/branches/PHP_5_3_1/ext/tidy/tests/
U php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c
_U
php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt
Property changes on: php/php-src/branches/PHP_5_3_1
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289752
/php/php-src/trunk:284726
+
/php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289706,289752
/php/php-src/trunk:284726
Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysql
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289612,289621-289624,289666,289752
/php/php-src/trunk/ext/mysql:284726
+
/php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289612,289621-289624,289666,289706,289752
/php/php-src/trunk/ext/mysql:284726
Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqli
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289752
/php/php-src/trunk/ext/mysqli:284726
+
/php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289706,289752
/php/php-src/trunk/ext/mysqli:284726
Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqlnd
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561,289612,289621-289624,289666,289752
/php/php-src/trunk/ext/mysqlnd:284726
+
/php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561,289612,289621-289624,289666,289706,289752
/php/php-src/trunk/ext/mysqlnd:284726
Property changes on: php/php-src/branches/PHP_5_3_1/ext/pdo_mysql
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/pdo_mysql:288202-289561,289612,289621-289624,289666,289752
/php/php-src/trunk/ext/pdo_mysql:284726
+
/php/php-src/branches/PHP_5_3/ext/pdo_mysql:288202-289561,289612,289621-289624,289666,289706,289752
/php/php-src/trunk/ext/pdo_mysql:284726
Property changes on: php/php-src/branches/PHP_5_3_1/ext/tidy/tests
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/tidy/tests:288351,289341,289612,289621-289624,289666-289667,289752
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:288351,289341,289612,289621-289624,289666-289667,289706,289752
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Modified: php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c
===
--- php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c 2009-10-19 16:59:40 UTC
(rev 289756)
+++ php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c 2009-10-19 17:04:44 UTC
(rev 289757)
@@ -2038,7 +2038,7 @@
1. we are running from shell and got filename
was there
2. we are running as cgi or fastcgi
*/
- if (cgi || SG(request_info).path_translated) {
+ if (cgi || fastcgi || SG(request_info).path_translated)
{
if (php_fopen_primary_script(file_handle
TSRMLS_CC) == FAILURE) {
if (errno == EACCES) {
SG(sapi_headers).http_response_code = 403;
Property changes on:
php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:288351,289341,289612,289621-289624,289666-289667,289752
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:288351,289341,289612,289621-289624,289666-289667,289706,289752
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/ ext/sqlite3/libsqlite/sqlite3.c ext/sqlite3/libsqlite/sqlite3.h tests/security/open_basedir_parse_ini_file.phpt
pajoye Mon, 19 Oct 2009 17:11:05 + Revision: http://svn.php.net/viewvc?view=revisionrevision=289758 Log: - Merge: Update libsqlite to 3.6.19 Changed paths: _U php/php-src/branches/PHP_5_3_1/ _U php/php-src/branches/PHP_5_3_1/ext/mysql/ _U php/php-src/branches/PHP_5_3_1/ext/mysqli/ _U php/php-src/branches/PHP_5_3_1/ext/mysqlnd/ _U php/php-src/branches/PHP_5_3_1/ext/pdo_mysql/ U php/php-src/branches/PHP_5_3_1/ext/sqlite3/libsqlite/sqlite3.c U php/php-src/branches/PHP_5_3_1/ext/sqlite3/libsqlite/sqlite3.h _U php/php-src/branches/PHP_5_3_1/ext/tidy/tests/ _U php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt diffs exceeded maximum size -- 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/win32/build/Makefile branches/PHP_5_3/win32/build/config.w32 branches/PHP_5_3/win32/build/mkdist.php trunk/win32/build/mkdist.php
pajoye Mon, 19 Oct 2009 19:02:12 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289763
Log:
- add custom DLL to the package and fix the path to the deps bin (needs
absolute path in some cases)
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/Makefile
U php/php-src/branches/PHP_5_3/win32/build/config.w32
U php/php-src/branches/PHP_5_3/win32/build/mkdist.php
U php/php-src/trunk/win32/build/mkdist.php
Modified: php/php-src/branches/PHP_5_3/win32/build/Makefile
===
--- php/php-src/branches/PHP_5_3/win32/build/Makefile 2009-10-19 18:49:22 UTC
(rev 289762)
+++ php/php-src/branches/PHP_5_3/win32/build/Makefile 2009-10-19 19:02:12 UTC
(rev 289763)
@@ -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 -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)
+ $(BUILD_DIR)\php.exe -d date.timezone=UTC -n -dphar.readonly=0
win32/build/mkdist.php $(BUILD_DIR) $(PHP_BUILD) $(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 ..\..
Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-10-19 18:49:22 UTC
(rev 289762)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-10-19 19:02:12 UTC
(rev 289763)
@@ -251,6 +251,7 @@
}
}
}
+ PHP_PHP_BUILD = FSO.GetAbsolutePathName(PHP_PHP_BUILD);
}
DEFINE(PHP_BUILD, PHP_PHP_BUILD);
Modified: php/php-src/branches/PHP_5_3/win32/build/mkdist.php
===
--- php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2009-10-19 18:49:22 UTC
(rev 289762)
+++ php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2009-10-19 19:02:12 UTC
(rev 289763)
@@ -2,11 +2,12 @@
/* piece together a windows binary distro */
$build_dir = $argv[1];
-$phpdll = $argv[2];
-$sapi_targets = explode( , $argv[3]);
-$ext_targets = explode( , $argv[4]);
-$pecl_targets = explode( , $argv[5]);
-$snapshot_template = $argv[6];
+$php_build_dir = $argv[2];
+$phpdll = $argv[3];
+$sapi_targets = explode( , $argv[4]);
+$ext_targets = explode( , $argv[5]);
+$pecl_targets = explode( , $argv[6]);
+$snapshot_template = $argv[7];
$is_debug = preg_match(/^debug/i, $build_dir);
@@ -295,7 +296,7 @@
/* try template dir */
$tdll = $snapshot_template . /dlls/ . basename($dll);
if (!file_exists($tdll)) {
- $tdll = '../deps/bin/' . basename($dll);
+ $tdll = $php_build_dir . '/bin/' . basename($dll);
if (!file_exists($tdll)) {
echo WARNING: distro depends on $dll, but
could not find it on your system\n;
continue;
@@ -309,11 +310,23 @@
/* TODO:
add sanity check and test if all required DLLs are present, per version
This version works at least for 3.6, 3.8 and 4.0 (5.3-vc6, 5.3-vc9 and HEAD).
+Add ADD_DLLS to add extra DLLs like dynamic dependencies for standard
+deps. For example, libenchant.dll loads libenchant_myspell.dll or
+libenchant_ispell.dll
*/
-$ICU_DLLS = '../deps/bin/' . 'icu*.dll';
+$ICU_DLLS = $php_build_dir . '/icu*.dll';
foreach (glob($ICU_DLLS) as $filename) {
copy($filename, $dist_dir/ . basename($filename));
}
+$ENCHANT_DLLS = array(
+ 'glib-2.dll',
+ 'gmodule-2.dll',
+ 'libenchant_myspell.dll',
+ 'libenchant_ispell.dll',
+);
+foreach ($ENCHANT_DLLS as $filename) {
+ copy($php_build_dir . '/bin/' . $filename, $dist_dir/ .
basename($filename));
+}
/* and those for pecl */
foreach ($pecl_dll_deps as $dll) {
@@ -332,6 +345,7 @@
}
copy($dll, $pecl_dir/ . basename($dll));
}
+
function copy_dir($source, $dest)
{
if (!is_dir($dest)) {
@@ -365,7 +379,9 @@
}
if ($directory == 'tests') {
- mkdir($dest . '/tests', 0775, true);
+ if (!is_dir($dest . '/tests')) {
+
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/ tests/security/open_basedir_parse_ini_file.phpt win32/build/Makefile win32/build/config.w32 win32/build/mkdist.php
pajoye Mon, 19 Oct 2009 19:05:58 + Revision: http://svn.php.net/viewvc?view=revisionrevision=289764 Log: - Merge: add custom DLL to the package and fix the path to the deps bin (needs absolute path in some cases) Changed paths: _U php/php-src/branches/PHP_5_3_1/ _U php/php-src/branches/PHP_5_3_1/ext/mysql/ _U php/php-src/branches/PHP_5_3_1/ext/mysqli/ _U php/php-src/branches/PHP_5_3_1/ext/mysqlnd/ _U php/php-src/branches/PHP_5_3_1/ext/pdo_mysql/ _U php/php-src/branches/PHP_5_3_1/ext/tidy/tests/ _U php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt U php/php-src/branches/PHP_5_3_1/win32/build/Makefile U php/php-src/branches/PHP_5_3_1/win32/build/config.w32 U php/php-src/branches/PHP_5_3_1/win32/build/mkdist.php Property changes on: php/php-src/branches/PHP_5_3_1 ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752 /php/php-src/trunk:284726 + /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763 /php/php-src/trunk:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysql ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752 /php/php-src/trunk/ext/mysql:284726 + /php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763 /php/php-src/trunk/ext/mysql:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqli ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289690,289706,289752 /php/php-src/trunk/ext/mysqli:284726 + /php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763 /php/php-src/trunk/ext/mysqli:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqlnd ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561,289612,289621-289624,289666,289690,289706,289752 /php/php-src/trunk/ext/mysqlnd:284726 + /php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763 /php/php-src/trunk/ext/mysqlnd:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/pdo_mysql ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/pdo_mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752 /php/php-src/trunk/ext/pdo_mysql:284726 + /php/php-src/branches/PHP_5_3/ext/pdo_mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763 /php/php-src/trunk/ext/pdo_mysql:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/tidy/tests ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/tidy/tests:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 + /php/php-src/branches/PHP_5_3/ext/tidy/tests:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 Property changes on: php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 + /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 Modified: php/php-src/branches/PHP_5_3_1/win32/build/Makefile === --- php/php-src/branches/PHP_5_3_1/win32/build/Makefile 2009-10-19 19:02:12 UTC (rev 289763) +++ php/php-src/branches/PHP_5_3_1/win32/build/Makefile 2009-10-19 19:05:58 UTC (rev 289764) @@ -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
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/mkdist.php trunk/win32/build/mkdist.php
pajoye Mon, 19 Oct 2009 19:58:45 + Revision: http://svn.php.net/viewvc?view=revisionrevision=289768 Log: - we don't distribute the crt9 dll, don't try to add it Changed paths: U php/php-src/branches/PHP_5_3/win32/build/mkdist.php U php/php-src/trunk/win32/build/mkdist.php Modified: php/php-src/branches/PHP_5_3/win32/build/mkdist.php === --- php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2009-10-19 19:40:02 UTC (rev 289767) +++ php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2009-10-19 19:58:45 UTC (rev 289768) @@ -60,6 +60,7 @@ * but the debug version (msvcrtd.dll) and those from visual studio.net * (msvcrt7x.dll) are not */ 'msvcrt.dll', + 'msvcr90.dll', 'wldap32.dll' ); global $build_dir, $extra_dll_deps, $ext_targets, $sapi_targets, $pecl_targets, $phpdll, $per_module_deps, $pecl_dll_deps; Modified: php/php-src/trunk/win32/build/mkdist.php === --- php/php-src/trunk/win32/build/mkdist.php2009-10-19 19:40:02 UTC (rev 289767) +++ php/php-src/trunk/win32/build/mkdist.php2009-10-19 19:58:45 UTC (rev 289768) @@ -60,6 +60,7 @@ * but the debug version (msvcrtd.dll) and those from visual studio.net * (msvcrt7x.dll) are not */ 'msvcrt.dll', + 'msvcr90.dll', 'wldap32.dll' ); global $build_dir, $extra_dll_deps, $ext_targets, $sapi_targets, $pecl_targets, $phpdll, $per_module_deps, $pecl_dll_deps; -- 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_1/win32/build/ mkdist.php
pajoye Mon, 19 Oct 2009 20:02:05 + Revision: http://svn.php.net/viewvc?view=revisionrevision=289769 Log: - Merge: we don't distribute the crt9 dll, don't try to add it Changed paths: U php/php-src/branches/PHP_5_3_1/win32/build/mkdist.php Modified: php/php-src/branches/PHP_5_3_1/win32/build/mkdist.php === --- php/php-src/branches/PHP_5_3_1/win32/build/mkdist.php 2009-10-19 19:58:45 UTC (rev 289768) +++ php/php-src/branches/PHP_5_3_1/win32/build/mkdist.php 2009-10-19 20:02:05 UTC (rev 289769) @@ -60,6 +60,7 @@ * but the debug version (msvcrtd.dll) and those from visual studio.net * (msvcrt7x.dll) are not */ 'msvcrt.dll', + 'msvcr90.dll', 'wldap32.dll' ); global $build_dir, $extra_dll_deps, $ext_targets, $sapi_targets, $pecl_targets, $phpdll, $per_module_deps, $pecl_dll_deps; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/win-installer/trunk/ ExtensionsFeatures53.wxs ExtensionsFragment53.wxs
pajoye Mon, 19 Oct 2009 20:09:19 + Revision: http://svn.php.net/viewvc?view=revisionrevision=289771 Log: - add glib and enchant backends to 5.3 Changed paths: U php/win-installer/trunk/ExtensionsFeatures53.wxs U php/win-installer/trunk/ExtensionsFragment53.wxs Modified: php/win-installer/trunk/ExtensionsFeatures53.wxs === --- php/win-installer/trunk/ExtensionsFeatures53.wxs2009-10-19 20:07:25 UTC (rev 289770) +++ php/win-installer/trunk/ExtensionsFeatures53.wxs2009-10-19 20:09:19 UTC (rev 289771) @@ -80,6 +80,10 @@ Feature AllowAdvertise=no Id=ext_php_enchant Title=$(loc.Featureext_php_enchantTitle) Description=$(loc.Featureext_php_enchantDescription) Level=10 ComponentRef Id=php_enchant/ ComponentRef Id=libenchantDLL/ + ComponentRef Id=glib2DLL/ + ComponentRef Id=gmodule2DLL/ + ComponentRef Id=libenchantmyspellDLL/ + ComponentRef Id=libenchantispellDLL/ /Feature Feature AllowAdvertise=no Id=ext_php_event Title=$(loc.Featureext_php_eventTitle) Description=$(loc.Featureext_php_eventDescription) Level=10 ComponentRef Id=php_event/ Modified: php/win-installer/trunk/ExtensionsFragment53.wxs === --- php/win-installer/trunk/ExtensionsFragment53.wxs2009-10-19 20:07:25 UTC (rev 289770) +++ php/win-installer/trunk/ExtensionsFragment53.wxs2009-10-19 20:09:19 UTC (rev 289771) @@ -20,6 +20,18 @@ Component Id=libenchantDLL DiskId=1 Guid=E27E4C40-156D-11DE-8C30-0800200C9A66 File Id=filelibenchantDLL Name=LIBENC_1.DLL LongName=libenchant.dll Source=Files\libenchant.dll / /Component + Component Id=glib2DLL DiskId=1 Guid=837C3829-1DB4-4f6e-A6E1-A8C746A0BBBC + File Id=fileglib2DLL Name=glib-2.dll Source=Files\glib-2.dll / + /Component + Component Id=gmodule2DLL DiskId=1 Guid=9F64F164-C395-4edf-A615-44A212FBCCB7 + File Id=filegmodule2DLL Name=gmodul_2.dll Source=Files\gmodule-2.dll / + /Component + Component Id=libenchantmyspellDLL DiskId=1 Guid=A53BEC7D-A42C-4bfb-A64B-1727E786A270 + File Id=filelibenchantmyspellDLL Name=libenm_1.dll Source=Files\libenchant_myspell.dll / + /Component + Component Id=libenchantispellDLL DiskId=1 Guid=C39C22EC-D3F5-4a73-A27A-BF4C1F45F8C1 + File Id=filelibenchantispellDLL Name=libeni_1.dll Source=Files\libenchant_ispell.dll / + /Component Component Id=ntwdblibDLL DiskId=1 Guid=7FA2C1EB-5166-4D16-AD36-DEF92A491D8B File Id=filentwdblibDLL Name=ntwdblib.dll Source=Files\ntwdblib.dll / /Component -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/win32/build/ mkdist.php
pajoye Mon, 19 Oct 2009 22:47:44 + Revision: http://svn.php.net/viewvc?view=revisionrevision=289778 Log: - ws Changed paths: U php/php-src/trunk/win32/build/mkdist.php Modified: php/php-src/trunk/win32/build/mkdist.php === --- php/php-src/trunk/win32/build/mkdist.php2009-10-19 21:51:59 UTC (rev 289777) +++ php/php-src/trunk/win32/build/mkdist.php2009-10-19 22:47:44 UTC (rev 289778) @@ -229,12 +229,12 @@ /* populate reading material */ $text_files = array( - LICENSE =license.txt, - NEWS = news.txt, + LICENSE = license.txt, + NEWS = news.txt, README.REDIST.BINS = readme-redist-bins.txt, - php.ini-development =php.ini-development, + php.ini-development = php.ini-development, php.ini-production = php.ini-production, - win32/install.txt = install.txt, + win32/install.txt = install.txt, win32/pws-php5cgi.reg = pws-php5cgi.reg, win32/pws-php5isapi.reg = pws-php5isapi.reg, ); -- 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/TSRM/tsrm_virtual_cwd.c branches/PHP_5_3/TSRM/tsrm_win32.c branches/PHP_5_3/TSRM/tsrm_win32.h trunk/TSRM/tsrm_virtual_cwd.c trunk/TSRM/tsrm_win32.c trunk/
pajoye Mon, 19 Oct 2009 23:32:07 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289779
Log:
- Fix ACL support and add support for ACL for TS SAPI. Be sure to get the
impersonated token when the impersonation has been done. Add the SID as part of
the key for the cache (so each SID gets its cache and not previous requests run
under other SID)
Changed paths:
U php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
U php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c
U php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.h
U php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
U php/php-src/trunk/TSRM/tsrm_win32.c
U php/php-src/trunk/TSRM/tsrm_win32.h
Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c 2009-10-19 22:47:44 UTC (rev 289778)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c 2009-10-19 23:32:07 UTC (rev 289779)
@@ -428,6 +428,31 @@
}
/* }}} */
+#ifdef PHP_WIN32
+static inline unsigned long realpath_cache_key(const char *path, int path_len TSRMLS_DC) /* {{{ */
+{
+ register unsigned long h;
+ char *bucket_key = tsrm_win32_get_path_sid_key(path TSRMLS_CC);
+ char *bucket_key_start = (char *)bucket_key;
+ const char *e = bucket_key + strlen(bucket_key);
+
+ if (!bucket_key) {
+ return 0;
+ }
+
+ for (h = 2166136261U; bucket_key e;) {
+ h *= 16777619;
+ h ^= *bucket_key++;
+ }
+ /* if no SID were present the path is returned. Otherwise a Heap
+ allocated string is returned. */
+ if (bucket_key_start != path) {
+ LocalFree(bucket_key_start);
+ }
+ return h;
+}
+/* }}} */
+#else
static inline unsigned long realpath_cache_key(const char *path, int path_len) /* {{{ */
{
register unsigned long h;
@@ -441,6 +466,7 @@
return h;
}
/* }}} */
+#endif /* defined(PHP_WIN32) */
CWD_API void realpath_cache_clean(TSRMLS_D) /* {{{ */
{
@@ -461,7 +487,11 @@
CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC) /* {{{ */
{
+#ifdef PHP_WIN32
+ unsigned long key = realpath_cache_key(path, path_len TSRMLS_CC);
+#else
unsigned long key = realpath_cache_key(path, path_len);
+#endif
unsigned long n = key % (sizeof(CWDG(realpath_cache)) / sizeof(CWDG(realpath_cache)[0]));
realpath_cache_bucket **bucket = CWDG(realpath_cache)[n];
@@ -494,8 +524,12 @@
if (CWDG(realpath_cache_size) + size = CWDG(realpath_cache_size_limit)) {
realpath_cache_bucket *bucket = malloc(size);
unsigned long n;
-
+
+#ifdef PHP_WIN32
+ bucket-key = realpath_cache_key(path, path_len TSRMLS_CC);
+#else
bucket-key = realpath_cache_key(path, path_len);
+#endif
bucket-path = (char*)bucket + sizeof(realpath_cache_bucket);
memcpy(bucket-path, path, path_len+1);
bucket-path_len = path_len;
@@ -524,7 +558,12 @@
static inline realpath_cache_bucket* realpath_cache_find(const char *path, int path_len, time_t t TSRMLS_DC) /* {{{ */
{
+#ifdef PHP_WIN32
+ unsigned long key = realpath_cache_key(path, path_len TSRMLS_CC);
+#else
unsigned long key = realpath_cache_key(path, path_len);
+#endif
+
unsigned long n = key % (sizeof(CWDG(realpath_cache)) / sizeof(CWDG(realpath_cache)[0]));
realpath_cache_bucket **bucket = CWDG(realpath_cache)[n];
Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c 2009-10-19 22:47:44 UTC (rev 289778)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c 2009-10-19 23:32:07 UTC (rev 289779)
@@ -30,7 +30,7 @@
#include TSRM.h
#ifdef TSRM_WIN32
-
+#include Sddl.h
#include tsrm_win32.h
#include tsrm_virtual_cwd.h
@@ -42,25 +42,21 @@
static void tsrm_win32_ctor(tsrm_win32_globals *globals TSRMLS_DC)
{
- HANDLE process_token = NULL;
-
globals-process = NULL;
globals-shm = NULL;
globals-process_size = 0;
globals-shm_size = 0;
globals-comspec = _strdup((GetVersion()0x8000)?cmd.exe:command.com);
- globals-impersonation_token = NULL;
- /* Access check requires impersonation token. Create a duplicate token. */
- if(OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE | TOKEN_QUERY, process_token)) {
- DuplicateToken(process_token, SecurityImpersonation, globals-impersonation_token);
- }
-
- /* impersonation_token will be closed when the process dies */
- if(process_token != NULL) {
- CloseHandle(process_token);
- process_token = NULL;
- }
+ /* Set it to INVALID_HANDLE_VALUE
+ * It will be initialized correctly in tsrm_win32_access or set to
+ * NULL if no impersonation has been done.
+ * the impersonated token can't be set here as the impersonation
+ * will happen later, in fcgi_accept_request (or whatever is the
+ * SAPI being used).
+ */
+ globals-impersonation_token = INVALID_HANDLE_VALUE;
+ globals-impersonation_token_sid = NULL;
}
static void tsrm_win32_dtor(tsrm_win32_globals *globals TSRMLS_DC)
@@
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/ NEWS TSRM/tsrm_virtual_cwd.c TSRM/tsrm_win32.c TSRM/tsrm_win32.h tests/security/open_basedir_parse_ini_file.phpt
pajoye Mon, 19 Oct 2009 23:38:55 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289780
Log:
- Merge: Fix ACL support and add support for ACL for TS SAPI. Be sure to get
the impersonated token when the impersonation has been done. Add the SID as
part of the key for the cache (so each SID gets its cache and not previous
requests run under other SID)
Changed paths:
_U php/php-src/branches/PHP_5_3_1/
UU php/php-src/branches/PHP_5_3_1/NEWS
U php/php-src/branches/PHP_5_3_1/TSRM/tsrm_virtual_cwd.c
U php/php-src/branches/PHP_5_3_1/TSRM/tsrm_win32.c
U php/php-src/branches/PHP_5_3_1/TSRM/tsrm_win32.h
_U php/php-src/branches/PHP_5_3_1/ext/mysql/
_U php/php-src/branches/PHP_5_3_1/ext/mysqli/
_U php/php-src/branches/PHP_5_3_1/ext/mysqlnd/
_U php/php-src/branches/PHP_5_3_1/ext/pdo_mysql/
_U php/php-src/branches/PHP_5_3_1/ext/tidy/tests/
_U
php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt
Property changes on: php/php-src/branches/PHP_5_3_1
___
Modified: svn:mergeinfo
- /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763
/php/php-src/trunk:284726
+ /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_1/NEWS
===
--- php/php-src/branches/PHP_5_3_1/NEWS 2009-10-19 23:32:07 UTC (rev 289779)
+++ php/php-src/branches/PHP_5_3_1/NEWS 2009-10-19 23:38:55 UTC (rev 289780)
@@ -18,7 +18,12 @@
insensitive (garretts)
- Restored shebang line check to CGI sapi (not checked by scanner anymore).
(Jani)
+- Added support for ACL on Windows for thread safe SAPI (Apache2 for example)
+ and fix its support on NTS. (Pierre)
+- Improve symbolic, mounted volume and junctions support for realpath on
+ Windows. (Pierre)
+
- Fixed bug #49847 (exec() fails to return data inside 2nd parameter, given
output lines 4095 bytes). (Ilia)
- Fixed bug #49809 (time_sleep_until() is not available on OpenSolaris). (Jani)
Property changes on: php/php-src/branches/PHP_5_3_1/NEWS
___
Modified: svn:mergeinfo
- /php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667
/php/php-src/trunk/NEWS:284726
+ /php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779
/php/php-src/trunk/NEWS:284726
Modified: php/php-src/branches/PHP_5_3_1/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/branches/PHP_5_3_1/TSRM/tsrm_virtual_cwd.c 2009-10-19 23:32:07 UTC (rev 289779)
+++ php/php-src/branches/PHP_5_3_1/TSRM/tsrm_virtual_cwd.c 2009-10-19 23:38:55 UTC (rev 289780)
@@ -428,6 +428,31 @@
}
/* }}} */
+#ifdef PHP_WIN32
+static inline unsigned long realpath_cache_key(const char *path, int path_len TSRMLS_DC) /* {{{ */
+{
+ register unsigned long h;
+ char *bucket_key = tsrm_win32_get_path_sid_key(path TSRMLS_CC);
+ char *bucket_key_start = (char *)bucket_key;
+ const char *e = bucket_key + strlen(bucket_key);
+
+ if (!bucket_key) {
+ return 0;
+ }
+
+ for (h = 2166136261U; bucket_key e;) {
+ h *= 16777619;
+ h ^= *bucket_key++;
+ }
+ /* if no SID were present the path is
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/TSRM/ tsrm_virtual_cwd.c
pajoye Mon, 19 Oct 2009 23:41:14 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289781
Log:
- MFH: fix realloc usage
Changed paths:
U php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c2009-10-19
23:38:55 UTC (rev 289780)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c2009-10-19
23:41:14 UTC (rev 289781)
@@ -983,6 +983,7 @@
time_t t;
int ret;
int add_slash;
+ void *tmp;
TSRMLS_FETCH();
if (path_length == 0 || path_length = MAXPATHLEN-1) {
@@ -1127,7 +1128,16 @@
CWD_STATE_COPY(old_state, state);
state-cwd_length = path_length;
- state-cwd = (char *) realloc(state-cwd, state-cwd_length+1);
+
+ tmp = realloc(state-cwd, state-cwd_length+1);
+ if (tmp == NULL) {
+#if VIRTUAL_CWD_DEBUG
+ fprintf (stderr, Out of memory\n);
+#endif
+ return 1;
+ }
+ state-cwd = (char *) tmp;
+
memcpy(state-cwd, resolved_path, state-cwd_length+1);
if (verify_path(state)) {
CWD_STATE_FREE(state);
@@ -1139,7 +1149,15 @@
}
} else {
state-cwd_length = path_length;
- state-cwd = (char *) realloc(state-cwd, state-cwd_length+1);
+ tmp = realloc(state-cwd, state-cwd_length+1);
+ if (tmp == NULL) {
+#if VIRTUAL_CWD_DEBUG
+ fprintf (stderr, Out of memory\n);
+#endif
+ return 1;
+ }
+ state-cwd = (char *) tmp;
+
memcpy(state-cwd, resolved_path, state-cwd_length+1);
ret = 0;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/TSRM/ tsrm_virtual_cwd.c
pajoye Mon, 19 Oct 2009 23:43:31 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289782
Log:
- MF53: Fix #48746, improve fix to support all possible cases (see latest
comment in the report)
Bug: http://bugs.php.net/48746 (Assigned) Unable to browse directories within
Junction Points
Changed paths:
U php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2009-10-19 23:41:14 UTC (rev
289781)
+++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2009-10-19 23:43:31 UTC (rev
289782)
@@ -706,10 +706,14 @@
/* File is a reparse point. Get the target */
HANDLE hLink = NULL;
REPARSE_DATA_BUFFER * pbuffer;
- unsigned int retlength = 0, rname_off = 0;
- int bufindex = 0, rname_len = 0, isabsolute = 0;
+ unsigned int retlength = 0;
+ int bufindex = 0, isabsolute = 0;
wchar_t * reparsetarget;
BOOL isVolume = FALSE;
+ char printname[MAX_PATH];
+ char substitutename[MAX_PATH];
+ int printname_len, substitutename_len;
+ int substitutename_off = 0;
if(++(*ll) LINK_MAX) {
return -1;
@@ -730,33 +734,61 @@
CloseHandle(hLink);
if(pbuffer-ReparseTag == IO_REPARSE_TAG_SYMLINK) {
- rname_len =
pbuffer-SymbolicLinkReparseBuffer.PrintNameLength/2;
- rname_off =
pbuffer-SymbolicLinkReparseBuffer.PrintNameOffset/2;
- if(rname_len = 0) {
- rname_len =
pbuffer-SymbolicLinkReparseBuffer.SubstituteNameLength/2;
- rname_off =
pbuffer-SymbolicLinkReparseBuffer.SubstituteNameOffset/2;
- }
-
reparsetarget =
pbuffer-SymbolicLinkReparseBuffer.ReparseTarget;
+ printname_len =
pbuffer-MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
isabsolute =
(pbuffer-SymbolicLinkReparseBuffer.Flags == 0) ? 1 : 0;
+ if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
+ reparsetarget +
pbuffer-MountPointReparseBuffer.PrintNameOffset / sizeof(WCHAR),
+ printname_len + 1,
+ printname, MAX_PATH, NULL, NULL
+ )) {
+ tsrm_free_alloca(pbuffer,
use_heap_large);
+ return -1;
+ };
+ printname_len =
pbuffer-MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
+ printname[printname_len] = 0;
+
+ substitutename_len =
pbuffer-MountPointReparseBuffer.SubstituteNameLength / sizeof(WCHAR);
+ if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
+ reparsetarget +
pbuffer-MountPointReparseBuffer.SubstituteNameOffset / sizeof(WCHAR),
+ substitutename_len + 1,
+ substitutename, MAX_PATH, NULL, NULL
+ )) {
+ tsrm_free_alloca(pbuffer,
use_heap_large);
+ return -1;
+ };
+ substitutename[substitutename_len] = 0;
}
else if(pbuffer-ReparseTag ==
IO_REPARSE_TAG_MOUNT_POINT) {
- rname_len =
pbuffer-MountPointReparseBuffer.PrintNameLength/2;
- rname_off =
pbuffer-MountPointReparseBuffer.PrintNameOffset/2;
- if(rname_len = 0) {
- rname_len =
pbuffer-MountPointReparseBuffer.SubstituteNameLength/2;
- rname_off =
pbuffer-MountPointReparseBuffer.SubstituteNameOffset/2;
- }
+ isabsolute = 1;
+ reparsetarget =
pbuffer-MountPointReparseBuffer.ReparseTarget;
+ printname_len =
pbuffer-MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
+ if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
+ reparsetarget +
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/main/php_ini.c branches/PHP_5_3/sapi/cgi/cgi_main.c trunk/main/php_ini.c trunk/sapi/cgi/cgi_main.c
pajoye Thu, 15 Oct 2009 13:09:25 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289667
Log:
- #48779, fix another use case where / usage may differ
Bug: http://bugs.php.net/48779 (Open) Use of HOST section cause 500 error
Changed paths:
U php/php-src/branches/PHP_5_3/main/php_ini.c
U php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c
U php/php-src/trunk/main/php_ini.c
U php/php-src/trunk/sapi/cgi/cgi_main.c
Modified: php/php-src/branches/PHP_5_3/main/php_ini.c
===
--- php/php-src/branches/PHP_5_3/main/php_ini.c 2009-10-15 12:26:54 UTC (rev
289666)
+++ php/php-src/branches/PHP_5_3/main/php_ini.c 2009-10-15 13:09:25 UTC (rev
289667)
@@ -793,10 +793,18 @@
zval *tmp;
char *ptr;
+#if PHP_WIN32
+ char path_bak[MAXPATHLEN];
+ memcpy(path_bak, path, path_len);
+ path_bak[path_len] = 0;
+ TRANSLATE_SLASHES_LOWER(path_bak);
+ path = path_bak;
+#endif
+
/* Walk through each directory in path and apply any found
per-dir-system-configuration from configuration_hash */
if (has_per_dir_config path path_len) {
ptr = path + 1;
- while ((ptr = strchr(ptr, DEFAULT_SLASH)) != NULL) {
+ while ((ptr = strchr(ptr, '/')) != NULL) {
*ptr = 0;
/* Search for source array matching the path from
configuration_hash */
if (zend_hash_find(configuration_hash, path, path_len,
(void **) tmp) == SUCCESS) {
Modified: php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c
===
--- php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c2009-10-15 12:26:54 UTC
(rev 289666)
+++ php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c2009-10-15 13:09:25 UTC
(rev 289667)
@@ -818,10 +818,6 @@
path_len = zend_dirname(path, path_len);
}
path[path_len] = 0;
-#ifdef PHP_WIN32
- /* paths on windows should be case-insensitive */
- zend_str_tolower(path, path_len);
-#endif
/* Activate per-dir-system-configuration defined in php.ini and
stored into configuration_hash during startup */
php_ini_activate_per_dir_config(path, path_len TSRMLS_CC); /*
Note: for global settings sake we check from root to path */
Modified: php/php-src/trunk/main/php_ini.c
===
--- php/php-src/trunk/main/php_ini.c2009-10-15 12:26:54 UTC (rev 289666)
+++ php/php-src/trunk/main/php_ini.c2009-10-15 13:09:25 UTC (rev 289667)
@@ -800,10 +800,18 @@
zval *tmp;
char *ptr;
+#if PHP_WIN32
+ char path_bak[MAXPATHLEN];
+ memcpy(path_bak, path, path_len);
+ path_bak[path_len] = 0;
+ TRANSLATE_SLASHES_LOWER(path_bak);
+ path = path_bak;
+#endif
+
/* Walk through each directory in path and apply any found
per-dir-system-configuration from configuration_hash */
if (has_per_dir_config path path_len) {
ptr = path + 1;
- while ((ptr = strchr(ptr, DEFAULT_SLASH)) != NULL) {
+ while ((ptr = strchr(ptr, '/')) != NULL) {
*ptr = 0;
/* Search for source array matching the path from
configuration_hash */
if (zend_hash_find(configuration_hash, path, path_len,
(void **) tmp) == SUCCESS) {
Modified: php/php-src/trunk/sapi/cgi/cgi_main.c
===
--- php/php-src/trunk/sapi/cgi/cgi_main.c 2009-10-15 12:26:54 UTC (rev
289666)
+++ php/php-src/trunk/sapi/cgi/cgi_main.c 2009-10-15 13:09:25 UTC (rev
289667)
@@ -815,10 +815,6 @@
path_len = zend_dirname(path, path_len);
}
path[path_len] = 0;
-#ifdef PHP_WIN32
- /* paths on windows should be case-insensitive */
- zend_str_tolower(path, path_len);
-#endif
/* Activate per-dir-system-configuration defined in php.ini and
stored into configuration_hash during startup */
php_ini_activate_per_dir_config(path, path_len TSRMLS_CC); /*
Note: for global settings sake we check from root to path */
--
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_1/ main/php_ini.c sapi/cgi/cgi_main.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 15 Oct 2009 13:28:55 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289668
Log:
- Merge: - #48779, fix another use case where / usage may differ
Bug: http://bugs.php.net/48779 (Open) Use of HOST section cause 500 error
Changed paths:
_U php/php-src/branches/PHP_5_3_1/
_U php/php-src/branches/PHP_5_3_1/ext/tidy/tests/
U php/php-src/branches/PHP_5_3_1/main/php_ini.c
U php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c
_U
php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt
Property changes on: php/php-src/branches/PHP_5_3_1
___
Modified: svn:mergeinfo
- /php/php-src/trunk:284726
+ /php/php-src/branches/PHP_5_3:289667
/php/php-src/trunk:284726
Property changes on: php/php-src/branches/PHP_5_3_1/ext/tidy/tests
___
Modified: svn:mergeinfo
- /php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+ /php/php-src/branches/PHP_5_3/ext/tidy/tests:289667
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Modified: php/php-src/branches/PHP_5_3_1/main/php_ini.c
===
--- php/php-src/branches/PHP_5_3_1/main/php_ini.c 2009-10-15 13:09:25 UTC
(rev 289667)
+++ php/php-src/branches/PHP_5_3_1/main/php_ini.c 2009-10-15 13:28:55 UTC
(rev 289668)
@@ -793,10 +793,18 @@
zval *tmp;
char *ptr;
+#if PHP_WIN32
+ char path_bak[MAXPATHLEN];
+ memcpy(path_bak, path, path_len);
+ path_bak[path_len] = 0;
+ TRANSLATE_SLASHES_LOWER(path_bak);
+ path = path_bak;
+#endif
+
/* Walk through each directory in path and apply any found
per-dir-system-configuration from configuration_hash */
if (has_per_dir_config path path_len) {
ptr = path + 1;
- while ((ptr = strchr(ptr, DEFAULT_SLASH)) != NULL) {
+ while ((ptr = strchr(ptr, '/')) != NULL) {
*ptr = 0;
/* Search for source array matching the path from
configuration_hash */
if (zend_hash_find(configuration_hash, path, path_len,
(void **) tmp) == SUCCESS) {
Modified: php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c
===
--- php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c 2009-10-15 13:09:25 UTC
(rev 289667)
+++ php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c 2009-10-15 13:28:55 UTC
(rev 289668)
@@ -818,10 +818,6 @@
path_len = zend_dirname(path, path_len);
}
path[path_len] = 0;
-#ifdef PHP_WIN32
- /* paths on windows should be case-insensitive */
- zend_str_tolower(path, path_len);
-#endif
/* Activate per-dir-system-configuration defined in php.ini and
stored into configuration_hash during startup */
php_ini_activate_per_dir_config(path, path_len TSRMLS_CC); /*
Note: for global settings sake we check from root to path */
Property changes on:
php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
- /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:289667
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
--
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_1/ ext/standard/basic_functions.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 15 Oct 2009 14:10:03 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289669
Log:
- Merge: - #49855 ^# ^author ^date ^msg ^merge^
Bug: http://bugs.php.net/49855 (Closed) import_request_variables always return
false in any codition.
Changed paths:
_U php/php-src/branches/PHP_5_3_1/
_U php/php-src/branches/PHP_5_3_1/ext/mysql/
_U php/php-src/branches/PHP_5_3_1/ext/mysqli/
_U php/php-src/branches/PHP_5_3_1/ext/mysqlnd/
_U php/php-src/branches/PHP_5_3_1/ext/pdo_mysql/
U php/php-src/branches/PHP_5_3_1/ext/standard/basic_functions.c
_U php/php-src/branches/PHP_5_3_1/ext/tidy/tests/
_U
php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt
Property changes on: php/php-src/branches/PHP_5_3_1
___
Modified: svn:mergeinfo
- /php/php-src/branches/PHP_5_3:289667
/php/php-src/trunk:284726
+ /php/php-src/branches/PHP_5_3:289666-289667
/php/php-src/trunk:284726
Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysql
___
Modified: svn:mergeinfo
- /php/php-src/branches/PHP_5_3/ext/mysql:288202-289561
/php/php-src/trunk/ext/mysql:284726
+ /php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289666
/php/php-src/trunk/ext/mysql:284726
Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqli
___
Modified: svn:mergeinfo
- /php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561
/php/php-src/trunk/ext/mysqli:284726
+ /php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289666
/php/php-src/trunk/ext/mysqli:284726
Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqlnd
___
Modified: svn:mergeinfo
- /php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561
/php/php-src/trunk/ext/mysqlnd:284726
+ /php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561,289666
/php/php-src/trunk/ext/mysqlnd:284726
Property changes on: php/php-src/branches/PHP_5_3_1/ext/pdo_mysql
___
Modified: svn:mergeinfo
- /php/php-src/branches/PHP_5_3/ext/pdo_mysql:288202-289561
/php/php-src/trunk/ext/pdo_mysql:284726
+ /php/php-src/branches/PHP_5_3/ext/pdo_mysql:288202-289561,289666
/php/php-src/trunk/ext/pdo_mysql:284726
Modified: php/php-src/branches/PHP_5_3_1/ext/standard/basic_functions.c
===
--- php/php-src/branches/PHP_5_3_1/ext/standard/basic_functions.c
2009-10-15 13:28:55 UTC (rev 289668)
+++ php/php-src/branches/PHP_5_3_1/ext/standard/basic_functions.c
2009-10-15 14:10:03 UTC (rev 289669)
@@ -6048,6 +6048,7 @@
int types_len;
zval *prefix = NULL;
char *p;
+ zend_bool ok = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|z/, types,
types_len, prefix) == FAILURE) {
return;
@@ -6070,17 +6071,20 @@
case 'g':
case 'G':
zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_GET])
TSRMLS_CC, (apply_func_args_t) copy_request_variable, 1, prefix);
+ ok = 1;
break;
case 'p':
case 'P':
zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_POST])
TSRMLS_CC, (apply_func_args_t) copy_request_variable, 1, prefix);
zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_FILES])
TSRMLS_CC, (apply_func_args_t) copy_request_variable, 1, prefix);
+ ok = 1;
break;
case 'c':
case 'C':
zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE])
TSRMLS_CC, (apply_func_args_t) copy_request_variable, 1, prefix);
+ ok = 1;
break;
}
}
@@ -6088,6 +6092,7 @@
if (ZEND_NUM_ARGS() 2) {
zval_ptr_dtor(prefix);
}
+ RETURN_BOOL(ok);
}
/* }}} */
Property changes on: php/php-src/branches/PHP_5_3_1/ext/tidy/tests
___
Modified: svn:mergeinfo
- /php/php-src/branches/PHP_5_3/ext/tidy/tests:289667
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+ /php/php-src/branches/PHP_5_3/ext/tidy/tests:289666-289667
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/ configure.in
pajoye Thu, 15 Oct 2009 21:06:51 + Revision: http://svn.php.net/viewvc?view=revisionrevision=289685 Log: - Merge: #49809 (time_sleep_until is not available on solaris) Bug: http://bugs.php.net/49809 (Closed) time_sleep_until is not available on solaris Changed paths: U php/php-src/branches/PHP_5_3_1/configure.in Modified: php/php-src/branches/PHP_5_3_1/configure.in === --- php/php-src/branches/PHP_5_3_1/configure.in 2009-10-15 20:46:08 UTC (rev 289684) +++ php/php-src/branches/PHP_5_3_1/configure.in 2009-10-15 21:06:51 UTC (rev 289685) @@ -402,6 +402,8 @@ dnl in -lc, -lbind and -lresolv PHP_CHECK_FUNC(inet_aton, resolv, bind) +dnl Some systems (like OpenSolaris) do not have nanosleep in libc +PHP_CHECK_FUNC(nanosleep, rt) dnl Then headers. dnl - @@ -621,7 +623,6 @@ unlockpt \ unsetenv \ usleep \ -nanosleep \ utime \ vsnprintf \ vasprintf \ -- 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_1/ext/date/lib/ timezonedb.h
pajoye Thu, 15 Oct 2009 21:29:00 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289686
Log:
- Merge: Updated to version 2009.14 (2009n)
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/date/lib/timezonedb.h
Modified: php/php-src/branches/PHP_5_3_1/ext/date/lib/timezonedb.h
===
--- php/php-src/branches/PHP_5_3_1/ext/date/lib/timezonedb.h2009-10-15
21:06:51 UTC (rev 289685)
+++ php/php-src/branches/PHP_5_3_1/ext/date/lib/timezonedb.h2009-10-15
21:29:00 UTC (rev 289686)
@@ -8144,7 +8144,7 @@
0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x16, 0x89,
0x7E, 0xFC, 0xA4,
0xCC, 0x95, 0x32, 0xA8, 0xD2, 0x74, 0x12, 0x98, 0xDD, 0xA8, 0xE0, 0xA8, 0x02,
0x4F, 0xAB, 0x30,
0x3C, 0xAF, 0x45, 0xEC, 0x3D, 0x9F, 0x28, 0xDC, 0x48, 0x41, 0xA0, 0x30, 0x49,
0x0B, 0x47, 0xA0,
-0x49, 0xE4, 0xDD, 0x30, 0x4A, 0xEC, 0x7B, 0x20, 0x01, 0x02, 0x01, 0x03, 0x05,
0x04, 0x05, 0x04,
+0x49, 0xE4, 0xDD, 0x30, 0x4A, 0xC3, 0x9C, 0xA0, 0x01, 0x02, 0x01, 0x03, 0x05,
0x04, 0x05, 0x04,
0x05, 0x04, 0x05, 0x00, 0x00, 0x3E, 0xDC, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x58,
0x00, 0x04, 0x00,
0x00, 0x5B, 0x68, 0x01, 0x04, 0x00, 0x00, 0x46, 0x50, 0x00, 0x08, 0x00, 0x00,
0x54, 0x60, 0x01,
0x0D, 0x00, 0x00, 0x46, 0x50, 0x00, 0x12, 0x4C, 0x4D, 0x54, 0x00, 0x49, 0x53,
0x54, 0x00, 0x4B,
@@ -18095,4 +18095,4 @@
0x00, 0x00, 0x55, 0x54, 0x43, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01,
0x12, 0xA8, 0x80,
0x00, 0x00, 0x00, 0x00, };
-const timelib_tzdb timezonedb_builtin = { 2009.13, 560,
timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
+const timelib_tzdb timezonedb_builtin = { 2009.14, 560,
timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
--
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_1/ main/main.c win32/registry.c
pajoye Thu, 15 Oct 2009 21:32:24 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289687
Log:
- Merge: fix crash for bug #47627
Bug: http://bugs.php.net/47627 (Bogus) No input file specified causing crash
Changed paths:
U php/php-src/branches/PHP_5_3_1/main/main.c
U php/php-src/branches/PHP_5_3_1/win32/registry.c
Modified: php/php-src/branches/PHP_5_3_1/main/main.c
===
--- php/php-src/branches/PHP_5_3_1/main/main.c 2009-10-15 21:29:00 UTC (rev
289686)
+++ php/php-src/branches/PHP_5_3_1/main/main.c 2009-10-15 21:32:24 UTC (rev
289687)
@@ -2162,7 +2162,9 @@
char realfile[MAXPATHLEN];
#ifdef PHP_WIN32
- UpdateIniFromRegistry(primary_file-filename TSRMLS_CC);
+ if(primary_file-filename) {
+ UpdateIniFromRegistry(primary_file-filename TSRMLS_CC);
+ }
#endif
PG(during_request_startup) = 0;
@@ -2252,7 +2254,9 @@
zend_try {
#ifdef PHP_WIN32
- UpdateIniFromRegistry(primary_file-filename TSRMLS_CC);
+ if(primary_file-filename) {
+ UpdateIniFromRegistry(primary_file-filename TSRMLS_CC);
+ }
#endif
PG(during_request_startup) = 0;
Modified: php/php-src/branches/PHP_5_3_1/win32/registry.c
===
--- php/php-src/branches/PHP_5_3_1/win32/registry.c 2009-10-15 21:29:00 UTC
(rev 289686)
+++ php/php-src/branches/PHP_5_3_1/win32/registry.c 2009-10-15 21:32:24 UTC
(rev 289687)
@@ -168,6 +168,10 @@
int path_len;
HashTable **pht;
+ if(!path) {
+ return;
+ }
+
if (!PW32G(registry_directories)) {
PW32G(registry_directories) =
(HashTable*)malloc(sizeof(HashTable));
zend_hash_init(PW32G(registry_directories), 0, NULL,
delete_internal_hashtable, 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_3_1/ext/standard/ exec.c
pajoye Thu, 15 Oct 2009 21:36:42 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289688
Log:
- Merge: #49847
Bug: http://bugs.php.net/49847 (Closed) exec() confused by a specially crafted
string
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/standard/exec.c
Modified: php/php-src/branches/PHP_5_3_1/ext/standard/exec.c
===
--- php/php-src/branches/PHP_5_3_1/ext/standard/exec.c 2009-10-15 21:32:24 UTC
(rev 289687)
+++ php/php-src/branches/PHP_5_3_1/ext/standard/exec.c 2009-10-15 21:36:42 UTC
(rev 289688)
@@ -62,7 +62,7 @@
{
FILE *fp;
char *buf, *tmp=NULL;
- int l, pclose_return;
+ int l = 0, pclose_return;
char *cmd_p, *b, *c, *d=NULL;
php_stream *stream;
size_t buflen, bufl = 0;
@@ -157,13 +157,16 @@
}
if (bufl) {
/* strip trailing whitespaces if we have not done so
already */
- if (type != 2) {
+ if ((type == 2 bufl !l) || type != 2) {
l = bufl;
while (l-- isspace(((unsigned char
*)buf)[l]));
if (l != (int)(bufl - 1)) {
bufl = l + 1;
buf[bufl] = '\0';
}
+ if (type == 2) {
+ add_next_index_stringl(array, buf,
bufl, 1);
+ }
}
/* Return last line from the shell command */
--
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_1/ext/sqlite3/libsqlite/ sqlite3.c sqlite3.h
pajoye Thu, 15 Oct 2009 21:40:36 + Revision: http://svn.php.net/viewvc?view=revisionrevision=289689 Log: - Merge: Upgraded bundled sqlite to versio 3.6.18 Changed paths: U php/php-src/branches/PHP_5_3_1/ext/sqlite3/libsqlite/sqlite3.c U php/php-src/branches/PHP_5_3_1/ext/sqlite3/libsqlite/sqlite3.h diffs exceeded maximum size -- 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/gd/libgd/gd_gd.c branches/PHP_5_2/ext/gd/tests/crafted.gd2 branches/PHP_5_2/ext/gd/tests/crafted_gd2.phpt branches/PHP_5_3/ext/gd/libgd/gd_gd.c branch
pajoye Mon, 12 Oct 2009 10:01:37 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289557
Log:
- check max colors while loading gd2 palette image (patch by Tomas Hoger)
Changed paths:
U php/php-src/branches/PHP_5_2/ext/gd/libgd/gd_gd.c
A php/php-src/branches/PHP_5_2/ext/gd/tests/crafted.gd2
A php/php-src/branches/PHP_5_2/ext/gd/tests/crafted_gd2.phpt
U php/php-src/branches/PHP_5_3/ext/gd/libgd/gd_gd.c
A php/php-src/branches/PHP_5_3/ext/gd/tests/crafted.gd2
A php/php-src/branches/PHP_5_3/ext/gd/tests/crafted_gd2.phpt
U php/php-src/branches/PHP_5_3_1/ext/gd/libgd/gd_gd.c
A php/php-src/branches/PHP_5_3_1/ext/gd/tests/crafted.gd2
A php/php-src/branches/PHP_5_3_1/ext/gd/tests/crafted_gd2.phpt
U php/php-src/trunk/ext/gd/libgd/gd_gd.c
A php/php-src/trunk/ext/gd/tests/crafted.gd2
A php/php-src/trunk/ext/gd/tests/crafted_gd2.phpt
Modified: php/php-src/branches/PHP_5_2/ext/gd/libgd/gd_gd.c
===
--- php/php-src/branches/PHP_5_2/ext/gd/libgd/gd_gd.c 2009-10-12 09:44:18 UTC
(rev 289556)
+++ php/php-src/branches/PHP_5_2/ext/gd/libgd/gd_gd.c 2009-10-12 10:01:37 UTC
(rev 289557)
@@ -39,6 +39,9 @@
if (!gdGetWord(im-colorsTotal, in)) {
goto fail1;
}
+ if (im-colorsTotal gdMaxColors) {
+ goto fail1;
+ }
}
/* Int to accommodate truecolor single-color transparency */
if (!gdGetInt(im-transparent, in)) {
Added: php/php-src/branches/PHP_5_2/ext/gd/tests/crafted.gd2
===
(Binary files differ)
Property changes on: php/php-src/branches/PHP_5_2/ext/gd/tests/crafted.gd2
___
Added: svn:mime-type
+ application/octet-stream
Added: php/php-src/branches/PHP_5_2/ext/gd/tests/crafted_gd2.phpt
===
--- php/php-src/branches/PHP_5_2/ext/gd/tests/crafted_gd2.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_2/ext/gd/tests/crafted_gd2.phpt 2009-10-12
10:01:37 UTC (rev 289557)
@@ -0,0 +1,16 @@
+--TEST--
+Test max colors for a gd image.
+--SKIPIF--
+?php
+ if (!extension_loaded('gd')) {
+ die(skip gd extension not available\n);
+ }
+?
+--FILE--
+?php
+imagecreatefromgd(dirname(__FILE__) . '/crafted.gd2');
+?
+--EXPECTF--
+
+Warning: imagecreatefromgd(): '%scrafted.gd2' is not a valid GD file in %s on
line %d
+
Modified: php/php-src/branches/PHP_5_3/ext/gd/libgd/gd_gd.c
===
--- php/php-src/branches/PHP_5_3/ext/gd/libgd/gd_gd.c 2009-10-12 09:44:18 UTC
(rev 289556)
+++ php/php-src/branches/PHP_5_3/ext/gd/libgd/gd_gd.c 2009-10-12 10:01:37 UTC
(rev 289557)
@@ -39,6 +39,9 @@
if (!gdGetWord(im-colorsTotal, in)) {
goto fail1;
}
+ if (im-colorsTotal gdMaxColors) {
+ goto fail1;
+ }
}
/* Int to accommodate truecolor single-color transparency */
if (!gdGetInt(im-transparent, in)) {
Added: php/php-src/branches/PHP_5_3/ext/gd/tests/crafted.gd2
===
(Binary files differ)
Property changes on: php/php-src/branches/PHP_5_3/ext/gd/tests/crafted.gd2
___
Added: svn:mime-type
+ application/octet-stream
Added: php/php-src/branches/PHP_5_3/ext/gd/tests/crafted_gd2.phpt
===
--- php/php-src/branches/PHP_5_3/ext/gd/tests/crafted_gd2.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/gd/tests/crafted_gd2.phpt 2009-10-12
10:01:37 UTC (rev 289557)
@@ -0,0 +1,16 @@
+--TEST--
+Test max colors for a gd image.
+--SKIPIF--
+?php
+ if (!extension_loaded('gd')) {
+ die(skip gd extension not available\n);
+ }
+?
+--FILE--
+?php
+imagecreatefromgd(dirname(__FILE__) . '/crafted.gd2');
+?
+--EXPECTF--
+
+Warning: imagecreatefromgd(): '%scrafted.gd2' is not a valid GD file in %s on
line %d
+
Modified: php/php-src/branches/PHP_5_3_1/ext/gd/libgd/gd_gd.c
===
--- php/php-src/branches/PHP_5_3_1/ext/gd/libgd/gd_gd.c 2009-10-12 09:44:18 UTC
(rev 289556)
+++ php/php-src/branches/PHP_5_3_1/ext/gd/libgd/gd_gd.c 2009-10-12 10:01:37 UTC
(rev 289557)
@@ -39,6 +39,9 @@
if (!gdGetWord(im-colorsTotal, in)) {
goto fail1;
[PHP-CVS] svn: /SVNROOT/ global_avail
pajoye Mon, 12 Oct 2009 10:13:53 + Revision: http://svn.php.net/viewvc?view=revisionrevision=289558 Log: - aharvey karma for web (request from Hannes) Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2009-10-12 10:01:37 UTC (rev 289557) +++ SVNROOT/global_avail2009-10-12 10:13:53 UTC (rev 289558) @@ -52,7 +52,7 @@ # The PHP Web Group maintains www.php.net, news.php.net, bugs.php.net, # people.php.net and master.php.net. -avail|scottmac,jmertic,lsmith,johannes,ilia,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,jani,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip,didou,sfox,sean,dufuz,nlopess,pajoye,helly,tony2001,bjori,felipe,dsp|web/php,web/php-bugs,web/php-master,web/php-news,web/php-hosts,web/php-wiki,web/php-people +avail|scottmac,jmertic,lsmith,johannes,ilia,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,jani,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip,didou,sfox,sean,dufuz,nlopess,pajoye,helly,tony2001,bjori,felipe,dsp,aharvey|web/php,web/php-bugs,web/php-master,web/php-news,web/php-hosts,web/php-wiki,web/php-people # 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: /php/php-src/branches/PHP_5_3_1/ext/date/tests/ date_sunrise_variation5.phpt date_sunset_variation5.phpt
pajoye Mon, 12 Oct 2009 14:23:29 + Revision: http://svn.php.net/viewvc?view=revisionrevision=289564 Log: - Merge: fix test Changed paths: U php/php-src/branches/PHP_5_3_1/ext/date/tests/date_sunrise_variation5.phpt U php/php-src/branches/PHP_5_3_1/ext/date/tests/date_sunset_variation5.phpt Modified: php/php-src/branches/PHP_5_3_1/ext/date/tests/date_sunrise_variation5.phpt === --- php/php-src/branches/PHP_5_3_1/ext/date/tests/date_sunrise_variation5.phpt 2009-10-12 13:39:13 UTC (rev 289563) +++ php/php-src/branches/PHP_5_3_1/ext/date/tests/date_sunrise_variation5.phpt 2009-10-12 14:23:29 UTC (rev 289564) @@ -113,13 +113,13 @@ bool(false) --int 12345-- -string(5) 09:52 -float(9.882%d) -int(1218169377) +string(5) 09:51 +float(9.855%d) +int(1218169278) --int -12345-- string(5) 09:54 -float(9.909%d) +float(9.909782098) int(1218169475) --empty array-- Modified: php/php-src/branches/PHP_5_3_1/ext/date/tests/date_sunset_variation5.phpt === --- php/php-src/branches/PHP_5_3_1/ext/date/tests/date_sunset_variation5.phpt 2009-10-12 13:39:13 UTC (rev 289563) +++ php/php-src/branches/PHP_5_3_1/ext/date/tests/date_sunset_variation5.phpt 2009-10-12 14:23:29 UTC (rev 289564) @@ -113,9 +113,9 @@ bool(false) --int 12345-- -string(5) 19:19 -float(19.319%d) -int(1218203349) +string(5) 19:20 +float(19.340%d) +int(1218203424) --int -12345-- bool(false) -- 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_1/ext/date/lib/ timezonedb.h
pajoye Mon, 12 Oct 2009 14:26:47 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289566
Log:
- Merge: Updated to version 2009.13 (2009m)
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/date/lib/timezonedb.h
Modified: php/php-src/branches/PHP_5_3_1/ext/date/lib/timezonedb.h
===
--- php/php-src/branches/PHP_5_3_1/ext/date/lib/timezonedb.h 2009-10-12 14:25:51 UTC (rev 289565)
+++ php/php-src/branches/PHP_5_3_1/ext/date/lib/timezonedb.h 2009-10-12 14:26:47 UTC (rev 289566)
@@ -493,75 +493,75 @@
{ NZ, 0x038D89 },
{ NZ-CHAT , 0x039107 },
{ Pacific/Apia , 0x0393EF },
- { Pacific/Auckland , 0x039456 },
- { Pacific/Chatham , 0x0397E2 },
- { Pacific/Easter, 0x039AD9 },
- { Pacific/Efate , 0x039E37 },
- { Pacific/Enderbury , 0x039EFD },
- { Pacific/Fakaofo , 0x039F6B },
- { Pacific/Fiji , 0x039FAF },
- { Pacific/Funafuti , 0x03A025 },
- { Pacific/Galapagos , 0x03A069 },
- { Pacific/Gambier , 0x03A0E1 },
- { Pacific/Guadalcanal , 0x03A146 },
- { Pacific/Guam , 0x03A19B },
- { Pacific/Honolulu , 0x03A1F1 },
- { Pacific/Johnston , 0x03A285 },
- { Pacific/Kiritimati, 0x03A2D7 },
- { Pacific/Kosrae, 0x03A342 },
- { Pacific/Kwajalein , 0x03A39F },
- { Pacific/Majuro, 0x03A40B },
- { Pacific/Marquesas , 0x03A46A },
- { Pacific/Midway, 0x03A4D1 },
- { Pacific/Nauru , 0x03A55B },
- { Pacific/Niue , 0x03A5D3 },
- { Pacific/Norfolk , 0x03A631 },
- { Pacific/Noumea, 0x03A686 },
- { Pacific/Pago_Pago , 0x03A716 },
- { Pacific/Palau , 0x03A79F },
- { Pacific/Pitcairn , 0x03A7E3 },
- { Pacific/Ponape, 0x03A838 },
- { Pacific/Port_Moresby , 0x03A88D },
- { Pacific/Rarotonga , 0x03A8D1 },
- { Pacific/Saipan, 0x03A9AD },
- { Pacific/Samoa , 0x03AA10 },
- { Pacific/Tahiti, 0x03AA99 },
- { Pacific/Tarawa, 0x03AAFE },
- { Pacific/Tongatapu , 0x03AB52 },
- { Pacific/Truk , 0x03ABDE },
- { Pacific/Wake , 0x03AC37 },
- { Pacific/Wallis, 0x03AC87 },
- { Pacific/Yap , 0x03ACCB },
- { Poland, 0x03AD10 },
- { Portugal , 0x03B0F1 },
- { PRC , 0x03B5ED },
- { PST8PDT , 0x03B69E },
- { ROC , 0x03B9EF },
- { ROK , 0x03BB07 },
- { Singapore , 0x03BBAB },
- { Turkey, 0x03BC62 },
- { UCT , 0x03C04F },
- { Universal , 0x03C093 },
- { US/Alaska , 0x03C0D7 },
- { US/Aleutian , 0x03C440 },
- { US/Arizona, 0x03C7A6 },
- { US/Central, 0x03C834 },
- { US/East-Indiana , 0x03D23E },
- { US/Eastern, 0x03CD3F },
- { US/Hawaii , 0x03D4A8 },
- { US/Indiana-Starke , 0x03D536 },
- { US/Michigan , 0x03D8A7 },
- { US/Mountain , 0x03DBDE },
- { US/Pacific, 0x03DF57 },
- { US/Pacific-New, 0x03E35C },
- { US/Samoa , 0x03E761 },
- { UTC , 0x03E7EA },
- { W-SU , 0x03EAE1 },
- { WET , 0x03E82E },
- { Zulu , 0x03EE1C },
+ { Pacific/Auckland , 0x03946D },
+ { Pacific/Chatham , 0x0397F9 },
+ { Pacific/Easter, 0x039AF0 },
+ { Pacific/Efate , 0x039E4E },
+ { Pacific/Enderbury , 0x039F14 },
+ { Pacific/Fakaofo , 0x039F82 },
+ { Pacific/Fiji , 0x039FC6 },
+ { Pacific/Funafuti , 0x03A03C },
+ { Pacific/Galapagos , 0x03A080 },
+ { Pacific/Gambier , 0x03A0F8 },
+ { Pacific/Guadalcanal , 0x03A15D },
+ { Pacific/Guam , 0x03A1B2 },
+ { Pacific/Honolulu , 0x03A208 },
+ { Pacific/Johnston , 0x03A29C },
+ { Pacific/Kiritimati, 0x03A2EE },
+ {
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/main/php_ini.c branches/PHP_5_3/sapi/cgi/cgi_main.c trunk/main/php_ini.c trunk/sapi/cgi/cgi_main.c
pajoye Mon, 12 Oct 2009 14:40:27 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289568
Log:
- #48779, improve fix, drop usage of _tolower and use zend_strtolower
Bug: http://bugs.php.net/48779 (Open) Use of HOST section cause 500 error
Changed paths:
U php/php-src/branches/PHP_5_3/main/php_ini.c
U php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c
U php/php-src/trunk/main/php_ini.c
U php/php-src/trunk/sapi/cgi/cgi_main.c
Modified: php/php-src/branches/PHP_5_3/main/php_ini.c
===
--- php/php-src/branches/PHP_5_3/main/php_ini.c 2009-10-12 14:29:45 UTC (rev
289567)
+++ php/php-src/branches/PHP_5_3/main/php_ini.c 2009-10-12 14:40:27 UTC (rev
289568)
@@ -47,7 +47,7 @@
char *tmp = path; \
while (*tmp) { \
if (*tmp == '\\') *tmp = '/'; \
- else *tmp = (__isascii(*tmp)) ? _tolower(*tmp) :
tolower(*tmp); \
+ else *tmp = tolower(*tmp); \
tmp++; \
} \
}
Modified: php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c
===
--- php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c2009-10-12 14:29:45 UTC
(rev 289567)
+++ php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c2009-10-12 14:40:27 UTC
(rev 289568)
@@ -820,7 +820,7 @@
path[path_len] = 0;
#ifdef PHP_WIN32
/* paths on windows should be case-insensitive */
- strlwr(path);
+ zend_str_tolower(path, path_len);
#endif
/* Activate per-dir-system-configuration defined in php.ini and
stored into configuration_hash during startup */
@@ -838,7 +838,7 @@
#ifdef PHP_WIN32
/* paths on windows should be case-insensitive
*/
doc_root = estrndup(doc_root, doc_root_len);
- strlwr(doc_root);
+ zend_str_tolower(doc_root, doc_root_len);
#endif
php_cgi_ini_activate_user_config(path,
path_len, doc_root, doc_root_len, doc_root_len - 1 TSRMLS_CC);
}
Modified: php/php-src/trunk/main/php_ini.c
===
--- php/php-src/trunk/main/php_ini.c2009-10-12 14:29:45 UTC (rev 289567)
+++ php/php-src/trunk/main/php_ini.c2009-10-12 14:40:27 UTC (rev 289568)
@@ -47,7 +47,7 @@
char *tmp = path; \
while (*tmp) { \
if (*tmp == '\\') *tmp = '/'; \
- else *tmp = (__isascii(*tmp)) ? _tolower(*tmp) :
tolower(*tmp); \
+ else *tmp = tolower(*tmp); \
tmp++; \
} \
}
Modified: php/php-src/trunk/sapi/cgi/cgi_main.c
===
--- php/php-src/trunk/sapi/cgi/cgi_main.c 2009-10-12 14:29:45 UTC (rev
289567)
+++ php/php-src/trunk/sapi/cgi/cgi_main.c 2009-10-12 14:40:27 UTC (rev
289568)
@@ -817,7 +817,7 @@
path[path_len] = 0;
#ifdef PHP_WIN32
/* paths on windows should be case-insensitive */
- strlwr(path);
+ zend_str_tolower(path, path_len);
#endif
/* Activate per-dir-system-configuration defined in php.ini and
stored into configuration_hash during startup */
@@ -835,7 +835,7 @@
#ifdef PHP_WIN32
/* paths on windows should be case-insensitive
*/
doc_root = estrndup(doc_root, doc_root_len);
- strlwr(doc_root);
+ zend_str_tolower(doc_root, doc_root_len);
#endif
php_cgi_ini_activate_user_config(path,
path_len, doc_root, doc_root_len, doc_root_len - 1 TSRMLS_CC);
}
--
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_1/ main/php_ini.c sapi/cgi/cgi_main.c
pajoye Mon, 12 Oct 2009 14:51:24 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289571
Log:
- Merge: #48779
Bug: http://bugs.php.net/48779 (Open) Use of HOST section cause 500 error
Changed paths:
U php/php-src/branches/PHP_5_3_1/main/php_ini.c
U php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c
Modified: php/php-src/branches/PHP_5_3_1/main/php_ini.c
===
--- php/php-src/branches/PHP_5_3_1/main/php_ini.c 2009-10-12 14:50:11 UTC
(rev 289570)
+++ php/php-src/branches/PHP_5_3_1/main/php_ini.c 2009-10-12 14:51:24 UTC
(rev 289571)
@@ -41,6 +41,21 @@
#define S_ISREG(mode) (((mode) S_IFMT) == S_IFREG)
#endif
+#ifdef PHP_WIN32
+#define TRANSLATE_SLASHES_LOWER(path) \
+ { \
+ char *tmp = path; \
+ while (*tmp) { \
+ if (*tmp == '\\') *tmp = '/'; \
+ else *tmp = tolower(*tmp); \
+ tmp++; \
+ } \
+ }
+#else
+#define TRANSLATE_SLASHES_LOWER(path)
+#endif
+
+
typedef struct _php_extension_lists {
zend_llist engine;
zend_llist functions;
@@ -274,6 +289,9 @@
is_special_section = 1;
has_per_dir_config = 1;
+ /* make the path lowercase on Windows,
for case insensitivty. Does nothign for other platforms */
+ TRANSLATE_SLASHES_LOWER(key);
+
/* HOST sections */
} else if (!strncasecmp(Z_STRVAL_P(arg1),
HOST, sizeof(HOST) - 1)) {
key = Z_STRVAL_P(arg1);
@@ -281,6 +299,7 @@
key_len = Z_STRLEN_P(arg1) -
sizeof(HOST) + 1;
is_special_section = 1;
has_per_host_config = 1;
+ zend_str_tolower(key, key_len); /* host
names are case-insensitive. */
} else {
is_special_section = 0;
Modified: php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c
===
--- php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c 2009-10-12 14:50:11 UTC
(rev 289570)
+++ php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c 2009-10-12 14:51:24 UTC
(rev 289571)
@@ -754,7 +754,11 @@
if it is inside the docroot, we scan the tree up to the
docroot
to find more user.ini, if not we only scan the current
path.
*/
+#ifdef PHP_WIN32
+ if (strnicmp(s1, s2, s_len) == 0) {
+#else
if (strncmp(s1, s2, s_len) == 0) {
+#endif
ptr = s2 + start; /* start is the point where doc_root
ends! */
while ((ptr = strchr(ptr, DEFAULT_SLASH)) != NULL) {
*ptr = 0;
@@ -777,7 +781,7 @@
static int sapi_cgi_activate(TSRMLS_D)
{
char *path, *doc_root, *server_name;
- uint path_len, doc_root_len;
+ uint path_len, doc_root_len, server_name_len;
/* PATH_TRANSLATED should be defined at this stage but better safe than
sorry :) */
if (!SG(request_info).path_translated) {
@@ -789,7 +793,11 @@
server_name = sapi_cgibin_getenv(SERVER_NAME,
sizeof(SERVER_NAME) - 1 TSRMLS_CC);
/* SERVER_NAME should also be defined at this stage..but better
check it anyway */
if (server_name) {
- php_ini_activate_per_host_config(server_name,
strlen(server_name) + 1 TSRMLS_CC);
+ server_name_len = strlen(server_name);
+ server_name = estrndup(server_name, server_name_len);
+ zend_str_tolower(server_name, server_name_len);
+ php_ini_activate_per_host_config(server_name,
server_name_len + 1 TSRMLS_CC);
+ efree(server_name);
}
}
@@ -810,6 +818,10 @@
path_len = zend_dirname(path, path_len);
}
path[path_len] = 0;
+#ifdef PHP_WIN32
+ /* paths on windows should be case-insensitive */
+ zend_str_tolower(path, path_len);
+#endif
/* Activate per-dir-system-configuration defined in php.ini and
stored into configuration_hash during startup */
php_ini_activate_per_dir_config(path, path_len TSRMLS_CC); /*
Note: for global settings sake we check from root to path */
@@ -823,10 +835,18 @@
if (IS_SLASH(doc_root[doc_root_len - 1])) {
--doc_root_len;
}
+#ifdef
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/main/ php_ini.c
pajoye Mon, 12 Oct 2009 14:55:50 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289572
Log:
- Merge: fix possible issue in TS environment and fix handle leak (we don't
have to do that anymore anyway in 5.3+)
Changed paths:
U php/php-src/branches/PHP_5_3_1/main/php_ini.c
Modified: php/php-src/branches/PHP_5_3_1/main/php_ini.c
===
--- php/php-src/branches/PHP_5_3_1/main/php_ini.c 2009-10-12 14:51:24 UTC
(rev 289571)
+++ php/php-src/branches/PHP_5_3_1/main/php_ini.c 2009-10-12 14:55:50 UTC
(rev 289572)
@@ -507,33 +507,18 @@
}
strlcat(php_ini_search_path, default_location,
search_path_size);
}
- efree(default_location);
- {
- /* For people running under terminal services,
GetWindowsDirectory will
-* return their personal Windows directory, so lets add
the system
-* windows directory too */
- typedef UINT (WINAPI
*get_system_windows_directory_func)(char *buffer, UINT size);
- static get_system_windows_directory_func
get_system_windows_directory = NULL;
- HMODULE kern;
-
- if (get_system_windows_directory == NULL) {
- kern = LoadLibrary(kernel32.dll);
- if (kern) {
- get_system_windows_directory =
(get_system_windows_directory_func)GetProcAddress(kern,
GetSystemWindowsDirectoryA);
- }
+ /* For people running under terminal services,
GetWindowsDirectory will
+* return their personal Windows directory, so lets add the
system
+* windows directory too */
+ if (0 GetSystemWindowsDirectory(default_location,
MAXPATHLEN)) {
+ if (*php_ini_search_path) {
+ strlcat(php_ini_search_path, paths_separator,
search_path_size);
}
- if (get_system_windows_directory != NULL) {
- default_location = (char *) emalloc(MAXPATHLEN
+ 1);
- if (0
get_system_windows_directory(default_location, MAXPATHLEN)) {
- if (*php_ini_search_path) {
- strlcat(php_ini_search_path,
paths_separator, search_path_size);
- }
- strlcat(php_ini_search_path,
default_location, search_path_size);
- }
- efree(default_location);
- }
+ strlcat(php_ini_search_path, default_location,
search_path_size);
}
+ efree(default_location);
+
#else
default_location = PHP_CONFIG_FILE_PATH;
if (*php_ini_search_path) {
--
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_1/ext/enchant/ config.m4 config.w32 docs/examples/example1.php enchant.c php_enchant.h
pajoye Mon, 12 Oct 2009 22:35:36 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289597
Log:
- Merge: fix dictionnary path issues, add functions to define their path [DOC]
(approved by RM)
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/enchant/config.m4
U php/php-src/branches/PHP_5_3_1/ext/enchant/config.w32
U php/php-src/branches/PHP_5_3_1/ext/enchant/docs/examples/example1.php
U php/php-src/branches/PHP_5_3_1/ext/enchant/enchant.c
U php/php-src/branches/PHP_5_3_1/ext/enchant/php_enchant.h
Modified: php/php-src/branches/PHP_5_3_1/ext/enchant/config.m4
===
--- php/php-src/branches/PHP_5_3_1/ext/enchant/config.m4 2009-10-12 21:08:13 UTC (rev 289596)
+++ php/php-src/branches/PHP_5_3_1/ext/enchant/config.m4 2009-10-12 22:35:36 UTC (rev 289597)
@@ -33,4 +33,10 @@
PHP_SUBST(ENCHANT_SHARED_LIBADD)
PHP_ADD_LIBRARY_WITH_PATH(enchant, $ENCHANT_LIBDIR, ENCHANT_SHARED_LIBADD)
PHP_ADD_INCLUDE($ENCHANT_INCDIR)
+ PHP_CHECK_LIBRARY(enchant, enchant_broker_set_param,
+ [
+ AC_DEFINE(HAVE_ENCHANT_BROKER_SET_PARAM, 1, [ ])
+ AC_DEFINE(ENCHANT_VERSION_STRING, 1.5.x, [ ])
+ ], [], [ -L$ENCHANT_LIB $ENCHANT_SHARED_LIBADD])
+
fi
Modified: php/php-src/branches/PHP_5_3_1/ext/enchant/config.w32
===
--- php/php-src/branches/PHP_5_3_1/ext/enchant/config.w32 2009-10-12 21:08:13 UTC (rev 289596)
+++ php/php-src/branches/PHP_5_3_1/ext/enchant/config.w32 2009-10-12 22:35:36 UTC (rev 289597)
@@ -9,6 +9,7 @@
CHECK_LIB(libenchant.lib, enchant, PHP_ENCHANT) ) {
EXTENSION(enchant, enchant.c);
AC_DEFINE('HAVE_ENCHANT', 1, 'Have Enchant support', false);
+ AC_DEFINE('HAVE_ENCHANT_BROKER_SET_PARAM', 1);
ADD_FLAG(CFLAG_ENCHANT, /D _WIN32);
} else {
WARNING('Could not find enchant.h; skipping');
Modified: php/php-src/branches/PHP_5_3_1/ext/enchant/docs/examples/example1.php
===
--- php/php-src/branches/PHP_5_3_1/ext/enchant/docs/examples/example1.php 2009-10-12 21:08:13 UTC (rev 289596)
+++ php/php-src/branches/PHP_5_3_1/ext/enchant/docs/examples/example1.php 2009-10-12 22:35:36 UTC (rev 289597)
@@ -13,7 +13,7 @@
$spellerrors = enchant_dict_check($d, soong);
print_r($dprovides);
echo found $spellerrors spell errors\n;
- if ($spellerrors) {
+ if (spellerrors) {
$suggs = enchant_dict_suggest($d, soong);
echo Suggestions for 'soong':;
print_r($suggs);
Modified: php/php-src/branches/PHP_5_3_1/ext/enchant/enchant.c
===
--- php/php-src/branches/PHP_5_3_1/ext/enchant/enchant.c 2009-10-12 21:08:13 UTC (rev 289596)
+++ php/php-src/branches/PHP_5_3_1/ext/enchant/enchant.c 2009-10-12 22:35:36 UTC (rev 289597)
@@ -22,17 +22,13 @@
#ifdef HAVE_CONFIG_H
#include config.h
#endif
-#ifdef PHP_WIN32
-#include glib/glist.h
-#include glib/ghash.h
-#endif
+
#include enchant.h
#include php.h
#include php_ini.h
#include ext/standard/info.h
#include php_enchant.h
-
typedef EnchantBroker * EnchantBrokerPtr;
typedef struct _broker_struct enchant_broker;
typedef struct _dict_struct enchant_dict;
@@ -64,6 +60,9 @@
/* If you declare any globals in php_enchant.h uncomment this:*/
/*ZEND_DECLARE_MODULE_GLOBALS(enchant)*/
+#define PHP_ENCHANT_MYSPELL 1
+#define PHP_ENCHANT_ISPELL 2
+
/* {{{ arginfo */
ZEND_BEGIN_ARG_INFO(arginfo_enchant_broker_init, 0)
ZEND_END_ARG_INFO()
@@ -72,6 +71,17 @@
ZEND_ARG_INFO(0, broker)
ZEND_END_ARG_INFO()
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_set_dict_path, 0, 0, 3)
+ ZEND_ARG_INFO(0, broker)
+ ZEND_ARG_INFO(0, name)
+ ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_get_dict_path, 0, 0, 2)
+ ZEND_ARG_INFO(0, broker)
+ ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO()
+
ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_request_dict, 0, 0, 2)
ZEND_ARG_INFO(0, broker)
ZEND_ARG_INFO(0, tag)
@@ -118,6 +128,8 @@
PHP_FE(enchant_broker_init, arginfo_enchant_broker_init)
PHP_FE(enchant_broker_free, arginfo_enchant_broker_free)
PHP_FE(enchant_broker_get_error, arginfo_enchant_broker_free)
+ PHP_FE(enchant_broker_set_dict_path, arginfo_enchant_broker_set_dict_path)
+ PHP_FE(enchant_broker_get_dict_path, arginfo_enchant_broker_get_dict_path)
PHP_FE(enchant_broker_list_dicts, arginfo_enchant_broker_free)
PHP_FE(enchant_broker_request_dict, arginfo_enchant_broker_request_dict)
PHP_FE(enchant_broker_request_pwl_dict, arginfo_enchant_broker_request_pwl_dict)
@@ -277,7 +289,8 @@
{
le_enchant_broker = zend_register_list_destructors_ex(php_enchant_broker_free, NULL, enchant_broker, module_number);
le_enchant_dict = zend_register_list_destructors_ex(php_enchant_dict_free, NULL, enchant_dict, module_number);
-
+ REGISTER_LONG_CONSTANT(ENCHANT_MYSPELL,
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/ext/sqlite/ sqlite.c tests/sqlitedatabase_arrayquery.phpt
pajoye Mon, 12 Oct 2009 22:37:52 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289598
Log:
- Merge: Fixed possible crash when calling SQLiteDatabase::{ArrayQuery,
SingleQuery} methods using Reflection
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/sqlite/sqlite.c
A
php/php-src/branches/PHP_5_3_1/ext/sqlite/tests/sqlitedatabase_arrayquery.phpt
Modified: php/php-src/branches/PHP_5_3_1/ext/sqlite/sqlite.c
===
--- php/php-src/branches/PHP_5_3_1/ext/sqlite/sqlite.c 2009-10-12 22:35:36 UTC
(rev 289597)
+++ php/php-src/branches/PHP_5_3_1/ext/sqlite/sqlite.c 2009-10-12 22:37:52 UTC
(rev 289598)
@@ -129,7 +129,7 @@
#define RES_FROM_OBJECT(res, object) RES_FROM_OBJECT_RESTORE_ERH(res, object,
NULL)
#define PHP_SQLITE_EMPTY_QUERY \
- if (!sql_len) { \
+ if (!sql_len || !*sql) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot execute
empty query.); \
RETURN_FALSE; \
}
Added:
php/php-src/branches/PHP_5_3_1/ext/sqlite/tests/sqlitedatabase_arrayquery.phpt
===
---
php/php-src/branches/PHP_5_3_1/ext/sqlite/tests/sqlitedatabase_arrayquery.phpt
(rev 0)
+++
php/php-src/branches/PHP_5_3_1/ext/sqlite/tests/sqlitedatabase_arrayquery.phpt
2009-10-12 22:37:52 UTC (rev 289598)
@@ -0,0 +1,23 @@
+--TEST--
+Testing SQLiteDatabase::ArrayQuery with NULL-byte string
+--SKIPIF--
+?php
+if (!extension_loaded(sqlite)) print skip;
+?
+--FILE--
+?php
+
+$method = new ReflectionMethod('sqlitedatabase::arrayquery');
+
+$class = $method-getDeclaringClass()-newInstanceArgs(array(':memory:'));
+
+$p = \0;
+
+$method-invokeArgs($class, array_fill(0, 2, $p));
+$method-invokeArgs($class, array_fill(0, 1, $p));
+
+?
+--EXPECTF--
+Warning: SQLiteDatabase::arrayQuery() expects parameter 2 to be long, string
given in %s on line %d
+
+Warning: SQLiteDatabase::arrayQuery(): Cannot execute empty query. in %s on
line %d
--
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/main/php_ini.c trunk/main/php_ini.c
pajoye Sun, 11 Oct 2009 20:50:53 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289546
Log:
- #48779, don't loop twice over the path chars
Bug: http://bugs.php.net/48779 (Open) Use of HOST section cause 500 error
Changed paths:
U php/php-src/branches/PHP_5_3/main/php_ini.c
U php/php-src/trunk/main/php_ini.c
Modified: php/php-src/branches/PHP_5_3/main/php_ini.c
===
--- php/php-src/branches/PHP_5_3/main/php_ini.c 2009-10-11 20:14:47 UTC (rev
289545)
+++ php/php-src/branches/PHP_5_3/main/php_ini.c 2009-10-11 20:50:53 UTC (rev
289546)
@@ -42,16 +42,17 @@
#endif
#ifdef PHP_WIN32
-#define TRANSLATE_SLASHES(path) \
+#define TRANSLATE_SLASHES_LOWER(path) \
{ \
char *tmp = path; \
while (*tmp) { \
if (*tmp == '\\') *tmp = '/'; \
- tmp++; \
+ else *tmp = (__isascii(*tmp)) ? _tolower(*tmp) :
tolower(*tmp); \
+ tmp++; \
} \
}
#else
-#define TRANSLATE_SLASHES(path)
+#define TRANSLATE_SLASHES_LOWER(path)
#endif
@@ -287,12 +288,9 @@
key_len = Z_STRLEN_P(arg1) -
sizeof(PATH) + 1;
is_special_section = 1;
has_per_dir_config = 1;
-#ifdef PHP_WIN32
- /* make the path lowercase on Windows,
for case insensitivty. */
- strlwr(key);
- TRANSLATE_SLASHES(key);
-#endif
+ /* make the path lowercase on Windows,
for case insensitivty. Does nothign for other platforms */
+ TRANSLATE_SLASHES_LOWER(key);
/* HOST sections */
} else if (!strncasecmp(Z_STRVAL_P(arg1),
HOST, sizeof(HOST) - 1)) {
Modified: php/php-src/trunk/main/php_ini.c
===
--- php/php-src/trunk/main/php_ini.c2009-10-11 20:14:47 UTC (rev 289545)
+++ php/php-src/trunk/main/php_ini.c2009-10-11 20:50:53 UTC (rev 289546)
@@ -42,16 +42,17 @@
#endif
#ifdef PHP_WIN32
-#define TRANSLATE_SLASHES(path) \
+#define TRANSLATE_SLASHES_LOWER(path) \
{ \
char *tmp = path; \
while (*tmp) { \
if (*tmp == '\\') *tmp = '/'; \
- tmp++; \
+ else *tmp = (__isascii(*tmp)) ? _tolower(*tmp) :
tolower(*tmp); \
+ tmp++; \
} \
}
#else
-#define TRANSLATE_SLASHES(path)
+#define TRANSLATE_SLASHES_LOWER(path)
#endif
@@ -287,12 +288,9 @@
key_len = Z_STRLEN_P(arg1) -
sizeof(PATH) + 1;
is_special_section = 1;
has_per_dir_config = 1;
-#ifdef PHP_WIN32
- /* make the path lowercase on Windows,
for case insensitivty. */
- strlwr(key);
- TRANSLATE_SLASHES(key);
-#endif
+ /* make the path lowercase on Windows,
for case insensitivty. Does nothign for other platforms */
+ TRANSLATE_SLASHES_LOWER(key);
/* HOST sections */
} else if (!strncasecmp(Z_STRVAL_P(arg1),
HOST, sizeof(HOST) - 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_3/main/php_ini.c trunk/main/php_ini.c
pajoye Sun, 11 Oct 2009 21:04:35 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289547
Log:
- fix possible issue in TS environment (we don't have to do that anymore anyway
in 5.3+)
Changed paths:
U php/php-src/branches/PHP_5_3/main/php_ini.c
U php/php-src/trunk/main/php_ini.c
Modified: php/php-src/branches/PHP_5_3/main/php_ini.c
===
--- php/php-src/branches/PHP_5_3/main/php_ini.c 2009-10-11 20:50:53 UTC (rev
289546)
+++ php/php-src/branches/PHP_5_3/main/php_ini.c 2009-10-11 21:04:35 UTC (rev
289547)
@@ -507,33 +507,18 @@
}
strlcat(php_ini_search_path, default_location,
search_path_size);
}
- efree(default_location);
- {
- /* For people running under terminal services,
GetWindowsDirectory will
-* return their personal Windows directory, so lets add
the system
-* windows directory too */
- typedef UINT (WINAPI
*get_system_windows_directory_func)(char *buffer, UINT size);
- static get_system_windows_directory_func
get_system_windows_directory = NULL;
- HMODULE kern;
-
- if (get_system_windows_directory == NULL) {
- kern = LoadLibrary(kernel32.dll);
- if (kern) {
- get_system_windows_directory =
(get_system_windows_directory_func)GetProcAddress(kern,
GetSystemWindowsDirectoryA);
- }
+ /* For people running under terminal services,
GetWindowsDirectory will
+* return their personal Windows directory, so lets add the
system
+* windows directory too */
+ if (0 GetSystemWindowsDirectory(default_location,
MAXPATHLEN)) {
+ if (*php_ini_search_path) {
+ strlcat(php_ini_search_path, paths_separator,
search_path_size);
}
- if (get_system_windows_directory != NULL) {
- default_location = (char *) emalloc(MAXPATHLEN
+ 1);
- if (0
get_system_windows_directory(default_location, MAXPATHLEN)) {
- if (*php_ini_search_path) {
- strlcat(php_ini_search_path,
paths_separator, search_path_size);
- }
- strlcat(php_ini_search_path,
default_location, search_path_size);
- }
- efree(default_location);
- }
+ strlcat(php_ini_search_path, default_location,
search_path_size);
}
+ efree(default_location);
+
#else
default_location = PHP_CONFIG_FILE_PATH;
if (*php_ini_search_path) {
Modified: php/php-src/trunk/main/php_ini.c
===
--- php/php-src/trunk/main/php_ini.c2009-10-11 20:50:53 UTC (rev 289546)
+++ php/php-src/trunk/main/php_ini.c2009-10-11 21:04:35 UTC (rev 289547)
@@ -505,33 +505,18 @@
}
strlcat(php_ini_search_path, default_location,
search_path_size);
}
- efree(default_location);
- {
- /* For people running under terminal services,
GetWindowsDirectory will
-* return their personal Windows directory, so lets add
the system
-* windows directory too */
- typedef UINT (WINAPI
*get_system_windows_directory_func)(char *buffer, UINT size);
- static get_system_windows_directory_func
get_system_windows_directory = NULL;
- HMODULE kern;
-
- if (get_system_windows_directory == NULL) {
- kern = LoadLibrary(kernel32.dll);
- if (kern) {
- get_system_windows_directory =
(get_system_windows_directory_func)GetProcAddress(kern,
GetSystemWindowsDirectoryA);
- }
+ /* For people running under terminal services,
GetWindowsDirectory will
+* return their personal Windows directory, so lets add the
system
+* windows directory too */
+ if (0 GetSystemWindowsDirectory(default_location,
MAXPATHLEN)) {
+ if (*php_ini_search_path) {
+ strlcat(php_ini_search_path, paths_separator,
search_path_size);
}
-
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/Zend/ zend_vm_def.h zend_vm_execute.h
pajoye Sat, 10 Oct 2009 09:12:58 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289493
Log:
- Merge: Fixed memleak in tests/lang/engine_assignExecutionOrder_001.phpt
Changed paths:
U php/php-src/branches/PHP_5_3_1/Zend/zend_vm_def.h
U php/php-src/branches/PHP_5_3_1/Zend/zend_vm_execute.h
Modified: php/php-src/branches/PHP_5_3_1/Zend/zend_vm_def.h
===
--- php/php-src/branches/PHP_5_3_1/Zend/zend_vm_def.h 2009-10-10 08:56:28 UTC
(rev 289492)
+++ php/php-src/branches/PHP_5_3_1/Zend/zend_vm_def.h 2009-10-10 09:12:58 UTC
(rev 289493)
@@ -940,6 +940,7 @@
if (opline-op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) {
retval =
zend_std_get_static_property(EX_T(opline-op2.u.var).class_entry,
Z_STRVAL_P(varname), Z_STRLEN_P(varname), 0 TSRMLS_CC);
+ FREE_OP1();
} else {
target_symbol_table = zend_get_target_symbol_table(opline,
EX(Ts), type, varname TSRMLS_CC);
/*
Modified: php/php-src/branches/PHP_5_3_1/Zend/zend_vm_execute.h
===
--- php/php-src/branches/PHP_5_3_1/Zend/zend_vm_execute.h 2009-10-10
08:56:28 UTC (rev 289492)
+++ php/php-src/branches/PHP_5_3_1/Zend/zend_vm_execute.h 2009-10-10
09:12:58 UTC (rev 289493)
@@ -4607,6 +4607,7 @@
if (opline-op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) {
retval =
zend_std_get_static_property(EX_T(opline-op2.u.var).class_entry,
Z_STRVAL_P(varname), Z_STRLEN_P(varname), 0 TSRMLS_CC);
+ zval_dtor(free_op1.var);
} else {
target_symbol_table = zend_get_target_symbol_table(opline,
EX(Ts), type, varname TSRMLS_CC);
/*
@@ -7848,6 +7849,7 @@
if (opline-op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) {
retval =
zend_std_get_static_property(EX_T(opline-op2.u.var).class_entry,
Z_STRVAL_P(varname), Z_STRLEN_P(varname), 0 TSRMLS_CC);
+ if (free_op1.var) {zval_ptr_dtor(free_op1.var);};
} else {
target_symbol_table = zend_get_target_symbol_table(opline,
EX(Ts), type, varname TSRMLS_CC);
/*
--
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_1/ext/curl/ interface.c
pajoye Sat, 10 Oct 2009 09:17:01 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289494
Log:
- Merge: Fixed bug #49531 (CURLOPT_INFILESIZE sometimes causes warning
?\226?\128?\156CURLPROTO_FILE cannot be set ?\226?\128?\166)
Bug: http://bugs.php.net/49531 (Closed) CURLOPT_INFILESIZE sometimes causes
warning CURLPROTO_FILE cannot be set
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/curl/interface.c
Modified: php/php-src/branches/PHP_5_3_1/ext/curl/interface.c
===
--- php/php-src/branches/PHP_5_3_1/ext/curl/interface.c 2009-10-10 09:12:58 UTC
(rev 289493)
+++ php/php-src/branches/PHP_5_3_1/ext/curl/interface.c 2009-10-10 09:17:01 UTC
(rev 289494)
@@ -1563,7 +1563,8 @@
#endif
convert_to_long_ex(zvalue);
#if LIBCURL_VERSION_NUM = 0x71304
- if (((PG(open_basedir) *PG(open_basedir)) ||
PG(safe_mode)) (Z_LVAL_PP(zvalue) CURLPROTO_FILE)) {
+ if ((option == CURLOPT_PROTOCOLS || option ==
CURLOPT_REDIR_PROTOCOLS)
+ ((PG(open_basedir) *PG(open_basedir)) ||
PG(safe_mode)) (Z_LVAL_PP(zvalue) CURLPROTO_FILE)) {
php_error_docref(NULL TSRMLS_CC,
E_WARNING, CURLPROTO_FILE cannot be activated when in safe_mode or an
open_basedir is set);
RETVAL_FALSE;
return 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_3_1/ext/curl/ interface.c
pajoye Sat, 10 Oct 2009 09:24:59 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289495
Log:
- Merge: Fixed bug #49517 (cURL's CURLOPT_FILE prevents file from being deleted
after fclose)
Bug: http://bugs.php.net/49517 (Closed) cURL's CURLOPT_FILE prevents file from
being deleted after fclose
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/curl/interface.c
Modified: php/php-src/branches/PHP_5_3_1/ext/curl/interface.c
===
--- php/php-src/branches/PHP_5_3_1/ext/curl/interface.c 2009-10-10 09:17:01 UTC
(rev 289494)
+++ php/php-src/branches/PHP_5_3_1/ext/curl/interface.c 2009-10-10 09:24:59 UTC
(rev 289495)
@@ -1424,10 +1424,22 @@
dupch-cp = cp;
dupch-uses = 0;
+ if (ch-handlers-write-stream) {
+ Z_ADDREF_P(dupch-handlers-write-stream);
+ dupch-handlers-write-stream = ch-handlers-write-stream;
+ }
dupch-handlers-write-method = ch-handlers-write-method;
dupch-handlers-write-type = ch-handlers-write-type;
+ if (ch-handlers-read-stream) {
+ Z_ADDREF_P(ch-handlers-read-stream);
+ }
+ dupch-handlers-read-stream = ch-handlers-read-stream;
dupch-handlers-read-method = ch-handlers-read-method;
dupch-handlers-write_header-method =
ch-handlers-write_header-method;
+ if (ch-handlers-write_header-stream) {
+ Z_ADDREF_P(ch-handlers-write_header-stream);
+ }
+ dupch-handlers-write_header-stream =
ch-handlers-write_header-stream;
dupch-handlers-write-fp = ch-handlers-write-fp;
dupch-handlers-write_header-fp = ch-handlers-write_header-fp;
@@ -1673,9 +1685,10 @@
switch (option) {
case CURLOPT_FILE:
if (((php_stream *) what)-mode[0] !=
'r' || ((php_stream *) what)-mode[1] == '+') {
-
zend_list_addref(Z_LVAL_PP(zvalue));
+ Z_ADDREF_PP(zvalue);
ch-handlers-write-fp = fp;
ch-handlers-write-method =
PHP_CURL_FILE;
+ ch-handlers-write-stream =
*zvalue;
} else {
php_error_docref(NULL
TSRMLS_CC, E_WARNING, the provided file handle is not writable);
RETVAL_FALSE;
@@ -1684,9 +1697,10 @@
break;
case CURLOPT_WRITEHEADER:
if (((php_stream *) what)-mode[0] !=
'r' || ((php_stream *) what)-mode[1] == '+') {
-
zend_list_addref(Z_LVAL_PP(zvalue));
+ Z_ADDREF_PP(zvalue);
ch-handlers-write_header-fp
= fp;
ch-handlers-write_header-method = PHP_CURL_FILE;
+
ch-handlers-write_header-stream = *zvalue;
} else {
php_error_docref(NULL
TSRMLS_CC, E_WARNING, the provided file handle is not writable);
RETVAL_FALSE;
@@ -1694,9 +1708,10 @@
}
break;
case CURLOPT_INFILE:
- zend_list_addref(Z_LVAL_PP(zvalue));
+ Z_ADDREF_PP(zvalue);
ch-handlers-read-fp = fp;
ch-handlers-read-fd =
Z_LVAL_PP(zvalue);
+ ch-handlers-read-stream = *zvalue;
break;
case CURLOPT_STDERR:
if (((php_stream *) what)-mode[0] !=
'r' || ((php_stream *) what)-mode[1] == '+') {
@@ -2357,6 +2372,16 @@
efree(ch-header.str);
}
+ if (ch-handlers-write_header-stream) {
+ zval_ptr_dtor(ch-handlers-write_header-stream);
+ }
+ if (ch-handlers-write-stream) {
+ zval_ptr_dtor(ch-handlers-write-stream);
+ }
+ if (ch-handlers-read-stream) {
+ zval_ptr_dtor(ch-handlers-read-stream);
+ }
+
efree(ch-handlers-write);
efree(ch-handlers-write_header);
efree(ch-handlers-read);
--
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_1/ext/curl/ php_curl.h
pajoye Sat, 10 Oct 2009 09:29:34 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289496
Log:
- Merge: Fixed bug #49517 (cURL's CURLOPT_FILE prevents file from being deleted
after fclose)
Bug: http://bugs.php.net/49517 (Closed) cURL's CURLOPT_FILE prevents file from
being deleted after fclose
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/curl/php_curl.h
Modified: php/php-src/branches/PHP_5_3_1/ext/curl/php_curl.h
===
--- php/php-src/branches/PHP_5_3_1/ext/curl/php_curl.h 2009-10-10 09:24:59 UTC
(rev 289495)
+++ php/php-src/branches/PHP_5_3_1/ext/curl/php_curl.h 2009-10-10 09:29:34 UTC
(rev 289496)
@@ -86,6 +86,7 @@
smart_str buf;
int method;
int type;
+ zval*stream;
} php_curl_write;
typedef struct {
@@ -94,6 +95,7 @@
FILE*fp;
longfd;
int method;
+ zval*stream;
} php_curl_read;
typedef struct {
--
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_1/main/ network.c
pajoye Sat, 10 Oct 2009 12:21:08 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289498
Log:
- Merge: Fixed bug #48805 (IPv6 socket transport is not working)
Bug: http://bugs.php.net/48805 (Closed) IPv6 socket transport is not working
Changed paths:
U php/php-src/branches/PHP_5_3_1/main/network.c
Modified: php/php-src/branches/PHP_5_3_1/main/network.c
===
--- php/php-src/branches/PHP_5_3_1/main/network.c 2009-10-10 09:49:29 UTC
(rev 289497)
+++ php/php-src/branches/PHP_5_3_1/main/network.c 2009-10-10 12:21:08 UTC
(rev 289498)
@@ -792,7 +792,7 @@
switch (sa-sa_family) {
#if HAVE_GETADDRINFO HAVE_IPV6
case AF_INET6:
- if (bindto strchr(bindto, ':')) {
+ if (!bindto || strchr(bindto, ':')) {
((struct sockaddr_in6
*)sa)-sin6_family = sa-sa_family;
((struct sockaddr_in6 *)sa)-sin6_port
= htons(port);
socklen = sizeof(struct sockaddr_in6);
--
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_1/TSRM/ tsrm_virtual_cwd.c
pajoye Fri, 09 Oct 2009 14:05:13 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289414
Log:
- Merge Fix for #48746, improve fix for junctions/symlink/etc.
Bug: http://bugs.php.net/48746 (Assigned) Unable to browse directories within
Junction Points
Changed paths:
U php/php-src/branches/PHP_5_3_1/TSRM/tsrm_virtual_cwd.c
Modified: php/php-src/branches/PHP_5_3_1/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/branches/PHP_5_3_1/TSRM/tsrm_virtual_cwd.c 2009-10-09
12:38:10 UTC (rev 289413)
+++ php/php-src/branches/PHP_5_3_1/TSRM/tsrm_virtual_cwd.c 2009-10-09
14:05:13 UTC (rev 289414)
@@ -667,11 +667,14 @@
/* File is a reparse point. Get the target */
HANDLE hLink = NULL;
REPARSE_DATA_BUFFER * pbuffer;
- unsigned int retlength = 0, rname_off = 0;
- int bufindex = 0, rname_len = 0, isabsolute = 0;
+ unsigned int retlength = 0;
+ int bufindex = 0, isabsolute = 0;
wchar_t * reparsetarget;
- WCHAR szVolumePathNames[MAX_PATH];
BOOL isVolume = FALSE;
+ char printname[MAX_PATH];
+ char substitutename[MAX_PATH];
+ int printname_len, substitutename_len;
+ int substitutename_off = 0;
if(++(*ll) LINK_MAX) {
return -1;
@@ -692,33 +695,61 @@
CloseHandle(hLink);
if(pbuffer-ReparseTag == IO_REPARSE_TAG_SYMLINK) {
- rname_len =
pbuffer-SymbolicLinkReparseBuffer.PrintNameLength/2;
- rname_off =
pbuffer-SymbolicLinkReparseBuffer.PrintNameOffset/2;
- if(rname_len = 0) {
- rname_len =
pbuffer-SymbolicLinkReparseBuffer.SubstituteNameLength/2;
- rname_off =
pbuffer-SymbolicLinkReparseBuffer.SubstituteNameOffset/2;
- }
-
reparsetarget =
pbuffer-SymbolicLinkReparseBuffer.ReparseTarget;
+ printname_len =
pbuffer-MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
isabsolute =
(pbuffer-SymbolicLinkReparseBuffer.Flags == 0) ? 1 : 0;
+ if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
+ reparsetarget +
pbuffer-MountPointReparseBuffer.PrintNameOffset / sizeof(WCHAR),
+ printname_len + 1,
+ printname, MAX_PATH, NULL, NULL
+ )) {
+ tsrm_free_alloca(pbuffer,
use_heap_large);
+ return -1;
+ };
+ printname_len =
pbuffer-MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
+ printname[printname_len] = 0;
+
+ substitutename_len =
pbuffer-MountPointReparseBuffer.SubstituteNameLength / sizeof(WCHAR);
+ if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
+ reparsetarget +
pbuffer-MountPointReparseBuffer.SubstituteNameOffset / sizeof(WCHAR),
+ substitutename_len + 1,
+ substitutename, MAX_PATH, NULL, NULL
+ )) {
+ tsrm_free_alloca(pbuffer,
use_heap_large);
+ return -1;
+ };
+ substitutename[substitutename_len] = 0;
}
else if(pbuffer-ReparseTag ==
IO_REPARSE_TAG_MOUNT_POINT) {
- rname_len =
pbuffer-MountPointReparseBuffer.PrintNameLength/2;
- rname_off =
pbuffer-MountPointReparseBuffer.PrintNameOffset/2;
- if(rname_len = 0) {
- rname_len =
pbuffer-MountPointReparseBuffer.SubstituteNameLength/2;
- rname_off =
pbuffer-MountPointReparseBuffer.SubstituteNameOffset/2;
- }
+ isabsolute = 1;
+ reparsetarget =
pbuffer-MountPointReparseBuffer.ReparseTarget;
+ printname_len =
pbuffer-MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
+ if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/TSRM/ tsrm_win32.c
pajoye Fri, 09 Oct 2009 14:06:35 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289415
Log:
- Merge revision 288028, use of the user token by default, and fix for touch
and directory on windows
Changed paths:
U php/php-src/branches/PHP_5_3_1/TSRM/tsrm_win32.c
Modified: php/php-src/branches/PHP_5_3_1/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_3_1/TSRM/tsrm_win32.c2009-10-09 14:05:13 UTC
(rev 289414)
+++ php/php-src/branches/PHP_5_3_1/TSRM/tsrm_win32.c2009-10-09 14:06:35 UTC
(rev 289415)
@@ -200,7 +200,7 @@
/* Keep the result in realpath_cache */
if(bucket != NULL) {
- if(desired_access == FILE_GENERIC_READ) {
+ if(desired_access ==
(FILE_GENERIC_READ|FILE_FLAG_BACKUP_SEMANTICS)) {
bucket-is_rvalid = 1;
bucket-is_readable = fAccess;
}
@@ -318,7 +318,7 @@
char *ptype = (char *)type;
HANDLE thread_token = NULL;
HANDLE token_user = NULL;
- BOOL asuser = FALSE;
+ BOOL asuser = TRUE;
TSRMLS_FETCH();
--
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_1/ ext/ftp/ftp.c ext/openssl/xp_ssl.c ext/sockets/sockets.c main/network.c main/streams/xp_socket.c
pajoye Fri, 09 Oct 2009 14:20:17 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289416
Log:
- Merge: Fixed bug #49447 php engine need to correctly check for socket API
Bug: http://bugs.php.net/49447 (Closed) php engine need to correctly check for
socket API return status on windows
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/ftp/ftp.c
U php/php-src/branches/PHP_5_3_1/ext/openssl/xp_ssl.c
U php/php-src/branches/PHP_5_3_1/ext/sockets/sockets.c
U php/php-src/branches/PHP_5_3_1/main/network.c
U php/php-src/branches/PHP_5_3_1/main/streams/xp_socket.c
Modified: php/php-src/branches/PHP_5_3_1/ext/ftp/ftp.c
===
--- php/php-src/branches/PHP_5_3_1/ext/ftp/ftp.c2009-10-09 14:06:35 UTC
(rev 289415)
+++ php/php-src/branches/PHP_5_3_1/ext/ftp/ftp.c2009-10-09 14:20:17 UTC
(rev 289416)
@@ -147,7 +147,7 @@
size = sizeof(ftp-localaddr);
memset(ftp-localaddr, 0, size);
- if (getsockname(ftp-fd, (struct sockaddr*) ftp-localaddr, size) ==
-1) {
+ if (getsockname(ftp-fd, (struct sockaddr*) ftp-localaddr, size) !=
0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, getsockname
failed: %s (%d), strerror(errno), errno);
goto bail;
}
Modified: php/php-src/branches/PHP_5_3_1/ext/openssl/xp_ssl.c
===
--- php/php-src/branches/PHP_5_3_1/ext/openssl/xp_ssl.c 2009-10-09 14:06:35 UTC
(rev 289415)
+++ php/php-src/branches/PHP_5_3_1/ext/openssl/xp_ssl.c 2009-10-09 14:20:17 UTC
(rev 289416)
@@ -259,6 +259,10 @@
SSL_CTX_free(sslsock-ctx);
sslsock-ctx = NULL;
}
+#ifdef PHP_WIN32
+ if (sslsock-s.socket == -1)
+ sslsock-s.socket = SOCK_ERR;
+#endif
if (sslsock-s.socket != SOCK_ERR) {
#ifdef PHP_WIN32
/* prevent more data from coming in */
Modified: php/php-src/branches/PHP_5_3_1/ext/sockets/sockets.c
===
--- php/php-src/branches/PHP_5_3_1/ext/sockets/sockets.c2009-10-09
14:06:35 UTC (rev 289415)
+++ php/php-src/branches/PHP_5_3_1/ext/sockets/sockets.c2009-10-09
14:20:17 UTC (rev 289416)
@@ -370,14 +370,14 @@
sock-type = PF_INET;
- if (bind(sock-bsd_socket, (struct sockaddr *)la, sizeof(la)) 0) {
+ if (bind(sock-bsd_socket, (struct sockaddr *)la, sizeof(la)) != 0) {
PHP_SOCKET_ERROR(sock, unable to bind to given address,
errno);
close(sock-bsd_socket);
efree(sock);
return 0;
}
- if (listen(sock-bsd_socket, backlog) 0) {
+ if (listen(sock-bsd_socket, backlog) != 0) {
PHP_SOCKET_ERROR(sock, unable to listen on socket, errno);
close(sock-bsd_socket);
efree(sock);
Modified: php/php-src/branches/PHP_5_3_1/main/network.c
===
--- php/php-src/branches/PHP_5_3_1/main/network.c 2009-10-09 14:06:35 UTC
(rev 289415)
+++ php/php-src/branches/PHP_5_3_1/main/network.c 2009-10-09 14:20:17 UTC
(rev 289416)
@@ -314,7 +314,7 @@
SET_SOCKET_BLOCKING_MODE(sockfd, orig_flags);
- if ((n = connect(sockfd, addr, addrlen)) 0) {
+ if ((n = connect(sockfd, addr, addrlen)) != 0) {
error = php_socket_errno();
if (error_code) {
@@ -348,7 +348,7 @@
BSD-derived systems set errno correctly
Solaris returns -1 from getsockopt in case of error
*/
- if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, (char*)error,
len) 0) {
+ if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, (char*)error,
len) != 0) {
ret = -1;
}
} else {
@@ -375,7 +375,7 @@
if (asynchronous) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Asynchronous
connect() not supported on this platform);
}
- return connect(sockfd, addr, addrlen);
+ return (connect(sockfd, addr, addrlen) == 0) ? 0 : -1;
#endif
}
/* }}} */
@@ -715,7 +715,7 @@
clisock = accept(srvsock, (struct sockaddr*)sa, sl);
- if (clisock = 0) {
+ if (clisock != SOCK_ERR) {
php_network_populate_name_from_sockaddr((struct
sockaddr*)sa, sl,
textaddr, textaddrlen,
addr, addrlen
@@ -867,7 +867,7 @@
timeout ? working_timeout : NULL,
error_string, error_code);
- if (n != SOCK_CONN_ERR) {
+ if (n != -1) {
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/ext/sockets/ php_sockets.h sockets.c
pajoye Fri, 09 Oct 2009 14:22:29 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289417
Log:
- merge: #49464, fix build
Bug: http://bugs.php.net/49464 (Closed) php_sockets build broken
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/sockets/php_sockets.h
U php/php-src/branches/PHP_5_3_1/ext/sockets/sockets.c
Modified: php/php-src/branches/PHP_5_3_1/ext/sockets/php_sockets.h
===
--- php/php-src/branches/PHP_5_3_1/ext/sockets/php_sockets.h2009-10-09
14:20:17 UTC (rev 289416)
+++ php/php-src/branches/PHP_5_3_1/ext/sockets/php_sockets.h2009-10-09
14:22:29 UTC (rev 289417)
@@ -73,7 +73,9 @@
#ifndef PHP_WIN32
typedef int PHP_SOCKET;
+# define PHP_SOCKETS_API PHPAPI
#else
+# define PHP_SOCKETS_API __declspec(dllexport)
typedef SOCKET PHP_SOCKET;
#endif
@@ -91,7 +93,7 @@
};
#endif
-PHPAPI int php_sockets_le_socket(void);
+PHP_SOCKETS_API int php_sockets_le_socket(void);
/* Prototypes */
#ifdef ilia_0 /* not needed, only causes a compiler warning */
Modified: php/php-src/branches/PHP_5_3_1/ext/sockets/sockets.c
===
--- php/php-src/branches/PHP_5_3_1/ext/sockets/sockets.c2009-10-09
14:20:17 UTC (rev 289416)
+++ php/php-src/branches/PHP_5_3_1/ext/sockets/sockets.c2009-10-09
14:22:29 UTC (rev 289417)
@@ -323,7 +323,7 @@
/* inet_ntop should be used instead of inet_ntoa */
int inet_ntoa_lock = 0;
-PHPAPI int php_sockets_le_socket(void) /* {{{ */
+PHP_SOCKETS_API int php_sockets_le_socket(void) /* {{{ */
{
return le_socket;
}
--
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_1/ext/pcre/ php_pcre.c
pajoye Fri, 09 Oct 2009 14:25:51 + Revision: http://svn.php.net/viewvc?view=revisionrevision=289418 Log: - Merge: Fixed bug #49483 (preg_replace 'subject' parameter listed as optional) Bug: http://bugs.php.net/49483 (Closed) preg_replace 'subject' parameter listed as optional Changed paths: U php/php-src/branches/PHP_5_3_1/ext/pcre/php_pcre.c Modified: php/php-src/branches/PHP_5_3_1/ext/pcre/php_pcre.c === --- php/php-src/branches/PHP_5_3_1/ext/pcre/php_pcre.c 2009-10-09 14:22:29 UTC (rev 289417) +++ php/php-src/branches/PHP_5_3_1/ext/pcre/php_pcre.c 2009-10-09 14:25:51 UTC (rev 289418) @@ -1836,7 +1836,7 @@ ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_replace, 0, 0, 2) +ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_replace, 0, 0, 3) ZEND_ARG_INFO(0, regex) ZEND_ARG_INFO(0, replace) ZEND_ARG_INFO(0, subject) -- 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_1/ext/standard/ strnatcmp.c
pajoye Fri, 09 Oct 2009 14:33:38 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289419
Log:
- Merge: Fix for bug #49698
Bug: http://bugs.php.net/49698 (Closed) Unexpected change in strnatcasecmp()
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/standard/strnatcmp.c
Modified: php/php-src/branches/PHP_5_3_1/ext/standard/strnatcmp.c
===
--- php/php-src/branches/PHP_5_3_1/ext/standard/strnatcmp.c 2009-10-09
14:25:51 UTC (rev 289418)
+++ php/php-src/branches/PHP_5_3_1/ext/standard/strnatcmp.c 2009-10-09
14:33:38 UTC (rev 289419)
@@ -116,12 +116,12 @@
while (1) {
ca = *ap; cb = *bp;
- /* skip over leading zeros unless they are followed by
punctuation */
- while (leading ca == '0' (ap+1 aend)
!ispunct(*(ap+1))) {
+ /* skip over leading zeros */
+ while (leading ca == '0' (ap+1 aend)
isdigit(*(ap+1))) {
ca = *++ap;
}
- while (leading cb == '0' (bp+1 bend)
!ispunct(*(bp+1))) {
+ while (leading cb == '0' (bp+1 bend)
isdigit(*(bp+1))) {
cb = *++bp;
}
--
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_1/ext/standard/ credits.c
pajoye Fri, 09 Oct 2009 14:34:18 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289420
Log:
- Merge: throw some credit around
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/standard/credits.c
Modified: php/php-src/branches/PHP_5_3_1/ext/standard/credits.c
===
--- php/php-src/branches/PHP_5_3_1/ext/standard/credits.c 2009-10-09
14:33:38 UTC (rev 289419)
+++ php/php-src/branches/PHP_5_3_1/ext/standard/credits.c 2009-10-09
14:34:18 UTC (rev 289420)
@@ -109,10 +109,17 @@
}
if (flag PHP_CREDITS_WEB) {
- /* Website Team */
+ /* Websites and infrastructure */
+
php_info_print_table_start();
- php_info_print_table_header(1, PHP Website Team);
- php_info_print_table_row(1, Rasmus Lerdorf, Hannes Magnusson,
Philip Olson);
+ php_info_print_table_colspan_header(2, Websites and
Infrastructure team);
+ /* www., wiki., windows., master., and others, I guess pecl.
too? */
+ CREDIT_LINE(PHP Websites Team, Rasmus Lerdorf, Hannes
Magnusson, Philip Olson, Lukas Kahwe Smith, Pierre-Alain Joye, Kalle Sommer
Nielsen);
+ CREDIT_LINE(Event Maintainers, Damien Seguy, Daniel P.
Brown);
+ /* Mirroring */
+ CREDIT_LINE(Network Infrastructure, Daniel P. Brown);
+ /* Windows build boxes and such things */
+ CREDIT_LINE(Windows Infrastructure, Alex Schoenmaker);
php_info_print_table_end();
}
--
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_1/ext/standard/ file.c
pajoye Fri, 09 Oct 2009 14:37:45 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289422
Log:
- Merge: Make tempnam() return FALSE on error as documented
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/standard/file.c
Modified: php/php-src/branches/PHP_5_3_1/ext/standard/file.c
===
--- php/php-src/branches/PHP_5_3_1/ext/standard/file.c 2009-10-09 14:37:09 UTC
(rev 289421)
+++ php/php-src/branches/PHP_5_3_1/ext/standard/file.c 2009-10-09 14:37:45 UTC
(rev 289422)
@@ -858,6 +858,8 @@
if (p_len 64) {
p[63] = '\0';
}
+
+ RETVAL_FALSE;
if ((fd = php_open_temporary_fd(dir, p, opened_path TSRMLS_CC)) = 0) {
close(fd);
--
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_1/ext/oci8/ oci8.c tests/pecl_bug16842.phpt
pajoye Fri, 09 Oct 2009 14:44:43 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289423
Log:
- Merge: Pecl #16842
Bug: http://pecl.php.net/bugs/16842 (unknown)
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/oci8/oci8.c
A php/php-src/branches/PHP_5_3_1/ext/oci8/tests/pecl_bug16842.phpt
Modified: php/php-src/branches/PHP_5_3_1/ext/oci8/oci8.c
===
--- php/php-src/branches/PHP_5_3_1/ext/oci8/oci8.c 2009-10-09 14:37:45 UTC
(rev 289422)
+++ php/php-src/branches/PHP_5_3_1/ext/oci8/oci8.c 2009-10-09 14:44:43 UTC
(rev 289423)
@@ -1529,6 +1529,12 @@
break;
case OCI_NO_DATA:
php_error_docref(NULL TSRMLS_CC, E_WARNING,
OCI_NO_DATA);
+ errcode = php_oci_fetch_errmsg(err_p, errbuf
TSRMLS_CC);
+ if (errbuf) {
+ efree(errbuf);
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
OCI_NO_DATA: failed to fetch error message);
+ }
break;
case OCI_ERROR:
errcode = php_oci_fetch_errmsg(err_p, errbuf
TSRMLS_CC);
Added: php/php-src/branches/PHP_5_3_1/ext/oci8/tests/pecl_bug16842.phpt
===
--- php/php-src/branches/PHP_5_3_1/ext/oci8/tests/pecl_bug16842.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3_1/ext/oci8/tests/pecl_bug16842.phpt
2009-10-09 14:44:43 UTC (rev 289423)
@@ -0,0 +1,69 @@
+--TEST--
+PECL Bug #16842 (NO_DATA_FOUND exception is a warning)
+--SKIPIF--
+?php if (!extension_loaded('oci8')) die (skip no oci8 extension); ?
+--INI--
+error_reporting = E_WARNING
+--FILE--
+?php
+
+require(dirname(__FILE__).'/connect.inc');
+
+// Run Test
+
+echo Test 1\n;
+
+echo Raises NO_DATA_FOUND\n;
+$s = oci_parse($c, 'begin raise NO_DATA_FOUND; end;');
+$e = oci_execute($s);
+var_dump($e);
+var_dump(oci_error($s));
+
+echo Test 2\n;
+
+echo Raises ZERO_DIVIDE\n;
+$s = oci_parse($c, 'begin raise ZERO_DIVIDE; end;');
+$e = oci_execute($s);
+var_dump($e);
+var_dump(oci_error($s));
+
+oci_close($c);
+
+?
+===DONE===
+?php exit(0); ?
+--EXPECTF--
+Test 1
+Raises NO_DATA_FOUND
+
+Warning: oci_execute(): OCI_NO_DATA in %s on line 11
+bool(false)
+array(4) {
+ [%u|b%code]=
+ int(1403)
+ [%u|b%message]=
+ %unicode|string%(45) ORA-01403: %s
+ORA-06512: at line 1
+ [%u|b%offset]=
+ int(0)
+ [%u|b%sqltext]=
+ %unicode|string%(31) begin raise NO_DATA_FOUND; end;
+}
+Test 2
+Raises ZERO_DIVIDE
+
+Warning: oci_execute(): ORA-01476: %s
+ORA-06512: at line 1 in %s on line 19
+bool(false)
+array(4) {
+ [%u|b%code]=
+ int(1476)
+ [%u|b%message]=
+ %unicode|string%(56) ORA-01476: %s
+ORA-06512: at line 1
+ [%u|b%offset]=
+ int(0)
+ [%u|b%sqltext]=
+ %unicode|string%(29) begin raise ZERO_DIVIDE; end;
+}
+===DONE===
--
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_1/ext/posix/ posix.c
pajoye Fri, 09 Oct 2009 14:46:48 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289424
Log:
- Merge: Add missing open_basedir check in posix_mkfifo
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/posix/posix.c
Modified: php/php-src/branches/PHP_5_3_1/ext/posix/posix.c
===
--- php/php-src/branches/PHP_5_3_1/ext/posix/posix.c2009-10-09 14:44:43 UTC
(rev 289423)
+++ php/php-src/branches/PHP_5_3_1/ext/posix/posix.c2009-10-09 14:46:48 UTC
(rev 289424)
@@ -840,7 +840,8 @@
RETURN_FALSE;
}
- if (PG(safe_mode) (!php_checkuid(path, NULL,
CHECKUID_ALLOW_ONLY_DIR))) {
+ if (php_check_open_basedir_ex(path, 0 TSRMLS_CC) ||
+ (PG(safe_mode) (!php_checkuid(path, NULL,
CHECKUID_ALLOW_ONLY_DIR {
RETURN_FALSE;
}
--
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_1/ext/fileinfo/libmagic/ readcdf.c
pajoye Fri, 09 Oct 2009 14:51:25 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289425
Log:
- Merge: Fix #49732, Crashes in fileinfo when corrupted files are given
(timestamp fails)
Bug: http://bugs.php.net/49732 (Closed) PHP crashes when using finfo_file() to
get mime info with this file (included)
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/fileinfo/libmagic/readcdf.c
Modified: php/php-src/branches/PHP_5_3_1/ext/fileinfo/libmagic/readcdf.c
===
--- php/php-src/branches/PHP_5_3_1/ext/fileinfo/libmagic/readcdf.c
2009-10-09 14:46:48 UTC (rev 289424)
+++ php/php-src/branches/PHP_5_3_1/ext/fileinfo/libmagic/readcdf.c
2009-10-09 14:51:25 UTC (rev 289425)
@@ -125,7 +125,10 @@
return -1;
} else {
char *c, *ec;
- cdf_timestamp_to_timespec(ts, tp);
+
+ if (cdf_timestamp_to_timespec(ts, tp)
== -1) {
+ return -1;
+ }
c = ctime(ts.tv_sec);
if ((ec = strchr(c, '\n')) != NULL)
*ec = '\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_1/ext/standard/ file.c
pajoye Fri, 09 Oct 2009 14:37:09 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289421
Log:
- Merge: Fixed a safe_mode bypass in tempnam() identified by Grzegorz Stachowiak
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/standard/file.c
Modified: php/php-src/branches/PHP_5_3_1/ext/standard/file.c
===
--- php/php-src/branches/PHP_5_3_1/ext/standard/file.c 2009-10-09 14:34:18 UTC
(rev 289420)
+++ php/php-src/branches/PHP_5_3_1/ext/standard/file.c 2009-10-09 14:37:09 UTC
(rev 289421)
@@ -846,6 +846,10 @@
return;
}
+ if (PG(safe_mode) (!php_checkuid(dir, NULL,
CHECKUID_ALLOW_ONLY_DIR))) {
+ RETURN_FALSE;
+ }
+
if (php_check_open_basedir(dir TSRMLS_CC)) {
RETURN_FALSE;
}
--
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_1/ main/fopen_wrappers.c sapi/cgi/cgi_main.c
pajoye Fri, 09 Oct 2009 17:03:56 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289428
Log:
- Merge: Fixed bug #49182 (PHP CGI always outputs the shebang line), kill
unused var
Bug: http://bugs.php.net/49182 (Closed) PHP CGI always outputs the shebang line
Changed paths:
U php/php-src/branches/PHP_5_3_1/main/fopen_wrappers.c
U php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c
Modified: php/php-src/branches/PHP_5_3_1/main/fopen_wrappers.c
===
--- php/php-src/branches/PHP_5_3_1/main/fopen_wrappers.c2009-10-09
15:32:08 UTC (rev 289427)
+++ php/php-src/branches/PHP_5_3_1/main/fopen_wrappers.c2009-10-09
17:03:56 UTC (rev 289428)
@@ -382,9 +382,12 @@
*/
PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC)
{
+ FILE *fp;
+#ifndef PHP_WIN32
+ struct stat st;
+#endif
char *path_info, *filename;
int length;
- zend_bool orig_display_errors;
filename = SG(request_info).path_translated;
path_info = SG(request_info).request_uri;
@@ -451,7 +454,7 @@
}
} /* if doc_root path_info */
- if(filename) {
+ if (filename) {
filename = zend_resolve_path(filename, strlen(filename)
TSRMLS_CC);
}
@@ -463,21 +466,33 @@
STR_FREE(SG(request_info).path_translated);
SG(request_info).path_translated = NULL;
return FAILURE;
- } else {
- STR_FREE(SG(request_info).path_translated);
- SG(request_info).path_translated = filename;
}
+ fp = VCWD_FOPEN(filename, rb);
- orig_display_errors = PG(display_errors);
- PG(display_errors) = 0;
- if (zend_stream_open(filename, file_handle TSRMLS_CC) == FAILURE) {
- PG(display_errors) = orig_display_errors;
+#ifndef PHP_WIN32
+ /* refuse to open anything that is not a regular file */
+ if (fp (0 fstat(fileno(fp), st) || !S_ISREG(st.st_mode))) {
+ fclose(fp);
+ fp = NULL;
+ }
+#endif
+
+ if (!fp) {
STR_FREE(SG(request_info).path_translated); /* for same
reason as above */
SG(request_info).path_translated = NULL;
return FAILURE;
}
- PG(display_errors) = orig_display_errors;
+ file_handle-opened_path = expand_filepath(filename, NULL TSRMLS_CC);
+
+ STR_FREE(SG(request_info).path_translated); /* for same reason as
above */
+ SG(request_info).path_translated = filename;
+
+ file_handle-filename = SG(request_info).path_translated;
+ file_handle-free_filename = 0;
+ file_handle-handle.fp = fp;
+ file_handle-type = ZEND_HANDLE_FP;
+
return SUCCESS;
}
/* }}} */
Modified: php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c
===
--- php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c 2009-10-09 15:32:08 UTC
(rev 289427)
+++ php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c 2009-10-09 17:03:56 UTC
(rev 289428)
@@ -159,6 +159,7 @@
typedef struct _php_cgi_globals_struct {
zend_bool rfc2616_headers;
zend_bool nph;
+ zend_bool check_shebang_line;
zend_bool fix_pathinfo;
zend_bool force_redirect;
zend_bool discard_path;
@@ -1279,9 +1280,6 @@
if (pt) {
efree(pt);
}
- if (is_valid_path(script_path_translated)) {
- SG(request_info).path_translated =
estrdup(script_path_translated);
- }
} else {
/* make sure path_info/translated are empty */
if (!orig_script_filename ||
@@ -1310,9 +1308,6 @@
} else {
SG(request_info).request_uri =
env_script_name;
}
- if (is_valid_path(script_path_translated)) {
- SG(request_info).path_translated =
estrdup(script_path_translated);
- }
free(real_path);
}
} else {
@@ -1325,11 +1320,12 @@
if (!CGIG(discard_path) env_path_translated) {
script_path_translated = env_path_translated;
}
- if (is_valid_path(script_path_translated)) {
- SG(request_info).path_translated =
estrdup(script_path_translated);
- }
}
+ if (is_valid_path(script_path_translated)) {
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/ext/standard/ info.c
pajoye Fri, 09 Oct 2009 17:15:46 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289430
Log:
- Merge: fix #40013, php_uname() doesnt return nodename (MFH)
Bug: http://bugs.php.net/40013 (Closed) php_uname() doesnt return nodename
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/standard/info.c
Modified: php/php-src/branches/PHP_5_3_1/ext/standard/info.c
===
--- php/php-src/branches/PHP_5_3_1/ext/standard/info.c 2009-10-09 17:13:05 UTC
(rev 289429)
+++ php/php-src/branches/PHP_5_3_1/ext/standard/info.c 2009-10-09 17:15:46 UTC
(rev 289430)
@@ -527,9 +527,33 @@
if (uname((struct utsname *)buf) == -1) {
php_uname = PHP_UNAME;
} else {
+#ifdef NETWARE
if (mode == 's') {
php_uname = buf.sysname;
} else if (mode == 'r') {
+ snprintf(tmp_uname, sizeof(tmp_uname), %d.%d.%d,
+buf.netware_major, buf.netware_minor,
buf.netware_revision);
+ php_uname = tmp_uname;
+ } else if (mode == 'n') {
+ php_uname = buf.servername;
+ } else if (mode == 'v') {
+ snprintf(tmp_uname, sizeof(tmp_uname), libc-%d.%d.%d
#%d,
+buf.libmajor, buf.libminor,
buf.librevision, buf.libthreshold);
+ php_uname = tmp_uname;
+ } else if (mode == 'm') {
+ php_uname = buf.machine;
+ } else { /* assume mode == 'a' */
+ snprintf(tmp_uname, sizeof(tmp_uname), %s %s %d.%d.%d
libc-%d.%d.%d #%d %s,
+buf.sysname, buf.servername,
+buf.netware_major, buf.netware_minor,
buf.netware_revision,
+buf.libmajor, buf.libminor,
buf.librevision, buf.libthreshold,
+buf.machine);
+ php_uname = tmp_uname;
+ }
+#else
+ if (mode == 's') {
+ php_uname = buf.sysname;
+ } else if (mode == 'r') {
php_uname = buf.release;
} else if (mode == 'n') {
php_uname = buf.nodename;
@@ -543,6 +567,7 @@
buf.machine);
php_uname = tmp_uname;
}
+#endif /* NETWARE */
}
#else
php_uname = PHP_UNAME;
--
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_1/Zend/ zend_API.c
pajoye Fri, 09 Oct 2009 17:21:20 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289431
Log:
- Merge: don't hide early declaration
Changed paths:
U php/php-src/branches/PHP_5_3_1/Zend/zend_API.c
Modified: php/php-src/branches/PHP_5_3_1/Zend/zend_API.c
===
--- php/php-src/branches/PHP_5_3_1/Zend/zend_API.c 2009-10-09 17:15:46 UTC
(rev 289430)
+++ php/php-src/branches/PHP_5_3_1/Zend/zend_API.c 2009-10-09 17:21:20 UTC
(rev 289431)
@@ -1038,13 +1038,13 @@
Z_SET_ISREF_PP(q);
zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)q,
sizeof(zval*), NULL);
} else {
- zval *q;
+ zval *r;
- ALLOC_ZVAL(q);
- *q = **p;
- INIT_PZVAL(q);
- zval_copy_ctor(q);
-
zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)q,
sizeof(zval*), NULL);
+ ALLOC_ZVAL(r);
+ *r = **p;
+ INIT_PZVAL(r);
+ zval_copy_ctor(r);
+
zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)r,
sizeof(zval*), NULL);
}
zend_hash_move_forward_ex(class_type-default_static_members, pos);
}
--
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_1/Zend/ zend_compile.c
pajoye Fri, 09 Oct 2009 17:23:01 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289432
Log:
- Merge: don't hide early declaration
Changed paths:
U php/php-src/branches/PHP_5_3_1/Zend/zend_compile.c
Modified: php/php-src/branches/PHP_5_3_1/Zend/zend_compile.c
===
--- php/php-src/branches/PHP_5_3_1/Zend/zend_compile.c 2009-10-09 17:21:20 UTC
(rev 289431)
+++ php/php-src/branches/PHP_5_3_1/Zend/zend_compile.c 2009-10-09 17:23:01 UTC
(rev 289432)
@@ -5191,31 +5191,31 @@
if (CG(current_namespace)) {
/* Prefix import name with current namespace name to avoid
conflicts with classes */
- char *ns_name = emalloc(Z_STRLEN_P(CG(current_namespace)) + 1 +
Z_STRLEN_P(name) + 1);
+ char *c_ns_name = emalloc(Z_STRLEN_P(CG(current_namespace)) + 1
+ Z_STRLEN_P(name) + 1);
- zend_str_tolower_copy(ns_name,
Z_STRVAL_P(CG(current_namespace)), Z_STRLEN_P(CG(current_namespace)));
- ns_name[Z_STRLEN_P(CG(current_namespace))] = '\\';
- memcpy(ns_name+Z_STRLEN_P(CG(current_namespace))+1, lcname,
Z_STRLEN_P(name)+1);
- if (zend_hash_exists(CG(class_table), ns_name,
Z_STRLEN_P(CG(current_namespace)) + 1 + Z_STRLEN_P(name)+1)) {
+ zend_str_tolower_copy(c_ns_name,
Z_STRVAL_P(CG(current_namespace)), Z_STRLEN_P(CG(current_namespace)));
+ c_ns_name[Z_STRLEN_P(CG(current_namespace))] = '\\';
+ memcpy(c_ns_name+Z_STRLEN_P(CG(current_namespace))+1, lcname,
Z_STRLEN_P(name)+1);
+ if (zend_hash_exists(CG(class_table), c_ns_name,
Z_STRLEN_P(CG(current_namespace)) + 1 + Z_STRLEN_P(name)+1)) {
char *tmp = zend_str_tolower_dup(Z_STRVAL_P(ns),
Z_STRLEN_P(ns));
if (Z_STRLEN_P(ns) != Z_STRLEN_P(CG(current_namespace))
+ 1 + Z_STRLEN_P(name) ||
- memcmp(tmp, ns_name, Z_STRLEN_P(ns))) {
+ memcmp(tmp, c_ns_name, Z_STRLEN_P(ns))) {
zend_error(E_COMPILE_ERROR, Cannot use %s as
%s because the name is already in use, Z_STRVAL_P(ns), Z_STRVAL_P(name));
}
efree(tmp);
}
- efree(ns_name);
+ efree(c_ns_name);
} else if (zend_hash_find(CG(class_table), lcname, Z_STRLEN_P(name)+1,
(void**)pce) == SUCCESS
(*pce)-type == ZEND_USER_CLASS
(*pce)-filename == CG(compiled_filename)) {
- char *tmp = zend_str_tolower_dup(Z_STRVAL_P(ns),
Z_STRLEN_P(ns));
+ char *c_tmp = zend_str_tolower_dup(Z_STRVAL_P(ns),
Z_STRLEN_P(ns));
if (Z_STRLEN_P(ns) != Z_STRLEN_P(name) ||
- memcmp(tmp, lcname, Z_STRLEN_P(ns))) {
+ memcmp(c_tmp, lcname, Z_STRLEN_P(ns))) {
zend_error(E_COMPILE_ERROR, Cannot use %s as %s
because the name is already in use, Z_STRVAL_P(ns), Z_STRVAL_P(name));
}
- efree(tmp);
+ efree(c_tmp);
}
if (zend_hash_add(CG(current_import), lcname, Z_STRLEN_P(name)+1, ns,
sizeof(zval*), NULL) != SUCCESS) {
--
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_1/ext/mcrypt/ mcrypt.c tests/bug49738.phpt
pajoye Fri, 09 Oct 2009 17:28:52 + Revision: http://svn.php.net/viewvc?view=revisionrevision=289433 Log: - Merge: Fixed bug #49738 (calling mcrypt after mcrypt_generic_deinit crashes) Bug: http://bugs.php.net/49738 (Closed) calling mcrypt after mcrypt_generic_deinit crashes Changed paths: U php/php-src/branches/PHP_5_3_1/ext/mcrypt/mcrypt.c A php/php-src/branches/PHP_5_3_1/ext/mcrypt/tests/bug49738.phpt Modified: php/php-src/branches/PHP_5_3_1/ext/mcrypt/mcrypt.c === --- php/php-src/branches/PHP_5_3_1/ext/mcrypt/mcrypt.c 2009-10-09 17:23:01 UTC (rev 289432) +++ php/php-src/branches/PHP_5_3_1/ext/mcrypt/mcrypt.c 2009-10-09 17:28:52 UTC (rev 289433) @@ -780,6 +780,7 @@ php_error_docref(NULL TSRMLS_CC, E_WARNING, Could not terminate encryption specifier); RETURN_FALSE } + pm-init = 0; RETURN_TRUE } /* }}} */ Added: php/php-src/branches/PHP_5_3_1/ext/mcrypt/tests/bug49738.phpt === --- php/php-src/branches/PHP_5_3_1/ext/mcrypt/tests/bug49738.phpt (rev 0) +++ php/php-src/branches/PHP_5_3_1/ext/mcrypt/tests/bug49738.phpt 2009-10-09 17:28:52 UTC (rev 289433) @@ -0,0 +1,13 @@ +--TEST-- +Bug #49738 (calling mcrypt after mcrypt_generic_deinit crashes) +--SKIPIF-- +?php if (!extension_loaded(mcrypt)) print skip; ? +--FILE-- +?php + $td = mcrypt_module_open(MCRYPT_DES, '', MCRYPT_MODE_ECB, ''); + mcrypt_generic_init($td, '', ''); + mcrypt_generic_deinit($td); + echo mcrypt_generic($td, ''); +? +--EXPECTF-- +Warning: mcrypt_generic(): Operation disallowed prior to mcrypt_generic_init(). in %sbug49738.php on line 5 -- 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_1/ext/filter/ filter.c tests/bug49274.phpt
pajoye Fri, 09 Oct 2009 17:32:53 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289434
Log:
- Merge: fix #49274, filter_var does not accept object without a toString
implementation
Bug: http://bugs.php.net/49274 (Assigned) filter_var() should accept objects
without fatal error
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/filter/filter.c
A php/php-src/branches/PHP_5_3_1/ext/filter/tests/bug49274.phpt
Modified: php/php-src/branches/PHP_5_3_1/ext/filter/filter.c
===
--- php/php-src/branches/PHP_5_3_1/ext/filter/filter.c 2009-10-09 17:28:52 UTC
(rev 289433)
+++ php/php-src/branches/PHP_5_3_1/ext/filter/filter.c 2009-10-09 17:32:53 UTC
(rev 289434)
@@ -365,6 +365,19 @@
if (copy) {
SEPARATE_ZVAL(value);
}
+
+ /* #49274, fatal error with object without a toString method
+ Fails nicely instead of getting a recovarable fatal error. */
+ if (Z_TYPE_PP(value) == IS_OBJECT) {
+ zend_class_entry *ce;
+
+ ce = Z_OBJCE_PP(value);
+ if (!ce-__tostring) {
+ ZVAL_FALSE(*value);
+ return;
+ }
+ }
+
/* Here be strings */
convert_to_string(*value);
Added: php/php-src/branches/PHP_5_3_1/ext/filter/tests/bug49274.phpt
===
--- php/php-src/branches/PHP_5_3_1/ext/filter/tests/bug49274.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3_1/ext/filter/tests/bug49274.phpt
2009-10-09 17:32:53 UTC (rev 289434)
@@ -0,0 +1,10 @@
+--TEST--
+#49274, fatal error when an object does not implement toString
+--SKIPIF--
+?php if (!extension_loaded(filter)) die(skip); ?
+--FILE--
+?php
+var_dump(filter_var(new stdClass, FILTER_VALIDATE_EMAIL));
+?
+--EXPECTF--
+bool(false)
--
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_1/ext/imap/ php_imap.c
pajoye Fri, 09 Oct 2009 17:38:19 + Revision: http://svn.php.net/viewvc?view=revisionrevision=289435 Log: - Merge: Fixed bug #49630 (imap_listscan function missing) Bug: http://bugs.php.net/49630 (Closed) imap_listscan function missing Changed paths: U php/php-src/branches/PHP_5_3_1/ext/imap/php_imap.c Modified: php/php-src/branches/PHP_5_3_1/ext/imap/php_imap.c === --- php/php-src/branches/PHP_5_3_1/ext/imap/php_imap.c 2009-10-09 17:32:53 UTC (rev 289434) +++ php/php-src/branches/PHP_5_3_1/ext/imap/php_imap.c 2009-10-09 17:38:19 UTC (rev 289435) @@ -487,6 +487,7 @@ PHP_FE(imap_delete, arginfo_imap_delete) PHP_FE(imap_undelete, arginfo_imap_undelete) PHP_FE(imap_check, arginfo_imap_check) + PHP_FE(imap_listscan, arginfo_imap_listscan) PHP_FE(imap_mail_copy, arginfo_imap_mail_copy) PHP_FE(imap_mail_move, arginfo_imap_mail_move) PHP_FE(imap_mail_compose, arginfo_imap_mail_compose) -- 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_1/ext/standard/ basic_functions.c
pajoye Fri, 09 Oct 2009 17:41:29 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289436
Log:
- Merge: long2ip() can return wrong value in a multi-threaded applications
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/standard/basic_functions.c
Modified: php/php-src/branches/PHP_5_3_1/ext/standard/basic_functions.c
===
--- php/php-src/branches/PHP_5_3_1/ext/standard/basic_functions.c
2009-10-09 17:38:19 UTC (rev 289435)
+++ php/php-src/branches/PHP_5_3_1/ext/standard/basic_functions.c
2009-10-09 17:41:29 UTC (rev 289436)
@@ -3932,6 +3932,9 @@
int ip_len;
unsigned long n;
struct in_addr myaddr;
+#ifdef HAVE_INET_PTON
+ char str[40];
+#endif
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, ip, ip_len)
== FAILURE) {
return;
@@ -3940,7 +3943,15 @@
n = strtoul(ip, NULL, 0);
myaddr.s_addr = htonl(n);
+#ifdef HAVE_INET_PTON
+ if (inet_ntop(AF_INET, myaddr, str, sizeof(str))) {
+ RETURN_STRING(str, 1);
+ } else {
+ RETURN_FALSE;
+ }
+#else
RETURN_STRING(inet_ntoa(myaddr), 1);
+#endif
}
/* }}} */
--
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_1/main/streams/ memory.c
pajoye Fri, 09 Oct 2009 17:45:03 + Revision: http://svn.php.net/viewvc?view=revisionrevision=289437 Log: - Merge: Fixed bug #49572 (use of C++ style comments causes build failure) Bug: http://bugs.php.net/49572 (Closed) use of C++ style comments causes build failure Changed paths: U php/php-src/branches/PHP_5_3_1/main/streams/memory.c Modified: php/php-src/branches/PHP_5_3_1/main/streams/memory.c === --- php/php-src/branches/PHP_5_3_1/main/streams/memory.c2009-10-09 17:41:29 UTC (rev 289436) +++ php/php-src/branches/PHP_5_3_1/main/streams/memory.c2009-10-09 17:45:03 UTC (rev 289437) @@ -563,7 +563,7 @@ stream = php_stream_alloc_rel(php_stream_temp_ops, self, 0, mode TEMP_STREAM_READONLY ? rb : w+b); stream-flags |= PHP_STREAM_FLAG_NO_BUFFER; self-innerstream = php_stream_memory_create_rel(mode); - php_stream_auto_cleanup(self-innerstream); // do not warn if innerstream is GC'ed before stream + php_stream_auto_cleanup(self-innerstream); /* do not warn if innerstream is GC'ed before stream */ ((php_stream_memory_data*)self-innerstream-abstract)-owner_ptr = self-innerstream; return stream; -- 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_1/ext/filter/ sanitizing_filters.c
pajoye Fri, 09 Oct 2009 17:50:17 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289438
Log:
- Merge: Fixed bug #49470 (FILTER_SANITIZE_EMAIL allows disallowed characters)
Bug: http://bugs.php.net/49470 (Closed) FILTER_SANITIZE_EMAIL does not work
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/filter/sanitizing_filters.c
Modified: php/php-src/branches/PHP_5_3_1/ext/filter/sanitizing_filters.c
===
--- php/php-src/branches/PHP_5_3_1/ext/filter/sanitizing_filters.c
2009-10-09 17:45:03 UTC (rev 289437)
+++ php/php-src/branches/PHP_5_3_1/ext/filter/sanitizing_filters.c
2009-10-09 17:50:17 UTC (rev 289438)
@@ -275,7 +275,7 @@
void php_filter_email(PHP_INPUT_FILTER_PARAM_DECL)
{
/* Check section 6 of rfc 822 http://www.faqs.org/rfcs/rfc822.html */
- const unsigned char allowed_list[] = LOWALPHA HIALPHA DIGIT
!#$%'*+-/=?^_`{|}...@.[];
+ const unsigned char allowed_list[] = LOWALPHA HIALPHA DIGIT
!#$%'*+-=?^_`{|}...@.[];
filter_map map;
filter_map_init(map);
--
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_1/ext/dom/ documenttype.c
pajoye Fri, 09 Oct 2009 18:52:59 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289439
Log:
- Merge: fix mem leak
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/dom/documenttype.c
Modified: php/php-src/branches/PHP_5_3_1/ext/dom/documenttype.c
===
--- php/php-src/branches/PHP_5_3_1/ext/dom/documenttype.c 2009-10-09
17:50:17 UTC (rev 289438)
+++ php/php-src/branches/PHP_5_3_1/ext/dom/documenttype.c 2009-10-09
18:52:59 UTC (rev 289439)
@@ -190,7 +190,6 @@
xmlDtdPtr dtdptr;
xmlDtd *intsubset;
xmlOutputBuffer *buff = NULL;
- xmlChar *strintsubset;
dtdptr = (xmlDtdPtr) dom_object_get_node(obj);
@@ -206,9 +205,8 @@
if (buff != NULL) {
xmlNodeDumpOutput (buff, NULL, (xmlNodePtr) intsubset,
0, 0, NULL);
xmlOutputBufferFlush(buff);
- strintsubset = xmlStrndup(buff-buffer-content,
buff-buffer-use);
+ ZVAL_STRINGL(*retval, buff-buffer-content,
buff-buffer-use, 1);
(void)xmlOutputBufferClose(buff);
- ZVAL_STRING(*retval, (char *) strintsubset, 1);
return SUCCESS;
}
}
--
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_1/ext/pdo_dblib/ dblib_driver.c
pajoye Fri, 09 Oct 2009 18:56:19 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289440
Log:
- Possible fix for bug #49344 on Windows (pdo_mssql fails to connect,throws
PDOException SQLSTATE[] (null) (severity 0))
Bug: http://bugs.php.net/49344 (No Feedback) pdo_mssql fails to connect,throws
PDOException SQLSTATE[] (null) (severity 0)
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/pdo_dblib/dblib_driver.c
Modified: php/php-src/branches/PHP_5_3_1/ext/pdo_dblib/dblib_driver.c
===
--- php/php-src/branches/PHP_5_3_1/ext/pdo_dblib/dblib_driver.c 2009-10-09
18:52:59 UTC (rev 289439)
+++ php/php-src/branches/PHP_5_3_1/ext/pdo_dblib/dblib_driver.c 2009-10-09
18:56:19 UTC (rev 289440)
@@ -230,11 +230,11 @@
goto cleanup;
}
-#if PHP_DBLIB_IS_MSSQL
- if (DBSETOPT(H-link, DBTEXTLIMIT, 2147483647) == FAIL) {
- goto cleanup;
- }
-#endif
+ /* dblib do not return more than this length from text/image */
+ DBSETOPT(H-link, DBTEXTLIMIT, 2147483647);
+
+ /* limit text/image from network */
+ DBSETOPT(H-link, DBTEXTSIZE, 2147483647);
if (vars[3].optval FAIL == dbuse(H-link, vars[3].optval)) {
goto cleanup;
--
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_1/ext/date/ php_date.c
pajoye Fri, 09 Oct 2009 18:59:14 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289441
Log:
- Merege: Fix bug #49558 And as Colin mentioned in the bug report, this means
date_sunrise() and date_sunset() have been off by 26 seconds in most cases
until now
Bug: http://bugs.php.net/49558 (Closed) Sunrise Problems around 91 degree zenith
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/date/php_date.c
Modified: php/php-src/branches/PHP_5_3_1/ext/date/php_date.c
===
--- php/php-src/branches/PHP_5_3_1/ext/date/php_date.c 2009-10-09 18:56:19 UTC
(rev 289440)
+++ php/php-src/branches/PHP_5_3_1/ext/date/php_date.c 2009-10-09 18:59:14 UTC
(rev 289441)
@@ -3927,7 +3927,7 @@
}
timelib_unixtime2local(t, time);
- rs = timelib_astro_rise_set_altitude(t, longitude, latitude, altitude,
altitude -1 ? 1 : 0, h_rise, h_set, rise, set, transit);
+ rs = timelib_astro_rise_set_altitude(t, longitude, latitude, altitude,
1, h_rise, h_set, rise, set, transit);
timelib_time_dtor(t);
if (rs != 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_1/ ext/date/php_date.c main/main.c main/php_globals.h
pajoye Fri, 09 Oct 2009 19:06:10 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289442
Log:
- Merge: Fixed bug #49627 (error_log to specified file does not log time
according to date.timezone)
Bug: http://bugs.php.net/49627 (Closed) error_log to specified file does not
log time according to date.timezone
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/date/php_date.c
U php/php-src/branches/PHP_5_3_1/main/main.c
U php/php-src/branches/PHP_5_3_1/main/php_globals.h
Modified: php/php-src/branches/PHP_5_3_1/ext/date/php_date.c
===
--- php/php-src/branches/PHP_5_3_1/ext/date/php_date.c 2009-10-09 18:59:14 UTC
(rev 289441)
+++ php/php-src/branches/PHP_5_3_1/ext/date/php_date.c 2009-10-09 19:06:10 UTC
(rev 289442)
@@ -849,7 +849,17 @@
return env;
}
/* Check config setting for default timezone */
- if (DATEG(default_timezone) (strlen(DATEG(default_timezone)) 0)
timelib_timezone_id_is_valid(DATEG(default_timezone), tzdb)) {
+ if (!DATEG(default_timezone)) {
+ /* Special case: ext/date wasn't initialized yet */
+ zval ztz;
+
+ if (SUCCESS ==
zend_get_configuration_directive(date.timezone, sizeof(date.timezone),
ztz)
+ Z_TYPE(ztz) == IS_STRING
+ Z_STRLEN(ztz) 0
+ timelib_timezone_id_is_valid(Z_STRVAL(ztz), tzdb)) {
+ return Z_STRVAL(ztz);
+ }
+ } else if (*DATEG(default_timezone)
timelib_timezone_id_is_valid(DATEG(default_timezone), tzdb)) {
return DATEG(default_timezone);
}
#if HAVE_TM_ZONE
Modified: php/php-src/branches/PHP_5_3_1/main/main.c
===
--- php/php-src/branches/PHP_5_3_1/main/main.c 2009-10-09 18:59:14 UTC (rev
289441)
+++ php/php-src/branches/PHP_5_3_1/main/main.c 2009-10-09 19:06:10 UTC (rev
289442)
@@ -556,11 +556,18 @@
int fd = -1;
time_t error_time;
+ if (PG(in_error_log)) {
+ /* prevent recursive invocation */
+ return;
+ }
+ PG(in_error_log) = 1;
+
/* Try to use the specified logging location. */
if (PG(error_log) != NULL) {
#ifdef HAVE_SYSLOG_H
if (!strcmp(PG(error_log), syslog)) {
php_syslog(LOG_NOTICE, %.500s, log_message);
+ PG(in_error_log) = 0;
return;
}
#endif
@@ -571,7 +578,7 @@
char *error_time_str;
time(error_time);
- error_time_str = php_format_date(d-M-Y H:i:s, 11,
error_time, php_during_module_startup() TSRMLS_CC);
+ error_time_str = php_format_date(d-M-Y H:i:s, 11,
error_time, 1 TSRMLS_CC);
len = spprintf(tmp, 0, [%s] %s%s, error_time_str,
log_message, PHP_EOL);
#ifdef PHP_WIN32
php_flock(fd, 2);
@@ -580,6 +587,7 @@
efree(tmp);
efree(error_time_str);
close(fd);
+ PG(in_error_log) = 0;
return;
}
}
@@ -589,6 +597,7 @@
if (sapi_module.log_message) {
sapi_module.log_message(log_message);
}
+ PG(in_error_log) = 0;
}
/* }}} */
@@ -1352,6 +1361,7 @@
#endif
zend_try {
+ PG(in_error_log) = 0;
PG(during_request_startup) = 1;
php_output_activate(TSRMLS_C);
Modified: php/php-src/branches/PHP_5_3_1/main/php_globals.h
===
--- php/php-src/branches/PHP_5_3_1/main/php_globals.h 2009-10-09 18:59:14 UTC
(rev 289441)
+++ php/php-src/branches/PHP_5_3_1/main/php_globals.h 2009-10-09 19:06:10 UTC
(rev 289442)
@@ -168,6 +168,8 @@
zend_bool mail_x_header;
char *mail_log;
+
+ zend_bool in_error_log;
};
--
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_1/ext/openssl/ openssl.c
pajoye Fri, 09 Oct 2009 19:08:56 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289443
Log:
- Merge: Fixed certificate validation inside
php_openssl_apply_verification_policy
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/openssl/openssl.c
Modified: php/php-src/branches/PHP_5_3_1/ext/openssl/openssl.c
===
--- php/php-src/branches/PHP_5_3_1/ext/openssl/openssl.c2009-10-09
19:06:10 UTC (rev 289442)
+++ php/php-src/branches/PHP_5_3_1/ext/openssl/openssl.c2009-10-09
19:08:56 UTC (rev 289443)
@@ -4323,8 +4323,15 @@
GET_VER_OPT_STRING(CN_match, cnmatch);
if (cnmatch) {
int match = 0;
+ int name_len = X509_NAME_get_text_by_NID(name, NID_commonName,
buf, sizeof(buf));
- X509_NAME_get_text_by_NID(name, NID_commonName, buf,
sizeof(buf));
+ if (name_len == -1) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to
locate peer certificate CN);
+ return FAILURE;
+ } else if (name_len != strlen(buf)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Peer
certificate CN=`%.*s' is malformed, name_len, buf);
+ return FAILURE;
+ }
match = strcmp(cnmatch, buf) == 0;
if (!match strlen(buf) 3 buf[0] == '*' buf[1] ==
'.') {
@@ -4339,10 +4346,7 @@
if (!match) {
/* didn't match */
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
- Peer certificate CN=`%s' did not match
expected CN=`%s',
- buf, cnmatch);
-
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Peer
certificate CN=`%.*s' did not match expected CN=`%s', name_len, buf, cnmatch);
return 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_3/ext/enchant/enchant.c trunk/ext/enchant/enchant.c
pajoye Thu, 08 Oct 2009 20:40:48 + Revision: http://svn.php.net/viewvc?view=revisionrevision=289368 Log: - typo Changed paths: U php/php-src/branches/PHP_5_3/ext/enchant/enchant.c U php/php-src/trunk/ext/enchant/enchant.c Modified: php/php-src/branches/PHP_5_3/ext/enchant/enchant.c === --- php/php-src/branches/PHP_5_3/ext/enchant/enchant.c 2009-10-08 20:39:50 UTC (rev 289367) +++ php/php-src/branches/PHP_5_3/ext/enchant/enchant.c 2009-10-08 20:40:48 UTC (rev 289368) @@ -290,7 +290,7 @@ le_enchant_broker = zend_register_list_destructors_ex(php_enchant_broker_free, NULL, enchant_broker, module_number); le_enchant_dict = zend_register_list_destructors_ex(php_enchant_dict_free, NULL, enchant_dict, module_number); REGISTER_LONG_CONSTANT(ENCHANT_MYSPELL, PHP_ENCHANT_MYSPELL, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(ENCHAT_ISPELL, PHP_ENCHANT_ISPELL, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(ENCHANT_ISPELL, PHP_ENCHANT_ISPELL, CONST_CS | CONST_PERSISTENT); return SUCCESS; } /* }}} */ Modified: php/php-src/trunk/ext/enchant/enchant.c === --- php/php-src/trunk/ext/enchant/enchant.c 2009-10-08 20:39:50 UTC (rev 289367) +++ php/php-src/trunk/ext/enchant/enchant.c 2009-10-08 20:40:48 UTC (rev 289368) @@ -290,7 +290,7 @@ le_enchant_broker = zend_register_list_destructors_ex(php_enchant_broker_free, NULL, enchant_broker, module_number); le_enchant_dict = zend_register_list_destructors_ex(php_enchant_dict_free, NULL, enchant_dict, module_number); REGISTER_LONG_CONSTANT(ENCHANT_MYSPELL, PHP_ENCHANT_MYSPELL, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(ENCHAT_ISPELL, PHP_ENCHANT_ISPELL, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(ENCHANT_ISPELL, PHP_ENCHANT_ISPELL, CONST_CS | CONST_PERSISTENT); return SUCCESS; } /* }}} */ -- 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/enchant/ config.w32
pajoye Thu, 08 Oct 2009 20:59:50 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289372
Log:
- missing define
Changed paths:
U php/php-src/branches/PHP_5_3/ext/enchant/config.w32
Modified: php/php-src/branches/PHP_5_3/ext/enchant/config.w32
===
--- php/php-src/branches/PHP_5_3/ext/enchant/config.w32 2009-10-08 20:58:38 UTC
(rev 289371)
+++ php/php-src/branches/PHP_5_3/ext/enchant/config.w32 2009-10-08 20:59:50 UTC
(rev 289372)
@@ -9,6 +9,7 @@
CHECK_LIB(libenchant.lib, enchant, PHP_ENCHANT) ) {
EXTENSION(enchant, enchant.c);
AC_DEFINE('HAVE_ENCHANT', 1, 'Have Enchant support', false);
+ AC_DEFINE('HAVE_ENCHANT_BROKER_SET_PARAM', 1);
ADD_FLAG(CFLAG_ENCHANT, /D _WIN32);
} else {
WARNING('Could not find enchant.h; skipping');
--
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/enchant/config.m4 branches/PHP_5_3/ext/enchant/docs/examples/example1.php branches/PHP_5_3/ext/enchant/enchant.c branches/PHP_5_3/ext/enchant/php_ench
pajoye Thu, 08 Oct 2009 20:28:21 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289366
Log:
- [DOC] add enchant_broket_set_dict_path and enchant_broker_get_dict_path
- add constants ENCHANT_MYSPELL and ENCHANT_ISPELL
Changed paths:
U php/php-src/branches/PHP_5_3/ext/enchant/config.m4
U php/php-src/branches/PHP_5_3/ext/enchant/docs/examples/example1.php
U php/php-src/branches/PHP_5_3/ext/enchant/enchant.c
U php/php-src/branches/PHP_5_3/ext/enchant/php_enchant.h
U php/php-src/trunk/ext/enchant/config.m4
U php/php-src/trunk/ext/enchant/config.w32
U php/php-src/trunk/ext/enchant/docs/examples/example1.php
U php/php-src/trunk/ext/enchant/enchant.c
U php/php-src/trunk/ext/enchant/php_enchant.h
Modified: php/php-src/branches/PHP_5_3/ext/enchant/config.m4
===
--- php/php-src/branches/PHP_5_3/ext/enchant/config.m4 2009-10-08 20:10:51 UTC (rev 289365)
+++ php/php-src/branches/PHP_5_3/ext/enchant/config.m4 2009-10-08 20:28:21 UTC (rev 289366)
@@ -33,4 +33,10 @@
PHP_SUBST(ENCHANT_SHARED_LIBADD)
PHP_ADD_LIBRARY_WITH_PATH(enchant, $ENCHANT_LIBDIR, ENCHANT_SHARED_LIBADD)
PHP_ADD_INCLUDE($ENCHANT_INCDIR)
+ PHP_CHECK_LIBRARY(enchant, enchant_broker_set_param,
+ [
+ AC_DEFINE(HAVE_ENCHANT_BROKER_SET_PARAM, 1, [ ])
+ AC_DEFINE(ENCHANT_VERSION_STRING, 1.5.x, [ ])
+ ], [], [ -L$ENCHANT_LIB $ENCHANT_SHARED_LIBADD])
+
fi
Modified: php/php-src/branches/PHP_5_3/ext/enchant/docs/examples/example1.php
===
--- php/php-src/branches/PHP_5_3/ext/enchant/docs/examples/example1.php 2009-10-08 20:10:51 UTC (rev 289365)
+++ php/php-src/branches/PHP_5_3/ext/enchant/docs/examples/example1.php 2009-10-08 20:28:21 UTC (rev 289366)
@@ -13,7 +13,7 @@
$spellerrors = enchant_dict_check($d, soong);
print_r($dprovides);
echo found $spellerrors spell errors\n;
- if (!$spellerrors) {
+ if (spellerrors) {
$suggs = enchant_dict_suggest($d, soong);
echo Suggestions for 'soong':;
print_r($suggs);
Modified: php/php-src/branches/PHP_5_3/ext/enchant/enchant.c
===
--- php/php-src/branches/PHP_5_3/ext/enchant/enchant.c 2009-10-08 20:10:51 UTC (rev 289365)
+++ php/php-src/branches/PHP_5_3/ext/enchant/enchant.c 2009-10-08 20:28:21 UTC (rev 289366)
@@ -22,17 +22,13 @@
#ifdef HAVE_CONFIG_H
#include config.h
#endif
-#ifdef PHP_WIN32
-#include glib/glist.h
-#include glib/ghash.h
-#endif
+
#include enchant.h
#include php.h
#include php_ini.h
#include ext/standard/info.h
#include php_enchant.h
-
typedef EnchantBroker * EnchantBrokerPtr;
typedef struct _broker_struct enchant_broker;
typedef struct _dict_struct enchant_dict;
@@ -64,6 +60,9 @@
/* If you declare any globals in php_enchant.h uncomment this:*/
/*ZEND_DECLARE_MODULE_GLOBALS(enchant)*/
+#define PHP_ENCHANT_MYSPELL 1
+#define PHP_ENCHANT_ISPELL 2
+
/* {{{ arginfo */
ZEND_BEGIN_ARG_INFO(arginfo_enchant_broker_init, 0)
ZEND_END_ARG_INFO()
@@ -72,6 +71,17 @@
ZEND_ARG_INFO(0, broker)
ZEND_END_ARG_INFO()
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_set_dict_path, 0, 0, 3)
+ ZEND_ARG_INFO(0, broker)
+ ZEND_ARG_INFO(0, name)
+ ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_get_dict_path, 0, 0, 2)
+ ZEND_ARG_INFO(0, broker)
+ ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO()
+
ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_request_dict, 0, 0, 2)
ZEND_ARG_INFO(0, broker)
ZEND_ARG_INFO(0, tag)
@@ -118,6 +128,8 @@
PHP_FE(enchant_broker_init, arginfo_enchant_broker_init)
PHP_FE(enchant_broker_free, arginfo_enchant_broker_free)
PHP_FE(enchant_broker_get_error, arginfo_enchant_broker_free)
+ PHP_FE(enchant_broker_set_dict_path, arginfo_enchant_broker_set_dict_path)
+ PHP_FE(enchant_broker_get_dict_path, arginfo_enchant_broker_get_dict_path)
PHP_FE(enchant_broker_list_dicts, arginfo_enchant_broker_free)
PHP_FE(enchant_broker_request_dict, arginfo_enchant_broker_request_dict)
PHP_FE(enchant_broker_request_pwl_dict, arginfo_enchant_broker_request_pwl_dict)
@@ -277,7 +289,8 @@
{
le_enchant_broker = zend_register_list_destructors_ex(php_enchant_broker_free, NULL, enchant_broker, module_number);
le_enchant_dict = zend_register_list_destructors_ex(php_enchant_dict_free, NULL, enchant_dict, module_number);
-
+ REGISTER_LONG_CONSTANT(ENCHANT_MYSPELL, PHP_ENCHANT_MYSPELL, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(ENCHAT_ISPELL, PHP_ENCHANT_ISPELL, CONST_CS | CONST_PERSISTENT);
return SUCCESS;
}
/* }}} */
@@ -309,6 +322,11 @@
php_info_print_table_start();
php_info_print_table_header(2, enchant support, enabled);
php_info_print_table_row(2, Version, PHP_ENCHANT_VERSION);
+#ifdef ENCHANT_VERSION_STRING
+ php_info_print_table_row(2, Libenchant Version,
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/enchant/docs/examples/example1.php branches/PHP_5_3/ext/enchant/enchant.c trunk/ext/enchant/docs/examples/example1.php trunk/ext/enchant/enchant.c
pajoye Sat, 03 Oct 2009 10:19:06 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289123
Log:
- drop unused var and fix example
Changed paths:
U php/php-src/branches/PHP_5_3/ext/enchant/docs/examples/example1.php
U php/php-src/branches/PHP_5_3/ext/enchant/enchant.c
U php/php-src/trunk/ext/enchant/docs/examples/example1.php
U php/php-src/trunk/ext/enchant/enchant.c
Modified: php/php-src/branches/PHP_5_3/ext/enchant/docs/examples/example1.php
===
--- php/php-src/branches/PHP_5_3/ext/enchant/docs/examples/example1.php
2009-10-03 09:57:32 UTC (rev 289122)
+++ php/php-src/branches/PHP_5_3/ext/enchant/docs/examples/example1.php
2009-10-03 10:19:06 UTC (rev 289123)
@@ -13,7 +13,7 @@
$spellerrors = enchant_dict_check($d, soong);
print_r($dprovides);
echo found $spellerrors spell errors\n;
- if ($spellerrors) {
+ if (!$spellerrors) {
$suggs = enchant_dict_suggest($d, soong);
echo Suggestions for 'soong':;
print_r($suggs);
Modified: php/php-src/branches/PHP_5_3/ext/enchant/enchant.c
===
--- php/php-src/branches/PHP_5_3/ext/enchant/enchant.c 2009-10-03 09:57:32 UTC
(rev 289122)
+++ php/php-src/branches/PHP_5_3/ext/enchant/enchant.c 2009-10-03 10:19:06 UTC
(rev 289123)
@@ -405,8 +405,6 @@
enchant_broker *pbroker;
EnchantDictDescribeFn describetozval = php_enchant_list_dicts_fn;
- char *msg;
-
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r, broker) ==
FAILURE) {
RETURN_FALSE;
}
Modified: php/php-src/trunk/ext/enchant/docs/examples/example1.php
===
--- php/php-src/trunk/ext/enchant/docs/examples/example1.php2009-10-03
09:57:32 UTC (rev 289122)
+++ php/php-src/trunk/ext/enchant/docs/examples/example1.php2009-10-03
10:19:06 UTC (rev 289123)
@@ -13,7 +13,7 @@
$spellerrors = enchant_dict_check($d, soong);
print_r($dprovides);
echo found $spellerrors spell errors\n;
- if ($spellerrors) {
+ if (!$spellerrors) {
$suggs = enchant_dict_suggest($d, soong);
echo Suggestions for 'soong':;
print_r($suggs);
Modified: php/php-src/trunk/ext/enchant/enchant.c
===
--- php/php-src/trunk/ext/enchant/enchant.c 2009-10-03 09:57:32 UTC (rev
289122)
+++ php/php-src/trunk/ext/enchant/enchant.c 2009-10-03 10:19:06 UTC (rev
289123)
@@ -405,8 +405,6 @@
enchant_broker *pbroker;
EnchantDictDescribeFn describetozval = php_enchant_list_dicts_fn;
- char *msg;
-
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r, broker) ==
FAILURE) {
RETURN_FALSE;
}
--
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/win32/build/config.w32 trunk/win32/build/config.w32
pajoye Wed, 30 Sep 2009 11:53:29 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288988
Log:
- restore W3 flag to get usefull errors (unused vars, etc.)
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/config.w32
U php/php-src/trunk/win32/build/config.w32
Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-09-30 11:52:14 UTC
(rev 288987)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-09-30 11:53:29 UTC
(rev 288988)
@@ -119,7 +119,7 @@
// General CFLAGS for building objects
DEFINE(CFLAGS, /nologo /FD $(BASE_INCLUDES) /D _WINDOWS \
-/D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS);
+/D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS /W3 );
if (VCVERS 1400) {
// Enable automatic precompiled headers
@@ -177,7 +177,7 @@
// Set some debug/release specific options
if (PHP_DEBUG == yes) {
- ADD_FLAG(CFLAGS, /LDd /MDd /Gm /Od /D _DEBUG /D ZEND_DEBUG=1 +
+ ADD_FLAG(CFLAGS, /LDd /MDd /W3 /Gm /Od /D _DEBUG /D ZEND_DEBUG=1 +
(X64?/Zi:/ZI));
ADD_FLAG(LDFLAGS, /debug);
// Avoid problems when linking to release libraries that use the release
Modified: php/php-src/trunk/win32/build/config.w32
===
--- php/php-src/trunk/win32/build/config.w322009-09-30 11:52:14 UTC (rev
288987)
+++ php/php-src/trunk/win32/build/config.w322009-09-30 11:53:29 UTC (rev
288988)
@@ -177,7 +177,7 @@
// Set some debug/release specific options
if (PHP_DEBUG == yes) {
- ADD_FLAG(CFLAGS, /LDd /MDd /Gm /Od /D _DEBUG /D ZEND_DEBUG=1 +
+ ADD_FLAG(CFLAGS, /LDd /MDd /W3 /Gm /Od /D _DEBUG /D ZEND_DEBUG=1 +
(X64?/Zi:/ZI));
ADD_FLAG(LDFLAGS, /debug);
// Avoid problems when linking to release libraries that use the release
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/mysqlnd/ php_mysqlnd.c
pajoye Mon, 28 Sep 2009 12:54:23 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288894
Log:
- fix TS build, this macro contains code and declaration, always put it right
after your declaration
Changed paths:
U php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c
Modified: php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2009-09-28 10:42:36 UTC (rev
288893)
+++ php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2009-09-28 12:54:23 UTC (rev
288894)
@@ -46,14 +46,14 @@
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), pos_values);
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(values),
-
(void **)values_entry, pos_values) == SUCCESS) {
- TSRMLS_FETCH();
+ (void **)values_entry, pos_values) == SUCCESS) {
zstrstring_key;
uintstring_key_len;
ulong num_key;
int s_len;
char*s = NULL;
+ TSRMLS_FETCH();
zend_hash_get_current_key_ex(Z_ARRVAL_P(values), string_key,
string_key_len, num_key, 0, pos_values);
convert_to_string(*values_entry);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
pajoye Tue, 22 Sep 2009 14:22:05 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288572 Log: - Give Ken access to pres Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2009-09-22 13:59:29 UTC (rev 288571) +++ SVNROOT/global_avail2009-09-22 14:22:05 UTC (rev 288572) @@ -57,7 +57,7 @@ # The PHP Presentation Group has access to the presentations on the # conf.php.net site. -avail|toby,sterling,jon,graeme,derick,imajes,wez,iliaa,jmcastagnetto,shiflett,nohn,sebastian,vmarshall,alan_k,lhl,eru,sklar,wenz,zak,gschlossnagle,jacques,pollita,amt,john,hholzgra,pajoye,helly,dbs,vrana,kore,philip|web/pres2,web/presentations +avail|toby,sterling,jon,graeme,derick,imajes,wez,iliaa,jmcastagnetto,shiflett,nohn,sebastian,vmarshall,alan_k,lhl,eru,sklar,wenz,zak,gschlossnagle,jacques,pollita,amt,john,hholzgra,pajoye,helly,dbs,vrana,kore,philip,kguest|web/pres2,web/presentations # The PHP Quality Assurance Team maintains their own website. -- 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/TSRM/tsrm_win32.c trunk/TSRM/tsrm_win32.c
pajoye Sat, 19 Sep 2009 20:54:34 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288462
Log:
- fix ACL cache for read check
Changed paths:
U php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c
U php/php-src/trunk/TSRM/tsrm_win32.c
Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c 2009-09-19 18:54:33 UTC
(rev 288461)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c 2009-09-19 20:54:34 UTC
(rev 288462)
@@ -200,7 +200,7 @@
/* Keep the result in realpath_cache */
if(bucket != NULL) {
- if(desired_access == FILE_GENERIC_READ) {
+ if(desired_access ==
(FILE_GENERIC_READ|FILE_FLAG_BACKUP_SEMANTICS)) {
bucket-is_rvalid = 1;
bucket-is_readable = fAccess;
}
Modified: php/php-src/trunk/TSRM/tsrm_win32.c
===
--- php/php-src/trunk/TSRM/tsrm_win32.c 2009-09-19 18:54:33 UTC (rev 288461)
+++ php/php-src/trunk/TSRM/tsrm_win32.c 2009-09-19 20:54:34 UTC (rev 288462)
@@ -201,7 +201,7 @@
/* Keep the result in realpath_cache */
if(bucket != NULL) {
- if(desired_access == FILE_GENERIC_READ) {
+ if(desired_access == (FILE_GENERIC_READ |
FILE_FLAG_BACKUP_SEMANTICS)) {
bucket-is_rvalid = 1;
bucket-is_readable = fAccess;
}
--
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/ext/curl/interface.c trunk/ext/curl/interface.c
pajoye Tue, 15 Sep 2009 15:47:06 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288348
Log:
- #49253, add support for libcurl's CERTINFO option
Bug: http://bugs.php.net/49253 (Assigned) add support for libcurl's CERTINFO
option
Changed paths:
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_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-09-15 06:52:03 UTC (rev 288347)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-09-15 15:47:06 UTC (rev 288348)
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? ??? 2009, PHP 5.3.2
+- Implement FR #49253 (add support for libcurl's CERTINFO option).
+ (Linus Nielsen Feltzing li...@haxx.se)
?? ??? 2009, PHP 5.3.1RC?
- Fixed certificate validation inside php_openssl_apply_verification_policy
Modified: php/php-src/branches/PHP_5_3/ext/curl/interface.c
===
--- php/php-src/branches/PHP_5_3/ext/curl/interface.c 2009-09-15 06:52:03 UTC (rev 288347)
+++ php/php-src/branches/PHP_5_3/ext/curl/interface.c 2009-09-15 15:47:06 UTC (rev 288348)
@@ -629,6 +629,9 @@
REGISTER_CURL_CONSTANT(CURLINFO_REDIRECT_COUNT);
REGISTER_CURL_CONSTANT(CURLINFO_HEADER_OUT);
REGISTER_CURL_CONSTANT(CURLINFO_PRIVATE);
+#if LIBCURL_VERSION_NUM 0x071202
+ REGISTER_CURL_CONSTANT(CURLINFO_CERTINFO);
+#endif
/* cURL protocol constants (curl_version) */
REGISTER_CURL_CONSTANT(CURL_VERSION_IPV6);
@@ -744,6 +747,9 @@
REGISTER_CURL_CONSTANT(CURLFTPSSL_CONTROL);
REGISTER_CURL_CONSTANT(CURLFTPSSL_ALL);
#endif
+#if LIBCURL_VERSION_NUM 0x071202
+ REGISTER_CURL_CONSTANT(CURLOPT_CERTINFO);
+#endif
/* SSH support works in 7.19.0+ using libssh2 */
#if LIBCURL_VERSION_NUM = 0x071300
@@ -1336,6 +1342,85 @@
}
/* }}} */
+#if LIBCURL_VERSION_NUM 0x071202
+/* {{{ split_certinfo
+ */
+static void split_certinfo(char *string, zval *hash)
+{
+ int i;
+ char *org = estrdup(string);
+ char *s = org;
+ char *split;
+
+ if(org) {
+do {
+ char *key;
+ char *val;
+ char *tmp;
+
+split = strstr(s, ; );
+if(split)
+*split = '\0';
+
+ key = s;
+ tmp = memchr(key, '=', 64);
+ if(tmp) {
+*tmp = '\0';
+val = tmp+1;
+add_assoc_string(hash, key, val, 1);
+ }
+ s = split+2;
+ } while(split);
+ efree(org);
+ }
+}
+
+/* {{{ create_certinfo
+ */
+static void create_certinfo(struct curl_certinfo *ci, zval *listcode)
+{
+ int i;
+
+ if(ci) {
+ zval *certhash = NULL;
+ char *tmp;
+
+ for(i=0; ici-num_of_certs; i++) {
+ struct curl_slist *slist;
+
+ MAKE_STD_ZVAL(certhash);
+ array_init(certhash);
+ for(slist = ci-certinfo[i]; slist; slist = slist-next) {
+int len;
+char s[64];
+char *tmp;
+strncpy(s, slist-data, 64);
+tmp = memchr(s, ':', 64);
+if(tmp) {
+ *tmp = '\0';
+ len = strlen(s);
+ if(!strcmp(s, Subject) || !strcmp(s, Issuer)) {
+ zval *hash;
+
+ MAKE_STD_ZVAL(hash);
+ array_init(hash);
+
+ split_certinfo(slist-data[len+1], hash);
+ add_assoc_zval(certhash, s, hash);
+ } else {
+ add_assoc_string(certhash, s, slist-data[len+1], 1);
+ }
+} else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Could not extract hash key from certificate info);
+}
+ }
+ add_next_index_zval(listcode, certhash);
+ }
+ }
+}
+/* }}} */
+#endif
+
/* {{{ proto resource curl_init([string url])
Initialize a cURL session */
PHP_FUNCTION(curl_init)
@@ -1561,6 +1646,9 @@
#if LIBCURL_VERSION_NUM = 0x070f01
case CURLOPT_FTP_FILEMETHOD:
#endif
+#if LIBCURL_VERSION_NUM 0x071202
+ case CURLOPT_CERTINFO:
+#endif
convert_to_long_ex(zvalue);
#if LIBCURL_VERSION_NUM = 0x71304
if (((PG(open_basedir) *PG(open_basedir)) || PG(safe_mode)) (Z_LVAL_PP(zvalue) CURLPROTO_FILE)) {
@@ -2105,6 +2193,10 @@
char *s_code;
longl_code;
double d_code;
+#if LIBCURL_VERSION_NUM 0x071202
+ struct curl_certinfo *ci = NULL;
+ zval *listcode;
+#endif
array_init(return_value);
@@ -2175,6 +2267,14 @@
if (curl_easy_getinfo(ch-cp, CURLINFO_REDIRECT_TIME, d_code) == CURLE_OK) {
CAAD(redirect_time, d_code);
}
+#if LIBCURL_VERSION_NUM 0x071202
+ if (curl_easy_getinfo(ch-cp, CURLINFO_CERTINFO, ci) == CURLE_OK) {
+ MAKE_STD_ZVAL(listcode);
+ array_init(listcode);
+ create_certinfo(ci, listcode);
+ CAAZ(certinfo, listcode);
+ }
+#endif
if (ch-header.str_len 0) {
CAAS(request_header, ch-header.str);
}
@@ -2234,6 +2334,20 @@
} else {
RETURN_FALSE;
}
+#if LIBCURL_VERSION_NUM 0x071202
+ case CURLINFO_CERTINFO: {
+struct curl_certinfo *ci = NULL;
+
+
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c trunk/TSRM/tsrm_virtual_cwd.c
pajoye Mon, 14 Sep 2009 18:46:56 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288339
Log:
- Fix #48746, improve fix to support all possible cases (see latest comment in
the report)
Bug: http://bugs.php.net/48746 (Assigned) Unable to browse directories within
Junction Points
Changed paths:
U php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
U php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c2009-09-14
18:12:51 UTC (rev 288338)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c2009-09-14
18:46:56 UTC (rev 288339)
@@ -667,11 +667,14 @@
/* File is a reparse point. Get the target */
HANDLE hLink = NULL;
REPARSE_DATA_BUFFER * pbuffer;
- unsigned int retlength = 0, rname_off = 0;
- int bufindex = 0, rname_len = 0, isabsolute = 0;
+ unsigned int retlength = 0;
+ int bufindex = 0, isabsolute = 0;
wchar_t * reparsetarget;
- WCHAR szVolumePathNames[MAX_PATH];
BOOL isVolume = FALSE;
+ char printname[MAX_PATH];
+ char substitutename[MAX_PATH];
+ int printname_len, substitutename_len;
+ int substitutename_off = 0;
if(++(*ll) LINK_MAX) {
return -1;
@@ -692,33 +695,61 @@
CloseHandle(hLink);
if(pbuffer-ReparseTag == IO_REPARSE_TAG_SYMLINK) {
- rname_len =
pbuffer-SymbolicLinkReparseBuffer.PrintNameLength/2;
- rname_off =
pbuffer-SymbolicLinkReparseBuffer.PrintNameOffset/2;
- if(rname_len = 0) {
- rname_len =
pbuffer-SymbolicLinkReparseBuffer.SubstituteNameLength/2;
- rname_off =
pbuffer-SymbolicLinkReparseBuffer.SubstituteNameOffset/2;
- }
-
reparsetarget =
pbuffer-SymbolicLinkReparseBuffer.ReparseTarget;
+ printname_len =
pbuffer-MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
isabsolute =
(pbuffer-SymbolicLinkReparseBuffer.Flags == 0) ? 1 : 0;
+ if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
+ reparsetarget +
pbuffer-MountPointReparseBuffer.PrintNameOffset / sizeof(WCHAR),
+ printname_len + 1,
+ printname, MAX_PATH, NULL, NULL
+ )) {
+ tsrm_free_alloca(pbuffer,
use_heap_large);
+ return -1;
+ };
+ printname_len =
pbuffer-MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
+ printname[printname_len] = 0;
+
+ substitutename_len =
pbuffer-MountPointReparseBuffer.SubstituteNameLength / sizeof(WCHAR);
+ if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
+ reparsetarget +
pbuffer-MountPointReparseBuffer.SubstituteNameOffset / sizeof(WCHAR),
+ substitutename_len + 1,
+ substitutename, MAX_PATH, NULL, NULL
+ )) {
+ tsrm_free_alloca(pbuffer,
use_heap_large);
+ return -1;
+ };
+ substitutename[substitutename_len] = 0;
}
else if(pbuffer-ReparseTag ==
IO_REPARSE_TAG_MOUNT_POINT) {
- rname_len =
pbuffer-MountPointReparseBuffer.PrintNameLength/2;
- rname_off =
pbuffer-MountPointReparseBuffer.PrintNameOffset/2;
- if(rname_len = 0) {
- rname_len =
pbuffer-MountPointReparseBuffer.SubstituteNameLength/2;
- rname_off =
pbuffer-MountPointReparseBuffer.SubstituteNameOffset/2;
- }
+ isabsolute = 1;
+ reparsetarget =
pbuffer-MountPointReparseBuffer.ReparseTarget;
+ printname_len =
pbuffer-MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/Zend/zend.h branches/PHP_5_3/Zend/zend.h trunk/Zend/zend.h
pajoye Sun, 06 Sep 2009 15:56:58 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288110 Log: - revert last commit, breaks the build and needs test case(s) Changed paths: U php/php-src/branches/PHP_5_2/Zend/zend.h U php/php-src/branches/PHP_5_3/Zend/zend.h U php/php-src/trunk/Zend/zend.h Modified: php/php-src/branches/PHP_5_2/Zend/zend.h === --- php/php-src/branches/PHP_5_2/Zend/zend.h2009-09-06 14:43:09 UTC (rev 288109) +++ php/php-src/branches/PHP_5_2/Zend/zend.h2009-09-06 15:56:58 UTC (rev 288110) @@ -200,8 +200,8 @@ # define do_alloca(p) emalloc(p) # define free_alloca(p)efree(p) # define ALLOCA_FLAG(name) -# define do_alloca_with_limit(p, use_heap) emalloc(p), use_heap = 1 -# define free_alloca_with_limit(p, use_heap) efree(p), use_heap = 1 +# define do_alloca_with_limit(p, use_heap) emalloc(p) +# define free_alloca_with_limit(p, use_heap) efree(p) #endif #if ZEND_DEBUG Modified: php/php-src/branches/PHP_5_3/Zend/zend.h === --- php/php-src/branches/PHP_5_3/Zend/zend.h2009-09-06 14:43:09 UTC (rev 288109) +++ php/php-src/branches/PHP_5_3/Zend/zend.h2009-09-06 15:56:58 UTC (rev 288110) @@ -195,8 +195,8 @@ #else # define ALLOCA_FLAG(name) # define SET_ALLOCA_FLAG(name) -# define do_alloca(p, use_heap)emalloc(p), use_heap = 1 -# define free_alloca(p, use_heap) efree(p), use_heap = 1 +# define do_alloca(p, use_heap)emalloc(p) +# define free_alloca(p, use_heap) efree(p) #endif #if ZEND_DEBUG Modified: php/php-src/trunk/Zend/zend.h === --- php/php-src/trunk/Zend/zend.h 2009-09-06 14:43:09 UTC (rev 288109) +++ php/php-src/trunk/Zend/zend.h 2009-09-06 15:56:58 UTC (rev 288110) @@ -196,8 +196,8 @@ #else # define ALLOCA_FLAG(name) # define SET_ALLOCA_FLAG(name) -# define do_alloca(p, use_heap)emalloc(p), use_heap = 1 -# define free_alloca(p, use_heap) efree(p), use_heap = 1 +# define do_alloca(p, use_heap)emalloc(p) +# define free_alloca(p, use_heap) efree(p) #endif #if ZEND_DEBUG -- 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/ info.c
pajoye Sun, 06 Sep 2009 22:01:18 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288116
Log:
- fix #40013, php_uname() doesnt return nodename (MFH)
Bug: http://bugs.php.net/40013 (Open) php_uname() doesnt return nodename
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/info.c
Modified: php/php-src/branches/PHP_5_3/ext/standard/info.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/info.c2009-09-06 21:48:55 UTC
(rev 288115)
+++ php/php-src/branches/PHP_5_3/ext/standard/info.c2009-09-06 22:01:18 UTC
(rev 288116)
@@ -527,9 +527,33 @@
if (uname((struct utsname *)buf) == -1) {
php_uname = PHP_UNAME;
} else {
+#ifdef NETWARE
if (mode == 's') {
php_uname = buf.sysname;
} else if (mode == 'r') {
+ snprintf(tmp_uname, sizeof(tmp_uname), %d.%d.%d,
+buf.netware_major, buf.netware_minor,
buf.netware_revision);
+ php_uname = tmp_uname;
+ } else if (mode == 'n') {
+ php_uname = buf.servername;
+ } else if (mode == 'v') {
+ snprintf(tmp_uname, sizeof(tmp_uname), libc-%d.%d.%d
#%d,
+buf.libmajor, buf.libminor,
buf.librevision, buf.libthreshold);
+ php_uname = tmp_uname;
+ } else if (mode == 'm') {
+ php_uname = buf.machine;
+ } else { /* assume mode == 'a' */
+ snprintf(tmp_uname, sizeof(tmp_uname), %s %s %d.%d.%d
libc-%d.%d.%d #%d %s,
+buf.sysname, buf.servername,
+buf.netware_major, buf.netware_minor,
buf.netware_revision,
+buf.libmajor, buf.libminor,
buf.librevision, buf.libthreshold,
+buf.machine);
+ php_uname = tmp_uname;
+ }
+#else
+ if (mode == 's') {
+ php_uname = buf.sysname;
+ } else if (mode == 'r') {
php_uname = buf.release;
} else if (mode == 'n') {
php_uname = buf.nodename;
@@ -543,6 +567,7 @@
buf.machine);
php_uname = tmp_uname;
}
+#endif /* NETWARE */
}
#else
php_uname = PHP_UNAME;
--
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/filter/filter.c branches/PHP_5_2/ext/filter/tests/bug49274.phpt branches/PHP_5_3/ext/filter/filter.c branches/PHP_5_3/ext/filter/tests/bug49274.phpt t
pajoye Sat, 05 Sep 2009 17:35:26 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288083
Log:
- fix #49274, filter_var does not accept object without a toString
implementation
Bug: http://bugs.php.net/49274 (Analyzed) filter_var() should accept objects
without fatal error
Changed paths:
U php/php-src/branches/PHP_5_2/ext/filter/filter.c
A php/php-src/branches/PHP_5_2/ext/filter/tests/bug49274.phpt
U php/php-src/branches/PHP_5_3/ext/filter/filter.c
A php/php-src/branches/PHP_5_3/ext/filter/tests/bug49274.phpt
U php/php-src/trunk/ext/filter/filter.c
A php/php-src/trunk/ext/filter/tests/bug49274.phpt
Modified: php/php-src/branches/PHP_5_2/ext/filter/filter.c
===
--- php/php-src/branches/PHP_5_2/ext/filter/filter.c2009-09-05 17:11:44 UTC
(rev 288082)
+++ php/php-src/branches/PHP_5_2/ext/filter/filter.c2009-09-05 17:35:26 UTC
(rev 288083)
@@ -316,6 +316,19 @@
if (copy) {
SEPARATE_ZVAL(value);
}
+
+ /* #49274, fatal error with object without a toString method
+ Fails nicely instead of getting a recovarable fatal error. */
+ if (Z_TYPE_PP(value) == IS_OBJECT) {
+ zend_class_entry *ce;
+
+ ce = Z_OBJCE_PP(value);
+ if (!ce-__tostring) {
+ ZVAL_FALSE(*value);
+ return;
+ }
+ }
+
/* Here be strings */
convert_to_string(*value);
Added: php/php-src/branches/PHP_5_2/ext/filter/tests/bug49274.phpt
===
--- php/php-src/branches/PHP_5_2/ext/filter/tests/bug49274.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_2/ext/filter/tests/bug49274.phpt 2009-09-05
17:35:26 UTC (rev 288083)
@@ -0,0 +1,10 @@
+--TEST--
+#49274, fatal error when an object does not implement toString
+--SKIPIF--
+?php if (!extension_loaded(filter)) die(skip); ?
+--FILE--
+?php
+var_dump(filter_var(new stdClass, FILTER_VALIDATE_EMAIL));
+?
+--EXPECTF--
+bool(false)
Modified: php/php-src/branches/PHP_5_3/ext/filter/filter.c
===
--- php/php-src/branches/PHP_5_3/ext/filter/filter.c2009-09-05 17:11:44 UTC
(rev 288082)
+++ php/php-src/branches/PHP_5_3/ext/filter/filter.c2009-09-05 17:35:26 UTC
(rev 288083)
@@ -365,6 +365,19 @@
if (copy) {
SEPARATE_ZVAL(value);
}
+
+ /* #49274, fatal error with object without a toString method
+ Fails nicely instead of getting a recovarable fatal error. */
+ if (Z_TYPE_PP(value) == IS_OBJECT) {
+ zend_class_entry *ce;
+
+ ce = Z_OBJCE_PP(value);
+ if (!ce-__tostring) {
+ ZVAL_FALSE(*value);
+ return;
+ }
+ }
+
/* Here be strings */
convert_to_string(*value);
Added: php/php-src/branches/PHP_5_3/ext/filter/tests/bug49274.phpt
===
--- php/php-src/branches/PHP_5_3/ext/filter/tests/bug49274.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/filter/tests/bug49274.phpt 2009-09-05
17:35:26 UTC (rev 288083)
@@ -0,0 +1,10 @@
+--TEST--
+#49274, fatal error when an object does not implement toString
+--SKIPIF--
+?php if (!extension_loaded(filter)) die(skip); ?
+--FILE--
+?php
+var_dump(filter_var(new stdClass, FILTER_VALIDATE_EMAIL));
+?
+--EXPECTF--
+bool(false)
Modified: php/php-src/trunk/ext/filter/filter.c
===
--- php/php-src/trunk/ext/filter/filter.c 2009-09-05 17:11:44 UTC (rev
288082)
+++ php/php-src/trunk/ext/filter/filter.c 2009-09-05 17:35:26 UTC (rev
288083)
@@ -379,6 +379,19 @@
if (copy) {
SEPARATE_ZVAL(value);
}
+
+ /* #49274, fatal error with object without a toString method
+ Fails nicely instead of getting a recovarable fatal error. */
+ if (Z_TYPE_PP(value) == IS_OBJECT) {
+ zend_class_entry *ce;
+
+ ce = Z_OBJCE_PP(value);
+ if (!ce-__tostring) {
+ ZVAL_FALSE(*value);
+ return;
+ }
+ }
+
/* Here be strings */
convert_to_string(*value);
Added: php/php-src/trunk/ext/filter/tests/bug49274.phpt
===
--- php/php-src/trunk/ext/filter/tests/bug49274.phpt
(rev 0)
+++ php/php-src/trunk/ext/filter/tests/bug49274.phpt2009-09-05 17:35:26 UTC
(rev 288083)
@@ -0,0 +1,10 @@
+--TEST--
+#49274, fatal error when an object does not implement toString
+--SKIPIF--
+?php if (!extension_loaded(filter)) die(skip); ?
+--FILE--
+?php
[PHP-CVS] svn: /php/php-src/trunk/ext/filter/ filter.c logical_filters.c
pajoye Sat, 05 Sep 2009 17:39:18 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288084
Log:
- useless #ifdef
Changed paths:
U php/php-src/trunk/ext/filter/filter.c
U php/php-src/trunk/ext/filter/logical_filters.c
Modified: php/php-src/trunk/ext/filter/filter.c
===
--- php/php-src/trunk/ext/filter/filter.c 2009-09-05 17:35:26 UTC (rev
288083)
+++ php/php-src/trunk/ext/filter/filter.c 2009-09-05 17:39:18 UTC (rev
288084)
@@ -485,11 +485,6 @@
INIT_PZVAL(tmp_new_var);
php_zval_filter(tmp_new_var, IF_G(default_filter),
IF_G(default_filter_flags), NULL, NULL/*charset*/, 0 TSRMLS_CC);
}
-#if PHP_VERSION_ID6
- else if (PG(magic_quotes_gpc)) {
- Z_STRVAL(new_var) = php_addslashes(*val,
Z_STRLEN(new_var), Z_STRLEN(new_var), 0 TSRMLS_CC);
- }
-#endif
else {
Z_STRVAL(new_var) = estrndup(*val, val_len);
}
@@ -554,11 +549,7 @@
{
zval *array_ptr = NULL;
- zend_bool jit_initialization = (PG(auto_globals_jit)
-#if PHP_VERSION_ID6
- !PG(register_globals) !PG(register_long_arrays)
-#endif
-);
+ zend_bool jit_initialization = (PG(auto_globals_jit));
switch (arg) {
case PARSE_GET:
Modified: php/php-src/trunk/ext/filter/logical_filters.c
===
--- php/php-src/trunk/ext/filter/logical_filters.c 2009-09-05 17:35:26 UTC
(rev 288083)
+++ php/php-src/trunk/ext/filter/logical_filters.c 2009-09-05 17:39:18 UTC
(rev 288084)
@@ -24,10 +24,6 @@
#include ext/standard/url.h
#include ext/pcre/php_pcre.h
-#if PHP_MAJOR_VERSION = 6
-#define zend_ascii_hash_find(hash, name, sizeof_name, val)
zend_hash_find(hash, name, sizeof_name, val)
-#endif
-
#include zend_multiply.h
#if HAVE_ARPA_INET_H
--
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/file/windows_links/bug48746.phpt branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746_1.phpt branches/PHP_5_3/ext/standard/t
pajoye Sat, 05 Sep 2009 18:10:31 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288085
Log:
- add test for #48746
Bug: http://bugs.php.net/48746 (Feedback) Unable to browse directories within
Junction Points
Changed paths:
A php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/
A
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746.phpt
A
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746_1.phpt
A
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746_2.phpt
A
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746_3.phpt
A php/php-src/trunk/ext/standard/tests/file/windows_links/
A php/php-src/trunk/ext/standard/tests/file/windows_links/bug48746.phpt
A php/php-src/trunk/ext/standard/tests/file/windows_links/bug48746_1.phpt
A php/php-src/trunk/ext/standard/tests/file/windows_links/bug48746_2.phpt
A php/php-src/trunk/ext/standard/tests/file/windows_links/bug48746_3.phpt
Added: php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746.phpt 2009-09-05 18:10:31 UTC (rev 288085)
@@ -0,0 +1,54 @@
+--TEST--
+Bug#48746 - Junction not working properly
+
+--CREDIT--
+Venkat Raman Don (don.ra...@microsoft.com)
+
+--SKIPIF--
+?php
+$cmd = mklink.exe /?;
+$ret = @exec($cmd, $output, $return_val);
+if (count($output) == 0) {
+die(mklink.exe not found in PATH);
+}
+if(substr(PHP_OS, 0, 3) != 'WIN' ) {
+die('skip windows only test');
+}
+?
+--FILE--
+?php
+$old_dir = __DIR__;
+$dirname = __DIR__ . \\mnt\\test\\directory;
+exec(mkdir . $dirname, $output, $ret_val);
+chdir(__DIR__ . \\mnt\\test);
+$drive = substr(__DIR__, 0, 2);
+$pathwithoutdrive = substr(__DIR__, 2);
+$ret = exec(mountvol . $drive . /L, $output, $ret_val);
+exec(mklink /j mounted_volume . $ret, $output, $ret_val);
+$fullpath = mounted_volume . $pathwithoutdrive;
+exec(mklink /j mklink_junction directory, $output, $ret_val);
+var_dump(file_exists(directory));
+var_dump(file_exists(mklink_junction));
+var_dump(file_exists(mounted_volume));
+var_dump(file_exists($fullpath));
+var_dump(is_dir(mklink_junction));
+var_dump(is_dir($fullpath));
+var_dump(is_readable(mklink_junction));
+var_dump(is_writeable($fullpath));
+chdir($old_dir);
+rmdir(__DIR__ . \\mnt\\test\\directory);
+rmdir(__DIR__ . \\mnt\\test\\mklink_junction);
+rmdir(__DIR__ . \\mnt\\test\\mounted_volume);
+rmdir(__DIR__ . \\mnt\\test);
+rmdir(__DIR__ . \\mnt);
+
+?
+--EXPECT--
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
\ No newline at end of file
Added: php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746_1.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746_1.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746_1.phpt 2009-09-05 18:10:31 UTC (rev 288085)
@@ -0,0 +1,56 @@
+--TEST--
+Bug#48746 - Junction not working properly
+
+--CREDIT--
+Venkat Raman Don (don.ra...@microsoft.com)
+
+--SKIPIF--
+?php
+$cmd = mklink.exe /?;
+$ret = @exec($cmd, $output, $return_val);
+if (count($output) == 0) {
+die(mklink.exe not found in PATH);
+}
+if(substr(PHP_OS, 0, 3) != 'WIN' ) {
+die('skip windows only test');
+}
+?
+--FILE--
+?php
+$old_dir = __DIR__;
+$dirname = __DIR__ . \\mnt\\test\\directory;
+exec(mkdir . $dirname, $output, $ret_val);
+chdir(__DIR__ . \\mnt\\test);
+$drive = substr(__DIR__, 0, 2);
+$pathwithoutdrive = substr(__DIR__, 2);
+$ret = exec(mountvol . $drive . /L, $output, $ret_val);
+exec(mklink /j mounted_volume . $ret, $output, $ret_val);
+$fullpath = mounted_volume . $pathwithoutdrive;
+exec(mklink /j mklink_junction directory, $output, $ret_val);
+file_put_contents(mklink_junction\\a.php, ?php echo \I am included.\n\ ?);
+include_once mklink_junction\\a.php;
+file_put_contents($fullpath\\mnt\\test\\directory\\b.php, ?php echo \I am included.\n\ ?);
+require $fullpath\\mnt\\test\\directory\\b.php;
+file_put_contents($fullpath\\mnt\\test\\mklink_junction\\c.php, ?php echo \I am included.\n\ ?);
+require_once $fullpath\\mnt\\test\\mklink_junction\\c.php;
+var_dump(is_file(mklink_junction\\a.php));
+var_dump(is_file($fullpath\\mnt\\test\\directory\\b.php));
+var_dump(is_file($fullpath\\mnt\\test\\mklink_junction\\c.php));
+unlink($fullpath\\mnt\\test\\directory\\b.php);
+unlink($fullpath\\mnt\\test\\mklink_junction\\c.php);
+unlink(mklink_junction\\a.php);
+chdir($old_dir);
+rmdir(__DIR__ . \\mnt\\test\\directory);
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/Zend/zend_API.c branches/PHP_5_3/Zend/zend_API.c trunk/Zend/zend_API.c
pajoye Sat, 05 Sep 2009 19:00:05 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288088
Log:
- don't hide early declaration
Changed paths:
U php/php-src/branches/PHP_5_2/Zend/zend_API.c
U php/php-src/branches/PHP_5_3/Zend/zend_API.c
U php/php-src/trunk/Zend/zend_API.c
Modified: php/php-src/branches/PHP_5_2/Zend/zend_API.c
===
--- php/php-src/branches/PHP_5_2/Zend/zend_API.c2009-09-05 18:22:16 UTC
(rev 288087)
+++ php/php-src/branches/PHP_5_2/Zend/zend_API.c2009-09-05 19:00:05 UTC
(rev 288088)
@@ -909,13 +909,13 @@
(*q)-is_ref = 1;
zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)q,
sizeof(zval*), NULL);
} else {
- zval *q;
+ zval *r;
- ALLOC_ZVAL(q);
- *q = **p;
- INIT_PZVAL(q);
- zval_copy_ctor(q);
-
zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)q,
sizeof(zval*), NULL);
+ ALLOC_ZVAL(r);
+ *r = **p;
+ INIT_PZVAL(r);
+ zval_copy_ctor(r);
+
zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)r,
sizeof(zval*), NULL);
}
zend_hash_move_forward_ex(class_type-default_static_members, pos);
}
Modified: php/php-src/branches/PHP_5_3/Zend/zend_API.c
===
--- php/php-src/branches/PHP_5_3/Zend/zend_API.c2009-09-05 18:22:16 UTC
(rev 288087)
+++ php/php-src/branches/PHP_5_3/Zend/zend_API.c2009-09-05 19:00:05 UTC
(rev 288088)
@@ -1038,13 +1038,13 @@
Z_SET_ISREF_PP(q);
zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)q,
sizeof(zval*), NULL);
} else {
- zval *q;
+ zval *r;
- ALLOC_ZVAL(q);
- *q = **p;
- INIT_PZVAL(q);
- zval_copy_ctor(q);
-
zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)q,
sizeof(zval*), NULL);
+ ALLOC_ZVAL(r);
+ *r = **p;
+ INIT_PZVAL(r);
+ zval_copy_ctor(r);
+
zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)r,
sizeof(zval*), NULL);
}
zend_hash_move_forward_ex(class_type-default_static_members, pos);
}
Modified: php/php-src/trunk/Zend/zend_API.c
===
--- php/php-src/trunk/Zend/zend_API.c 2009-09-05 18:22:16 UTC (rev 288087)
+++ php/php-src/trunk/Zend/zend_API.c 2009-09-05 19:00:05 UTC (rev 288088)
@@ -1320,13 +1320,13 @@
Z_SET_ISREF_PP(q);
zend_u_hash_add(CE_STATIC_MEMBERS(class_type), utype, str_index, str_length,
(void**)q, sizeof(zval*), NULL);
} else {
- zval *q;
+ zval *r;
- ALLOC_ZVAL(q);
- *q = **p;
- INIT_PZVAL(q);
- zval_copy_ctor(q);
-
zend_u_hash_add(CE_STATIC_MEMBERS(class_type), utype, str_index, str_length,
(void**)q, sizeof(zval*), NULL);
+ ALLOC_ZVAL(r);
+ *r = **p;
+ INIT_PZVAL(r);
+ zval_copy_ctor(r);
+
zend_u_hash_add(CE_STATIC_MEMBERS(class_type), utype, str_index, str_length,
(void**)r, sizeof(zval*), NULL);
}
zend_hash_move_forward_ex(class_type-default_static_members, pos);
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/Zend/ zend_API.c
pajoye Sat, 05 Sep 2009 19:01:06 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288089
Log:
- WS
Changed paths:
U php/php-src/branches/PHP_5_2/Zend/zend_API.c
Modified: php/php-src/branches/PHP_5_2/Zend/zend_API.c
===
--- php/php-src/branches/PHP_5_2/Zend/zend_API.c2009-09-05 19:00:05 UTC
(rev 288088)
+++ php/php-src/branches/PHP_5_2/Zend/zend_API.c2009-09-05 19:01:06 UTC
(rev 288089)
@@ -901,10 +901,10 @@
zend_hash_get_current_key_ex(class_type-default_static_members, str_index,
str_length, num_index, 0, pos);
if ((*p)-is_ref
- class_type-parent
-
zend_hash_find(class_type-parent-default_static_members, str_index,
str_length, (void**)q) == SUCCESS
- *p == *q
-
zend_hash_find(CE_STATIC_MEMBERS(class_type-parent), str_index, str_length,
(void**)q) == SUCCESS) {
+ class_type-parent
+
zend_hash_find(class_type-parent-default_static_members, str_index,
str_length, (void**)q) == SUCCESS
+ *p == *q
+
zend_hash_find(CE_STATIC_MEMBERS(class_type-parent), str_index, str_length,
(void**)q) == SUCCESS) {
(*q)-refcount++;
(*q)-is_ref = 1;
zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)q,
sizeof(zval*), NULL);
--
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/Zend/zend_compile.c trunk/Zend/zend_compile.c
pajoye Sat, 05 Sep 2009 21:16:05 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288096
Log:
- don't hide previous declaration
Changed paths:
U php/php-src/branches/PHP_5_3/Zend/zend_compile.c
U php/php-src/trunk/Zend/zend_compile.c
Modified: php/php-src/branches/PHP_5_3/Zend/zend_compile.c
===
--- php/php-src/branches/PHP_5_3/Zend/zend_compile.c2009-09-05 20:59:27 UTC
(rev 288095)
+++ php/php-src/branches/PHP_5_3/Zend/zend_compile.c2009-09-05 21:16:05 UTC
(rev 288096)
@@ -5191,31 +5191,31 @@
if (CG(current_namespace)) {
/* Prefix import name with current namespace name to avoid
conflicts with classes */
- char *ns_name = emalloc(Z_STRLEN_P(CG(current_namespace)) + 1 +
Z_STRLEN_P(name) + 1);
+ char *c_ns_name = emalloc(Z_STRLEN_P(CG(current_namespace)) + 1
+ Z_STRLEN_P(name) + 1);
- zend_str_tolower_copy(ns_name,
Z_STRVAL_P(CG(current_namespace)), Z_STRLEN_P(CG(current_namespace)));
- ns_name[Z_STRLEN_P(CG(current_namespace))] = '\\';
- memcpy(ns_name+Z_STRLEN_P(CG(current_namespace))+1, lcname,
Z_STRLEN_P(name)+1);
- if (zend_hash_exists(CG(class_table), ns_name,
Z_STRLEN_P(CG(current_namespace)) + 1 + Z_STRLEN_P(name)+1)) {
+ zend_str_tolower_copy(c_ns_name,
Z_STRVAL_P(CG(current_namespace)), Z_STRLEN_P(CG(current_namespace)));
+ c_ns_name[Z_STRLEN_P(CG(current_namespace))] = '\\';
+ memcpy(c_ns_name+Z_STRLEN_P(CG(current_namespace))+1, lcname,
Z_STRLEN_P(name)+1);
+ if (zend_hash_exists(CG(class_table), c_ns_name,
Z_STRLEN_P(CG(current_namespace)) + 1 + Z_STRLEN_P(name)+1)) {
char *tmp = zend_str_tolower_dup(Z_STRVAL_P(ns),
Z_STRLEN_P(ns));
if (Z_STRLEN_P(ns) != Z_STRLEN_P(CG(current_namespace))
+ 1 + Z_STRLEN_P(name) ||
- memcmp(tmp, ns_name, Z_STRLEN_P(ns))) {
+ memcmp(tmp, c_ns_name, Z_STRLEN_P(ns))) {
zend_error(E_COMPILE_ERROR, Cannot use %s as
%s because the name is already in use, Z_STRVAL_P(ns), Z_STRVAL_P(name));
}
efree(tmp);
}
- efree(ns_name);
+ efree(c_ns_name);
} else if (zend_hash_find(CG(class_table), lcname, Z_STRLEN_P(name)+1,
(void**)pce) == SUCCESS
(*pce)-type == ZEND_USER_CLASS
(*pce)-filename == CG(compiled_filename)) {
- char *tmp = zend_str_tolower_dup(Z_STRVAL_P(ns),
Z_STRLEN_P(ns));
+ char *c_tmp = zend_str_tolower_dup(Z_STRVAL_P(ns),
Z_STRLEN_P(ns));
if (Z_STRLEN_P(ns) != Z_STRLEN_P(name) ||
- memcmp(tmp, lcname, Z_STRLEN_P(ns))) {
+ memcmp(c_tmp, lcname, Z_STRLEN_P(ns))) {
zend_error(E_COMPILE_ERROR, Cannot use %s as %s
because the name is already in use, Z_STRVAL_P(ns), Z_STRVAL_P(name));
}
- efree(tmp);
+ efree(c_tmp);
}
if (zend_hash_add(CG(current_import), lcname, Z_STRLEN_P(name)+1, ns,
sizeof(zval*), NULL) != SUCCESS) {
Modified: php/php-src/trunk/Zend/zend_compile.c
===
--- php/php-src/trunk/Zend/zend_compile.c 2009-09-05 20:59:27 UTC (rev
288095)
+++ php/php-src/trunk/Zend/zend_compile.c 2009-09-05 21:16:05 UTC (rev
288096)
@@ -5480,28 +5480,28 @@
if (CG(current_namespace)) {
/* Prefix import name with current namespace name to avoid
conflicts with classes */
uint ns_name_len;
- zstr ns_name =
zend_u_str_case_fold(Z_TYPE_P(CG(current_namespace)),
Z_UNIVAL_P(CG(current_namespace)), Z_UNILEN_P(CG(current_namespace)), 0,
ns_name_len);
+ zstr c_ns_name =
zend_u_str_case_fold(Z_TYPE_P(CG(current_namespace)),
Z_UNIVAL_P(CG(current_namespace)), Z_UNILEN_P(CG(current_namespace)), 0,
ns_name_len);
if (Z_TYPE_P(CG(current_namespace)) == IS_UNICODE) {
- ns_name.u = eurealloc(ns_name.u, ns_name_len + 1 +
lcname_len + 1);
- ns_name.u[ns_name_len] = '\\';
- memcpy(ns_name.u + ns_name_len + 1, lcname.u,
UBYTES(lcname_len + 1));
+ c_ns_name.u = eurealloc(c_ns_name.u, ns_name_len + 1 +
lcname_len + 1);
+ c_ns_name.u[ns_name_len] = '\\';
+ memcpy(c_ns_name.u + ns_name_len + 1, lcname.u,
UBYTES(lcname_len + 1));
} else {
- ns_name.s = erealloc(ns_name.s, ns_name_len + 1 +
lcname_len + 1);
- ns_name.s[ns_name_len] = '\\';
- memcpy(ns_name.s
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/TSRM/tsrm_win32.c trunk/TSRM/tsrm_win32.c
pajoye Fri, 04 Sep 2009 06:59:08 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288028
Log:
- be sure that we use the user token by default (Christian Wenz)
Changed paths:
U php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c
U php/php-src/trunk/TSRM/tsrm_win32.c
Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c 2009-09-04 05:50:31 UTC
(rev 288027)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c 2009-09-04 06:59:08 UTC
(rev 288028)
@@ -318,7 +318,7 @@
char *ptype = (char *)type;
HANDLE thread_token = NULL;
HANDLE token_user = NULL;
- BOOL asuser = FALSE;
+ BOOL asuser = TRUE;
TSRMLS_FETCH();
@@ -380,7 +380,6 @@
if (err == ERROR_NO_TOKEN) {
asuser = FALSE;
}
-
}
cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof( /c
)+2);
Modified: php/php-src/trunk/TSRM/tsrm_win32.c
===
--- php/php-src/trunk/TSRM/tsrm_win32.c 2009-09-04 05:50:31 UTC (rev 288027)
+++ php/php-src/trunk/TSRM/tsrm_win32.c 2009-09-04 06:59:08 UTC (rev 288028)
@@ -319,7 +319,7 @@
char *ptype = (char *)type;
HANDLE thread_token = NULL;
HANDLE token_user = NULL;
- BOOL asuser = FALSE;
+ BOOL asuser = TRUE;
TSRMLS_FETCH();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/win-installer/trunk/ ExtensionsFeatures52.wxs
pajoye Fri, 04 Sep 2009 07:37:07 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288030 Log: - fix install of pgsql and mssql, required DLLs were not installed Changed paths: U php/win-installer/trunk/ExtensionsFeatures52.wxs Modified: php/win-installer/trunk/ExtensionsFeatures52.wxs === --- php/win-installer/trunk/ExtensionsFeatures52.wxs2009-09-04 07:28:53 UTC (rev 288029) +++ php/win-installer/trunk/ExtensionsFeatures52.wxs2009-09-04 07:37:07 UTC (rev 288030) @@ -220,6 +220,7 @@ /Feature Feature AllowAdvertise=no Id=ext_php_mssql Title=$(loc.Featureext_php_mssqlTitle) Description=$(loc.Featureext_php_mssqlDescription) Level=10 ComponentRef Id=php_mssql/ + ComponentRef Id=ntwdblibDLL/ /Feature Feature AllowAdvertise=no Id=ext_php_mysql Title=$(loc.Featureext_php_mysqlTitle) Description=$(loc.Featureext_php_mysqlDescription) Level=10 ComponentRef Id=php_mysql/ @@ -283,6 +284,7 @@ /Feature Feature AllowAdvertise=no Id=ext_php_pdo_mssql Title=$(loc.Featureext_php_pdo_mssqlTitle) Description=$(loc.Featureext_php_pdo_mssqlDescription) Level=10 ComponentRef Id=php_pdo_mssql/ + ComponentRef Id=ntwdblibDLL/ /Feature Feature AllowAdvertise=no Id=ext_php_pdo_mysql Title=$(loc.Featureext_php_pdo_mysqlTitle) Description=$(loc.Featureext_php_pdo_mysqlDescription) Level=10 ComponentRef Id=php_pdo_mysql/ @@ -299,6 +301,7 @@ /Feature Feature AllowAdvertise=no Id=ext_php_pdo_pgsql Title=$(loc.Featureext_php_pdo_pgsqlTitle) Description=$(loc.Featureext_php_pdo_pgsqlDescription) Level=10 ComponentRef Id=php_pdo_pgsql/ + ComponentRef Id=libpqDLL/ /Feature Feature AllowAdvertise=no Id=ext_php_pdo_sqlite Title=$(loc.Featureext_php_pdo_sqliteTitle) Description=$(loc.Featureext_php_pdo_sqliteDescription) Level=10 ComponentRef Id=php_pdo_sqlite/ @@ -322,6 +325,7 @@ /Feature Feature AllowAdvertise=no Id=ext_php_pgsql Title=$(loc.Featureext_php_pgsqlTitle) Description=$(loc.Featureext_php_pgsqlDescription) Level=10 ComponentRef Id=php_pgsql/ + ComponentRef Id=libpqDLL/ /Feature Feature AllowAdvertise=no Id=ext_php_printer Title=$(loc.Featureext_php_printerTitle) Description=$(loc.Featureext_php_printerDescription) Level=10 ComponentRef Id=php_printer/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/win-installer/trunk/ ExtensionsFeatures52.wxs ExtensionsFeatures53.wxs ExtensionsFeatures60.wxs ExtensionsFragment52.wxs
pajoye Fri, 04 Sep 2009 07:57:24 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288033 Log: - WS Changed paths: U php/win-installer/trunk/ExtensionsFeatures52.wxs U php/win-installer/trunk/ExtensionsFeatures53.wxs U php/win-installer/trunk/ExtensionsFeatures60.wxs U php/win-installer/trunk/ExtensionsFragment52.wxs Modified: php/win-installer/trunk/ExtensionsFeatures52.wxs === --- php/win-installer/trunk/ExtensionsFeatures52.wxs 2009-09-04 07:56:46 UTC (rev 288032) +++ php/win-installer/trunk/ExtensionsFeatures52.wxs 2009-09-04 07:57:24 UTC (rev 288033) @@ -306,10 +306,10 @@ Feature AllowAdvertise=no Id=ext_php_pdo_sqlite Title=$(loc.Featureext_php_pdo_sqliteTitle) Description=$(loc.Featureext_php_pdo_sqliteDescription) Level=10 ComponentRef Id=php_pdo_sqlite/ /Feature -Feature AllowAdvertise=no Id=ext_php_pdo_sqlite_external Title=$(loc.Featureext_php_pdo_sqlite_externalTitle) Description=$(loc.Featureext_php_pdo_sqlite_externalDescription) Level=10 +Feature AllowAdvertise=no Id=ext_php_pdo_sqlite_external Title=$(loc.Featureext_php_pdo_sqlite_externalTitle) Description=$(loc.Featureext_php_pdo_sqlite_externalDescription) Level=10 ComponentRef Id=php_pdo_sqlite_external/ /Feature -Feature AllowAdvertise=no Id=ext_php_pdo_user Title=$(loc.Featureext_php_pdo_userTitle) Description=$(loc.Featureext_php_pdo_userDescription) Level=10 +Feature AllowAdvertise=no Id=ext_php_pdo_user Title=$(loc.Featureext_php_pdo_userTitle) Description=$(loc.Featureext_php_pdo_userDescription) Level=10 ComponentRef Id=php_pdo_user/ /Feature /Feature Modified: php/win-installer/trunk/ExtensionsFeatures53.wxs === --- php/win-installer/trunk/ExtensionsFeatures53.wxs 2009-09-04 07:56:46 UTC (rev 288032) +++ php/win-installer/trunk/ExtensionsFeatures53.wxs 2009-09-04 07:57:24 UTC (rev 288033) @@ -118,7 +118,7 @@ Feature AllowAdvertise=no Id=ext_php_gopher Title=$(loc.Featureext_php_gopherTitle) Description=$(loc.Featureext_php_gopherDescription) Level=10 ComponentRef Id=php_gopher/ /Feature -Feature AllowAdvertise=no Id=ext_php_haru Title=$(loc.Featureext_php_haruTitle) Description=$(loc.Featureext_php_haruDescription) Level=10 + Feature AllowAdvertise=no Id=ext_php_haru Title=$(loc.Featureext_php_haruTitle) Description=$(loc.Featureext_php_haruDescription) Level=10 ComponentRef Id=php_haru/ /Feature Feature AllowAdvertise=no Id=ext_php_htscanner Title=$(loc.Featureext_php_htscannerTitle) Description=$(loc.Featureext_php_htscannerDescription) Level=10 @@ -180,7 +180,7 @@ ComponentRef Id=php5servlet/ ComponentRef Id=phpsrvltJAR/ /Feature -Feature AllowAdvertise=no Id=ext_php_java Title=$(loc.Featureext_php_javaTitle) Description=$(loc.Featureext_php_javaDescription) Level=10 + Feature AllowAdvertise=no Id=ext_php_java Title=$(loc.Featureext_php_javaTitle) Description=$(loc.Featureext_php_javaDescription) Level=10 ComponentRef Id=php_java/ ComponentRef Id=php_javaJAR/ ComponentRef Id=php6servlet/ @@ -304,15 +304,15 @@ /Feature Feature AllowAdvertise=no Id=ext_php_pdo_pgsql Title=$(loc.Featureext_php_pdo_pgsqlTitle) Description=$(loc.Featureext_php_pdo_pgsqlDescription) Level=10 ComponentRef Id=php_pdo_pgsql/ -ComponentRef Id=libpqDLL/ + ComponentRef Id=libpqDLL/ /Feature Feature AllowAdvertise=no Id=ext_php_pdo_sqlite Title=$(loc.Featureext_php_pdo_sqliteTitle) Description=$(loc.Featureext_php_pdo_sqliteDescription) TypicalDefault=install Level=1 ComponentRef Id=php_pdo_sqlite/ /Feature -Feature AllowAdvertise=no Id=ext_php_pdo_sqlite_external Title=$(loc.Featureext_php_pdo_sqlite_externalTitle) Description=$(loc.Featureext_php_pdo_sqlite_externalDescription) Level=10 +Feature AllowAdvertise=no Id=ext_php_pdo_sqlite_external Title=$(loc.Featureext_php_pdo_sqlite_externalTitle) Description=$(loc.Featureext_php_pdo_sqlite_externalDescription) Level=10 ComponentRef Id=php_pdo_sqlite_external/ /Feature -Feature AllowAdvertise=no Id=ext_php_pdo_user Title=$(loc.Featureext_php_pdo_userTitle) Description=$(loc.Featureext_php_pdo_userDescription) Level=10 +Feature AllowAdvertise=no Id=ext_php_pdo_user Title=$(loc.Featureext_php_pdo_userTitle) Description=$(loc.Featureext_php_pdo_userDescription) Level=10 ComponentRef Id=php_pdo_user/ /Feature /Feature @@ -328,7 +328,7 @@ /Feature Feature AllowAdvertise=no Id=ext_php_pgsql Title=$(loc.Featureext_php_pgsqlTitle) Description=$(loc.Featureext_php_pgsqlDescription) TypicalDefault=install Level=1 ComponentRef Id=php_pgsql/ -ComponentRef Id=libpqDLL/ +ComponentRef Id=libpqDLL/
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/sockets/php_sockets.h branches/PHP_5_3/ext/sockets/sockets.c trunk/ext/sockets/php_sockets.h trunk/ext/sockets/sockets.c
pajoye Fri, 04 Sep 2009 19:53:39 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288067
Log:
- #49464, fix build
Bug: http://bugs.php.net/49464 (Open) php_sockets build broken
Changed paths:
U php/php-src/branches/PHP_5_3/ext/sockets/php_sockets.h
U php/php-src/branches/PHP_5_3/ext/sockets/sockets.c
U php/php-src/trunk/ext/sockets/php_sockets.h
U php/php-src/trunk/ext/sockets/sockets.c
Modified: php/php-src/branches/PHP_5_3/ext/sockets/php_sockets.h
===
--- php/php-src/branches/PHP_5_3/ext/sockets/php_sockets.h 2009-09-04
19:36:02 UTC (rev 288066)
+++ php/php-src/branches/PHP_5_3/ext/sockets/php_sockets.h 2009-09-04
19:53:39 UTC (rev 288067)
@@ -73,7 +73,9 @@
#ifndef PHP_WIN32
typedef int PHP_SOCKET;
+# define PHP_SOCKETS_API PHPAPI
#else
+# define PHP_SOCKETS_API __declspec(dllexport)
typedef SOCKET PHP_SOCKET;
#endif
@@ -91,7 +93,7 @@
};
#endif
-PHPAPI int php_sockets_le_socket(void);
+PHP_SOCKETS_API int php_sockets_le_socket(void);
/* Prototypes */
#ifdef ilia_0 /* not needed, only causes a compiler warning */
Modified: php/php-src/branches/PHP_5_3/ext/sockets/sockets.c
===
--- php/php-src/branches/PHP_5_3/ext/sockets/sockets.c 2009-09-04 19:36:02 UTC
(rev 288066)
+++ php/php-src/branches/PHP_5_3/ext/sockets/sockets.c 2009-09-04 19:53:39 UTC
(rev 288067)
@@ -323,7 +323,7 @@
/* inet_ntop should be used instead of inet_ntoa */
int inet_ntoa_lock = 0;
-PHPAPI int php_sockets_le_socket(void) /* {{{ */
+PHP_SOCKETS_API int php_sockets_le_socket(void) /* {{{ */
{
return le_socket;
}
Modified: php/php-src/trunk/ext/sockets/php_sockets.h
===
--- php/php-src/trunk/ext/sockets/php_sockets.h 2009-09-04 19:36:02 UTC (rev
288066)
+++ php/php-src/trunk/ext/sockets/php_sockets.h 2009-09-04 19:53:39 UTC (rev
288067)
@@ -73,8 +73,10 @@
#ifndef PHP_WIN32
typedef int PHP_SOCKET;
+# define PHP_SOCKETS_API __declspec(dllexport)
#else
typedef SOCKET PHP_SOCKET;
+# define PHP_SOCKETS_API PHPAPI
#endif
typedef struct {
@@ -91,7 +93,7 @@
};
#endif
-PHPAPI int php_sockets_le_socket(void);
+PHP_SOCKETS_API int php_sockets_le_socket(void);
/* Prototypes */
#ifdef ilia_0 /* not needed, only causes a compiler warning */
Modified: php/php-src/trunk/ext/sockets/sockets.c
===
--- php/php-src/trunk/ext/sockets/sockets.c 2009-09-04 19:36:02 UTC (rev
288066)
+++ php/php-src/trunk/ext/sockets/sockets.c 2009-09-04 19:53:39 UTC (rev
288067)
@@ -323,7 +323,8 @@
/* inet_ntop should be used instead of inet_ntoa */
int inet_ntoa_lock = 0;
-PHPAPI int php_sockets_le_socket(void) /* {{{ */
+
+PHP_SOCKETS_API int php_sockets_le_socket(void) /* {{{ */
{
return le_socket;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
