com php-src: Merge branch 'PHP-5.6': ext/standard/basic_funct ions.c ext/standard/basic_functions.h main/output.c main/php_main.h main/php_output.h
sapi/phpdbg/ph pdbg.c sapi/phpdbg/phpdbg_frame.c sapi/phpdbg/phpdbg _prompt.c sapi/phpdbg/phpdbg_wait.c
| From: | Anatol Belski | Date: | Wed, 29 Oct 2014 19:04:56 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/standard/basic_funct ions.c ext/standard/basic_functions.h main/output.c main/php_main.h main/php_output.h sapi/phpdbg/ph pdbg.c sapi/phpdbg/phpdbg_frame.c sapi/phpdbg/phpdbg _prompt.c sapi/phpdbg/phpdbg_wait.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82874@lists.php.net to get a copy of this message | ||
Commit: d77ce317636919a87daa7f8ffb2979474f9cade7
Author: Anatol Belski <ab@php.net> Wed, 29 Oct 2014 20:04:56 +0100
Parents: 23f089a6b3586d524e8709d75262029bc8fa7ad4 fc904569ea5c5513925a69bf43820845eb3db104
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d77ce317636919a87daa7f8ffb2979474f9cade7
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
fix output globals importing
export output globals
use portable strndup implementation
unix sockets aren't available on windows
dll export APIs needed by phpdbg
fix sapi/phpdbg/config.w32
Don't treat warnings as failures in the junit output
Changed paths:
MM ext/standard/basic_functions.c
MM ext/standard/basic_functions.h
MM main/output.c
MM main/php_main.h
MM main/php_output.h
MM sapi/phpdbg/phpdbg.c
MM sapi/phpdbg/phpdbg_frame.c
MM sapi/phpdbg/phpdbg_prompt.c
MM sapi/phpdbg/phpdbg_wait.c
Diff:
diff --cc main/php_main.h
index f03e644,03c89c5..94a6299
--- a/main/php_main.h
+++ b/main/php_main.h
@@@ -47,12 -47,9 +47,9 @@@ PHPAPI int php_lint_script(zend_file_ha
PHPAPI void php_handle_aborted_connection(void);
PHPAPI int php_handle_auth_data(const char *auth TSRMLS_DC);
-PHPAPI void php_html_puts(const char *str, uint siz TSRMLS_DC);
+PHPAPI void php_html_puts(const char *str, size_t siz TSRMLS_DC);
PHPAPI int php_stream_open_for_zend_ex(const char *filename, zend_file_handle *handle, int mode
TSRMLS_DC);
- extern void php_call_shutdown_functions(TSRMLS_D);
- extern void php_free_shutdown_functions(TSRMLS_D);
-
/* environment module */
extern int php_init_environ(void);
extern int php_shutdown_environ(void);
diff --cc main/php_output.h
index c176063,947da2c..6da02a4
--- a/main/php_output.h
+++ b/main/php_output.h
@@@ -148,9 -150,14 +148,15 @@@ ZEND_BEGIN_MODULE_GLOBALS(output
php_output_handler *running;
const char *output_start_filename;
int output_start_lineno;
+ int flags;
ZEND_END_MODULE_GLOBALS(output)
+ #ifdef ZTS
+ PHPAPI extern int output_globals_id;
+ #else
+ PHPAPI extern php_output_globals output_globals;
+ #endif
+
/* there should not be a need to use OG() from outside of output.c */
#ifdef ZTS
# define OG(v) TSRMG(output_globals_id, zend_output_globals *, v)