[PHP-CVS] com php-src: Happy New Year~: TSRM/tsrm_nw.c TSRM/tsrm_nw.h TSRM/tsrm_virtual_cwd.c TSRM/tsrm_virtual_cwd.h TSRM/tsrm_win32.c TSRM/tsrm_win32.h ext/bcmath/bcmath.c ext/bcmath/php_bcmath.h ex

2013-01-01 Thread Xinchen Hui
Commit:a2045ff3320a7d037f198558c934b885f67fc00e
Author:Xinchen Hui larue...@php.net Tue, 1 Jan 2013 16:02:16 +0800
Parents:   b35ffdeae10eb1b71470eb831c02b3b7b838945d
Branches:  PHP-5.3

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=a2045ff3320a7d037f198558c934b885f67fc00e

Log:
Happy New Year~
  M  TSRM/tsrm_nw.c
  M  TSRM/tsrm_nw.h
  M  TSRM/tsrm_virtual_cwd.c
  M  TSRM/tsrm_virtual_cwd.h
  M  TSRM/tsrm_win32.c
  M  TSRM/tsrm_win32.h
  M  ext/bcmath/bcmath.c
  M  ext/bcmath/php_bcmath.h
  M  ext/bz2/bz2.c
  M  ext/bz2/bz2_filter.c
  M  ext/bz2/php_bz2.h
  M  ext/calendar/cal_unix.c
  M  ext/calendar/calendar.c
  M  ext/calendar/easter.c
  M  ext/com_dotnet/com_com.c
  M  ext/com_dotnet/com_dotnet.c
  M  ext/com_dotnet/com_extension.c
  M  ext/com_dotnet/com_handlers.c
  M  ext/com_dotnet/com_iterator.c
  M  ext/com_dotnet/com_misc.c
  M  ext/com_dotnet/com_olechar.c
  M  ext/com_dotnet/com_persist.c
  M  ext/com_dotnet/com_saproxy.c
  M  ext/com_dotnet/com_typeinfo.c
  M  ext/com_dotnet/com_variant.c
  M  ext/com_dotnet/com_wrapper.c
  M  ext/com_dotnet/php_com_dotnet.h
  M  ext/com_dotnet/php_com_dotnet_internal.h
  M  ext/ctype/ctype.c
  M  ext/ctype/php_ctype.h
  M  ext/curl/interface.c
  M  ext/curl/multi.c
  M  ext/curl/php_curl.h
  M  ext/curl/streams.c
  M  ext/date/lib/astro.c
  M  ext/date/lib/dow.c
  M  ext/date/lib/interval.c
  M  ext/date/lib/parse_date.c
  M  ext/date/lib/parse_date.re
  M  ext/date/lib/parse_iso_intervals.c
  M  ext/date/lib/parse_iso_intervals.re
  M  ext/date/lib/parse_tz.c
  M  ext/date/lib/timelib.c
  M  ext/date/lib/timelib.h
  M  ext/date/lib/timelib_structs.h
  M  ext/date/lib/tm2unixtime.c
  M  ext/date/lib/unixtime2tm.c
  M  ext/date/php_date.c
  M  ext/date/php_date.h
  M  ext/dba/dba.c
  M  ext/dba/dba_cdb.c
  M  ext/dba/dba_db1.c
  M  ext/dba/dba_db2.c
  M  ext/dba/dba_db3.c
  M  ext/dba/dba_db4.c
  M  ext/dba/dba_dbm.c
  M  ext/dba/dba_flatfile.c
  M  ext/dba/dba_gdbm.c
  M  ext/dba/dba_inifile.c
  M  ext/dba/dba_ndbm.c
  M  ext/dba/dba_qdbm.c
  M  ext/dba/libcdb/cdb.c
  M  ext/dba/libcdb/cdb.h
  M  ext/dba/libcdb/cdb_make.c
  M  ext/dba/libcdb/cdb_make.h
  M  ext/dba/libcdb/uint32.c
  M  ext/dba/libcdb/uint32.h
  M  ext/dba/libflatfile/flatfile.c
  M  ext/dba/libflatfile/flatfile.h
  M  ext/dba/libinifile/inifile.c
  M  ext/dba/libinifile/inifile.h
  M  ext/dba/php_dba.h
  M  ext/dom/attr.c
  M  ext/dom/cdatasection.c
  M  ext/dom/characterdata.c
  M  ext/dom/comment.c
  M  ext/dom/document.c
  M  ext/dom/documentfragment.c
  M  ext/dom/documenttype.c
  M  ext/dom/dom_ce.h
  M  ext/dom/dom_fe.h
  M  ext/dom/dom_iterators.c
  M  ext/dom/dom_properties.h
  M  ext/dom/domconfiguration.c
  M  ext/dom/domerror.c
  M  ext/dom/domerrorhandler.c
  M  ext/dom/domexception.c
  M  ext/dom/domimplementation.c
  M  ext/dom/domimplementationlist.c
  M  ext/dom/domimplementationsource.c
  M  ext/dom/domlocator.c
  M  ext/dom/domstringlist.c
  M  ext/dom/element.c
  M  ext/dom/entity.c
  M  ext/dom/entityreference.c
  M  ext/dom/namednodemap.c
  M  ext/dom/namelist.c
  M  ext/dom/node.c
  M  ext/dom/nodelist.c
  M  ext/dom/notation.c
  M  ext/dom/php_dom.c
  M  ext/dom/php_dom.h
  M  ext/dom/processinginstruction.c
  M  ext/dom/string_extend.c
  M  ext/dom/text.c
  M  ext/dom/typeinfo.c
  M  ext/dom/userdatahandler.c
  M  ext/dom/xml_common.h
  M  ext/dom/xpath.c
  M  ext/enchant/enchant.c
  M  ext/enchant/php_enchant.h
  M  ext/ereg/ereg.c
  M  ext/ereg/php_ereg.h
  M  ext/ereg/php_regex.h
  M  ext/exif/exif.c
  M  ext/exif/php_exif.h
  M  ext/fileinfo/fileinfo.c
  M  ext/fileinfo/php_fileinfo.h
  M  ext/filter/callback_filter.c
  M  ext/filter/filter.c
  M  ext/filter/filter_private.h
  M  ext/filter/logical_filters.c
  M  ext/filter/php_filter.h
  M  ext/filter/sanitizing_filters.c
  M  ext/ftp/ftp.c
  M  ext/ftp/ftp.h
  M  ext/ftp/php_ftp.c
  M  ext/ftp/php_ftp.h
  M  ext/gd/gd.c
  M  ext/gd/gd_ctx.c
  M  ext/gd/libgd/xbm.c
  M  ext/gd/php_gd.h
  M  ext/gettext/gettext.c
  M  ext/gettext/php_gettext.h
  M  ext/gmp/gmp.c
  M  ext/gmp/php_gmp.h
  M  ext/hash/hash.c
  M  ext/hash/hash_adler32.c
  M  ext/hash/hash_crc32.c
  M  ext/hash/hash_gost.c
  M  ext/hash/hash_haval.c
  M  ext/hash/hash_md.c
  M  ext/hash/hash_ripemd.c
  M  ext/hash/hash_salsa.c
  M  ext/hash/hash_sha.c
  M  ext/hash/hash_snefru.c
  M  ext/hash/hash_tiger.c
  M  ext/hash/hash_whirlpool.c
  M  ext/hash/php_hash.h
  M  ext/hash/php_hash_adler32.h
  M  ext/hash/php_hash_crc32.h
  M  ext/hash/php_hash_crc32_tables.h
  M  ext/hash/php_hash_gost.h
  M  ext/hash/php_hash_haval.h
  M  ext/hash/php_hash_md.h
  M  ext/hash/php_hash_ripemd.h
  M  ext/hash/php_hash_salsa.h
  M  ext/hash/php_hash_sha.h
  M  ext/hash/php_hash_snefru.h
  M  ext/hash/php_hash_snefru_tables.h
  M  ext/hash/php_hash_tiger.h
  M  ext/hash/php_hash_tiger_tables.h
  M  ext/hash/php_hash_types.h
  M  ext/hash/php_hash_whirlpool.h
  M  ext/hash/php_hash_whirlpool_tables.h
  M  ext/iconv/iconv.c
  M  

[PHP-CVS] com php-src: Happy New Year: TSRM/tsrm_nw.c TSRM/tsrm_nw.h TSRM/tsrm_virtual_cwd.c TSRM/tsrm_virtual_cwd.h TSRM/tsrm_win32.c TSRM/tsrm_win32.h Zend/zend.c Zend/zend.h Zend/zend_API.c Zend/ze

2013-01-01 Thread Xinchen Hui
Commit:0a7395e009b2df94c2a3f05aef69fb1779edf8f8
Author:Xinchen Hui larue...@php.net Tue, 1 Jan 2013 16:28:54 +0800
Parents:   58dabff8eda7089f70a826cab2ed7ba7d707974e
Branches:  PHP-5.4

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=0a7395e009b2df94c2a3f05aef69fb1779edf8f8

Log:
Happy New Year
  M  TSRM/tsrm_nw.c
  M  TSRM/tsrm_nw.h
  M  TSRM/tsrm_virtual_cwd.c
  M  TSRM/tsrm_virtual_cwd.h
  M  TSRM/tsrm_win32.c
  M  TSRM/tsrm_win32.h
  M  Zend/zend.c
  M  Zend/zend.h
  M  Zend/zend_API.c
  M  Zend/zend_API.h
  M  Zend/zend_alloc.c
  M  Zend/zend_alloc.h
  M  Zend/zend_build.h
  M  Zend/zend_builtin_functions.c
  M  Zend/zend_builtin_functions.h
  M  Zend/zend_closures.c
  M  Zend/zend_closures.h
  M  Zend/zend_compile.c
  M  Zend/zend_compile.h
  M  Zend/zend_config.nw.h
  M  Zend/zend_config.w32.h
  M  Zend/zend_constants.c
  M  Zend/zend_constants.h
  M  Zend/zend_default_classes.c
  M  Zend/zend_dynamic_array.c
  M  Zend/zend_dynamic_array.h
  M  Zend/zend_errors.h
  M  Zend/zend_exceptions.c
  M  Zend/zend_exceptions.h
  M  Zend/zend_execute.c
  M  Zend/zend_execute.h
  M  Zend/zend_execute_API.c
  M  Zend/zend_extensions.c
  M  Zend/zend_extensions.h
  M  Zend/zend_float.c
  M  Zend/zend_float.h
  M  Zend/zend_gc.c
  M  Zend/zend_gc.h
  M  Zend/zend_globals.h
  M  Zend/zend_globals_macros.h
  M  Zend/zend_hash.c
  M  Zend/zend_hash.h
  M  Zend/zend_highlight.c
  M  Zend/zend_highlight.h
  M  Zend/zend_indent.c
  M  Zend/zend_indent.h
  M  Zend/zend_ini.c
  M  Zend/zend_ini.h
  M  Zend/zend_ini_parser.y
  M  Zend/zend_ini_scanner.c
  M  Zend/zend_ini_scanner.h
  M  Zend/zend_ini_scanner.l
  M  Zend/zend_interfaces.c
  M  Zend/zend_interfaces.h
  M  Zend/zend_istdiostream.h
  M  Zend/zend_iterators.c
  M  Zend/zend_iterators.h
  M  Zend/zend_language_parser.y
  M  Zend/zend_language_scanner.c
  M  Zend/zend_language_scanner.h
  M  Zend/zend_language_scanner.l
  M  Zend/zend_list.c
  M  Zend/zend_list.h
  M  Zend/zend_llist.c
  M  Zend/zend_llist.h
  M  Zend/zend_modules.h
  M  Zend/zend_multibyte.c
  M  Zend/zend_multibyte.h
  M  Zend/zend_multiply.h
  M  Zend/zend_object_handlers.c
  M  Zend/zend_object_handlers.h
  M  Zend/zend_objects.c
  M  Zend/zend_objects.h
  M  Zend/zend_objects_API.c
  M  Zend/zend_objects_API.h
  M  Zend/zend_opcode.c
  M  Zend/zend_operators.c
  M  Zend/zend_operators.h
  M  Zend/zend_ptr_stack.c
  M  Zend/zend_ptr_stack.h
  M  Zend/zend_qsort.c
  M  Zend/zend_qsort.h
  M  Zend/zend_sprintf.c
  M  Zend/zend_stack.c
  M  Zend/zend_stack.h
  M  Zend/zend_static_allocator.c
  M  Zend/zend_static_allocator.h
  M  Zend/zend_stream.c
  M  Zend/zend_stream.h
  M  Zend/zend_string.c
  M  Zend/zend_string.h
  M  Zend/zend_strtod.h
  M  Zend/zend_ts_hash.c
  M  Zend/zend_ts_hash.h
  M  Zend/zend_types.h
  M  Zend/zend_variables.c
  M  Zend/zend_variables.h
  M  Zend/zend_vm.h
  M  Zend/zend_vm_def.h
  M  Zend/zend_vm_execute.h
  M  Zend/zend_vm_gen.php
  M  Zend/zend_vm_opcodes.h
  M  ext/bcmath/bcmath.c
  M  ext/bcmath/php_bcmath.h
  M  ext/bz2/bz2.c
  M  ext/bz2/bz2_filter.c
  M  ext/bz2/php_bz2.h
  M  ext/calendar/cal_unix.c
  M  ext/calendar/calendar.c
  M  ext/calendar/easter.c
  M  ext/com_dotnet/com_com.c
  M  ext/com_dotnet/com_dotnet.c
  M  ext/com_dotnet/com_extension.c
  M  ext/com_dotnet/com_handlers.c
  M  ext/com_dotnet/com_iterator.c
  M  ext/com_dotnet/com_misc.c
  M  ext/com_dotnet/com_olechar.c
  M  ext/com_dotnet/com_persist.c
  M  ext/com_dotnet/com_saproxy.c
  M  ext/com_dotnet/com_typeinfo.c
  M  ext/com_dotnet/com_variant.c
  M  ext/com_dotnet/com_wrapper.c
  M  ext/com_dotnet/php_com_dotnet.h
  M  ext/com_dotnet/php_com_dotnet_internal.h
  M  ext/ctype/ctype.c
  M  ext/ctype/php_ctype.h
  M  ext/curl/interface.c
  M  ext/curl/multi.c
  M  ext/curl/php_curl.h
  M  ext/curl/streams.c
  M  ext/date/lib/astro.c
  M  ext/date/lib/dow.c
  M  ext/date/lib/interval.c
  M  ext/date/lib/parse_date.c
  M  ext/date/lib/parse_date.re
  M  ext/date/lib/parse_iso_intervals.c
  M  ext/date/lib/parse_iso_intervals.re
  M  ext/date/lib/parse_tz.c
  M  ext/date/lib/timelib.c
  M  ext/date/lib/timelib.h
  M  ext/date/lib/timelib_structs.h
  M  ext/date/lib/tm2unixtime.c
  M  ext/date/lib/unixtime2tm.c
  M  ext/date/php_date.c
  M  ext/date/php_date.h
  M  ext/dba/dba.c
  M  ext/dba/dba_cdb.c
  M  ext/dba/dba_db1.c
  M  ext/dba/dba_db2.c
  M  ext/dba/dba_db3.c
  M  ext/dba/dba_db4.c
  M  ext/dba/dba_dbm.c
  M  ext/dba/dba_flatfile.c
  M  ext/dba/dba_gdbm.c
  M  ext/dba/dba_inifile.c
  M  ext/dba/dba_ndbm.c
  M  ext/dba/dba_qdbm.c
  M  ext/dba/dba_tcadb.c
  M  ext/dba/libcdb/cdb.c
  M  ext/dba/libcdb/cdb.h
  M  ext/dba/libcdb/cdb_make.c
  M  ext/dba/libcdb/cdb_make.h
  M  ext/dba/libcdb/uint32.c
  M  ext/dba/libcdb/uint32.h
  M  ext/dba/libflatfile/flatfile.c
  M  ext/dba/libflatfile/flatfile.h
  M  ext/dba/libinifile/inifile.c
  M  ext/dba/libinifile/inifile.h
  M  ext/dba/php_dba.h
  M  ext/dba/php_tcadb.h
  M  ext/dom/attr.c
  M  

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend.h Zend/zend_vm_def.h Zend/zend_vm_execute.h

