- applied upstream

[packages/php-pecl-session_mysql.git] / php-pecl-session_mysql-zts.patch

diff --git a/php-pecl-session_mysql-zts.patch b/php-pecl-session_mysql-zts.patch
deleted file mode 100644 (file)
index 0dd8f6e..0000000
--- a/php-pecl-session_mysql-zts.patch
+++ /dev/null
@@ -1,137 +0,0 @@
---- session_mysql-1.8/session_mysql.c  2006-04-17 04:29:01.000000000 +0300
-+++ session_mysql-1.8.ZTS/session_mysql.c      2006-06-12 15:41:55.472008927 +0300
-@@ -264,7 +264,7 @@
-       PS_MOD(mysql)
- };
- 
--static char *get_escapedhost() {
-+static char *get_escapedhost(TSRMLS_D) {
-       char *server_name, *escapedhost;
-       int host_len;
- 
-@@ -283,7 +283,7 @@
-       return escapedhost;
- }
- 
--static int session_mysql_connect() {
-+static int session_mysql_connect(TSRMLS_D) {
- #if   MYSQL_VERSION_ID >= 50013
-       my_bool opt=1;
- #endif
-@@ -318,7 +318,7 @@
-       return FAILURE;
- }
- 
--static void session_mysql_close() {
-+static void session_mysql_close(TSRMLS_D) {
-       if (!SESSION_MYSQL_G(persistent)) {
-               mysql_close(SESSION_MYSQL_G(mysql));
-               SESSION_MYSQL_G(mysql)=NULL;
-@@ -343,7 +343,7 @@
-       my_ulonglong rows;
-       unsigned long *lengths;
- 
--      escapedhost=get_escapedhost();
-+      escapedhost=get_escapedhost(TSRMLS_C);
-       escapedhost_len=strlen(escapedhost);
- 
-       key_len=strlen(key);
-@@ -424,7 +424,7 @@
-       char *query_unlock=NULL;
-       MYSQL_RES *res;
- 
--      escapedhost=get_escapedhost();
-+      escapedhost=get_escapedhost(TSRMLS_C);
-       escapedhost_len=strlen(escapedhost);
- 
-       key_len=strlen(key);
-@@ -506,7 +506,7 @@
-       my_ulonglong rows;
-       unsigned long *lengths;
- 
--      escapedhost=get_escapedhost();
-+      escapedhost=get_escapedhost(TSRMLS_C);
-       escapedhost_len=strlen(escapedhost);
- 
-       key_len=strlen(key);
-@@ -554,7 +554,7 @@
-       return ret;
- }
- 
--static int session_mysql_gc() {
-+static int session_mysql_gc(TSRMLS_D) {
-       char *prequery="delete from phpsession where unix_timestamp()>=sess_mtime+%s";
-       char *query=NULL;
-       char *query_optimize="optimize table phpsession";
-@@ -592,7 +592,7 @@
-       int ret;
-       *mod_data = (void *)1; 
- 
--      ret=session_mysql_connect();
-+      ret=session_mysql_connect(TSRMLS_C);
-       if (SESSION_MYSQL_G(quiet)) {
-               return SUCCESS;
-       } else {
-@@ -607,7 +607,7 @@
- {
-       *mod_data = (void *)0;
- 
--      session_mysql_close();
-+      session_mysql_close(TSRMLS_C);
- 
-       return SUCCESS;
- }
-@@ -619,7 +619,7 @@
- {
-       int ret;
-       if (!SESSION_MYSQL_G(mysql)) {
--              if (!session_mysql_connect()){
-+              if (!session_mysql_connect(TSRMLS_C)){
-                       return FAILURE;
-               }
-       }
-@@ -638,7 +638,7 @@
-       int ret;
- 
-       if (!SESSION_MYSQL_G(mysql)) {
--              if (!session_mysql_connect()){
-+              if (!session_mysql_connect(TSRMLS_C)){
-                       if (SESSION_MYSQL_G(quiet)) {
-                               return SUCCESS;
-                       } else {
-@@ -664,7 +664,7 @@
-       int ret;
- 
-       if (!SESSION_MYSQL_G(mysql)) {
--              if (!session_mysql_connect()){
-+              if (!session_mysql_connect(TSRMLS_C)){
-                       if (SESSION_MYSQL_G(quiet)) {
-                               return SUCCESS;
-                       } else {
-@@ -690,7 +690,7 @@
-       int ret;
- 
-       if (!SESSION_MYSQL_G(mysql)) {
--              if (!session_mysql_connect()){
-+              if (!session_mysql_connect(TSRMLS_C)){
-                       if (SESSION_MYSQL_G(quiet)) {
-                               return FAILURE;
-                       } else {
-@@ -699,7 +699,7 @@
-               }
-       }
- 
--      ret=session_mysql_gc();
-+      ret=session_mysql_gc(TSRMLS_C);
- 
-       if (SESSION_MYSQL_G(quiet)) {
-               return SUCCESS;
-@@ -735,7 +735,7 @@
-       }
- 
-       if (!SESSION_MYSQL_G(mysql)) {
--              if (!session_mysql_connect()){
-+              if (!session_mysql_connect(TSRMLS_C)){
-                       return FAILURE;
-               }
-       }