[PHP-CVS] com php-src: Update NEWS: NEWS
Commit:8b87c6df8408b95a1bfae4a82958a48e3a220b5a Author:Xinchen Hui larue...@php.net Sun, 19 Aug 2012 18:33:06 +0800 Parents: 46a3f257724df7b85cc8c3e6374c36ed9ee783b4 Branches: PHP-5.3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8b87c6df8408b95a1bfae4a82958a48e3a220b5a Log: Update NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 7f5c48b..b796117 100644 --- a/NEWS +++ b/NEWS @@ -18,6 +18,8 @@ PHP NEWS (r.hampartsum...@gmail.com, Laruence) - DateTime: + . Fixed bug #62852 (Unserialize invalid DateTime causes crash). +(reeze@gmail.com) . Fixed bug #62500 (Segfault in DateInterval class when extended). (Laruence) - PDO: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed bug #62852 (Unserialize invalid DateTime causes crash): ext/date/php_date.c ext/date/tests/bug62852.phpt
Commit:46a3f257724df7b85cc8c3e6374c36ed9ee783b4
Author:Reeze Xia reeze@gmail.com Sun, 19 Aug 2012 17:57:45
+0800
Parents: 1a23d42909070269d53fc7500d683e88ba219cb3
Branches: PHP-5.3
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=46a3f257724df7b85cc8c3e6374c36ed9ee783b4
Log:
Fixed bug #62852 (Unserialize invalid DateTime causes crash)
Bugs:
https://bugs.php.net/62852
Changed paths:
M ext/date/php_date.c
A ext/date/tests/bug62852.phpt
Diff:
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index e8a4570..d9e6a28 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -2544,6 +2544,9 @@ static int php_date_initialize_from_hash(zval
**return_value, php_date_obj **dat
if (zend_hash_find(myht, timezone_type, 14, (void**)
z_timezone_type) == SUCCESS) {
convert_to_long(*z_timezone_type);
if (zend_hash_find(myht, timezone, 9, (void**)
z_timezone) == SUCCESS) {
+ zend_error_handling error_handling;
+
+ zend_replace_error_handling(EH_THROW, NULL,
error_handling TSRMLS_CC);
convert_to_string(*z_timezone);
switch (Z_LVAL_PP(z_timezone_type)) {
@@ -2551,9 +2554,9 @@ static int php_date_initialize_from_hash(zval
**return_value, php_date_obj **dat
case TIMELIB_ZONETYPE_ABBR: {
char *tmp =
emalloc(Z_STRLEN_PP(z_date) + Z_STRLEN_PP(z_timezone) + 2);
snprintf(tmp,
Z_STRLEN_PP(z_date) + Z_STRLEN_PP(z_timezone) + 2, %s %s,
Z_STRVAL_PP(z_date), Z_STRVAL_PP(z_timezone));
- php_date_initialize(*dateobj,
tmp, Z_STRLEN_PP(z_date) + Z_STRLEN_PP(z_timezone) + 1, NULL, NULL, 0
TSRMLS_CC);
+ php_date_initialize(*dateobj,
tmp, Z_STRLEN_PP(z_date) + Z_STRLEN_PP(z_timezone) + 1, NULL, NULL, 1
TSRMLS_CC);
efree(tmp);
- return 1;
+ break;
}
case TIMELIB_ZONETYPE_ID:
@@ -2567,10 +2570,15 @@ static int php_date_initialize_from_hash(zval
**return_value, php_date_obj **dat
tzobj-tzi.tz = tzi;
tzobj-initialized = 1;
- php_date_initialize(*dateobj,
Z_STRVAL_PP(z_date), Z_STRLEN_PP(z_date), NULL, tmp_obj, 0 TSRMLS_CC);
+ php_date_initialize(*dateobj,
Z_STRVAL_PP(z_date), Z_STRLEN_PP(z_date), NULL, tmp_obj, 1 TSRMLS_CC);
zval_ptr_dtor(tmp_obj);
- return 1;
+ break;
+ default:
+
zend_restore_error_handling(error_handling TSRMLS_CC);
+ return 0;
}
+ zend_restore_error_handling(error_handling
TSRMLS_CC);
+ return 1;
}
}
}
diff --git a/ext/date/tests/bug62852.phpt b/ext/date/tests/bug62852.phpt
new file mode 100644
index 000..6426a80
--- /dev/null
+++ b/ext/date/tests/bug62852.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Bug #62852 (Unserialize invalid DateTime causes crash)
+--INI--
+date.timezone=GMT
+--FILE--
+?php
+try {
+ $datetime = unserialize('O:8:DateTime:3:{s:4:date;s:20:10007-06-07
03:51:49;s:13:timezone_type;i:3;s:8:timezone;s:3:UTC;}');
+ var_dump($datetime);
+} catch (Exception $e) {
+var_dump($e-getMessage());
+}
+?
+--EXPECTF--
+string(%d) DateTime::__wakeup(): Failed to parse time string (%s) at position
12 (0): Double time specification
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/date/php_date.c
Commit:8693bae624a562dddfa7893eec651ebb03e0f16c Author:Xinchen Hui larue...@php.net Sun, 19 Aug 2012 18:33:37 +0800 Parents: ebefbdb76d7e16c03dc9f3cf761bff6656af42c0 8b87c6df8408b95a1bfae4a82958a48e3a220b5a Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8693bae624a562dddfa7893eec651ebb03e0f16c Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM ext/date/php_date.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: - Remove unused variable: ext/standard/pack.c
Commit:2b685075b57cd0d0ed83d0566a97c81824f95063
Author:Felipe Pena felipe...@gmail.com Sun, 19 Aug 2012 11:35:18
-0300
Parents: b2a74b5bdb5fe66a59969cb2aa87931958ca56d3
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=2b685075b57cd0d0ed83d0566a97c81824f95063
Log:
- Remove unused variable
Changed paths:
M ext/standard/pack.c
Diff:
diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index 61228a6..9894746 100644
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -676,7 +676,6 @@ PHP_FUNCTION(unpack)
switch ((int) type) {
case 'a': {
/* a will not strip any
trailing whitespace or null padding */
- char pad = ' ';
int len = inputlen - inputpos;
/* Remaining string */
/* If size was given take
minimum of len and size */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/dom/element.c
Commit:6513ca85c2d30f43cfed29b51bd58fc8f7a10899 Author:Felipe Pena felipe...@gmail.com Sun, 19 Aug 2012 12:13:59 -0300 Parents: 8693bae624a562dddfa7893eec651ebb03e0f16c dc1138b102b8fde7a119cb8f7ceb30b26dfdf6b3 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6513ca85c2d30f43cfed29b51bd58fc8f7a10899 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: - Value stored to var is never read Changed paths: MM ext/dom/element.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: - Value stored to var is never read: ext/dom/element.c
Commit:dc1138b102b8fde7a119cb8f7ceb30b26dfdf6b3
Author:Felipe Pena felipe...@gmail.com Sun, 19 Aug 2012 12:13:48
-0300
Parents: 8b87c6df8408b95a1bfae4a82958a48e3a220b5a
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=dc1138b102b8fde7a119cb8f7ceb30b26dfdf6b3
Log:
- Value stored to var is never read
Changed paths:
M ext/dom/element.c
Diff:
diff --git a/ext/dom/element.c b/ext/dom/element.c
index 9792741..33002fa 100644
--- a/ext/dom/element.c
+++ b/ext/dom/element.c
@@ -832,7 +832,7 @@ PHP_FUNCTION(dom_element_set_attribute_ns)
}
if (errorcode == 0 is_xmlns == 0) {
- attr = xmlSetNsProp(elemp, nsptr, (xmlChar
*)localname, (xmlChar *)value);
+ xmlSetNsProp(elemp, nsptr, (xmlChar
*)localname, (xmlChar *)value);
}
} else {
name_valid = xmlValidateName((xmlChar *) localname, 0);
@@ -844,7 +844,7 @@ PHP_FUNCTION(dom_element_set_attribute_ns)
if (attr != NULL attr-type !=
XML_ATTRIBUTE_DECL) {
node_list_unlink(attr-children
TSRMLS_CC);
}
- attr = xmlSetProp(elemp, (xmlChar *)localname,
(xmlChar *)value);
+ xmlSetProp(elemp, (xmlChar *)localname,
(xmlChar *)value);
}
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: - Value stored to var is never used: Zend/zend_API.c
Commit:001966c754f67f36871507e70e2ec1af5a9816bd
Author:Felipe Pena felipe...@gmail.com Sun, 19 Aug 2012 12:44:44
-0300
Parents: dc1138b102b8fde7a119cb8f7ceb30b26dfdf6b3
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=001966c754f67f36871507e70e2ec1af5a9816bd
Log:
- Value stored to var is never used
Changed paths:
M Zend/zend_API.c
Diff:
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 5618213..70cf0c7 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2445,11 +2445,9 @@ static int zend_is_callable_check_func(int check_flags,
zval *callable, zend_fca
/* Skip leading \ */
if (Z_STRVAL_P(callable)[0] == '\\') {
mlen = Z_STRLEN_P(callable) - 1;
- mname = Z_STRVAL_P(callable) + 1;
lmname = zend_str_tolower_dup(Z_STRVAL_P(callable) + 1,
mlen);
} else {
mlen = Z_STRLEN_P(callable);
- mname = Z_STRVAL_P(callable);
lmname = zend_str_tolower_dup(Z_STRVAL_P(callable),
mlen);
}
/* Check if function with given name exists.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/zend_API.c
Commit:7a724051711ad4746ac1f3fcab14f2af0a1ef100 Author:Felipe Pena felipe...@gmail.com Sun, 19 Aug 2012 12:44:49 -0300 Parents: 6513ca85c2d30f43cfed29b51bd58fc8f7a10899 001966c754f67f36871507e70e2ec1af5a9816bd Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7a724051711ad4746ac1f3fcab14f2af0a1ef100 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: - Value stored to var is never used Changed paths: MM Zend/zend_API.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: - Value stored to var is never used: ext/spl/spl_directory.c
Commit:6cd0e446dd93b5232b49c6248102b77b17865904
Author:Felipe Pena felipe...@gmail.com Sun, 19 Aug 2012 12:55:38
-0300
Parents: 001966c754f67f36871507e70e2ec1af5a9816bd
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=6cd0e446dd93b5232b49c6248102b77b17865904
Log:
- Value stored to var is never used
Changed paths:
M ext/spl/spl_directory.c
Diff:
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index 4f8edb5..8c1810e 100755
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -434,7 +434,6 @@ static spl_filesystem_object *
spl_filesystem_object_create_info(spl_filesystem_
if (file_path !use_copy) {
efree(file_path);
}
- use_copy = 1;
file_path_len = 1;
file_path = /;
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/spl/spl_directory.c
Commit:2497bb97e70aa8b7375c5a365b8d21a92357f262 Author:Felipe Pena felipe...@gmail.com Sun, 19 Aug 2012 12:55:43 -0300 Parents: 7a724051711ad4746ac1f3fcab14f2af0a1ef100 6cd0e446dd93b5232b49c6248102b77b17865904 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2497bb97e70aa8b7375c5a365b8d21a92357f262 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: - Value stored to var is never used Changed paths: MM ext/spl/spl_directory.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: - Value stored to var is never used: ext/standard/string.c
Commit:50ab6c63a700155b8d6be361eac29eae2bc6d869
Author:Felipe Pena felipe...@gmail.com Sun, 19 Aug 2012 14:34:38
-0300
Parents: 6cd0e446dd93b5232b49c6248102b77b17865904
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=50ab6c63a700155b8d6be361eac29eae2bc6d869
Log:
- Value stored to var is never used
Changed paths:
M ext/standard/string.c
Diff:
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 1a7bd1e..68bf3fe 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -3902,7 +3902,6 @@ static void php_hebrev(INTERNAL_FUNCTION_PARAMETERS, int
convert_newlines)
new_char_count--;
}
if (new_char_count 0) {
- char_count=new_char_count;
begin=new_begin;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/standard/string.c
Commit:9d8d84ebdf8f59ecd6a256f5195fba8e877e611d Author:Felipe Pena felipe...@gmail.com Sun, 19 Aug 2012 14:34:42 -0300 Parents: 2497bb97e70aa8b7375c5a365b8d21a92357f262 50ab6c63a700155b8d6be361eac29eae2bc6d869 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9d8d84ebdf8f59ecd6a256f5195fba8e877e611d Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: - Value stored to var is never used Changed paths: MM ext/standard/string.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4': ext/standard/string.c
Commit:01c3e0e62c417cdcb0f43a5c0318bae3effd4815 Author:Felipe Pena felipe...@gmail.com Sun, 19 Aug 2012 14:34:46 -0300 Parents: 9ad748edfb44537b23baf52da5b3e68dd946dd21 9d8d84ebdf8f59ecd6a256f5195fba8e877e611d Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=01c3e0e62c417cdcb0f43a5c0318bae3effd4815 Log: Merge branch 'PHP-5.4' * PHP-5.4: - Value stored to var is never used Changed paths: MM ext/standard/string.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: - Value stored to var is never used: ext/standard/url.c
Commit:3dd256a67b61a995b580cce762a46be689ea34b1
Author:Felipe Pena felipe...@gmail.com Sun, 19 Aug 2012 14:50:49
-0300
Parents: 50ab6c63a700155b8d6be361eac29eae2bc6d869
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=3dd256a67b61a995b580cce762a46be689ea34b1
Log:
- Value stored to var is never used
Changed paths:
M ext/standard/url.c
Diff:
diff --git a/ext/standard/url.c b/ext/standard/url.c
index 18c300c..2525afb 100644
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -220,14 +220,14 @@ PHPAPI php_url *php_url_parse_ex(char const *str, int
length)
if (query fragment) {
if (query fragment) {
- p = e = fragment;
+ e = fragment;
} else {
- p = e = query;
+ e = query;
}
} else if (query) {
- p = e = query;
+ e = query;
} else if (fragment) {
- p = e = fragment;
+ e = fragment;
}
} else {
e = p;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: - Value stored to var is never used: ext/phar/util.c
Commit:f4054afe40bd2b1876832b01f6cbae8f8236d2aa Author:Felipe Pena felipe...@gmail.com Sun, 19 Aug 2012 15:09:14 -0300 Parents: 3dd256a67b61a995b580cce762a46be689ea34b1 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f4054afe40bd2b1876832b01f6cbae8f8236d2aa Log: - Value stored to var is never used Changed paths: M ext/phar/util.c Diff: diff --git a/ext/phar/util.c b/ext/phar/util.c index 9797ec8..cc44574 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -211,8 +211,6 @@ int phar_mount_entry(phar_archive_data *phar, char *filename, int filename_len, return FAILURE; } #endif - - filename_len = strlen(entry.tmp); filename = entry.tmp; /* only check openbasedir for files, not for phar streams */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/standard/url.c
Commit:d6e6db4501254524ad442f68e760ad975f083476 Author:Felipe Pena felipe...@gmail.com Sun, 19 Aug 2012 14:50:52 -0300 Parents: 9d8d84ebdf8f59ecd6a256f5195fba8e877e611d 3dd256a67b61a995b580cce762a46be689ea34b1 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d6e6db4501254524ad442f68e760ad975f083476 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: - Value stored to var is never used Changed paths: MM ext/standard/url.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/phar/util.c
Commit:13768f8650d58156c0e0380a662cad93a7cf77eb Author:Felipe Pena felipe...@gmail.com Sun, 19 Aug 2012 15:09:18 -0300 Parents: d6e6db4501254524ad442f68e760ad975f083476 f4054afe40bd2b1876832b01f6cbae8f8236d2aa Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=13768f8650d58156c0e0380a662cad93a7cf77eb Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: - Value stored to var is never used Changed paths: MM ext/phar/util.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: update NEWS: NEWS
Commit:675545f042fc08d015a27ee2c88d16d4d2e4ce04 Author:Stanislav Malyshev s...@php.net Sun, 19 Aug 2012 20:37:44 -0700 Parents: 13768f8650d58156c0e0380a662cad93a7cf77eb Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=675545f042fc08d015a27ee2c88d16d4d2e4ce04 Log: update NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 1142a42..c9d6305 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,10 @@ PHP NEWS (Laruence) . Fixed bug #62725 (Calling exit() in a shutdown function does not return the exit value). (Laruence) + . Fixed bug #62744 (dangling pointers made by zend_disable_class). (Laruence) + . Fixed bug #62716 (munmap() is called with the incorrect length). +(slang...@google.com) + . Fixed bug #62460 (php binaries installed as binary.dSYM). (Reeze Xia) . Fixed bug #62328 (implementing __toString and a cast to string fails) (Laruence) . Fixed bug #51363 (Fatal error raised by var_export() not caught by error @@ -14,6 +18,13 @@ PHP NEWS . Fixed bug #40459 (Stat and Dir stream wrapper methods do not call constructor). (Stas) +- CURL: + . Fixed bug #62839 (curl_copy_handle segfault with CURLOPT_FILE). (Pierrick) + +- DateTime: + . Fixed bug #62852 (Unserialize invalid DateTime causes crash). +(reeze@gmail.com) + - PDO: . Fixed bug #62685 (Wrong return datatype in PDO::inTransaction()). (Laruence) @@ -31,7 +42,7 @@ PHP NEWS (Laruence) -?? ??? 2012, PHP 5.4.6 +16 Aug 2012, PHP 5.4.6 - CLI Server: . Implemented FR #62700 (have the console output 'Listening on -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: add finally: ext/tokenizer/tokenizer_data.c
Commit:5ee3bf16474bd94f4813714491742fb17e258d18
Author:Stanislav Malyshev s...@php.net Sun, 19 Aug 2012 21:43:16
-0700
Parents: 3336e1e78c48cabf51c1a502ac84f20cd732981f
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=5ee3bf16474bd94f4813714491742fb17e258d18
Log:
add finally
Changed paths:
M ext/tokenizer/tokenizer_data.c
Diff:
diff --git a/ext/tokenizer/tokenizer_data.c b/ext/tokenizer/tokenizer_data.c
index 85822f1..a915bb8 100644
--- a/ext/tokenizer/tokenizer_data.c
+++ b/ext/tokenizer/tokenizer_data.c
@@ -21,7 +21,7 @@
/*
DO NOT EDIT THIS FILE!
This file is generated using tokenizer_data_gen.sh
-*/
+*/
#include php.h
#include zend.h
@@ -110,6 +110,7 @@ void tokenizer_register_constants(INIT_FUNC_ARGS) {
REGISTER_LONG_CONSTANT(T_RETURN, T_RETURN, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(T_TRY, T_TRY, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(T_CATCH, T_CATCH, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(T_FINALLY, T_FINALLY, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(T_THROW, T_THROW, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(T_USE, T_USE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(T_INSTEADOF, T_INSTEADOF, CONST_CS |
CONST_PERSISTENT);
@@ -244,6 +245,7 @@ char *get_token_type_name(int token_type)
case T_RETURN: return T_RETURN;
case T_TRY: return T_TRY;
case T_CATCH: return T_CATCH;
+ case T_FINALLY: return T_FINALLY;
case T_THROW: return T_THROW;
case T_USE: return T_USE;
case T_INSTEADOF: return T_INSTEADOF;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: relative-scheme: ext/standard/url.c
Commit:4ec29b945c9b1811c89e46c16215a7563a9f0430
Author:Andrew Faulds a...@ajf.me Mon, 20 Aug 2012 00:29:18 +0100
Committer: Stanislav Malyshev s...@php.net Sun, 19 Aug 2012 22:16:07
-0700
Parents: 36b88d77f2a9d0ac74692a679f636ccb5d11589f
Branches: PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=4ec29b945c9b1811c89e46c16215a7563a9f0430
Log:
relative-scheme
Changed paths:
M ext/standard/url.c
Diff:
diff --git a/ext/standard/url.c b/ext/standard/url.c
index f1e48a1..44a5680 100644
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -204,7 +204,7 @@ PHPAPI php_url *php_url_parse_ex(char const *str, int
length)
} else {
goto just_path;
}
- } else if (*s == '/' *(s+1) == '/') { /* same-scheme (relative) URL
*/
+ } else if (*s == '/' *(s+1) == '/') { /* relative-scheme URL */
s += 2;
} else {
just_path:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix for #62844: NEWS
Commit:12ea5c54e521d189c97b8f5c4f9bf65f137f3c80 Author:Stanislav Malyshev s...@php.net Sun, 19 Aug 2012 22:19:57 -0700 Parents: 4ec29b945c9b1811c89e46c16215a7563a9f0430 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=12ea5c54e521d189c97b8f5c4f9bf65f137f3c80 Log: Fix for #62844 Bugs: https://bugs.php.net/62844 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index c9d6305..27a34c3 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ PHP NEWS ?? ??? 2012, PHP 5.4.7 - Core: + . Fixed bug #62844 (parse_url() does not recognize //). (Andrew Faulds). . Fixed bug #62763 (register_shutdown_function and extending class). (Laruence) . Fixed bug #62725 (Calling exit() in a shutdown function does not return -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: add heredoc parsing fix: NEWS
Commit:591c59d9bf09ead5605e30d71db6ff1351fa0d50 Author:Stanislav Malyshev s...@php.net Sun, 19 Aug 2012 21:46:29 -0700 Parents: 5ee3bf16474bd94f4813714491742fb17e258d18 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=591c59d9bf09ead5605e30d71db6ff1351fa0d50 Log: add heredoc parsing fix Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index b719450..f4df446 100644 --- a/NEWS +++ b/NEWS @@ -70,6 +70,9 @@ PHP NEWS - pgsql . Added pg_escape_literal() and pg_escape_identifier() (Yasuo) +- Tokenizer: + . Fixed bug #60097 (token_get_all fails to lex nested heredoc). (Nikita Popov) + - Zip: . Upgraded libzip to 0.10.1 (Anatoliy) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: bug #62844; relative URL schemes in parse_url(): ext/standard/tests/url/parse_url_relative_scheme.phpt ext/standard/url.c
Commit:36b88d77f2a9d0ac74692a679f636ccb5d11589f
Author:Andrew Faulds a...@ajf.me Mon, 20 Aug 2012 00:03:55 +0100
Committer: Stanislav Malyshev s...@php.net Sun, 19 Aug 2012 22:15:58
-0700
Parents: 675545f042fc08d015a27ee2c88d16d4d2e4ce04
Branches: PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=36b88d77f2a9d0ac74692a679f636ccb5d11589f
Log:
bug #62844; relative URL schemes in parse_url()
Bugs:
https://bugs.php.net/62844
Changed paths:
A ext/standard/tests/url/parse_url_relative_scheme.phpt
M ext/standard/url.c
Diff:
diff --git a/ext/standard/tests/url/parse_url_relative_scheme.phpt
b/ext/standard/tests/url/parse_url_relative_scheme.phpt
new file mode 100644
index 000..7c8952d
--- /dev/null
+++ b/ext/standard/tests/url/parse_url_relative_scheme.phpt
@@ -0,0 +1,11 @@
+--TEST--
+Test parse_url() function: Checks relative URL schemes (e.g. //example.com)
+--FILE--
+?php
+var_dump(parse_url('//example.org'));
+--EXPECT--
+array(1) {
+ [host]=
+ string(11) example.org
+}
+
diff --git a/ext/standard/url.c b/ext/standard/url.c
index 0555c7b..f1e48a1 100644
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -204,6 +204,8 @@ PHPAPI php_url *php_url_parse_ex(char const *str, int
length)
} else {
goto just_path;
}
+ } else if (*s == '/' *(s+1) == '/') { /* same-scheme (relative) URL
*/
+ s += 2;
} else {
just_path:
ue = s + length;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