2013-01-01 Thread Xinchen Hui
Commit:642721b38a9c5ebf336c81027c0dafd6f9246bd6
Author:Xinchen Hui larue...@php.net Tue, 1 Jan 2013 16:39:03 +0800
Parents:   ae5d86270f966af73473203375e1e4491f74a0ff 
a666285bc2488b7f7362368c388e41428610ad1d
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=642721b38a9c5ebf336c81027c0dafd6f9246bd6

Log:
Merge branch 'PHP-5.5'

Changed paths:
  MM  Zend/zend.h
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:



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



[PHP-CVS] com php-src: Remove passwd handler from struct when not needed: ext/curl/interface.c ext/curl/php_curl.h

2013-01-01 Thread Pierrick Charron
Commit:343a9199bbbf4f63b02099ceef27ef9881d8aa9f
Author:Pierrick Charron pierr...@php.net Tue, 1 Jan 2013 21:12:02 
-0500
Parents:   a666285bc2488b7f7362368c388e41428610ad1d
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=343a9199bbbf4f63b02099ceef27ef9881d8aa9f

Log:
Remove passwd handler from struct when not needed

CURLOPT_PASSWDFUNCTION was removed in cURL 7.15.5, the passwd field
will not be used for version greater than this one

Changed paths:
  M  ext/curl/interface.c
  M  ext/curl/php_curl.h


