Skip to content
This repository was archived by the owner on Feb 1, 2022. It is now read-only.

PHP-1529: Fix undefined symbols from contrib/php-ssl.c #884

Merged
merged 3 commits into from
Sep 5, 2017
Merged

PHP-1529: Fix undefined symbols from contrib/php-ssl.c #884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c23c1d4
PHP-1529: read config.h to retrieve HAVE_MONGO_OPENSSL
remicollet Sep 4, 2017
5f794b4
PHP-1529: Ensure php-ssl.h has HAVE_MONGO_OPENSSL
jmikola Sep 5, 2017
9492c94
PHP-1529: Move HAVE_MONGO_OPENSSL usage below explicit config.h include
jmikola Sep 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions contrib/php-ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
+----------------------------------------------------------------------+
*/

#ifdef HAVE_CONFIG_H
# include "config.h"
#endif

#ifdef PHP_WIN32
# include "config.w32.h"
Expand Down
4 changes: 4 additions & 0 deletions contrib/php-ssl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
#ifndef MONGO_CONTRIB_SSL_H
#define MONGO_CONTRIB_SSL_H

#ifdef HAVE_CONFIG_H
# include "config.h"
#endif

#ifdef PHP_WIN32
# include "config.w32.h"
#else
Expand Down
8 changes: 4 additions & 4 deletions io_stream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@
# include <php_config.h>
#endif

#ifdef HAVE_MONGO_OPENSSL
# include "contrib/php-ssl.h"
#endif

#include <php.h>
#include <main/php_streams.h>
#include <main/php_network.h>
Expand All @@ -50,6 +46,10 @@
# include "config.h"
#endif

#ifdef HAVE_MONGO_OPENSSL
# include "contrib/php-ssl.h"
#endif

#if HAVE_MONGO_SASL
#include <sasl/sasl.h>
#include <sasl/saslutil.h>
Expand Down