Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/phar/phar.c branches/PHP_5_4/ext/phar/phar.c trunk/ext/phar/phar.c
On Sun, Nov 20, 2011 at 00:09, Pierre Joye paj...@php.net wrote: pajoye Sat, 19 Nov 2011 23:09:12 + Revision: http://svn.php.net/viewvc?view=revisionrevision=319566 Log: - fix build, ansi c requires constant value, no expresion, even constant var Changed paths: U php/php-src/branches/PHP_5_3/ext/phar/phar.c U php/php-src/branches/PHP_5_4/ext/phar/phar.c U php/php-src/trunk/ext/phar/phar.c Modified: php/php-src/branches/PHP_5_3/ext/phar/phar.c === --- php/php-src/branches/PHP_5_3/ext/phar/phar.c 2011-11-19 23:04:42 UTC (rev 319565) +++ php/php-src/branches/PHP_5_3/ext/phar/phar.c 2011-11-19 23:09:12 UTC (rev 319566) @@ -1570,8 +1570,8 @@ const char gz_magic[] = \x1f\x8b\x08; const char bz_magic[] = BZh; char *pos, test = '\0'; - const int window_size = 1024; - char buffer[window_size + sizeof(token)]; /* a 1024 byte window + the size of the halt_compiler token (moving window) */ + const int window_size = 1024 + sizeof(token); + char buffer[1024 + sizeof(token)]; /* a 1024 byte window + the size of the halt_compiler token (moving window) */ Was the change in the window_size intentional? -Hannes -- 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/phar/phar.c branches/PHP_5_4/ext/phar/phar.c trunk/ext/phar/phar.c
pajoye Sun, 20 Nov 2011 10:10:43 + Revision: http://svn.php.net/viewvc?view=revisionrevision=319576 Log: - restore correct window_size Changed paths: U php/php-src/branches/PHP_5_3/ext/phar/phar.c U php/php-src/branches/PHP_5_4/ext/phar/phar.c U php/php-src/trunk/ext/phar/phar.c Modified: php/php-src/branches/PHP_5_3/ext/phar/phar.c === --- php/php-src/branches/PHP_5_3/ext/phar/phar.c2011-11-20 09:25:57 UTC (rev 319575) +++ php/php-src/branches/PHP_5_3/ext/phar/phar.c2011-11-20 10:10:43 UTC (rev 319576) @@ -1570,7 +1570,7 @@ const char gz_magic[] = \x1f\x8b\x08; const char bz_magic[] = BZh; char *pos, test = '\0'; - const int window_size = 1024 + sizeof(token); + const int window_size = 1024; char buffer[1024 + sizeof(token)]; /* a 1024 byte window + the size of the halt_compiler token (moving window) */ const long readsize = sizeof(buffer) - sizeof(token); const long tokenlen = sizeof(token) - 1; Modified: php/php-src/branches/PHP_5_4/ext/phar/phar.c === --- php/php-src/branches/PHP_5_4/ext/phar/phar.c2011-11-20 09:25:57 UTC (rev 319575) +++ php/php-src/branches/PHP_5_4/ext/phar/phar.c2011-11-20 10:10:43 UTC (rev 319576) @@ -1570,7 +1570,7 @@ const char gz_magic[] = \x1f\x8b\x08; const char bz_magic[] = BZh; char *pos, test = '\0'; - const int window_size = 1024 + sizeof(token); + const int window_size = 1024; char buffer[1024 + sizeof(token)]; /* a 1024 byte window + the size of the halt_compiler token (moving window) */ const long readsize = sizeof(buffer) - sizeof(token); const long tokenlen = sizeof(token) - 1; Modified: php/php-src/trunk/ext/phar/phar.c === --- php/php-src/trunk/ext/phar/phar.c 2011-11-20 09:25:57 UTC (rev 319575) +++ php/php-src/trunk/ext/phar/phar.c 2011-11-20 10:10:43 UTC (rev 319576) @@ -1570,7 +1570,7 @@ const char gz_magic[] = \x1f\x8b\x08; const char bz_magic[] = BZh; char *pos, test = '\0'; - const int window_size = 1024 + sizeof(token); + const int window_size = 1024; char buffer[1024 + sizeof(token)]; /* a 1024 byte window + the size of the halt_compiler token (moving window) */ const long readsize = sizeof(buffer) - sizeof(token); const long tokenlen = sizeof(token) - 1; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/phar/phar.c branches/PHP_5_4/ext/phar/phar.c trunk/ext/phar/phar.c
no, fixed, thanks :) On Sun, Nov 20, 2011 at 10:51 AM, Hannes Magnusson hannes.magnus...@gmail.com wrote: On Sun, Nov 20, 2011 at 00:09, Pierre Joye paj...@php.net wrote: pajoye Sat, 19 Nov 2011 23:09:12 + Revision: http://svn.php.net/viewvc?view=revisionrevision=319566 -- 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_4/Zend/zend_builtin_functions.c trunk/Zend/zend_builtin_functions.c
stas Sun, 20 Nov 2011 22:20:03 + Revision: http://svn.php.net/viewvc?view=revisionrevision=319587 Log: fix is_a reflection Changed paths: U php/php-src/branches/PHP_5_4/Zend/zend_builtin_functions.c U php/php-src/trunk/Zend/zend_builtin_functions.c Modified: php/php-src/branches/PHP_5_4/Zend/zend_builtin_functions.c === --- php/php-src/branches/PHP_5_4/Zend/zend_builtin_functions.c 2011-11-20 18:59:18 UTC (rev 319586) +++ php/php-src/branches/PHP_5_4/Zend/zend_builtin_functions.c 2011-11-20 22:20:03 UTC (rev 319587) @@ -143,6 +143,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_is_subclass_of, 0, 0, 2) ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, class_name) + ZEND_ARG_INFO(0, allow_string) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_get_class_vars, 0, 0, 1) Modified: php/php-src/trunk/Zend/zend_builtin_functions.c === --- php/php-src/trunk/Zend/zend_builtin_functions.c 2011-11-20 18:59:18 UTC (rev 319586) +++ php/php-src/trunk/Zend/zend_builtin_functions.c 2011-11-20 22:20:03 UTC (rev 319587) @@ -143,6 +143,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_is_subclass_of, 0, 0, 2) ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, class_name) + ZEND_ARG_INFO(0, allow_string) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_get_class_vars, 0, 0, 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/ext/curl/tests/bug54798.phpt branches/PHP_5_4/ext/curl/tests/bug54798.phpt trunk/ext/curl/tests/bug54798.phpt
pierrick Mon, 21 Nov 2011 02:10:57 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=319592
Log:
Fix test to use PHP_CURL_HTTP_REMOTE_SERVER
Changed paths:
U php/php-src/branches/PHP_5_3/ext/curl/tests/bug54798.phpt
U php/php-src/branches/PHP_5_4/ext/curl/tests/bug54798.phpt
U php/php-src/trunk/ext/curl/tests/bug54798.phpt
Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/bug54798.phpt
===
--- php/php-src/branches/PHP_5_3/ext/curl/tests/bug54798.phpt 2011-11-21
02:03:20 UTC (rev 319591)
+++ php/php-src/branches/PHP_5_3/ext/curl/tests/bug54798.phpt 2011-11-21
02:10:57 UTC (rev 319592)
@@ -12,7 +12,7 @@
--FILE--
?php
-function checkForClosedFilePointer($curl_option, $description) {
+function checkForClosedFilePointer($host, $curl_option, $description) {
$fp = fopen(dirname(__FILE__) . '/bug54798.tmp', 'w+');
$ch = curl_init();
@@ -28,7 +28,7 @@
curl_setopt($ch, $curl_option, $fp);
- curl_setopt($ch, CURLOPT_URL, 'localhost');
+ curl_setopt($ch, CURLOPT_URL, $host);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
fclose($fp); // -- premature close of $fp caused a crash!
@@ -47,8 +47,9 @@
CURLOPT_INFILE
);
+$host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
foreach($options_to_check as $option) {
- checkForClosedFilePointer(constant($option), $option);
+ checkForClosedFilePointer($host, constant($option), $option);
}
?
Modified: php/php-src/branches/PHP_5_4/ext/curl/tests/bug54798.phpt
===
--- php/php-src/branches/PHP_5_4/ext/curl/tests/bug54798.phpt 2011-11-21
02:03:20 UTC (rev 319591)
+++ php/php-src/branches/PHP_5_4/ext/curl/tests/bug54798.phpt 2011-11-21
02:10:57 UTC (rev 319592)
@@ -12,7 +12,7 @@
--FILE--
?php
-function checkForClosedFilePointer($curl_option, $description) {
+function checkForClosedFilePointer($host, $curl_option, $description) {
$fp = fopen(dirname(__FILE__) . '/bug54798.tmp', 'w+');
$ch = curl_init();
@@ -28,7 +28,7 @@
curl_setopt($ch, $curl_option, $fp);
- curl_setopt($ch, CURLOPT_URL, 'localhost');
+ curl_setopt($ch, CURLOPT_URL, $host);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
fclose($fp); // -- premature close of $fp caused a crash!
@@ -47,8 +47,9 @@
CURLOPT_INFILE
);
+$host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
foreach($options_to_check as $option) {
- checkForClosedFilePointer(constant($option), $option);
+ checkForClosedFilePointer($host, constant($option), $option);
}
?
Modified: php/php-src/trunk/ext/curl/tests/bug54798.phpt
===
--- php/php-src/trunk/ext/curl/tests/bug54798.phpt 2011-11-21 02:03:20 UTC
(rev 319591)
+++ php/php-src/trunk/ext/curl/tests/bug54798.phpt 2011-11-21 02:10:57 UTC
(rev 319592)
@@ -12,7 +12,7 @@
--FILE--
?php
-function checkForClosedFilePointer($curl_option, $description) {
+function checkForClosedFilePointer($host, $curl_option, $description) {
$fp = fopen(dirname(__FILE__) . '/bug54798.tmp', 'w+');
$ch = curl_init();
@@ -28,7 +28,7 @@
curl_setopt($ch, $curl_option, $fp);
- curl_setopt($ch, CURLOPT_URL, 'localhost');
+ curl_setopt($ch, CURLOPT_URL, $host);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
fclose($fp); // -- premature close of $fp caused a crash!
@@ -47,8 +47,9 @@
CURLOPT_INFILE
);
+$host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
foreach($options_to_check as $option) {
- checkForClosedFilePointer(constant($option), $option);
+ checkForClosedFilePointer($host, constant($option), $option);
}
?
--
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/curl/interface.c branches/PHP_5_4/ext/curl/interface.c trunk/ext/curl/interface.c
pierrick Mon, 21 Nov 2011 02:29:24 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=319593
Log:
Fix memory leak
Changed paths:
U php/php-src/branches/PHP_5_3/ext/curl/interface.c
U php/php-src/branches/PHP_5_4/ext/curl/interface.c
U php/php-src/trunk/ext/curl/interface.c
Modified: php/php-src/branches/PHP_5_3/ext/curl/interface.c
===
--- php/php-src/branches/PHP_5_3/ext/curl/interface.c 2011-11-21 02:10:57 UTC
(rev 319592)
+++ php/php-src/branches/PHP_5_3/ext/curl/interface.c 2011-11-21 02:29:24 UTC
(rev 319593)
@@ -1422,6 +1422,9 @@
(*ch)-header.str_len = 0;
memset((*ch)-err, 0, sizeof((*ch)-err));
+ (*ch)-handlers-write-stream = NULL;
+ (*ch)-handlers-write_header-stream = NULL;
+ (*ch)-handlers-read-stream = NULL;
zend_llist_init((*ch)-to_free.str, sizeof(char *),
(llist_dtor_func_t) curl_free_string, 0);
zend_llist_init((*ch)-to_free.slist, sizeof(struct curl_slist),
(llist_dtor_func_t) curl_free_slist, 0);
@@ -1890,6 +1893,9 @@
switch (option) {
case CURLOPT_FILE:
if (((php_stream *) what)-mode[0] !=
'r' || ((php_stream *) what)-mode[1] == '+') {
+ if
(ch-handlers-write-stream) {
+
Z_DELREF_P(ch-handlers-write-stream);
+ }
Z_ADDREF_PP(zvalue);
ch-handlers-write-fp = fp;
ch-handlers-write-method =
PHP_CURL_FILE;
@@ -1902,6 +1908,9 @@
break;
case CURLOPT_WRITEHEADER:
if (((php_stream *) what)-mode[0] !=
'r' || ((php_stream *) what)-mode[1] == '+') {
+ if
(ch-handlers-write_header-stream) {
+
Z_DELREF_P(ch-handlers-write_header-stream);
+ }
Z_ADDREF_PP(zvalue);
ch-handlers-write_header-fp
= fp;
ch-handlers-write_header-method = PHP_CURL_FILE;
@@ -1913,6 +1922,9 @@
}
break;
case CURLOPT_INFILE:
+ if (ch-handlers-read-stream) {
+
Z_DELREF_P(ch-handlers-read-stream);
+ }
Z_ADDREF_PP(zvalue);
ch-handlers-read-fp = fp;
ch-handlers-read-fd =
Z_LVAL_PP(zvalue);
Modified: php/php-src/branches/PHP_5_4/ext/curl/interface.c
===
--- php/php-src/branches/PHP_5_4/ext/curl/interface.c 2011-11-21 02:10:57 UTC
(rev 319592)
+++ php/php-src/branches/PHP_5_4/ext/curl/interface.c 2011-11-21 02:29:24 UTC
(rev 319593)
@@ -1420,6 +1420,9 @@
(*ch)-header.str_len = 0;
memset((*ch)-err, 0, sizeof((*ch)-err));
+ (*ch)-handlers-write-stream = NULL;
+ (*ch)-handlers-write_header-stream = NULL;
+ (*ch)-handlers-read-stream = NULL;
zend_llist_init((*ch)-to_free.str, sizeof(char *),
(llist_dtor_func_t) curl_free_string, 0);
zend_llist_init((*ch)-to_free.slist, sizeof(struct curl_slist),
(llist_dtor_func_t) curl_free_slist, 0);
@@ -1886,6 +1889,9 @@
switch (option) {
case CURLOPT_FILE:
if (((php_stream *) what)-mode[0] !=
'r' || ((php_stream *) what)-mode[1] == '+') {
+ if
(ch-handlers-write-stream) {
+
Z_DELREF_P(ch-handlers-write-stream);
+ }
Z_ADDREF_PP(zvalue);
ch-handlers-write-fp = fp;
ch-handlers-write-method =
PHP_CURL_FILE;
@@ -1898,6 +1904,9 @@
break;
case CURLOPT_WRITEHEADER:
if (((php_stream *) what)-mode[0] !=
'r' || ((php_stream *) what)-mode[1] == '+') {
+ if
(ch-handlers-write_header-stream) {
+
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/curl/interface.c trunk/ext/curl/interface.c
pierrick Mon, 21 Nov 2011 02:44:28 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=319594
Log:
Fix memory leak
Changed paths:
U php/php-src/branches/PHP_5_4/ext/curl/interface.c
U php/php-src/trunk/ext/curl/interface.c
Modified: php/php-src/branches/PHP_5_4/ext/curl/interface.c
===
--- php/php-src/branches/PHP_5_4/ext/curl/interface.c 2011-11-21 02:29:24 UTC
(rev 319593)
+++ php/php-src/branches/PHP_5_4/ext/curl/interface.c 2011-11-21 02:44:28 UTC
(rev 319594)
@@ -2035,6 +2035,7 @@
char *string_key = NULL;
uint string_key_len;
ulong num_key;
+ int numeric_key;
SEPARATE_ZVAL(current);
convert_to_string_ex(current);
@@ -2045,6 +2046,9 @@
if(!string_key) {
spprintf(string_key, 0, %ld,
num_key);
string_key_len =
strlen(string_key)+1;
+ numeric_key = 1;
+ } else {
+ numeric_key = 0;
}
postval = Z_STRVAL_PP(current);
@@ -2088,6 +2092,10 @@
CURLFORM_CONTENTSLENGTH, (long)Z_STRLEN_PP(current),
CURLFORM_END);
}
+
+ if (numeric_key) {
+ efree(string_key);
+ }
}
SAVE_CURL_ERROR(ch, error);
Modified: php/php-src/trunk/ext/curl/interface.c
===
--- php/php-src/trunk/ext/curl/interface.c 2011-11-21 02:29:24 UTC (rev
319593)
+++ php/php-src/trunk/ext/curl/interface.c 2011-11-21 02:44:28 UTC (rev
319594)
@@ -2035,6 +2035,7 @@
char *string_key = NULL;
uint string_key_len;
ulong num_key;
+ intnumeric_key;
SEPARATE_ZVAL(current);
convert_to_string_ex(current);
@@ -2045,6 +2046,9 @@
if(!string_key) {
spprintf(string_key, 0, %ld,
num_key);
string_key_len =
strlen(string_key)+1;
+ numeric_key = 1;
+ } else {
+ numeric_key = 0;
}
postval = Z_STRVAL_PP(current);
@@ -2088,6 +2092,10 @@
CURLFORM_CONTENTSLENGTH, (long)Z_STRLEN_PP(current),
CURLFORM_END);
}
+
+ if (numeric_key) {
+ efree(string_key);
+ }
}
SAVE_CURL_ERROR(ch, error);
--
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_4/ext/mbstring/libmbfl/filters/mbfilter_big5.c trunk/ext/mbstring/libmbfl/filters/mbfilter_big5.c
laruence Mon, 21 Nov 2011 06:07:43 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=319598
Log:
Comparison between pointer and integer
Changed paths:
U
php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_big5.c
U php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_big5.c
Modified:
php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_big5.c
===
--- php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_big5.c
2011-11-21 05:57:45 UTC (rev 319597)
+++ php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_big5.c
2011-11-21 06:07:43 UTC (rev 319598)
@@ -319,7 +319,7 @@
static int mbfl_filt_ident_big5(int c, mbfl_identify_filter *filter)
{
int c1;
- if (filter-encoding == mbfl_no_encoding_cp950) {
+ if (filter-encoding-no_encoding == mbfl_no_encoding_cp950) {
c1 = 0x80;
} else {
c1 = 0xa0;
Modified: php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_big5.c
===
--- php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_big5.c
2011-11-21 05:57:45 UTC (rev 319597)
+++ php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_big5.c
2011-11-21 06:07:43 UTC (rev 319598)
@@ -319,7 +319,7 @@
static int mbfl_filt_ident_big5(int c, mbfl_identify_filter *filter)
{
int c1;
- if (filter-encoding == mbfl_no_encoding_cp950) {
+ if (filter-encoding-no_encoding == mbfl_no_encoding_cp950) {
c1 = 0x80;
} else {
c1 = 0xa0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_big5.c trunk/ext/mbstring/libmbfl/filters/mbfilter_big5.c
Hi moriyoshi:
I think this should be a typo, right?
thanks
On Mon, Nov 21, 2011 at 2:07 PM, Xinchen Hui larue...@php.net wrote:
laruence Mon, 21 Nov 2011 06:07:43 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=319598
Log:
Comparison between pointer and integer
Changed paths:
U
php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_big5.c
U php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_big5.c
Modified:
php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_big5.c
===
--- php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_big5.c
2011-11-21 05:57:45 UTC (rev 319597)
+++ php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_big5.c
2011-11-21 06:07:43 UTC (rev 319598)
@@ -319,7 +319,7 @@
static int mbfl_filt_ident_big5(int c, mbfl_identify_filter *filter)
{
int c1;
- if (filter-encoding == mbfl_no_encoding_cp950) {
+ if (filter-encoding-no_encoding == mbfl_no_encoding_cp950) {
c1 = 0x80;
} else {
c1 = 0xa0;
Modified: php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_big5.c
===
--- php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_big5.c
2011-11-21 05:57:45 UTC (rev 319597)
+++ php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_big5.c
2011-11-21 06:07:43 UTC (rev 319598)
@@ -319,7 +319,7 @@
static int mbfl_filt_ident_big5(int c, mbfl_identify_filter *filter)
{
int c1;
- if (filter-encoding == mbfl_no_encoding_cp950) {
+ if (filter-encoding-no_encoding == mbfl_no_encoding_cp950) {
c1 = 0x80;
} else {
c1 = 0xa0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
Laruence Xinchen Hui
http://www.laruence.com/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
