tony2001 Wed May 2 10:30:25 2007 UTC
Modified files:
/php-src/ext/session php_session.h session.c
Log:
fix build when ext/hash is compiled as shared module
http://cvs.php.net/viewvc.cgi/php-src/ext/session/php_session.h?r1=1.113&r2=1.114&diff_format=u
Index: php-src/ext/session/php_session.h
diff -u php-src/ext/session/php_session.h:1.113
php-src/ext/session/php_session.h:1.114
--- php-src/ext/session/php_session.h:1.113 Fri Jan 5 03:57:57 2007
+++ php-src/ext/session/php_session.h Wed May 2 10:30:24 2007
@@ -16,14 +16,14 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_session.h,v 1.113 2007/01/05 03:57:57 pollita Exp $ */
+/* $Id: php_session.h,v 1.114 2007/05/02 10:30:24 tony2001 Exp $ */
#ifndef PHP_SESSION_H
#define PHP_SESSION_H
#include "ext/standard/php_var.h"
-#ifdef HAVE_HASH_EXT
+#if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH)
# include "ext/hash/php_hash.h"
#endif
@@ -125,7 +125,7 @@
zend_bool apply_trans_sid; /* whether or not to enable trans-sid
for the current request */
long hash_func;
-#ifdef HAVE_HASH_EXT
+#if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH)
php_hash_ops *hash_ops;
#endif
long hash_bits_per_character;
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.468&r2=1.469&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.468 php-src/ext/session/session.c:1.469
--- php-src/ext/session/session.c:1.468 Wed Apr 4 19:46:42 2007
+++ php-src/ext/session/session.c Wed May 2 10:30:24 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.468 2007/04/04 19:46:42 tony2001 Exp $ */
+/* $Id: session.c,v 1.469 2007/05/02 10:30:24 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -265,7 +265,7 @@
{
PHP_MD5_CTX md5_context;
PHP_SHA1_CTX sha1_context;
-#ifdef HAVE_HASH_EXT
+#if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH)
void *hash_context;
#endif
unsigned char *digest;
@@ -302,7 +302,7 @@
PHP_SHA1Update(&sha1_context, (unsigned char *) buf,
strlen(buf));
digest_len = 20;
break;
-#ifdef HAVE_HASH_EXT
+#if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH)
case PS_HASH_FUNC_OTHER:
if (!PS(hash_ops)) {
php_error_docref(NULL TSRMLS_CC, E_ERROR,
"Invalid session hash function");
@@ -342,7 +342,7 @@
case PS_HASH_FUNC_SHA1:
PHP_SHA1Update(&sha1_context,
rbuf, n);
break;
-#ifdef HAVE_HASH_EXT
+#if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH)
case PS_HASH_FUNC_OTHER:
PS(hash_ops)->hash_update(hash_context, rbuf, n);
break;
@@ -362,7 +362,7 @@
case PS_HASH_FUNC_SHA1:
PHP_SHA1Final(digest, &sha1_context);
break;
-#ifdef HAVE_HASH_EXT
+#if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH)
case PS_HASH_FUNC_OTHER:
PS(hash_ops)->hash_final(digest, hash_context);
efree(hash_context);
@@ -568,7 +568,7 @@
long val;
char *endptr = NULL;
-#ifdef HAVE_HASH_EXT
+#if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH)
PS(hash_ops) = NULL;
#endif
@@ -594,7 +594,7 @@
return SUCCESS;
}
-#ifdef HAVE_HASH_EXT
+#if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH)
{
php_hash_ops *ops = php_hash_fetch_ops(new_value, new_value_length);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
