- fixed build-issues in config.m4

- make sure that 'plain_text' is passed on 'verify'
- set error_reporting to E_ALL during tests
This commit is contained in:
Thilo Raufeisen 2006-10-24 14:04:02 +00:00
parent 645661b180
commit 6803be309c
3 changed files with 3 additions and 3 deletions

View file

@ -24,7 +24,7 @@ if test "$PHP_GNUPG" != "no"; then
AC_MSG_ERROR([Please reinstall the gpgme distribution]) AC_MSG_ERROR([Please reinstall the gpgme distribution])
fi fi
PHP_ADD_INCLUDE($GNUPG_DIR/include) PHP_ADD_INCLUDE($GNUPG_DIR)
LIBNAME=gpgme LIBNAME=gpgme
LIBSYMBOL=gpgme_check_version LIBSYMBOL=gpgme_check_version

View file

@ -1162,7 +1162,7 @@ PHP_FUNCTION(gnupg_verify){
gnupg_fetchsignatures (gpgme_result->signatures,signature_array,return_value); gnupg_fetchsignatures (gpgme_result->signatures,signature_array,return_value);
/* get a 'plain' version of the text without a signature */ /* get a 'plain' version of the text without a signature */
gpg_plain = gpgme_data_release_and_get_mem(gpgme_text,&gpg_plain_len); gpg_plain = gpgme_data_release_and_get_mem(gpgme_text,&gpg_plain_len);
if(gpg_plain && gpg_plain_len > 0){ if(gpg_plain && gpg_plain_len > 0 && plain_text){
ZVAL_STRINGL (plain_text, gpg_plain,gpg_plain_len,1); ZVAL_STRINGL (plain_text, gpg_plain,gpg_plain_len,1);
} }
free (gpg_plain); free (gpg_plain);

View file

@ -1,6 +1,6 @@
<?php <?php
putenv("GNUPGHOME=".dirname(__FILE__)); putenv("GNUPGHOME=".dirname(__FILE__));
error_reporting (E_ALL);
$fingerprint = "64DF06E42FCF2094590CDEEE2E96F141B3DD2B2E"; $fingerprint = "64DF06E42FCF2094590CDEEE2E96F141B3DD2B2E";
$passphrase = "blabla"; $passphrase = "blabla";