Commit 4fb03dc4 authored by Chris's avatar Chris

Merge branch 'php-7.2' into 'master'

specificites php 7.2

See merge request !2
parents 95e3c30a 3ffe3a67
......@@ -95,7 +95,7 @@ ZEND_FUNCTION(mail_php)
#ifdef USE_MYSQL
if (INI_BOOL("mail_php.enable_mysql")) {
if (sql(from)!=0) {
RETURN_STRING("Rights or quota error.",1);
RETURN_STRING("Rights or quota error.");
}
}
#endif
......@@ -122,7 +122,7 @@ ZEND_FUNCTION(mail_php)
// Smtp libre dans la fonction
if ((rv = getaddrinfo(smtp_server, portStr, &hints, &servinfo)) != 0) {
zend_printf("Gethost ERROR\n");
return(1);
return;
}
/* Si le serveur SMTP n'est pas force, on lis le parametre SSL */
if (strcmp(ssl_on,"1")==0) {
......@@ -133,7 +133,7 @@ ZEND_FUNCTION(mail_php)
} else {
if ((rv = getaddrinfo(INI_STR("mail_php.smtp_server"), portStr, &hints, &servinfo)) != 0) {
zend_printf("Gethost ERROR\n");
return(1);
return;
}
/* Le ssl est pilote par le fichier de configuration */
if (INI_BOOL("mail_php.enable_ssl")) {
......@@ -163,7 +163,7 @@ ZEND_FUNCTION(mail_php)
if (p == NULL) {
// On a pas reussi a se connecter
zend_printf("Client socket creation or connection issue\n");
return(1);
return;
}
/* Envoi du mail */
......
......@@ -228,7 +228,7 @@ void appli (char *login,char *pass, char *from, char *to, char *reply, char *sub
SSL_CTX *ctx;
BIO *sbio;
SSL_SESSION *sess;
SSL_METHOD *meth;
const SSL_METHOD *meth;
writesmtp("STARTTLS",ssl);
sendsmtp("\r\n",ssl);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment