Move timeout code to Zend, allow Win32 timeouts

@- Implemented max_execution_time under Win32 (Zeev)

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 8e341bf671ee801d908ca0e1872b8f6134889ab5..2eb11df8348663facbdfc091100194a72721251e 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -210,7 +210,7 @@ static void _close_mysql_plink(MYSQL *link)
 static PHP_INI_MH(OnMySQLPort)
 {
        MySLS_FETCH();
-       
+
        if (new_value==NULL) { /* default port */
 #ifndef PHP_WIN32
                struct servent *serv_ptr;
@@ -236,11 +236,12 @@ static PHP_INI_MH(OnMySQLPort)
 PHP_INI_BEGIN()
        STD_PHP_INI_BOOLEAN("mysql.allow_persistent",   "1",    PHP_INI_SYSTEM,         OnUpdateInt,            allow_persistent,       zend_mysql_globals,             mysql_globals)
        STD_PHP_INI_ENTRY_EX("mysql.max_persistent",    "-1",   PHP_INI_SYSTEM,         OnUpdateInt,            max_persistent,         zend_mysql_globals,             mysql_globals,  display_link_numbers)
-       STD_PHP_INI_ENTRY_EX("mysql.max_links",         "-1",   PHP_INI_SYSTEM,                 OnUpdateInt,            max_links,                      zend_mysql_globals,             mysql_globals,  display_link_numbers)
-       STD_PHP_INI_ENTRY("mysql.default_host",         NULL,   PHP_INI_ALL,                    OnUpdateString,         default_host,           zend_mysql_globals,             mysql_globals)
-       STD_PHP_INI_ENTRY("mysql.default_user",         NULL,   PHP_INI_ALL,                    OnUpdateString,         default_user,           zend_mysql_globals,             mysql_globals)
-       STD_PHP_INI_ENTRY("mysql.default_password",     NULL,   PHP_INI_ALL,                    OnUpdateString,         default_password,       zend_mysql_globals,             mysql_globals)
-       PHP_INI_ENTRY("mysql.default_port",             NULL,   PHP_INI_ALL,                    OnMySQLPort)
+       STD_PHP_INI_ENTRY_EX("mysql.max_links",                 "-1",   PHP_INI_SYSTEM,         OnUpdateInt,            max_links,                      zend_mysql_globals,             mysql_globals,  display_link_numbers)
+       STD_PHP_INI_ENTRY("mysql.default_host",                 NULL,   PHP_INI_ALL,            OnUpdateString,         default_host,           zend_mysql_globals,             mysql_globals)
+       STD_PHP_INI_ENTRY("mysql.default_user",                 NULL,   PHP_INI_ALL,            OnUpdateString,         default_user,           zend_mysql_globals,             mysql_globals)
+       STD_PHP_INI_ENTRY("mysql.default_password",             NULL,   PHP_INI_ALL,            OnUpdateString,         default_password,       zend_mysql_globals,             mysql_globals)
+       PHP_INI_ENTRY("mysql.default_port",                             NULL,   PHP_INI_ALL,            OnMySQLPort)
+       STD_PHP_INI_ENTRY("mysql.default_socket",               NULL,   PHP_INI_ALL,            OnUpdateStringUnempty,  default_socket, zend_mysql_globals,             mysql_globals)
 PHP_INI_END()
 
 
@@ -311,7 +312,7 @@ PHP_MINFO_FUNCTION(mysql)
 
 static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
 {
-       char *user,*passwd,*host,*socket=NULL,*tmp;
+       char *user,*passwd,*host,*socket,*tmp;
        char *hashed_details;
        int hashed_details_length,port = MYSQL_PORT;
        MYSQL *mysql;
@@ -319,6 +320,8 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
        MySLS_FETCH();
        PLS_FETCH();
 
+       socket = MySG(default_socket);
+
        if (PG(sql_safe_mode)) {
                if (ZEND_NUM_ARGS()>0) {
                        php_error(E_NOTICE,"SQL safe mode in effect - ignoring host/user/password information");

diff --git a/ext/mysql/php_mysql.h b/ext/mysql/php_mysql.h
index 5b98e8299485fafbeb77b0e35ae17adfce018a99..1a9f0a3d74b6adddbc042b7c50d1523a0451fee8 100644 (file)
--- a/ext/mysql/php_mysql.h
+++ b/ext/mysql/php_mysql.h
@@ -82,6 +82,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mysql)
        long allow_persistent;
        long default_port;
        char *default_host, *default_user, *default_password;
+       char *default_socket;
 ZEND_END_MODULE_GLOBALS(mysql);
 
 #ifdef ZTS

diff --git a/main/main.c b/main/main.c
index 2ad89b5bf80623f7d9f22c38b849f8e0cb9a95c3..6da4b219b5e0a5e6157f8c35d0891d0a1a2b0b30 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -96,8 +96,6 @@ static MUTEX_T global_lock;
  
 
 static void php_build_argv(char *s, zval *track_vars_array ELS_DC PLS_DC);
-static void php_timeout(int dummy);
-static void php_set_timeout(long seconds);
 
 void *gLock;                                   /*mutex variable */
 
@@ -441,55 +439,6 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
 }
 
 
-static long php_timeout_seconds;
-
-#ifdef HAVE_SETITIMER
-static void php_timeout(int dummy)
-{
-       PLS_FETCH();
-
-       PG(connection_status) |= PHP_CONNECTION_TIMEOUT;
-       php_error(E_ERROR, "Maximum execution time of %d second%s exceeded",
-                         php_timeout_seconds, php_timeout_seconds == 1 ? "" : "s");
-}
-#endif
-
-/* This one doesn't exists on QNX */
-#ifndef SIGPROF
-#define SIGPROF 27
-#endif
-
-static void php_set_timeout(long seconds)
-{
-#ifdef PHP_WIN32
-#else
-#      ifdef HAVE_SETITIMER
-       struct itimerval t_r;           /* timeout requested */
-
-       t_r.it_value.tv_sec = seconds;
-       t_r.it_value.tv_usec = t_r.it_interval.tv_sec = t_r.it_interval.tv_usec = 0;
-
-       php_timeout_seconds = seconds;
-       setitimer(ITIMER_PROF, &t_r, NULL);
-       signal(SIGPROF, php_timeout);
-#      endif
-#endif
-}
-
-
-static void php_unset_timeout(void)
-{
-#ifdef PHP_WIN32
-#else
-#      ifdef HAVE_SETITIMER
-       struct itimerval no_timeout;
-
-       no_timeout.it_value.tv_sec = no_timeout.it_value.tv_usec = no_timeout.it_interval.tv_sec = no_timeout.it_interval.tv_usec = 0;
-
-       setitimer(ITIMER_PROF, &no_timeout, NULL);
-#      endif
-#endif
-}
 
 /* {{{ proto void set_time_limit(int seconds)
    Sets the maximum time a script can run */
@@ -518,8 +467,8 @@ PHP_FUNCTION(set_time_limit)
           should work fine.  Is this FIXME a WIN32 problem?  Is
           there no way to do per-thread timers on WIN32?
         */
-       php_unset_timeout();
-       php_set_timeout(Z_LVAL_PP(new_timeout));
+       zend_unset_timeout();
+       zend_set_timeout(Z_LVAL_PP(new_timeout));
 }
 /* }}} */
 
@@ -654,7 +603,7 @@ int php_request_startup(CLS_D ELS_DC PLS_DC SLS_DC)
        virtual_cwd_activate(SG(request_info).path_translated);
 #endif
 
-       php_set_timeout(PG(max_execution_time));
+       zend_set_timeout(PG(max_execution_time));
        
        if (PG(expose_php)) {
                sapi_add_header(SAPI_PHP_VERSION_HEADER, sizeof(SAPI_PHP_VERSION_HEADER)-1, 1);
@@ -703,7 +652,7 @@ void php_request_shutdown(void *dummy)
        sapi_deactivate(SLS_C);
 
        shutdown_memory_manager(CG(unclean_shutdown), 0);
-       php_unset_timeout();
+       zend_unset_timeout();
 
        global_unlock();
 }

diff --git a/php.ini-dist b/php.ini-dist
index 0a76188079f1efa19c19c4894c45d33f3f61a8db..2532c41e2e7da92464bcc78e5590064fc77b9cdb 100644 (file)
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -300,6 +300,8 @@ mysql.default_port          =               ; default port number for mysql_connect().  If unset,
                                                                ; mysql_connect() will use the $MYSQL_TCP_PORT, or the mysql-tcp
                                                                ; entry in /etc/services, or the compile-time defined MYSQL_PORT
                                                                ; (in that order).  Win32 will only look at MYSQL_PORT.
+mysql.default_socket   =               ; default socket name for local MySQL connects.  If empty, uses the built-in
+                                                               ; MySQL defaults
 mysql.default_host             =               ; default host for mysql_connect() (doesn't apply in safe mode)
 mysql.default_user             =               ; default user for mysql_connect() (doesn't apply in safe mode)
 mysql.default_password =               ; default password for mysql_connect() (doesn't apply in safe mode)

diff --git a/php.ini-optimized b/php.ini-optimized
index 3e8b72165668c3d2a06a1b9d2607a71f7d1291f6..2306212944291edc2c3af31b756033590ee1c20e 100644 (file)
--- a/php.ini-optimized
+++ b/php.ini-optimized
@@ -288,6 +288,8 @@ mysql.default_port          =               ; default port number for mysql_connect().  If unset,
                                                                ; mysql_connect() will use the $MYSQL_TCP_PORT, or the mysql-tcp
                                                                ; entry in /etc/services, or the compile-time defined MYSQL_PORT
                                                                ; (in that order).  Win32 will only look at MYSQL_PORT.
+mysql.default_socket   =               ; default socket name for local MySQL connects.  If empty, uses the built-in
+                                                               ; MySQL defaults
 mysql.default_host             =               ; default host for mysql_connect() (doesn't apply in safe mode)
 mysql.default_user             =               ; default user for mysql_connect() (doesn't apply in safe mode)
 mysql.default_password =               ; default password for mysql_connect() (doesn't apply in safe mode)

diff --git a/php.ini-recommended b/php.ini-recommended
index 3e8b72165668c3d2a06a1b9d2607a71f7d1291f6..2306212944291edc2c3af31b756033590ee1c20e 100644 (file)
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -288,6 +288,8 @@ mysql.default_port          =               ; default port number for mysql_connect().  If unset,
                                                                ; mysql_connect() will use the $MYSQL_TCP_PORT, or the mysql-tcp
                                                                ; entry in /etc/services, or the compile-time defined MYSQL_PORT
                                                                ; (in that order).  Win32 will only look at MYSQL_PORT.
+mysql.default_socket   =               ; default socket name for local MySQL connects.  If empty, uses the built-in
+                                                               ; MySQL defaults
 mysql.default_host             =               ; default host for mysql_connect() (doesn't apply in safe mode)
 mysql.default_user             =               ; default user for mysql_connect() (doesn't apply in safe mode)
 mysql.default_password =               ; default password for mysql_connect() (doesn't apply in safe mode)