jani                                     Sun, 26 Jul 2009 23:20:34 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=286379

Log:
- Fixed bug #49064 (--enable-session=shared does not work: undefined symbol:
  php_url_scanner_reset_vars). (Jani)

# Note: This does not exist in PHP_5_2. Merged there as well to keep these 
files synced.

Bug: http://bugs.php.net/49064 (Assigned) --enable-session=shared does not work
      
Changed paths:
    U   php/php-src/branches/PHP_5_2/ext/standard/url_scanner_ex.h
    U   php/php-src/branches/PHP_5_2/ext/standard/url_scanner_ex.re
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/ext/standard/url_scanner_ex.h
    U   php/php-src/branches/PHP_5_3/ext/standard/url_scanner_ex.re
    U   php/php-src/trunk/ext/standard/url_scanner_ex.h
    U   php/php-src/trunk/ext/standard/url_scanner_ex.re

Modified: php/php-src/branches/PHP_5_2/ext/standard/url_scanner_ex.h
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/url_scanner_ex.h	2009-07-26 22:59:46 UTC (rev 286378)
+++ php/php-src/branches/PHP_5_2/ext/standard/url_scanner_ex.h	2009-07-26 23:20:34 UTC (rev 286379)
@@ -27,14 +27,10 @@
 PHP_RINIT_FUNCTION(url_scanner_ex);
 PHP_RSHUTDOWN_FUNCTION(url_scanner_ex);

-char *php_url_scanner_adapt_single_url(const char *url, size_t urllen, const char *name, const char *value, size_t *newlen TSRMLS_DC);
+PHPAPI char *php_url_scanner_adapt_single_url(const char *url, size_t urllen, const char *name, const char *value, size_t *newlen TSRMLS_DC);
+PHPAPI int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int urlencode TSRMLS_DC);
+PHPAPI int php_url_scanner_reset_vars(TSRMLS_D);

-int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int urlencode TSRMLS_DC);
-int php_url_scanner_reset_vars(TSRMLS_D);
-
-int php_url_scanner_ex_activate(TSRMLS_D);
-int php_url_scanner_ex_deactivate(TSRMLS_D);
-
 #include "php_smart_str_public.h"

 typedef struct {
@@ -59,9 +55,4 @@
 	HashTable *tags;
 } url_adapt_state_ex_t;

-typedef struct {
-	smart_str var;
-	smart_str val;
-} url_adapt_var_t;
-
 #endif

Modified: php/php-src/branches/PHP_5_2/ext/standard/url_scanner_ex.re
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/url_scanner_ex.re	2009-07-26 22:59:46 UTC (rev 286378)
+++ php/php-src/branches/PHP_5_2/ext/standard/url_scanner_ex.re	2009-07-26 23:20:34 UTC (rev 286379)
@@ -401,7 +401,7 @@
 	return retval;
 }

-int php_url_scanner_ex_activate(TSRMLS_D)
+static int php_url_scanner_ex_activate(TSRMLS_D)
 {
 	url_adapt_state_ex_t *ctx;

@@ -412,7 +412,7 @@
 	return SUCCESS;
 }

-int php_url_scanner_ex_deactivate(TSRMLS_D)
+static int php_url_scanner_ex_deactivate(TSRMLS_D)
 {
 	url_adapt_state_ex_t *ctx;

@@ -457,7 +457,7 @@
 	}
 }

-int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int urlencode TSRMLS_DC)
+PHPAPI int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int urlencode TSRMLS_DC)
 {
 	char *encoded;
 	int encoded_len;
@@ -497,7 +497,7 @@
 	return SUCCESS;
 }

-int php_url_scanner_reset_vars(TSRMLS_D)
+PHPAPI int php_url_scanner_reset_vars(TSRMLS_D)
 {
 	BG(url_adapt_state_ex).form_app.len = 0;
 	BG(url_adapt_state_ex).url_app.len = 0;

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS	2009-07-26 22:59:46 UTC (rev 286378)
+++ php/php-src/branches/PHP_5_3/NEWS	2009-07-26 23:20:34 UTC (rev 286379)
@@ -1,4 +1,4 @@
-PHP                                                                        NEWS
+PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2009, PHP 5.3.1
 - Fixed spl_autoload_unregister/spl_autoload_functions wrt. Closures and
@@ -7,6 +7,8 @@
   Stas)
 - Fixed signature generation/validation for zip archives in ext/phar. (Greg)

+- Fixed bug #49064 (--enable-session=shared does not work: undefined symbol:
+  php_url_scanner_reset_vars). (Jani)
 - Fixed bug #49052 (context option headers freed too early when using
   --with-curlwrappers). (Jani)
 - Fixed bug #49032 (SplFileObject::fscanf() variables passed by reference).

Modified: php/php-src/branches/PHP_5_3/ext/standard/url_scanner_ex.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/url_scanner_ex.h	2009-07-26 22:59:46 UTC (rev 286378)
+++ php/php-src/branches/PHP_5_3/ext/standard/url_scanner_ex.h	2009-07-26 23:20:34 UTC (rev 286379)
@@ -27,14 +27,10 @@
 PHP_RINIT_FUNCTION(url_scanner_ex);
 PHP_RSHUTDOWN_FUNCTION(url_scanner_ex);