Diff:
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 125094c..e0c95ef 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -3267,9 +3267,11 @@ static void _php_curl_close_ex(php_curl *ch TSRMLS_DC)
if (ch-handlers-write_header-func_name) {
zval_ptr_dtor(ch-handlers-write_header-func_name);
}
+#if CURLOPT_PASSWDFUNCTION != 0
if (ch-handlers-passwd) {
zval_ptr_dtor(ch-handlers-passwd);
}
+#endif
if (ch-handlers-std_err) {
zval_ptr_dtor(ch-handlers-std_err);
}
diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h
index 3ae7060..5c24fc1 100644
--- a/ext/curl/php_curl.h
+++ b/ext/curl/php_curl.h
@@ -135,7 +135,9 @@ typedef struct {
php_curl_write *write;
php_curl_write *write_header;
php_curl_read  *read;
+#if CURLOPT_PASSWDFUNCTION != 0
zval   *passwd;
+#endif
zval   *std_err;
php_curl_progress *progress;
 #if LIBCURL_VERSION_NUM = 0x071500 /* Available since 7.21.0 */


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



[PHP-CVS] com php-src: Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.: Zend/zend.c main/main.c sapi/cli/tests/bug43177.phpt

2013-01-01 Thread Stanislav Malyshev
Commit:36e19c9cab6cce4e44782563f590c6c4560fb187
Author:Stanislav Malyshev s...@php.net Tue, 1 Jan 2013 20:14:44 
-0800
Parents:   dd288f93e1faa0aff5a22c51be034dfa4edaa0c0
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=36e19c9cab6cce4e44782563f590c6c4560fb187

Log:
Bug #43177: If an eval() has a parse error, the overall exit status and return 
code should not be affected.

Without this fix, a webpage using eval() may return code 500.  That might 
display
fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause 
problems.

Bugs:
https://bugs.php.net/43177

Changed paths:
  M  Zend/zend.c
  M  main/main.c
  A  sapi/cli/tests/bug43177.phpt

diff --git a/Zend/zend.c b/Zend/zend.c
index 43d3b66..fc443d9 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -1238,7 +1238,13 @@ ZEND_API void zend_error(int type, const char *format, 
...) /* {{{ */
va_end(args);
 
if (type == E_PARSE) {
-   EG(exit_status) = 255;
+   /* eval() errors do not affect exit_status */
+   if (!(EG(current_execute_data) 
+   EG(current_execute_data)-opline 
+   EG(current_execute_data)-opline-opcode == 
ZEND_INCLUDE_OR_EVAL 
+   EG(current_execute_data)-opline-extended_value == 
ZEND_EVAL)) {
+   EG(exit_status) = 255;
+   }
zend_init_compiler_data_structures(TSRMLS_C);
}
 }
