com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/odbc/php _odbc.c ext/pdo_mysql/pdo_mysql.c ext/session/ses sion.c ext/standard/browscap.c
| From: | Johannes Schlüter | Date: | Fri, 22 Jun 2012 15:33:22 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/odbc/php _odbc.c ext/pdo_mysql/pdo_mysql.c ext/session/ses sion.c ext/standard/browscap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69430@lists.php.net to get a copy of this message | ||
Commit: 5e23a047acf7b27fff20381d460fcd699731e9a5
Author: Johannes Schlüter <johannes@php.net> Fri, 22 Jun 2012 17:33:22 +0200
Parents: 4af92aca872d7463b671c037f9d3b782e22a7c9c a62d4e2c43a41a2864e9b38836170e2d4f34033f
Branches: PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5e23a047acf7b27fff20381d460fcd699731e9a5
Log:
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Remove extra ;
Changed paths:
MM ext/odbc/php_odbc.c
MM ext/pdo_mysql/pdo_mysql.c
MM ext/session/session.c
MM ext/standard/browscap.c
Diff:
diff --cc ext/session/session.c
index 7a8199d,47c1e35..0c08d49
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@@ -59,17 -56,8 +59,17 @@@
#include "mod_mm.h"
#endif
- PHPAPI ZEND_DECLARE_MODULE_GLOBALS(ps);
+ PHPAPI ZEND_DECLARE_MODULE_GLOBALS(ps)
+static int php_session_rfc1867_callback(unsigned int event, void *event_data, void **extra
TSRMLS_DC);
+static int (*php_session_rfc1867_orig_callback)(unsigned int event, void *event_data, void **extra
TSRMLS_DC);
+
+/* SessionHandler class */
+zend_class_entry *php_session_class_entry;
+
+/* SessionHandlerInterface */
+zend_class_entry *php_session_iface_entry;
+
/* ***********
* Helpers *
*********** */