Skip to content

fix postgresql 9.4 / php 5.5 issues #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix postgresql 9.4 / php 5.5 issues #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions plphp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
#include "postgres.h"
#include "access/heapam.h"
#include "access/transam.h"
#include "access/htup_details.h"

#include "catalog/catversion.h"
#include "catalog/pg_language.h"
Expand Down Expand Up @@ -566,7 +567,7 @@ plphp_call_handler(PG_FUNCTION_ARGS)
desc = plphp_compile_function(fcinfo->flinfo->fn_oid, true TSRMLS_CC);

/* Activate PHP safe mode if needed */
PG(safe_mode) = desc->trusted;
//PG(safe_mode) = desc->trusted;

retval = plphp_trigger_handler(fcinfo, desc TSRMLS_CC);
}
Expand All @@ -575,7 +576,7 @@ plphp_call_handler(PG_FUNCTION_ARGS)
desc = plphp_compile_function(fcinfo->flinfo->fn_oid, false TSRMLS_CC);

/* Activate PHP safe mode if needed */
PG(safe_mode) = desc->trusted;
//PG(safe_mode) = desc->trusted;

if (desc->retset)
retval = plphp_srf_handler(fcinfo, desc TSRMLS_CC);
Expand Down
1 change: 1 addition & 0 deletions plphp_io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "utils/rel.h"
#include "utils/syscache.h"
#include "utils/memutils.h"
#include "access/htup_details.h"

/*
* plphp_zval_from_tuple
Expand Down
1 change: 1 addition & 0 deletions plphp_spi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@

/* PostgreSQL stuff */
#include "access/xact.h"
#include "access/htup_details.h"
#include "miscadmin.h"

#undef DEBUG_PLPHP_MEMORY
Expand Down