diff --git a/main/main.c b/main/main.c
index 2ec5f1f..be289c8 100644
--- a/main/main.c
+++ b/main/main.c
@@ -257,7 +257,7 @@ static void php_disable_classes(TSRMLS_D)
 
 /* {{{ php_binary_init
  */
-static void php_binary_init(TSRMLS_D) 
+static void php_binary_init(TSRMLS_D)
 {
char *binary_location;
 #ifdef PHP_WIN32
@@ -845,7 +845,7 @@ PHPAPI void php_verror(const char *docref, const char 
*params, int type, const c
efree(docref_buf);
}
 
-   if (PG(track_errors)  module_initialized  
+   if (PG(track_errors)  module_initialized 
(!EG(user_error_handler) || 
!(EG(user_error_handler_error_reporting)  type))) {
if (!EG(active_symbol_table)) {
zend_rebuild_symbol_table(TSRMLS_C);
@@ -962,7 +962,7 @@ static void php_error_cb(int type, const char 
*error_filename, const uint error_
/* store the error if it has changed */
if (display) {
 #ifdef ZEND_SIGNALS
-   HANDLE_BLOCK_INTERRUPTIONS();   
+   HANDLE_BLOCK_INTERRUPTIONS();
 #endif
if (PG(last_error_message)) {
free(PG(last_error_message));
@@ -1133,11 +1133,20 @@ static void php_error_cb(int type, const char 
*error_filename, const uint error_
case E_PARSE:
case E_COMPILE_ERROR:
case E_USER_ERROR:
-   EG(exit_status) = 255;
+   { /* new block to allow variable definition */
+   /* eval() errors do not affect exit_status or response 
code */
+   zend_bool during_eval = (type == E_PARSE)  
(EG(current_execute_data) 
+   
EG(current_execute_data)-opline 
+   
EG(current_execute_data)-opline-opcode == ZEND_INCLUDE_OR_EVAL 
+   
EG(current_execute_data)-opline-extended_value == ZEND_EVAL);
+   if (!during_eval) {
+   EG(exit_status) = 255;
+   }
if (module_initialized) {
if (!PG(display_errors) 
!SG(headers_sent) 
-   SG(sapi_headers).http_response_code == 
200
+   SG(sapi_headers).http_response_code == 
200 
+   !during_eval
) {
sapi_header_line ctr = {0};
 
@@ -1158,6 +1167,7 @@ static void php_error_cb(int type, const char 
*error_filename, const uint error_
}
}
break;
+   }
}
 
/* Log if necessary */
@@ -1211,7 +1221,7 @@ PHPAPI char *php_get_current_user(TSRMLS_D)
name[len] = '\0';
SG(request_info).current_user_length = len;
SG(request_info).current_user = estrndup(name, len);
-   return SG(request_info).current_user;   
+   return SG(request_info).current_user;
 #else
struct passwd *pwd;
 #if defined(ZTS)  defined(HAVE_GETPWUID_R)  defined(_SC_GETPW_R_SIZE_MAX)
@@ -1239,9 +1249,9 @@ PHPAPI char *php_get_current_user(TSRMLS_D)
 #if defined(ZTS)  defined(HAVE_GETPWUID_R)  defined(_SC_GETPW_R_SIZE_MAX)

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend.c main/main.c

2013-01-01 Thread Stanislav Malyshev
Commit:80a9a80a52d1eb0281cd2894be05c685e4d526a0
Author:Stanislav Malyshev s...@php.net Tue, 1 Jan 2013 21:20:35 
-0800
Parents:   343a9199bbbf4f63b02099ceef27ef9881d8aa9f 
36e19c9cab6cce4e44782563f590c6c4560fb187
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=80a9a80a52d1eb0281cd2894be05c685e4d526a0

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Bug #43177: If an eval() has a parse error, the overall exit status and 
return code should not be affected.
  fix NEWS

Conflicts:
main/main.c

Bugs:
https://bugs.php.net/43177

Changed paths:
  MM  Zend/zend.c
  MM  main/main.c


Diff:



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



[PHP-CVS] com php-src: fix NEWS: NEWS

2013-01-01 Thread Stanislav Malyshev
Commit:dd288f93e1faa0aff5a22c51be034dfa4edaa0c0
Author:Stanislav Malyshev s...@php.net Sun, 30 Dec 2012 17:58:40 
-0800
Parents:   0a7395e009b2df94c2a3f05aef69fb1779edf8f8
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=dd288f93e1faa0aff5a22c51be034dfa4edaa0c0

Log:
fix NEWS

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 6165ff9..c83e24a 100644
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@ PHP   
 NEWS
   . Fixed bug #55438 (Curlwapper is not sending http header randomly).
 (php...@lostreality.org, Pierrick)
 
-?? ??? 2012, PHP 5.4.10
+20 Dec 2012, PHP 5.4.10
 
 - Core:
   . Fixed bug #63726 (Memleak with static properties and internal/user
@@ -43,7 +43,7 @@ PHP   
 NEWS
 (Mike, casper at langemeijer dot eu)
 
 - Date:
-  . Fixed bug #63666 (Poor date() performance). (Paul Talborg).
+  . Fixed bug #63666 (Poor date() performance). (Paul Taulborg).
   . Fixed bug #63435 (Datetime::format('u') sometimes wrong by 1 microsecond).
 (Remi)


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



[PHP-CVS] com php-src: add bug #63762: NEWS

2013-01-01 Thread Stanislav Malyshev
Commit:7ed2fdbf99219c39e7ac24658905f736c62efe0b
Author:Stanislav Malyshev s...@php.net Tue, 1 Jan 2013 22:09:32 
-0800
Parents:   86c46b96b6e93f566094917f0b24e79b795e062a
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=7ed2fdbf99219c39e7ac24658905f736c62efe0b

Log:
add bug #63762

Bugs:
https://bugs.php.net/63762

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 6e1e180..a1df72d 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP 
   NEWS
 ?? ??? 2012, PHP 5.4.11
 
 - Core:
+  . Fixed bug #63762 (Sigsegv when Exception::$trace is changed by user).
+(Johannes)
   . Fixed bug #43177 (Errors in eval()'ed code produce status code 500). 
 (Todd Ruth, Stas).


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