[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/browscap.c branches/PHP_5_4/ext/standard/browscap.c trunk/ext/standard/browscap.c
cataphract Thu, 02 Jun 2011 08:46:40 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=311730
Log:
- Fixed double registering of browscap ini directive. See bug #54896.
Bug: http://bugs.php.net/54896 (Assigned) Connection to localhost doesn't work
in Apache SAPI but works in CLI and CGI
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/browscap.c
U php/php-src/branches/PHP_5_4/ext/standard/browscap.c
U php/php-src/trunk/ext/standard/browscap.c
Modified: php/php-src/branches/PHP_5_3/ext/standard/browscap.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/browscap.c2011-06-02
07:40:26 UTC (rev 311729)
+++ php/php-src/branches/PHP_5_3/ext/standard/browscap.c2011-06-02
08:46:40 UTC (rev 311730)
@@ -330,16 +330,10 @@
}
/* }}} */
-PHP_INI_BEGIN()
- PHP_INI_ENTRY(browscap, NULL, PHP_INI_SYSTEM,
OnChangeBrowscap)
-PHP_INI_END()
-
PHP_MINIT_FUNCTION(browscap) /* {{{ */
{
char *browscap = INI_STR(browscap);
- REGISTER_INI_ENTRIES();
-
if (browscap browscap[0]) {
if (browscap_read_file(browscap, global_bdata, 1 TSRMLS_CC) ==
FAILURE) {
return FAILURE;
Modified: php/php-src/branches/PHP_5_4/ext/standard/browscap.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/browscap.c2011-06-02
07:40:26 UTC (rev 311729)
+++ php/php-src/branches/PHP_5_4/ext/standard/browscap.c2011-06-02
08:46:40 UTC (rev 311730)
@@ -330,16 +330,10 @@
}
/* }}} */
-PHP_INI_BEGIN()
- PHP_INI_ENTRY(browscap, NULL, PHP_INI_SYSTEM,
OnChangeBrowscap)
-PHP_INI_END()
-
PHP_MINIT_FUNCTION(browscap) /* {{{ */
{
char *browscap = INI_STR(browscap);
- REGISTER_INI_ENTRIES();
-
if (browscap browscap[0]) {
if (browscap_read_file(browscap, global_bdata, 1 TSRMLS_CC) ==
FAILURE) {
return FAILURE;
Modified: php/php-src/trunk/ext/standard/browscap.c
===
--- php/php-src/trunk/ext/standard/browscap.c 2011-06-02 07:40:26 UTC (rev
311729)
+++ php/php-src/trunk/ext/standard/browscap.c 2011-06-02 08:46:40 UTC (rev
311730)
@@ -330,16 +330,10 @@
}
/* }}} */
-PHP_INI_BEGIN()
- PHP_INI_ENTRY(browscap, NULL, PHP_INI_SYSTEM,
OnChangeBrowscap)
-PHP_INI_END()
-
PHP_MINIT_FUNCTION(browscap) /* {{{ */
{
char *browscap = INI_STR(browscap);
- REGISTER_INI_ENTRIES();
-
if (browscap browscap[0]) {
if (browscap_read_file(browscap, global_bdata, 1 TSRMLS_CC) ==
FAILURE) {
return FAILURE;
--
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/NEWS branches/PHP_5_3/ext/intl/php_intl.c branches/PHP_5_3/ext/intl/tests/intl_icu_version_constant.phpt branches/PHP_5_4/ext/intl/php_intl.c branches
On Wed, Jun 1, 2011 at 18:26, Ilia Alshanetsky il...@php.net wrote: iliaa Wed, 01 Jun 2011 16:26:21 + Revision: http://svn.php.net/viewvc?view=revisionrevision=311714 Log: Implemented FR #54561 (Expose ICU Version ICU Data Version info). Bug: http://bugs.php.net/54561 (Assigned) Expose ICU version info Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/intl/php_intl.c A php/php-src/branches/PHP_5_3/ext/intl/tests/intl_icu_version_constant.phpt U php/php-src/branches/PHP_5_4/ext/intl/php_intl.c A php/php-src/branches/PHP_5_4/ext/intl/tests/intl_icu_version_constant.phpt U php/php-src/trunk/ext/intl/php_intl.c A php/php-src/trunk/ext/intl/tests/intl_icu_version_constant.phpt Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2011-06-01 16:23:43 UTC (rev 311713) +++ php/php-src/branches/PHP_5_3/NEWS 2011-06-01 16:26:21 UTC (rev 311714) @@ -90,6 +90,7 @@ - intl extension: . Implemented FR #54540 (Allow loading of arbitrary resource bundles when fallback is disabled). (David Zuelke, Stas) + . Implemented FR #54561 (Expose ICU version info). (David Zuelke, Ilia) - json extension: . Fixed bug #54484 (Empty string in json_decode doesn't reset Modified: php/php-src/branches/PHP_5_3/ext/intl/php_intl.c === --- php/php-src/branches/PHP_5_3/ext/intl/php_intl.c 2011-06-01 16:23:43 UTC (rev 311713) +++ php/php-src/branches/PHP_5_3/ext/intl/php_intl.c 2011-06-01 16:26:21 UTC (rev 311714) @@ -543,6 +543,10 @@ REGISTER_INI_ENTRIES(); REGISTER_LONG_CONSTANT(INTL_MAX_LOCALE_LEN, INTL_MAX_LOCALE_LEN, CONST_CS); + REGISTER_STRING_CONSTANT(INTL_ICU_VERSION, U_ICU_VERSION, CONST_PERSISTENT | CONST_CS); +#ifdef U_ICU_DATA_VERSION + REGISTER_STRING_CONSTANT(INTL_ICU_DATA_VERSION, U_ICU_DATA_VERSION, CONST_PERSISTENT | CONST_CS); +#endif Print it in phpinfo() too? -Hannes -- 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/NEWS branches/PHP_5_3/ext/intl/php_intl.c branches/PHP_5_3/ext/intl/tests/intl_icu_version_constant.phpt branches/PHP_5_4/ext/intl/php_intl.c branches
The version is already printed in phpinfo(), I am not sure we need to bring the data version... What do you think? On Thu, Jun 2, 2011 at 11:37 AM, Hannes Magnusson hannes.magnus...@gmail.com wrote: On Wed, Jun 1, 2011 at 18:26, Ilia Alshanetsky il...@php.net wrote: iliaa Wed, 01 Jun 2011 16:26:21 + Revision: http://svn.php.net/viewvc?view=revisionrevision=311714 Log: Implemented FR #54561 (Expose ICU Version ICU Data Version info). Bug: http://bugs.php.net/54561 (Assigned) Expose ICU version info Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/intl/php_intl.c A php/php-src/branches/PHP_5_3/ext/intl/tests/intl_icu_version_constant.phpt U php/php-src/branches/PHP_5_4/ext/intl/php_intl.c A php/php-src/branches/PHP_5_4/ext/intl/tests/intl_icu_version_constant.phpt U php/php-src/trunk/ext/intl/php_intl.c A php/php-src/trunk/ext/intl/tests/intl_icu_version_constant.phpt Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2011-06-01 16:23:43 UTC (rev 311713) +++ php/php-src/branches/PHP_5_3/NEWS 2011-06-01 16:26:21 UTC (rev 311714) @@ -90,6 +90,7 @@ - intl extension: . Implemented FR #54540 (Allow loading of arbitrary resource bundles when fallback is disabled). (David Zuelke, Stas) + . Implemented FR #54561 (Expose ICU version info). (David Zuelke, Ilia) - json extension: . Fixed bug #54484 (Empty string in json_decode doesn't reset Modified: php/php-src/branches/PHP_5_3/ext/intl/php_intl.c === --- php/php-src/branches/PHP_5_3/ext/intl/php_intl.c 2011-06-01 16:23:43 UTC (rev 311713) +++ php/php-src/branches/PHP_5_3/ext/intl/php_intl.c 2011-06-01 16:26:21 UTC (rev 311714) @@ -543,6 +543,10 @@ REGISTER_INI_ENTRIES(); REGISTER_LONG_CONSTANT(INTL_MAX_LOCALE_LEN, INTL_MAX_LOCALE_LEN, CONST_CS); + REGISTER_STRING_CONSTANT(INTL_ICU_VERSION, U_ICU_VERSION, CONST_PERSISTENT | CONST_CS); +#ifdef U_ICU_DATA_VERSION + REGISTER_STRING_CONSTANT(INTL_ICU_DATA_VERSION, U_ICU_DATA_VERSION, CONST_PERSISTENT | CONST_CS); +#endif Print it in phpinfo() too? -Hannes -- 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.c TSRM/TSRM.h TSRM/tsrm.m4 Zend/Makefile.am Zend/Zend.m4 Zend/zend.c Zend/zend.h Zend/zend_alloc.c Zend/zend_execute_API.c Zend/zend_hash.c Zend/zend_signa
iliaaThu, 02 Jun 2011 21:16:50 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=311740
Log:
Zend Signal Handling (see RFC: https://wiki.php.net/rfc/zendsignals)
This needs to go into 5.4 as well, but will wait for Pierre to review win32
situation
# Patch by Lucas Nealan, Arnaud Le Blanc, Brian Shire Ilia Alshanetsky
Changed paths:
U php/php-src/trunk/TSRM/TSRM.c
U php/php-src/trunk/TSRM/TSRM.h
U php/php-src/trunk/TSRM/tsrm.m4
U php/php-src/trunk/Zend/Makefile.am
U php/php-src/trunk/Zend/Zend.m4
U php/php-src/trunk/Zend/zend.c
U php/php-src/trunk/Zend/zend.h
U php/php-src/trunk/Zend/zend_alloc.c
U php/php-src/trunk/Zend/zend_execute_API.c
U php/php-src/trunk/Zend/zend_hash.c
A php/php-src/trunk/Zend/zend_signal.c
A php/php-src/trunk/Zend/zend_signal.h
U php/php-src/trunk/configure.in
U php/php-src/trunk/ext/pcntl/php_signal.c
U php/php-src/trunk/ext/standard/info.c
U php/php-src/trunk/ext/standard/tests/general_functions/phpinfo.phpt
U php/php-src/trunk/main/SAPI.c
U php/php-src/trunk/main/main.c
Modified: php/php-src/trunk/TSRM/TSRM.c
===
--- php/php-src/trunk/TSRM/TSRM.c 2011-06-02 20:01:40 UTC (rev 311739)
+++ php/php-src/trunk/TSRM/TSRM.c 2011-06-02 21:16:50 UTC (rev 311740)
@@ -710,7 +710,23 @@
#endif
}
+/*
+ Changes the signal mask of the calling thread
+*/
+#ifdef HAVE_SIGPROCMASK
+TSRM_API int tsrm_sigmask(int how, const sigset_t *set, sigset_t *oldset)
+{
+ TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, Changed sigmask in thread: %ld, tsrm_thread_id()));
+ /* TODO: add support for other APIs */
+#ifdef PTHREADS
+ return pthread_sigmask(how, set, oldset);
+#else
+ return sigprocmask(how, set, oldset);
+#endif
+}
+#endif
+
TSRM_API void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begin_handler)
{
void *retval = (void *) tsrm_new_thread_begin_handler;
Modified: php/php-src/trunk/TSRM/TSRM.h
===
--- php/php-src/trunk/TSRM/TSRM.h 2011-06-02 20:01:40 UTC (rev 311739)
+++ php/php-src/trunk/TSRM/TSRM.h 2011-06-02 21:16:50 UTC (rev 311740)
@@ -90,6 +90,10 @@
# define MUTEX_T beos_ben *
#endif
+#ifdef HAVE_SIGNAL_H
+#include signal.h
+#endif
+
typedef void (*ts_allocate_ctor)(void *, void ***);
typedef void (*ts_allocate_dtor)(void *, void ***);
@@ -138,6 +142,9 @@
TSRM_API void tsrm_mutex_free(MUTEX_T mutexp);
TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp);
TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp);
+#ifdef HAVE_SIGPROCMASK
+TSRM_API int tsrm_sigmask(int how, const sigset_t *set, sigset_t *oldset);
+#endif
TSRM_API void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begin_handler);
TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler);
Modified: php/php-src/trunk/TSRM/tsrm.m4
===
--- php/php-src/trunk/TSRM/tsrm.m4 2011-06-02 20:01:40 UTC (rev 311739)
+++ php/php-src/trunk/TSRM/tsrm.m4 2011-06-02 21:16:50 UTC (rev 311740)
@@ -30,6 +30,8 @@
AC_CHECK_HEADERS(stdarg.h)
+AC_CHECK_FUNCS(sigprocmask)
+
])
Modified: php/php-src/trunk/Zend/Makefile.am
===
--- php/php-src/trunk/Zend/Makefile.am 2011-06-02 20:01:40 UTC (rev 311739)
+++ php/php-src/trunk/Zend/Makefile.am 2011-06-02 21:16:50 UTC (rev 311740)
@@ -17,7 +17,7 @@
zend_objects_API.c zend_ts_hash.c zend_stream.c \
zend_default_classes.c \
zend_iterators.c zend_interfaces.c zend_exceptions.c \
- zend_strtod.c zend_closures.c zend_float.c zend_string.c
+ zend_strtod.c zend_closures.c zend_float.c zend_string.c zend_signal.c
libZend_la_LDFLAGS =
libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
Modified: php/php-src/trunk/Zend/Zend.m4
===
--- php/php-src/trunk/Zend/Zend.m4 2011-06-02 20:01:40 UTC (rev 311739)
+++ php/php-src/trunk/Zend/Zend.m4 2011-06-02 21:16:50 UTC (rev 311740)
@@ -392,9 +392,23 @@
AC_CHECK_FUNCS(mremap)
+
+AC_CHECK_FUNC(sigaction, [
+ ZEND_SIGNALS=yes
+ AC_DEFINE(ZEND_SIGNALS, 1, [Use zend signal handling])
+ AC_DEFINE(HAVE_SIGACTION, 1, [Whether sigaction() is available])
+], [
+ ZEND_SIGNALS=no
])
+if test $ZEND_SIGNALS = yes; then
+ CFLAGS=$CFLAGS -DZEND_SIGNALS
+fi
+AC_MSG_CHECKING(whether to enable zend signal handling)
+AC_MSG_RESULT($ZEND_SIGNALS)
+])
+
AC_DEFUN([LIBZEND_CPLUSPLUS_CHECKS],[
])
Modified: php/php-src/trunk/Zend/zend.c
===
--- php/php-src/trunk/Zend/zend.c 2011-06-02 20:01:40 UTC (rev 311739)
+++ php/php-src/trunk/Zend/zend.c 2011-06-02 21:16:50 UTC (rev 311740)
@@ -108,6 +108,9 @@
STD_ZEND_INI_BOOLEAN(zend.multibyte, 0, ZEND_INI_PERDIR, OnUpdateBool,
[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_alloc.c
iliaaThu, 02 Jun 2011 21:38:54 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=311741
Log:
Missing ifdef related to the previous patch
Changed paths:
U php/php-src/trunk/Zend/zend_alloc.c
Modified: php/php-src/trunk/Zend/zend_alloc.c
===
--- php/php-src/trunk/Zend/zend_alloc.c 2011-06-02 21:16:50 UTC (rev 311740)
+++ php/php-src/trunk/Zend/zend_alloc.c 2011-06-02 21:38:54 UTC (rev 311741)
@@ -2123,8 +2123,9 @@
size_t true_size;
size_t orig_size;
void *ptr;
+#ifdef ZEND_SIGNALS
TSRMLS_FETCH();
-
+#endif
if (UNEXPECTED(!p) || !ZEND_MM_VALID_PTR(p)) {
return _zend_mm_alloc_int(heap, size ZEND_FILE_LINE_RELAY_CC
ZEND_FILE_LINE_ORIG_RELAY_CC);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_hash.c
felipe Thu, 02 Jun 2011 22:54:14 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=311742
Log:
- Fix ZTS build
Changed paths:
U php/php-src/trunk/Zend/zend_hash.c
Modified: php/php-src/trunk/Zend/zend_hash.c
===
--- php/php-src/trunk/Zend/zend_hash.c 2011-06-02 21:38:54 UTC (rev 311741)
+++ php/php-src/trunk/Zend/zend_hash.c 2011-06-02 22:54:14 UTC (rev 311742)
@@ -368,6 +368,9 @@
{
uint nIndex;
Bucket *p;
+#ifdef ZEND_SIGNALS
+ TSRMLS_FETCH();
+#endif
IS_CONSISTENT(ht);
CHECK_INIT(ht);
--
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/NEWS branches/PHP_5_4/UPGRADING branches/PHP_5_4/ext/standard/basic_functions.c branches/PHP_5_4/ext/standard/php_string.h branches/PHP_5_4/ext/standard/s
scottmac Fri, 03 Jun 2011 00:12:22 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=311743
Log:
Added fabled hex2bin() function
Changed paths:
U php/php-src/branches/PHP_5_4/NEWS
U php/php-src/branches/PHP_5_4/UPGRADING
U php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c
U php/php-src/branches/PHP_5_4/ext/standard/php_string.h
U php/php-src/branches/PHP_5_4/ext/standard/string.c
U php/php-src/trunk/ext/standard/basic_functions.c
U php/php-src/trunk/ext/standard/php_string.h
U php/php-src/trunk/ext/standard/string.c
Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS 2011-06-02 22:54:14 UTC (rev 311742)
+++ php/php-src/branches/PHP_5_4/NEWS 2011-06-03 00:12:22 UTC (rev 311743)
@@ -130,6 +130,7 @@
- Improved core functions:
. number_format() no longer truncates multibyte decimal points and thousand
separators to the first byte. FR #53457. (Adam)
+ . Added hex2bin() function. (Scott)
- Improved CURL extension:
. Added support for CURLOPT_MAX_RECV_SPEED_LARGE and
Modified: php/php-src/branches/PHP_5_4/UPGRADING
===
--- php/php-src/branches/PHP_5_4/UPGRADING 2011-06-02 22:54:14 UTC (rev
311742)
+++ php/php-src/branches/PHP_5_4/UPGRADING 2011-06-03 00:12:22 UTC (rev
311743)
@@ -358,10 +358,11 @@
- Core:
- get_declared_traits()
+ - hex2bin()
- http_response_code()
- - trait_exists()
- stream_set_chunk_size()
- socket_import_stream()
+ - trait_exists()
- LDAP:
- ldap_control_paged_results()
Modified: php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c 2011-06-02
22:54:14 UTC (rev 311742)
+++ php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c 2011-06-03
00:12:22 UTC (rev 311743)
@@ -2142,6 +2142,10 @@
ZEND_ARG_INFO(0, data)
ZEND_END_ARG_INFO()
+ZEND_BEGIN_ARG_INFO(arginfo_hex2bin, 0)
+ ZEND_ARG_INFO(0, data)
+ZEND_END_ARG_INFO()
+
ZEND_BEGIN_ARG_INFO_EX(arginfo_strspn, 0, 0, 2)
ZEND_ARG_INFO(0, str)
ZEND_ARG_INFO(0, mask)
@@ -2682,6 +2686,7 @@
const zend_function_entry basic_functions[] = { /* {{{ */
PHP_FE(constant,
arginfo_constant)
PHP_FE(bin2hex,
arginfo_bin2hex)
+ PHP_FE(hex2bin,
arginfo_hex2bin)
PHP_FE(sleep,
arginfo_sleep)
PHP_FE(usleep,
arginfo_usleep)
#if HAVE_NANOSLEEP
Modified: php/php-src/branches/PHP_5_4/ext/standard/php_string.h
===
--- php/php-src/branches/PHP_5_4/ext/standard/php_string.h 2011-06-02
22:54:14 UTC (rev 311742)
+++ php/php-src/branches/PHP_5_4/ext/standard/php_string.h 2011-06-03
00:12:22 UTC (rev 311743)
@@ -78,6 +78,7 @@
PHP_FUNCTION(parse_str);
PHP_FUNCTION(str_getcsv);
PHP_FUNCTION(bin2hex);
+PHP_FUNCTION(hex2bin);
PHP_FUNCTION(similar_text);
PHP_FUNCTION(strip_tags);
PHP_FUNCTION(str_repeat);
Modified: php/php-src/branches/PHP_5_4/ext/standard/string.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/string.c 2011-06-02 22:54:14 UTC
(rev 311742)
+++ php/php-src/branches/PHP_5_4/ext/standard/string.c 2011-06-03 00:12:22 UTC
(rev 311743)
@@ -146,6 +146,46 @@
}
/* }}} */
+/* {{{ php_hex2bin
+ */
+static char *php_hex2bin(const unsigned char *old, const size_t oldlen, size_t
*newlen)
+{
+ size_t target_length = oldlen 1;
+ register unsigned char *str = (unsigned char
*)safe_emalloc(target_length, sizeof(char), 1);
+ size_t i, j;
+ for (i = j = 0; i target_length; i++) {
+ char c = old[j++];
+ if (c = '0' c = '9') {
+ str[i] = (c - '0') 4;
+ } else if (c = 'a' c = 'f') {
+ str[i] = (c - 'a' + 10) 4;
+ } else if (c = 'A' c = 'F') {
+ str[i] = (c - 'A' + 10) 4;
+ } else {
+ efree(str);
+ return NULL;
+ }
+ c = old[j++];
+
[PHP-CVS] svn: /php/php-src/trunk/ext/pcntl/ php_signal.c
felipe Fri, 03 Jun 2011 00:35:22 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=311744
Log:
- Fix crash in pcntl
Changed paths:
U php/php-src/trunk/ext/pcntl/php_signal.c
Modified: php/php-src/trunk/ext/pcntl/php_signal.c
===
--- php/php-src/trunk/ext/pcntl/php_signal.c2011-06-03 00:12:22 UTC (rev
311743)
+++ php/php-src/trunk/ext/pcntl/php_signal.c2011-06-03 00:35:22 UTC (rev
311744)
@@ -18,6 +18,7 @@
/* $Id$ */
+#include TSRM.h
#include php_signal.h
/* php_signal using sigaction is derrived from Advanced Programing
@@ -25,6 +26,9 @@
Sigfunc *php_signal4(int signo, Sigfunc *func, int restart, int mask_all)
{
struct sigaction act,oact;
+#ifdef ZEND_SIGNALS
+ TSRMLS_FETCH();
+#endif
act.sa_handler = func;
if (mask_all) {
sigfillset(act.sa_mask);
@@ -42,7 +46,7 @@
#endif
}
#ifdef ZEND_SIGNALS
- if (zend_sigaction(signo, act, oact) 0)
+ if (zend_sigaction(signo, act, oact TSRMLS_CC) 0)
#else
if (sigaction(signo, act, oact) 0)
#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_4/ext/standard/browscap.c trunk/ext/standard/browscap.c
scottmac Fri, 03 Jun 2011 00:42:07 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=311745
Log:
Fix Bug #54918 - Crash when there is a failure to read the browscap file
Bug: http://bugs.php.net/54918 (Assigned) browscap issues
Changed paths:
U php/php-src/branches/PHP_5_4/ext/standard/browscap.c
U php/php-src/trunk/ext/standard/browscap.c
Modified: php/php-src/branches/PHP_5_4/ext/standard/browscap.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/browscap.c2011-06-03
00:35:22 UTC (rev 311744)
+++ php/php-src/branches/PHP_5_4/ext/standard/browscap.c2011-06-03
00:42:07 UTC (rev 311745)
@@ -333,19 +333,19 @@
PHP_MINIT_FUNCTION(browscap) /* {{{ */
{
char *browscap = INI_STR(browscap);
-
- if (browscap browscap[0]) {
- if (browscap_read_file(browscap, global_bdata, 1 TSRMLS_CC) ==
FAILURE) {
- return FAILURE;
- }
- }
-
+
#ifdef ZTS
ts_allocate_id(browscap_globals_id, sizeof(browser_data),
browscap_globals_ctor, NULL);
#endif
/* ctor call not really needed for non-ZTS */
+ if (browscap browscap[0]) {
+ if (browscap_read_file(browscap, global_bdata, 1 TSRMLS_CC) ==
FAILURE) {
+ return FAILURE;
+ }
+ }
+
return SUCCESS;
}
/* }}} */
Modified: php/php-src/trunk/ext/standard/browscap.c
===
--- php/php-src/trunk/ext/standard/browscap.c 2011-06-03 00:35:22 UTC (rev
311744)
+++ php/php-src/trunk/ext/standard/browscap.c 2011-06-03 00:42:07 UTC (rev
311745)
@@ -333,19 +333,19 @@
PHP_MINIT_FUNCTION(browscap) /* {{{ */
{
char *browscap = INI_STR(browscap);
-
- if (browscap browscap[0]) {
- if (browscap_read_file(browscap, global_bdata, 1 TSRMLS_CC) ==
FAILURE) {
- return FAILURE;
- }
- }
-
+
#ifdef ZTS
ts_allocate_id(browscap_globals_id, sizeof(browser_data),
browscap_globals_ctor, NULL);
#endif
/* ctor call not really needed for non-ZTS */
+ if (browscap browscap[0]) {
+ if (browscap_read_file(browscap, global_bdata, 1 TSRMLS_CC) ==
FAILURE) {
+ return FAILURE;
+ }
+ }
+
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_4/Zend/zend.h branches/PHP_5_4/Zend/zend_API.c branches/PHP_5_4/Zend/zend_API.h branches/PHP_5_4/Zend/zend_compile.c branches/PHP_5_4/Zend/zend_language_par
stas Fri, 03 Jun 2011 01:09:32 + Revision: http://svn.php.net/viewvc?view=revisionrevision=311746 Log: scalar types cleanup Changed paths: U php/php-src/branches/PHP_5_4/Zend/zend.h U php/php-src/branches/PHP_5_4/Zend/zend_API.c U php/php-src/branches/PHP_5_4/Zend/zend_API.h U php/php-src/branches/PHP_5_4/Zend/zend_compile.c U php/php-src/branches/PHP_5_4/Zend/zend_language_parser.y U php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.c U php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.l U php/php-src/branches/PHP_5_4/Zend/zend_language_scanner_defs.h U php/php-src/branches/PHP_5_4/Zend/zend_variables.c U php/php-src/trunk/Zend/zend.h U php/php-src/trunk/Zend/zend_API.c U php/php-src/trunk/Zend/zend_API.h U php/php-src/trunk/Zend/zend_compile.c U php/php-src/trunk/Zend/zend_language_parser.y U php/php-src/trunk/Zend/zend_language_scanner.c U php/php-src/trunk/Zend/zend_language_scanner.l U php/php-src/trunk/Zend/zend_language_scanner_defs.h U php/php-src/trunk/Zend/zend_variables.c diffs exceeded maximum size -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/ TSRM/TSRM.c TSRM/TSRM.h TSRM/tsrm.m4 Zend/Makefile.am Zend/Zend.m4 Zend/zend.c Zend/zend.h Zend/zend_alloc.c Zend/zend_execute_API.c Zend/zend_hash.c Zend/zend_s
Ilia, What about NEWS? Chris On 06/02/2011 02:16 PM, Ilia Alshanetsky wrote: iliaaThu, 02 Jun 2011 21:16:50 + Revision: http://svn.php.net/viewvc?view=revisionrevision=311740 Log: Zend Signal Handling (see RFC: https://wiki.php.net/rfc/zendsignals) This needs to go into 5.4 as well, but will wait for Pierre to review win32 situation # Patch by Lucas Nealan, Arnaud Le Blanc, Brian Shire Ilia Alshanetsky Changed paths: U php/php-src/trunk/TSRM/TSRM.c U php/php-src/trunk/TSRM/TSRM.h U php/php-src/trunk/TSRM/tsrm.m4 U php/php-src/trunk/Zend/Makefile.am U php/php-src/trunk/Zend/Zend.m4 U php/php-src/trunk/Zend/zend.c U php/php-src/trunk/Zend/zend.h U php/php-src/trunk/Zend/zend_alloc.c U php/php-src/trunk/Zend/zend_execute_API.c U php/php-src/trunk/Zend/zend_hash.c A php/php-src/trunk/Zend/zend_signal.c A php/php-src/trunk/Zend/zend_signal.h U php/php-src/trunk/configure.in U php/php-src/trunk/ext/pcntl/php_signal.c U php/php-src/trunk/ext/standard/info.c U php/php-src/trunk/ext/standard/tests/general_functions/phpinfo.phpt U php/php-src/trunk/main/SAPI.c U php/php-src/trunk/main/main.c -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- 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/tokenizer/tokenizer_data.c trunk/ext/tokenizer/tokenizer_data.c
stas Fri, 03 Jun 2011 01:16:01 + Revision: http://svn.php.net/viewvc?view=revisionrevision=311747 Log: and clean the tokenizer too Changed paths: U php/php-src/branches/PHP_5_4/ext/tokenizer/tokenizer_data.c U php/php-src/trunk/ext/tokenizer/tokenizer_data.c Modified: php/php-src/branches/PHP_5_4/ext/tokenizer/tokenizer_data.c === --- php/php-src/branches/PHP_5_4/ext/tokenizer/tokenizer_data.c 2011-06-03 01:09:32 UTC (rev 311746) +++ php/php-src/branches/PHP_5_4/ext/tokenizer/tokenizer_data.c 2011-06-03 01:16:01 UTC (rev 311747) @@ -66,8 +66,6 @@ REGISTER_LONG_CONSTANT(T_ARRAY_CAST, T_ARRAY_CAST, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(T_STRING_CAST, T_STRING_CAST, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(T_DOUBLE_CAST, T_DOUBLE_CAST, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(T_SCALAR_CAST, T_SCALAR_CAST, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(T_NUMERIC_CAST, T_NUMERIC_CAST, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(T_INT_CAST, T_INT_CAST, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(T_DEC, T_DEC, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(T_INC, T_INC, CONST_CS | CONST_PERSISTENT); @@ -200,8 +198,6 @@ case T_ARRAY_CAST: return T_ARRAY_CAST; case T_STRING_CAST: return T_STRING_CAST; case T_DOUBLE_CAST: return T_DOUBLE_CAST; - case T_SCALAR_CAST: return T_SCALAR_CAST; - case T_NUMERIC_CAST: return T_NUMERIC_CAST; case T_INT_CAST: return T_INT_CAST; case T_DEC: return T_DEC; case T_INC: return T_INC; Modified: php/php-src/trunk/ext/tokenizer/tokenizer_data.c === --- php/php-src/trunk/ext/tokenizer/tokenizer_data.c2011-06-03 01:09:32 UTC (rev 311746) +++ php/php-src/trunk/ext/tokenizer/tokenizer_data.c2011-06-03 01:16:01 UTC (rev 311747) @@ -66,8 +66,6 @@ REGISTER_LONG_CONSTANT(T_ARRAY_CAST, T_ARRAY_CAST, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(T_STRING_CAST, T_STRING_CAST, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(T_DOUBLE_CAST, T_DOUBLE_CAST, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(T_SCALAR_CAST, T_SCALAR_CAST, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(T_NUMERIC_CAST, T_NUMERIC_CAST, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(T_INT_CAST, T_INT_CAST, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(T_DEC, T_DEC, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(T_INC, T_INC, CONST_CS | CONST_PERSISTENT); @@ -200,8 +198,6 @@ case T_ARRAY_CAST: return T_ARRAY_CAST; case T_STRING_CAST: return T_STRING_CAST; case T_DOUBLE_CAST: return T_DOUBLE_CAST; - case T_SCALAR_CAST: return T_SCALAR_CAST; - case T_NUMERIC_CAST: return T_NUMERIC_CAST; case T_INT_CAST: return T_INT_CAST; case T_DEC: return T_DEC; case T_INC: return T_INC; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