-char *php_url_scanner_adapt_single_url(const char *url, size_t urllen, const char *name, const char *value, size_t *newlen TSRMLS_DC);
+PHPAPI char *php_url_scanner_adapt_single_url(const char *url, size_t urllen, const char *name, const char *value, size_t *newlen TSRMLS_DC);
+PHPAPI int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int urlencode TSRMLS_DC);
+PHPAPI int php_url_scanner_reset_vars(TSRMLS_D);

-int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int urlencode TSRMLS_DC);
-int php_url_scanner_reset_vars(TSRMLS_D);
-
-int php_url_scanner_ex_activate(TSRMLS_D);
-int php_url_scanner_ex_deactivate(TSRMLS_D);
-
 #include "php_smart_str_public.h"

 typedef struct {
@@ -59,9 +55,4 @@
 	HashTable *tags;
 } url_adapt_state_ex_t;

-typedef struct {
-	smart_str var;
-	smart_str val;
-} url_adapt_var_t;
-
 #endif

Modified: php/php-src/branches/PHP_5_3/ext/standard/url_scanner_ex.re
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/url_scanner_ex.re	2009-07-26 22:59:46 UTC (rev 286378)
+++ php/php-src/branches/PHP_5_3/ext/standard/url_scanner_ex.re	2009-07-26 23:20:34 UTC (rev 286379)
@@ -401,7 +401,7 @@
 	return retval;
 }

-int php_url_scanner_ex_activate(TSRMLS_D)
+static int php_url_scanner_ex_activate(TSRMLS_D)
 {
 	url_adapt_state_ex_t *ctx;

@@ -412,7 +412,7 @@
 	return SUCCESS;
 }

-int php_url_scanner_ex_deactivate(TSRMLS_D)
+static int php_url_scanner_ex_deactivate(TSRMLS_D)
 {
 	url_adapt_state_ex_t *ctx;

@@ -457,7 +457,7 @@
 	}
 }

-int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int urlencode TSRMLS_DC)
+PHPAPI int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int urlencode TSRMLS_DC)
 {
 	char *encoded;
 	int encoded_len;
@@ -497,7 +497,7 @@
 	return SUCCESS;
 }

-int php_url_scanner_reset_vars(TSRMLS_D)
+PHPAPI int php_url_scanner_reset_vars(TSRMLS_D)
 {
 	BG(url_adapt_state_ex).form_app.len = 0;
 	BG(url_adapt_state_ex).url_app.len = 0;

Modified: php/php-src/trunk/ext/standard/url_scanner_ex.h
===================================================================
--- php/php-src/trunk/ext/standard/url_scanner_ex.h	2009-07-26 22:59:46 UTC (rev 286378)
+++ php/php-src/trunk/ext/standard/url_scanner_ex.h	2009-07-26 23:20:34 UTC (rev 286379)
@@ -27,14 +27,10 @@
 PHP_RINIT_FUNCTION(url_scanner_ex);
 PHP_RSHUTDOWN_FUNCTION(url_scanner_ex);

-char *php_url_scanner_adapt_single_url(const char *url, size_t urllen, const char *name, const char *value, size_t *newlen TSRMLS_DC);
+PHPAPI char *php_url_scanner_adapt_single_url(const char *url, size_t urllen, const char *name, const char *value, size_t *newlen TSRMLS_DC);
+PHPAPI int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int urlencode TSRMLS_DC);
+PHPAPI int php_url_scanner_reset_vars(TSRMLS_D);

-int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int urlencode TSRMLS_DC);
-int php_url_scanner_reset_vars(TSRMLS_D);
-
-int php_url_scanner_ex_activate(TSRMLS_D);
-int php_url_scanner_ex_deactivate(TSRMLS_D);
-
 #include "php_smart_str_public.h"

 typedef struct {
@@ -59,9 +55,4 @@
 	HashTable *tags;
 } url_adapt_state_ex_t;

-typedef struct {
-	smart_str var;
-	smart_str val;
-} url_adapt_var_t;
-
 #endif

Modified: php/php-src/trunk/ext/standard/url_scanner_ex.re
===================================================================
--- php/php-src/trunk/ext/standard/url_scanner_ex.re	2009-07-26 22:59:46 UTC (rev 286378)
+++ php/php-src/trunk/ext/standard/url_scanner_ex.re	2009-07-26 23:20:34 UTC (rev 286379)
@@ -401,7 +401,7 @@
 	return retval;
 }

-int php_url_scanner_ex_activate(TSRMLS_D)
+static int php_url_scanner_ex_activate(TSRMLS_D)
 {
 	url_adapt_state_ex_t *ctx;

@@ -412,7 +412,7 @@
 	return SUCCESS;
 }

-int php_url_scanner_ex_deactivate(TSRMLS_D)
+static int php_url_scanner_ex_deactivate(TSRMLS_D)
 {
 	url_adapt_state_ex_t *ctx;

@@ -457,7 +457,7 @@
 	}
 }

-int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int urlencode TSRMLS_DC)
+PHPAPI int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int urlencode TSRMLS_DC)
 {
 	char *encoded;
 	int encoded_len;
@@ -501,7 +501,7 @@
 	return SUCCESS;
 }

-int php_url_scanner_reset_vars(TSRMLS_D)
+PHPAPI int php_url_scanner_reset_vars(TSRMLS_D)
 {
 	BG(url_adapt_state_ex).form_app.len = 0;
 	BG(url_adapt_state_ex).url_app.len = 0;
-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to