char *typelib_name_buffer;
char *strtok_buf = NULL;
int interactive;
- CLS_FETCH();
+ TSRMLS_FETCH();
interactive = CG(interactive);
#endif
} cpdflib_global_struct;
-# define CPDF_GLOBAL(a) cpdflib_globals->a
-# define CPDF_TLS_VARS cpdflib_global_struct *cpdflib_globals=TlsGetValue(CPDFlibTls)
+# define CPDF_GLOBAL(v) TSRMG(CPDFlibTls, cpdflib_global_struct *, v)
#else
-# define CPDF_GLOBAL(a) a
-# define CPDF_TLS_VARS
+# define CPDF_GLOBAL(a) a
static int le_cpdf;
static int le_outline;
#if HAVE_LIBGD13
/* {{{ proto void cpdf_global_set_document_limits(int maxPages, int maxFonts, int maxImages, int maxAnnots, int maxObjects)
Sets document settings for all documents */
-PHP_FUNCTION(cpdf_global_set_document_limits) {
+PHP_FUNCTION(cpdf_global_set_document_limits)
+{
pval *argv[5];
int argc;
- CPDF_TLS_VARS;
argc = ZEND_NUM_ARGS();
if(argc != 5)
/* {{{ proto bool cpdf_set_creator(int pdfdoc, string creator)
Sets the creator field */
-PHP_FUNCTION(cpdf_set_creator) {
+PHP_FUNCTION(cpdf_set_creator)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
-
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto bool cpdf_set_title(int pdfptr, string title)
Fills the title field of the info structure */
-PHP_FUNCTION(cpdf_set_title) {
+PHP_FUNCTION(cpdf_set_title)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
-
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto bool cpdf_set_subject(int pdfptr, string subject)
Fills the subject field of the info structure */
-PHP_FUNCTION(cpdf_set_subject) {
+PHP_FUNCTION(cpdf_set_subject)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
/* {{{ proto bool cpdf_set_keywords(int pdfptr, string keywords)
Fills the keywords field of the info structure */
-PHP_FUNCTION(cpdf_set_keywords) {
+PHP_FUNCTION(cpdf_set_keywords)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
-
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_set_viewer_preferences(int pdfdoc, array preferences)
How to show the document in the viewer */
-PHP_FUNCTION(cpdf_set_viewer_preferences) {
+PHP_FUNCTION(cpdf_set_viewer_preferences)
+{
zval *arg1, *arg2;
zval **zvalue;
-
int id, type;
-
CPDFdoc *pdf;
CPDFviewerPrefs vP = { 0, 0, 0, 0, 0, 0, 0, 0 };
- CPDF_TLS_VARS;
if(ZEND_NUM_ARGS() != 2)
WRONG_PARAM_COUNT;
/* {{{ proto int cpdf_open(int compression [, string filename [, array doc_limits]])
Opens a new pdf document */
-PHP_FUNCTION(cpdf_open) {
+PHP_FUNCTION(cpdf_open)
+{
pval *arg1, *arg2, *arg3;
int id, argc;
CPDFdoc *cpdf;
- CPDF_TLS_VARS;
argc = ZEND_NUM_ARGS();
switch(argc) {
/* {{{ proto void cpdf_close(int pdfdoc)
Closes the pdf document */
-PHP_FUNCTION(cpdf_close) {
+PHP_FUNCTION(cpdf_close)
+{
pval *arg1;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
#define BUFFERLEN 40
/* {{{ proto void cpdf_page_init(int pdfdoc, int pagenr, int orientation, int height, int width [, double unit])
Starts page */
-PHP_FUNCTION(cpdf_page_init) {
+PHP_FUNCTION(cpdf_page_init)
+{
pval *argv[6];
int id, type, pagenr, orientation;
int height, width, argc;
char buffer[BUFFERLEN];
CPDFdoc *pdf;
- CPDF_TLS_VARS;
argc = ZEND_NUM_ARGS();
if(argc < 5 || argc > 6)
/* {{{ proto void cpdf_finalize_page(int pdfdoc, int pagenr)
Ends the page to save memory */
-PHP_FUNCTION(cpdf_finalize_page) {
+PHP_FUNCTION(cpdf_finalize_page)
+{
pval *arg1, *arg2;
int id, type, pagenr;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_set_current_page(int pdfdoc, int pagenr)
Sets page for output */
-PHP_FUNCTION(cpdf_set_current_page) {
+PHP_FUNCTION(cpdf_set_current_page)
+{
pval *arg1, *arg2;
int id, type, pagenr;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_begin_text(int pdfdoc)
Starts text section */
-PHP_FUNCTION(cpdf_begin_text) {
+PHP_FUNCTION(cpdf_begin_text)
+{
pval *arg1;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_end_text(int pdfdoc)
Ends text section */
-PHP_FUNCTION(cpdf_end_text) {
+PHP_FUNCTION(cpdf_end_text)
+{
pval *arg1;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_show(int pdfdoc, string text)
Output text at current position */
-PHP_FUNCTION(cpdf_show) {
+PHP_FUNCTION(cpdf_show)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_show_xy(int pdfdoc, string text, double x-koor, double y-koor [, int mode])
Output text at position */
-PHP_FUNCTION(cpdf_show_xy) {
+PHP_FUNCTION(cpdf_show_xy)
+{
pval *argv[5];
int id, type, argc, mode=0;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
argc = ZEND_NUM_ARGS();
if((argc < 4) || (argc > 5))
/* {{{ proto void cpdf_continue_text(int pdfdoc, string text)
Output text in next line */
-PHP_FUNCTION(cpdf_continue_text) {
+PHP_FUNCTION(cpdf_continue_text)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_text(int pdfdoc, string text [, double x-koor, double y-koor [, int mode [, double orientation [, int alignmode]]]])
Output text */
-PHP_FUNCTION(cpdf_text) {
+PHP_FUNCTION(cpdf_text)
+{
pval *argv[7];
int id, type, argc, mode=0;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
argc = ZEND_NUM_ARGS();
if((argc < 2) || (argc == 3) || (argc > 7) || getParametersArray(ht, argc, argv) == FAILURE)
/* {{{ proto void cpdf_set_font(int pdfdoc, string font, double size, string encoding)
Select the current font face, size and encoding */
-PHP_FUNCTION(cpdf_set_font) {
+PHP_FUNCTION(cpdf_set_font)
+{
pval *arg1, *arg2, *arg3, *arg4;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 4 || getParameters(ht, 4, &arg1, &arg2, &arg3, &arg4) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_set_font_directories(int pdfdoc, string pfmdir, string pfbdir)
Set directories to search when using external fonts. */
-PHP_FUNCTION(cpdf_set_font_directories) {
+PHP_FUNCTION(cpdf_set_font_directories)
+{
pval *arg1, *arg2, *arg3;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 3 || getParameters(ht, 3, &arg1, &arg2, &arg3) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_set_font_map_file(int pdfdoc, string filename)
Set fontname to filename translation map when using external fonts. */
-PHP_FUNCTION(cpdf_set_font_map_file) {
+PHP_FUNCTION(cpdf_set_font_map_file)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_set_leading(int pdfdoc, double distance)
Sets distance between text lines */
-PHP_FUNCTION(cpdf_set_leading) {
+PHP_FUNCTION(cpdf_set_leading)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_set_text_rendering(int pdfdoc, int rendermode)
Determines how text is rendered */
-PHP_FUNCTION(cpdf_set_text_rendering) {
+PHP_FUNCTION(cpdf_set_text_rendering)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_set_horiz_scaling(int pdfdoc, double scale)
Sets horizontal scaling of text */
-PHP_FUNCTION(cpdf_set_horiz_scaling) {
+PHP_FUNCTION(cpdf_set_horiz_scaling)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_set_text_rise(int pdfdoc, double value)
Sets the text rise */
-PHP_FUNCTION(cpdf_set_text_rise) {
+PHP_FUNCTION(cpdf_set_text_rise)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_set_text_matrix(int pdfdoc, arry matrix)
Sets the text matrix */
-PHP_FUNCTION(cpdf_set_text_matrix) {
+PHP_FUNCTION(cpdf_set_text_matrix)
+{
pval *arg1, *arg2, *data;
int id, type, i;
HashTable *matrix;
CPDFdoc *pdf;
float *pdfmatrixptr;
float pdfmatrix[6];
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_set_text_pos(int pdfdoc, double x, double y [, int mode])
Set the position of text for the next cpdf_show call */
-PHP_FUNCTION(cpdf_set_text_pos) {
+PHP_FUNCTION(cpdf_set_text_pos)
+{
pval *argv[4];
int id, type, argc, mode=0;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
argc = ZEND_NUM_ARGS();
if((argc < 3) || (argc > 4))
/* {{{ proto void cpdf_rotate_text(int pdfdoc, double angle)
Sets character spacing */
-PHP_FUNCTION(cpdf_rotate_text) {
+PHP_FUNCTION(cpdf_rotate_text)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_set_char_spacing(int pdfdoc, double space)
Sets character spacing */
-PHP_FUNCTION(cpdf_set_char_spacing) {
+PHP_FUNCTION(cpdf_set_char_spacing)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_set_word_spacing(int pdfdoc, double space)
Sets spacing between words */
-PHP_FUNCTION(cpdf_set_word_spacing) {
+PHP_FUNCTION(cpdf_set_word_spacing)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto double cpdf_stringwidth(int pdfdoc, string text)
Returns width of text in current font */
-PHP_FUNCTION(cpdf_stringwidth) {
+PHP_FUNCTION(cpdf_stringwidth)
+{
pval *arg1, *arg2;
int id, type;
double width;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_save(int pdfdoc)
Saves current enviroment */
-PHP_FUNCTION(cpdf_save) {
+PHP_FUNCTION(cpdf_save)
+{
pval *arg1;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_restore(int pdfdoc)
Restores formerly saved enviroment */
-PHP_FUNCTION(cpdf_restore) {
+PHP_FUNCTION(cpdf_restore)
+{
pval *arg1;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_translate(int pdfdoc, double x, double y)
Sets origin of coordinate system */
-PHP_FUNCTION(cpdf_translate) {
+PHP_FUNCTION(cpdf_translate)
+{
pval *arg1, *arg2, *arg3;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 3 || getParameters(ht, 3, &arg1, &arg2, &arg3) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_scale(int pdfdoc, double x-scale, double y-scale)
Sets scaling */
-PHP_FUNCTION(cpdf_scale) {
+PHP_FUNCTION(cpdf_scale)
+{
pval *arg1, *arg2, *arg3;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 3 || getParameters(ht, 3, &arg1, &arg2, &arg3) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_rotate(int pdfdoc, double angle)
Sets rotation */
-PHP_FUNCTION(cpdf_rotate) {
+PHP_FUNCTION(cpdf_rotate)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_setflat(int pdfdoc, double value)
Sets flatness */
-PHP_FUNCTION(cpdf_setflat) {
+PHP_FUNCTION(cpdf_setflat)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_setlinejoin(int pdfdoc, int value)
Sets linejoin parameter */
-PHP_FUNCTION(cpdf_setlinejoin) {
+PHP_FUNCTION(cpdf_setlinejoin)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_setlinecap(int pdfdoc, int value)
Sets linecap parameter */
-PHP_FUNCTION(cpdf_setlinecap) {
+PHP_FUNCTION(cpdf_setlinecap)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_setmiterlimit(int pdfdoc, double value)
Sets miter limit */
-PHP_FUNCTION(cpdf_setmiterlimit) {
+PHP_FUNCTION(cpdf_setmiterlimit)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_setlinewidth(int pdfdoc, double width)
Sets line width */
-PHP_FUNCTION(cpdf_setlinewidth) {
+PHP_FUNCTION(cpdf_setlinewidth)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
#define BUFFERLEN 20
/* {{{ proto void cpdf_setdash(int pdfdoc, long white, long black)
Sets dash pattern */
-PHP_FUNCTION(cpdf_setdash) {
+PHP_FUNCTION(cpdf_setdash)
+{
pval *arg1, *arg2, *arg3;
int id, type;
char buffer[BUFFERLEN];
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 3 || getParameters(ht, 3, &arg1, &arg2, &arg3) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_moveto(int pdfdoc, double x, double y [, int mode])
Sets current point */
-PHP_FUNCTION(cpdf_moveto) {
+PHP_FUNCTION(cpdf_moveto)
+{
pval *argv[4];
int id, type, argc, mode=0;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
argc = ZEND_NUM_ARGS();
if((argc < 3) || (argc > 4))
/* {{{ proto void cpdf_rmoveto(int pdfdoc, double x, double y [, int mode])
Sets current point */
-PHP_FUNCTION(cpdf_rmoveto) {
+PHP_FUNCTION(cpdf_rmoveto)
+{
pval *argv[4];
int id, type, argc, mode=0;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
argc = ZEND_NUM_ARGS();
if((argc < 3) || (argc > 4))
/* {{{ proto void cpdf_curveto(int pdfdoc, double x1, double y1, double x2, double y2, double x3, double y3 [, int mode])
Draws a curve */
-PHP_FUNCTION(cpdf_curveto) {
+PHP_FUNCTION(cpdf_curveto)
+{
pval *argv[8];
int id, type, argc, mode=0;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
argc = ZEND_NUM_ARGS();
if((argc < 7) || (argc > 8))
/* {{{ proto void cpdf_lineto(int pdfdoc, double x, double y [, int mode])
Draws a line */
-PHP_FUNCTION(cpdf_lineto) {
+PHP_FUNCTION(cpdf_lineto)
+{
pval *argv[4];
int id, type, argc, mode=0;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
argc = ZEND_NUM_ARGS();
if((argc < 3) || (argc > 4))
/* {{{ proto void cpdf_rlineto(int pdfdoc, double x, double y [, int mode])
Draws a line relative to current point */
-PHP_FUNCTION(cpdf_rlineto) {
+PHP_FUNCTION(cpdf_rlineto)
+{
pval *argv[4];
int id, type, argc, mode=0;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
argc = ZEND_NUM_ARGS();
if((argc < 3) || (argc > 4))
/* {{{ proto void cpdf_circle(int pdfdoc, double x, double y, double radius [, int mode])
Draws a circle */
-PHP_FUNCTION(cpdf_circle) {
+PHP_FUNCTION(cpdf_circle)
+{
pval *argv[5];
int id, type, argc, mode=0;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
argc = ZEND_NUM_ARGS();
if((argc < 4) || (argc > 5))
/* {{{ proto void cpdf_arc(int pdfdoc, double x, double y, double radius, double start, double end [, int mode])
Draws an arc */
-PHP_FUNCTION(cpdf_arc) {
+PHP_FUNCTION(cpdf_arc)
+{
pval *argv[7];
int id, type, argc, mode=0;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
argc = ZEND_NUM_ARGS();
if((argc < 6) || (argc > 7))
/* {{{ proto void cpdf_rect(int pdfdoc, double x, double y, double width, double height [, int mode])
Draws a rectangle */
-PHP_FUNCTION(cpdf_rect) {
+PHP_FUNCTION(cpdf_rect)
+{
pval *argv[6];
int id, type, argc, mode=0;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
argc = ZEND_NUM_ARGS();
if((argc < 5) || (argc > 6))
/* {{{ proto void cpdf_newpath(int pdfdoc)
Starts new path */
-PHP_FUNCTION(cpdf_newpath) {
+PHP_FUNCTION(cpdf_newpath)
+{
pval *arg1;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_closepath(int pdfdoc)
Close path */
-PHP_FUNCTION(cpdf_closepath) {
+PHP_FUNCTION(cpdf_closepath)
+{
pval *arg1;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_closepath_stroke(int pdfdoc)
Close path and draw line along path */
-PHP_FUNCTION(cpdf_closepath_stroke) {
+PHP_FUNCTION(cpdf_closepath_stroke)
+{
pval *arg1;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_stroke(int pdfdoc)
Draw line along path path */
-PHP_FUNCTION(cpdf_stroke) {
+PHP_FUNCTION(cpdf_stroke)
+{
pval *arg1;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_fill(int pdfdoc)
Fill current path */
-PHP_FUNCTION(cpdf_fill) {
+PHP_FUNCTION(cpdf_fill)
+{
pval *arg1;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_fill_stroke(int pdfdoc)
Fill and stroke current path */
-PHP_FUNCTION(cpdf_fill_stroke) {
+PHP_FUNCTION(cpdf_fill_stroke)
+{
pval *arg1;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_closepath_fill_stroke(int pdfdoc)
Close, fill and stroke current path */
-PHP_FUNCTION(cpdf_closepath_fill_stroke) {
+PHP_FUNCTION(cpdf_closepath_fill_stroke)
+{
pval *arg1;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_clip(int pdfdoc)
Clips to current path */
-PHP_FUNCTION(cpdf_clip) {
+PHP_FUNCTION(cpdf_clip)
+{
pval *arg1;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_setgray_fill(int pdfdoc, double value)
Sets filling color to gray value */
-PHP_FUNCTION(cpdf_setgray_fill) {
+PHP_FUNCTION(cpdf_setgray_fill)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_setgray_stroke(int pdfdoc, double value)
Sets drawing color to gray value */
-PHP_FUNCTION(cpdf_setgray_stroke) {
+PHP_FUNCTION(cpdf_setgray_stroke)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_setgray(int pdfdoc, double value)
Sets drawing and filling color to gray value */
-PHP_FUNCTION(cpdf_setgray) {
+PHP_FUNCTION(cpdf_setgray)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_setrgbcolor_fill(int pdfdoc, double red, double green, double blue)
Sets filling color to rgb color value */
-PHP_FUNCTION(cpdf_setrgbcolor_fill) {
+PHP_FUNCTION(cpdf_setrgbcolor_fill)
+{
pval *arg1, *arg2, *arg3, *arg4;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 4 || getParameters(ht, 4, &arg1, &arg2, &arg3, &arg4) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_setrgbcolor_stroke(int pdfdoc, double red, double green, double blue)
Sets drawing color to rgb color value */
-PHP_FUNCTION(cpdf_setrgbcolor_stroke) {
+PHP_FUNCTION(cpdf_setrgbcolor_stroke)
+{
pval *arg1, *arg2, *arg3, *arg4;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 4 || getParameters(ht, 4, &arg1, &arg2, &arg3, &arg4) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_setrgbcolor(int pdfdoc, double red, double green, double blue)
Sets drawing and filling color to rgb color value */
-PHP_FUNCTION(cpdf_setrgbcolor) {
+PHP_FUNCTION(cpdf_setrgbcolor)
+{
pval *arg1, *arg2, *arg3, *arg4;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 4 || getParameters(ht, 4, &arg1, &arg2, &arg3, &arg4) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_set_page_animation(int pdfdoc, int transition, double duration, double direction, int orientation, int inout)
Sets transition between pages */
-PHP_FUNCTION(cpdf_set_page_animation) {
+PHP_FUNCTION(cpdf_set_page_animation)
+{
pval *arg1, *arg2, *arg3, *arg4, *arg5, *arg6;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 6 || getParameters(ht, 6, &arg1, &arg2, &arg3, &arg4, &arg5, &arg6) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto array cpdf_finalize(int pdfdoc)
Creates pdf doc in memory */
-PHP_FUNCTION(cpdf_finalize) {
+PHP_FUNCTION(cpdf_finalize)
+{
pval *arg1;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto array cpdf_output_buffer(int pdfdoc)
Returns the internal memory stream as string */
-PHP_FUNCTION(cpdf_output_buffer) {
+PHP_FUNCTION(cpdf_output_buffer)
+{
pval *arg1;
int id, type, lenght;
CPDFdoc *pdf;
char *buffer;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto array cpdf_save_to_file(int pdfdoc, string filename)
Saves the internal memory stream to a file */
-PHP_FUNCTION(cpdf_save_to_file) {
+PHP_FUNCTION(cpdf_save_to_file)
+{
pval *arg1, *arg2;
int id, type;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto void cpdf_import_jpeg(int pdfdoc, string filename, double x, double y, double angle, double width, double height, double x-scale, double y-scale, int gsave [, int mode])
Includes jpeg image */
-PHP_FUNCTION(cpdf_import_jpeg) {
+PHP_FUNCTION(cpdf_import_jpeg)
+{
pval *argv[11];
int id, type, argc, mode=0;
float width, height, xscale, yscale;
CPDFdoc *pdf;
- CPDF_TLS_VARS;
argc = ZEND_NUM_ARGS();
if((argc < 10) || (argc > 11))
#if HAVE_LIBGD13
/* {{{ proto void cpdf_place_inline_image(int pdfdoc, int gdimage, double x, double y, double angle, fload width, float height, int gsave [, int mode])
Includes image */
-PHP_FUNCTION(cpdf_place_inline_image) {
+PHP_FUNCTION(cpdf_place_inline_image)
+{
pval *argv[11];
int id, gid, type, argc, mode=0;
int count, i, j, color;
CPDFdoc *pdf;
unsigned char *buffer, *ptr;
gdImagePtr im;
- CPDF_TLS_VARS;
argc = ZEND_NUM_ARGS();
if((argc < 8) || (argc > 9))
/* {{{ proto void cpdf_add_annotation(int pdfdoc, double xll, double yll, double xur, double xur, string title, string text [, int mode])
Sets annotation */
-PHP_FUNCTION(cpdf_add_annotation) {
+PHP_FUNCTION(cpdf_add_annotation)
+{
pval *argv[11];
int id, type, argc, mode=0;
CPDFdoc *pdf;
CPDFannotAttrib attrib;
- CPDF_TLS_VARS;
argc = ZEND_NUM_ARGS();
if((argc < 7) || (argc > 8))
/* {{{ proto void cpdf_set_action_url(int pdfdoc, double xll, double yll, double xur, double xur, string url [, int mode])
Sets Hyperlink */
-PHP_FUNCTION(cpdf_set_action_url) {
+PHP_FUNCTION(cpdf_set_action_url)
+{
pval *argv[11];
int id, type, argc, mode=0;
CPDFdoc *pdf;
CPDFannotAttrib attrib;
- CPDF_TLS_VARS;
argc = ZEND_NUM_ARGS();
if((argc < 6) || (argc > 7))
/* {{{ proto int cpdf_add_outline(int pdfdoc, int lastoutline, int sublevel, int open, int pagenr, string title)
Add outline */
-PHP_FUNCTION(cpdf_add_outline) {
+PHP_FUNCTION(cpdf_add_outline)
+{
pval *argv[11];
int id, oid, type, argc;
CPDFdoc *pdf;
CPDFoutlineEntry *lastoutline;
- CPDF_TLS_VARS;
argc = ZEND_NUM_ARGS();
if(argc != 6)
{
PWDICT *pwdict;
long resource;
-
- CRACKLS_FETCH();
+ TSRMLS_FETCH();
if (CRACKG(current_id) != -1) {
zend_error(E_WARNING, "Can not use more than one open dictionary with this implementation of libcrack");
ZEND_RINIT_FUNCTION(crack)
{
- CRACKLS_FETCH();
-
CRACKG(last_message) = NULL;
CRACKG(current_id) = -1;
ZEND_RSHUTDOWN_FUNCTION(crack)
{
- CRACKLS_FETCH();
+ TSRMLS_FETCH();
if (NULL != CRACKG(last_message)) {
efree(CRACKG(last_message));
zval **dictionary;
long id;
- CRACKLS_FETCH();
-
switch (ZEND_NUM_ARGS()) {
case 0:
id = CRACKG(current_id);
PWDICT *pwdict;
long id;
- CRACKLS_FETCH();
-
switch (ZEND_NUM_ARGS()) {
case 1:
if (zend_get_parameters_ex(1, &password) == FAILURE) {
Returns the message from the last obscure check. */
ZEND_FUNCTION(crack_getlastmessage)
{
- CRACKLS_FETCH();
-
if (ZEND_NUM_ARGS() != 0) {
WRONG_PARAM_COUNT;
}
ZEND_END_MODULE_GLOBALS(crack)
#ifdef ZTS
-#define CRACKG(v) (crack_globals->v)
-#define CRACKLS_FETCH() zend_crack_globals *crack_globals = ts_resource(crack_globals_id)
+#define CRACKG(v) TSRMG(crack_globals_id, zend_crack_globals *, v)
#else
#define CRACKG(v) (crack_globals.v)
-#define CRACKLS_FETCH()
#endif
#else
PHP_MINFO_FUNCTION(ctype)
{
TSRMLS_FETCH();
- SLS_FETCH();
php_info_print_table_start();
php_info_print_table_row(2, "ctype functions", "enabled (experimental)");
*/
/* In every function that needs to use variables in php_ctype_globals,
- do call CTYPELS_FETCH(); after declaring other variables used by
+ do call TSRMLS_FETCH(); after declaring other variables used by
that function, and always refer to them as CTYPEG(variable).
You are encouraged to rename these macros something shorter, see
examples in any other php module directory.
*/
#ifdef ZTS
-#define CTYPEG(v) (ctype_globals->v)
-#define CTYPELS_FETCH() php_ctype_globals *ctype_globals = ts_resource(ctype_globals_id)
+#define CTYPEG(v) TSRMG(ctype_globals_id, php_ctype_globals *, v)
#else
#define CTYPEG(v) (ctype_globals.v)
-#define CTYPELS_FETCH()
#endif
#else
zval *argv[2];
zval *retval;
int error;
- TSRMLS_FETCH();
MAKE_STD_ZVAL(argv[0]);
MAKE_STD_ZVAL(argv[1]);
*/
#ifdef ZTS
-#define CYBERMUTG(v) (cybermut_globals->v)
-#define CYBERMUTLS_FETCH() php_cybermut_globals *cybermut_globals = ts_resource(cybermut_globals_id)
+#define CYBERMUTG(v) TSRMG(cybermut_globals_id, php_cybermut_globals *, v)
#else
#define CYBERMUTG(v) (cybermut_globals.v)
-#define CYBERMUTLS_FETCH()
#endif
#endif /* PHP_CYBERMUT_H */
/* {{{ php_dbm_open
*/
-dbm_info *php_dbm_open(char *filename, char *mode) {
+dbm_info *php_dbm_open(char *filename, char *mode)
+{
dbm_info *info;
int ret, lock=0;
char *lockfn = NULL;
DBM_TYPE dbf=NULL;
DBM_MODE_TYPE imode;
- PLS_FETCH();
+ TSRMLS_FETCH();
if (filename == NULL) {
php_error(E_WARNING, "NULL filename passed to php_dbm_open()");
/* {{{ php_dbm_replace
*/
-int php_dbm_replace(dbm_info *info, char *key, char *value) {
+int php_dbm_replace(dbm_info *info, char *key, char *value)
+{
DBM_TYPE dbf;
int ret;
datum key_datum, value_datum;
- PLS_FETCH();
+ TSRMLS_FETCH();
if (PG(magic_quotes_runtime)) {
php_stripslashes(key,NULL);
/* {{{ php_dbm_fetch
*/
-char *php_dbm_fetch(dbm_info *info, char *key) {
+char *php_dbm_fetch(dbm_info *info, char *key)
+{
datum key_datum, value_datum;
char *ret;
DBM_TYPE dbf;
- PLS_FETCH();
+ TSRMLS_FETCH();
key_datum.dptr = key;
key_datum.dsize = strlen(key);
/* {{{ php_dbm_nextkey
*/
-char *php_dbm_nextkey(dbm_info *info, char *key) {
+char *php_dbm_nextkey(dbm_info *info, char *key)
+{
datum key_datum, ret_datum;
char *ret;
DBM_TYPE dbf;
- PLS_FETCH();
+ TSRMLS_FETCH();
key_datum.dptr = key;
key_datum.dsize = strlen(key);
pval *dbf_name, *options;
dbhead_t *dbh;
int handle;
- PLS_FETCH();
DBase_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht,2,&dbf_name,&options)==FAILURE) {
int num_fields;
dbfield_t *dbf, *cur_f;
int i, rlen, handle;
- PLS_FETCH();
DBase_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht,2,&filename,&fields)==FAILURE) {
*/
#ifdef ZTS
-#define DBPLUSG(v) (dbplus_globals->v)
-#define DBPLUSLS_FETCH() php_dbplus_globals *dbplus_globals = ts_resource(dbplus_globals_id)
+#define AG(v) TSRMG(dbplus_globals_id, php_dbplus_globals *, v)
#else
#define DBPLUSG(v) (dbplus_globals.v)
-#define DBPLUSLS_FETCH()
#endif
*/
#ifdef ZTS
-#define DBXLS_D zend_dbx_globals *dbx_globals
-#define DBXLS_DC , DBXLS_D
-#define DBXLS_C dbx_globals
-#define DBXLS_CC , DBXLS_C
-#define DBXG(v) (dbx_globals->v)
-#define DBXLS_FETCH() zend_dbx_globals *dbx_globals = ts_resource(dbx_globals_id)
+#define DBXG(v) TSRMG(dbx_globals_id, zend_dbx_globals *, v)
#else
-#define DBXLS_D
-#define DBXLS_DC
-#define DBXLS_C
-#define DBXLS_CC
#define DBXG(v) (dbx_globals.v)
-#define DBXLS_FETCH()
#endif
#endif /* ZEND_PHP_DBX_H */
int r = 0;
int patlen = strlen(pattern);
reg_cache *rc = NULL;
- REGLS_FETCH();
+ TSRMLS_FETCH();
if(zend_hash_find(®(ht_rc), (char *) pattern, patlen+1, (void **) &rc) == FAILURE ||
rc->cflags != cflags) {
PHP_MSHUTDOWN_FUNCTION(regex)
{
- REGLS_FETCH();
+ TSRMLS_FETCH();
zend_hash_destroy(®(ht_rc));
return SUCCESS;
#ifdef ZTS
-#define REGLS_D php_reg_globals *reg_globals
-#define REGLS_DC , REGLS_D
-#define REGLS_C reg_globals
-#define REGLS_CC , REGLS_C
-#define REG(v) (reg_globals->v)
-#define REGLS_FETCH() php_reg_globals *reg_globals = ts_resource(reg_globals_id)
+#define REG(v) TSRMG(reg_globals_id, php_reg_globals *, v)
#else
-#define REGLS_D
-#define REGLS_DC
-#define REGLS_C
-#define REGLS_CC
#define REG(v) (reg_globals.v)
-#define REGLS_FETCH()
#endif
#endif /* REG_H */
static void phpfbReleaseResult(zend_rsrc_list_entry *rsrc)
{
PHPFBResult* result = (PHPFBResult *)rsrc->ptr;
- FBSQLLS_FETCH();
+ TSRMLS_FETCH();
+
if (result)
{
if (result->fetchHandle) {
static void phpfbReleaseLink (zend_rsrc_list_entry *rsrc)
{
PHPFBLink* link = (PHPFBLink *)rsrc->ptr;
- FBSQLLS_FETCH();
+ TSRMLS_FETCH();
+
if (link)
{
if (link->hostName) free(link->hostName);
static void phpfbReleasePLink (zend_rsrc_list_entry *rsrc)
{
PHPFBLink* link = (PHPFBLink *)rsrc->ptr;
- FBSQLLS_FETCH();
+ TSRMLS_FETCH();
+
if (link)
{
if (link->hostName) free(link->hostName);
static void php_fbsql_set_default_link(int id)
{
- FBSQLLS_FETCH();
+ TSRMLS_FETCH();
if (FB_SQL_G(linkIndex)!=-1) {
zend_list_delete(FB_SQL_G(linkIndex));
zend_list_addref(id);
}
-static int php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAMETERS FBSQLLS_DC)
+static int php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAMETERS TSRMLS_DC)
{
if (FB_SQL_G(linkIndex)==-1) { /* no link opened yet, implicitly open one */
ht = 0;
PHP_RINIT_FUNCTION(fbsql)
{
- FBSQLLS_FETCH();
-
FB_SQL_G(linkIndex) = -1;
FB_SQL_G(linkCount) = FB_SQL_G(persistantCount);
return SUCCESS;
PHP_MINFO_FUNCTION(fbsql)
{
char buf[32];
- FBSQLLS_FETCH();
+ TSRMLS_FETCH();
+
php_info_print_table_start();
php_info_print_table_header(2, "FrontBase support", "enabled");
char *hostName = NULL, *userName = NULL, *userPassword = NULL;
int argc = ZEND_NUM_ARGS(), create_new = 0;
zval **argv[3];
- FBSQLLS_FETCH();
-
if ((argc < 0) || (argc > 3)) WRONG_PARAM_COUNT;
if (zend_get_parameters_ex(argc,&argv[0],&argv[1],&argv[2])==FAILURE) RETURN_FALSE;
PHPFBLink* phpLink = NULL;
zval **fbsql_link_index = NULL;
int id;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 0:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU FBSQLLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
break;
case 1:
unsigned port;
FBCDatabaseConnection* c;
FBCMetaData* md;
- FBSQLLS_FETCH();
+ TSRMLS_FETCH();
if (!link->databaseName || strcmp(link->databaseName, databaseName))
{
FBCMetaData* md;
zval **fbsql_link_index = NULL, **onoff = NULL;
zend_bool OnOff;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
FBCMetaData* md;
zval **fbsql_link_index = NULL;
int id;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 0:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU FBSQLLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
break;
case 1:
FBCMetaData* md;
zval **fbsql_link_index = NULL;
int id;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 0:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU FBSQLLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
break;
case 1:
{
PHPFBLink* phpLink = NULL;
zval **fbsql_link_index = NULL, **host_name = NULL;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
{
PHPFBLink* phpLink = NULL;
zval **fbsql_link_index = NULL, **dbname = NULL;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
{
PHPFBLink* phpLink = NULL;
zval **fbsql_link_index = NULL, **db_password = NULL;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
{
PHPFBLink* phpLink = NULL;
zval **fbsql_link_index = NULL, **username = NULL;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
{
PHPFBLink* phpLink = NULL;
zval **fbsql_link_index = NULL, **password = NULL;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
zval **fbsql_link_index = NULL, **dbname;
int id;
char* name = NULL;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 0:
name = FB_SQL_G(databaseName);
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU FBSQLLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
break;
case 1:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU FBSQLLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
if (zend_get_parameters_ex(1, &dbname)==FAILURE) {
RETURN_FALSE;
int id;
char *name = NULL, *userName, *userPassword;
char buffer[1024];
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 2:
name = FB_SQL_G(databaseName);
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU FBSQLLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
if (zend_get_parameters_ex(2, &user, &password)==FAILURE) {
RETURN_FALSE;
}
break;
case 3:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU FBSQLLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
if (zend_get_parameters_ex(3, &user, &password, &database)==FAILURE) {
RETURN_FALSE;
int id;
int i, status;
char *databaseName;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU FBSQLLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
if (zend_get_parameters_ex(1, &database_name)==FAILURE) {
RETURN_FALSE;
int id;
int i, status;
char *databaseName;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU FBSQLLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
if (zend_get_parameters_ex(1, &database_name)==FAILURE) {
RETURN_FALSE;
int id;
int i, status;
char *databaseName;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU FBSQLLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
if (zend_get_parameters_ex(1, &database_name)==FAILURE) {
RETURN_FALSE;
int id;
int i, status;
char *databaseName;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU FBSQLLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
if (zend_get_parameters_ex(1, &database_name)==FAILURE) {
RETURN_FALSE;
zval **fbsql_link_index = NULL, **database_name;
int id;
char *databaseName;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU FBSQLLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
if (zend_get_parameters_ex(1, &database_name)==FAILURE) {
RETURN_FALSE;
{
FBCDatabaseConnection* c = link->connection;
int result = 1;
- FBSQLLS_FETCH();
+ TSRMLS_FETCH();
link->errorNo = 0;
if (link->errorText)
char* tp;
char* fh;
unsigned int sR = 1, cR = 0;
- FBSQLLS_FETCH();
+ TSRMLS_FETCH();
meta = fbcdcExecuteDirectSQL(link->connection, sql);
PHPFBLink* phpLink = NULL;
zval **fbsql_link_index = NULL, **query;
int id;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU FBSQLLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
if (zend_get_parameters_ex(1, &query)==FAILURE) {
RETURN_FALSE;
PHPFBLink* phpLink = NULL;
zval **fbsql_link_index = NULL, **dbname, **query;
int id;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 2:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU FBSQLLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
if (zend_get_parameters_ex(2, &dbname, &query)==FAILURE) {
RETURN_FALSE;
PHPFBLink* phpLink = NULL;
zval **fbsql_link_index = NULL;
int id;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 0:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU FBSQLLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
break;
case 1:
zval **fbsql_link_index = NULL, **database_name;
int id;
char *databaseName;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU FBSQLLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
if (zend_get_parameters_ex(1, &database_name)==FAILURE) {
RETURN_FALSE;
int id;
char *databaseName, *tableName;
char sql[1024];
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 2:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU FBSQLLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
if (zend_get_parameters_ex(2, &database_name, &table_name)==FAILURE) {
RETURN_FALSE;
PHPFBLink* phpLink = NULL;
zval **fbsql_link_index = NULL;
int id;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 0:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU FBSQLLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
break;
case 1:
PHPFBLink* phpLink = NULL;
zval **fbsql_link_index = NULL;
int id;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 0:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU FBSQLLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
break;
case 1:
{
int argc = ARG_COUNT(ht);
zval **argv[1];
- FBSQLLS_FETCH();
if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
if (zend_get_parameters_ex(argc,&argv[0])==FAILURE) RETURN_FALSE;
PHPFBLink* phpLink = NULL;
zval **fbsql_link_index = NULL;
int id;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 0:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU FBSQLLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
break;
case 1:
PHPFBLink* phpLink = NULL;
zval **fbsql_link_index = NULL;
int id;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 0:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU FBSQLLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
break;
case 1:
zval **fbsql_result_index = NULL, **row = NULL, **field = NULL;
int rowIndex;
int columnIndex;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
{
PHPFBResult* result = NULL;
zval **fbsql_result_index = NULL;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
PHPFBResult* result = NULL;
zval **fbsql_result_index = NULL;
int rowCount;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
{
PHPFBResult* result = NULL;
zval **fbsql_result_index = NULL;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
int rowIndex;
int i;
void **row;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
PHPFBResult* result = NULL;
zval **fbsql_result_index = NULL, **row_number = NULL;
int rowIndex;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 2:
PHPFBResult* result = NULL;
zval **fbsql_result_index = NULL;
int i;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
PHPFBResult* result = NULL;
zval **fbsql_result_index = NULL, **field_index = NULL;
int column = -1;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
PHPFBResult* result = NULL;
zval **fbsql_result_index = NULL, **field_index = NULL;
int column = -1;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
PHPFBResult* result = NULL;
zval **fbsql_result_index = NULL, **field_index = NULL;
int column = -1;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
PHPFBResult* result = NULL;
zval **fbsql_result_index = NULL, **field_index = NULL;
int column = -1;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
PHPFBResult* result = NULL;
zval **fbsql_result_index = NULL, **field_index = NULL;
int column = -1;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
PHPFBResult* result = NULL;
zval **fbsql_result_index = NULL, **field_index = NULL;
int column = -1;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
int column = -1;
char buf[512];
int len;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
{
PHPFBResult* result = NULL;
zval **fbsql_result_index = NULL;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
zval **fbsql_link_index = NULL;
int id;
FBCAutoStartInfo* asInfo;
- FBSQLLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 0:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU FBSQLLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
break;
case 1:
ZEND_END_MODULE_GLOBALS(fbsql)
#ifdef ZTS
-# define FBSQLLS_D zend_fbsql_globals *fbsql_globals
-# define FBSQLLS_DC , FBSQLLS_D
-# define FBSQLLS_C fbsql_globals
-# define FBSQLLS_CC , FBSQLLS_C
-# define FB_SQL_G(v) (fbsql_globals->v)
-# define FBSQLLS_FETCH() zend_fbsql_globals *fbsql_globals = ts_resource(fbsql_globals_id)
+# define FB_SQL_G(v) TSRMG(fbsql_globals_id, zend_fbsql_globals *, v)
#else
-# define FBSQLLS_D
-# define FBSQLLS_DC
-# define FBSQLLS_C
-# define FBSQLLS_CC
# define FB_SQL_G(v) (fbsql_globals.v)
-# define FBSQLLS_FETCH()
#endif
ASInt32 nBytes;
zval *array_ptr = (zval *) arg;
TSRMLS_FETCH();
- PLS_FETCH();
fp=php_open_temporary_file(NULL,"fdfdata.",&filename);
if(!fp) {
for(p=value;*p;p++) if(*p=='\r') *p='\n';
if(lastfieldname) efree(lastfieldname);
lastfieldname = estrdup(name);
- php_register_variable(name, value, array_ptr TSRMLS_CC PLS_CC);
+ php_register_variable(name, value, array_ptr TSRMLS_CC);
}
}
}
char *strtok_buf = NULL;
int i;
FP_FIELD *new_field, *tmp;
- PLS_FETCH();
FP_TLS_VARS;
if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, &dir) == FAILURE) {
char workbuf[MAXPATHLEN];
char readbuf[256];
int recsize = 0, records = 0;
- PLS_FETCH();
FP_TLS_VARS;
if (ZEND_NUM_ARGS() != 0) {
char readbuf[1024]; /* FIX - Work out better buffering! */
int i, fnum, rnum;
long offset;
- PLS_FETCH();
FP_TLS_VARS;
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &rno, &fno) == FAILURE) {
*/
#ifdef ZTS
-#define FRIBIDIG(v) (fribidi_globals->v)
-#define FRIBIDILS_FETCH() php_fribidi_globals *fribidi_globals = ts_resource(fribidi_globals_id)
+#define FRIBIDIG(v) TSRMG(fribidi_globals_id, php_fribidi_globals *, v)
#else
#define FRIBIDIG(v) (fribidi_globals.v)
-#define FRIBIDILS_FETCH()
#endif
#else
#if APACHE && defined(CHARSET_EBCDIC)
/* XXX this is unlikely to work any more thies@thieso.net */
- SLS_FETCH();
/* This is a binary file already: avoid EBCDIC->ASCII conversion */
ap_bsetflag(php3_rqst->connection->client, B_EBCDIC2ASCII, 0);
#endif
#if APACHE && defined(CHARSET_EBCDIC)
/* XXX this is unlikely to work any more thies@thieso.net */
- SLS_FETCH();
/* This is a binary file already: avoid EBCDIC->ASCII conversion */
ap_bsetflag(php3_rqst->connection->client, B_EBCDIC2ASCII, 0);
#endif
*/
#ifdef ZTS
-#define GMPG(v) (gmp_globals->v)
-#define GMPLS_FETCH() php_gmp_globals *gmp_globals = ts_resource(gmp_globals_id)
+#define GMPG(v) TSRMG(gmp_globals_id, php_gmp_globals *, v)
#else
#define GMPG(v) (gmp_globals.v)
-#define GMPLS_FETCH()
#endif
#else
void _close_hw_link(zend_rsrc_list_entry *rsrc)
{
hw_connection *conn = (hw_connection *)rsrc->ptr;
- HwSLS_FETCH();
+ TSRMLS_FETCH();
if(conn->hostname)
free(conn->hostname);
void _close_hw_plink(zend_rsrc_list_entry *rsrc)
{
hw_connection *conn = (hw_connection *)rsrc->ptr;
- HwSLS_FETCH();
+ TSRMLS_FETCH();
if(conn->hostname)
free(conn->hostname);
hw_globals->num_persistent = 0;
}
-static PHP_INI_MH(OnHyperwavePort) {
- HwSLS_FETCH();
+static PHP_INI_MH(OnHyperwavePort)
+{
+ TSRMLS_FETCH();
+
if (new_value==NULL) {
HwSG(default_port) = HG_SERVER_PORT;
} else {
hw_connection *ptr;
int do_swap;
int version = 0;
- HwSLS_FETCH();
argc = ZEND_NUM_ARGS();
switch(argc) {
} zend_hw_globals;
#ifdef ZTS
-# define HwSLS_D zend_hw_globals *hw_globals
-# define HwSLS_DC , HwSLS_D
-# define HwSLS_C hw_globals
-# define HwSLS_CC , HwSLS_C
-# define HwSG(v) (hw_globals->v)
-# define HwSLS_FETCH() zend_hw_globals *hw_globals = ts_resource(hw_globals_id)
+# define HwSG(v) TSRMG(hw_globals_id, zend_hw_globals *, v)
#else
-# define HwSLS_D
-# define HwSLS_DC
-# define HwSLS_C
-# define HwSLS_CC
# define HwSG(v) (hw_globals.v)
-# define HwSLS_FETCH()
extern PHP_HW_API zend_hw_globals hw_globals;
#endif
{
char *out_buffer;
zval **zv_string, **zv_status;
- SLS_FETCH();
- ICONVLS_FETCH();
if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2, &zv_string, &zv_status)==FAILURE) {
ZEND_WRONG_PARAM_COUNT();
{
zval **type, **charset;
int argc = ZEND_NUM_ARGS();
- ICONVLS_FETCH();
if (argc != 2 || zend_get_parameters_ex(2, &type, &charset) == FAILURE) {
WRONG_PARAM_COUNT;
{
zval **type;
int argc = ZEND_NUM_ARGS();
- ICONVLS_FETCH();
if (argc < 0 || argc > 1 || zend_get_parameters_ex(1, &type) == FAILURE) {
WRONG_PARAM_COUNT;
ZEND_END_MODULE_GLOBALS(iconv)
#ifdef ZTS
-#define ICONVLS_D zend_iconv_globals *iconv_globals
-#define ICONVLS_C iconv_globals
-#define ICONVG(v) (iconv_globals->v)
-#define ICONVLS_FETCH() zend_iconv_globals *iconv_globals = ts_resource(iconv_globals_id)
+#define ICONVG(v) TSRMG(iconv_globals_id, zend_iconv_globals *, v)
#else
-#define ICONVLS_D
-#define ICONVLS_C
#define ICONVG(v) (iconv_globals.v)
-#define ICONVLS_FETCH()
#endif
#define ICONV_INPUT_ENCODING "ISO-8859-1"
void mail_close_it(zend_rsrc_list_entry *rsrc)
{
pils *imap_le_struct = (pils *)rsrc->ptr;
- IMAPLS_FETCH();
+ TSRMLS_FETCH();
mail_close_full(imap_le_struct->imap_stream, imap_le_struct->flags);
/* Author: CJH */
PHP_RINIT_FUNCTION(imap)
{
- IMAPLS_FETCH();
-
IMAPG(imap_errorstack) = NIL;
IMAPG(imap_alertstack) = NIL;
return SUCCESS;
{
ERRORLIST *ecur = NIL;
STRINGLIST *acur = NIL;
- IMAPLS_FETCH();
+ TSRMLS_FETCH();
if (IMAPG(imap_errorstack) != NIL) {
/* output any remaining errors at their original error level */
*/
void mail_getquota(MAILSTREAM *stream, char *qroot,QUOTALIST *qlist)
{
- IMAPLS_FETCH();
+ TSRMLS_FETCH();
/* this should only be run through once */
for (; qlist; qlist = qlist->next)
#endif
int ind;
int myargc=ZEND_NUM_ARGS();
- IMAPLS_FETCH();
if (myargc <3 || myargc >4 || zend_get_parameters_ex(myargc, &mailbox, &user, &passwd, &options) == FAILURE) {
ZEND_WRONG_PARAM_COUNT();
zval **streamind, **qroot;
int ind, ind_type;
pils *imap_le_struct;
- IMAPLS_FETCH();
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &streamind, &qroot) == FAILURE) {
ZEND_WRONG_PARAM_COUNT();
int ind, ind_type;
pils *imap_le_struct;
STRINGLIST *cur=NIL;
- IMAPLS_FETCH();
/* set flag for normal, old mailbox list */
IMAPG(folderlist_style) = FLIST_ARRAY;
pils *imap_le_struct;
FOBJECTLIST *cur=NIL;
char *delim=NIL;
- IMAPLS_FETCH();
/* set flag for new, improved array of objects mailbox list */
IMAPG(folderlist_style) = FLIST_OBJECT;
int ind, ind_type;
pils *imap_le_struct;
STRINGLIST *cur=NIL;
- IMAPLS_FETCH();
if (ZEND_NUM_ARGS()!=4 || zend_get_parameters_ex(4, &streamind, &ref, &pat, &content) == FAILURE) {
ZEND_WRONG_PARAM_COUNT();
int ind, ind_type;
pils *imap_le_struct;
STRINGLIST *cur=NIL;
- IMAPLS_FETCH();
-
/* set flag for normal, old mailbox list */
IMAPG(folderlist_style) = FLIST_ARRAY;
pils *imap_le_struct;
FOBJECTLIST *cur=NIL;
char *delim=NIL;
- IMAPLS_FETCH();
+ TSRMLS_FETCH();
delim = emalloc(2 * sizeof(char));
int ind, ind_type;
pils *imap_le_struct;
int myargc=ZEND_NUM_ARGS();
- IMAPLS_FETCH();
if (myargc != 3 || zend_get_parameters_ex(myargc, &streamind, &mbx, &flags) == FAILURE) {
ZEND_WRONG_PARAM_COUNT();
long flags;
char *search_criteria;
MESSAGELIST *cur;
- IMAPLS_FETCH();
args = ZEND_NUM_ARGS();
if (args < 2 || args > 3 || zend_get_parameters_ex(args, &streamind, &criteria, &search_flags) == FAILURE) {
{
STRINGLIST *cur=NIL;
int arg_count = ZEND_NUM_ARGS();
- IMAPLS_FETCH();
if (arg_count > 0) {
ZEND_WRONG_PARAM_COUNT();
{
ERRORLIST *cur=NIL;
int arg_count = ZEND_NUM_ARGS();
- IMAPLS_FETCH();
if (arg_count > 0) {
ZEND_WRONG_PARAM_COUNT();
{
ERRORLIST *cur=NIL;
int arg_count = ZEND_NUM_ARGS();
- IMAPLS_FETCH();
if (arg_count > 0) {
ZEND_WRONG_PARAM_COUNT();
void mm_searched(MAILSTREAM *stream,unsigned long number)
{
MESSAGELIST *cur = NIL;
- IMAPLS_FETCH();
+ TSRMLS_FETCH();
if (IMAPG(imap_messages) == NIL) {
IMAPG(imap_messages) = mail_newmessagelist();
void mm_notify(MAILSTREAM *stream, char *str, long errflg)
{
STRINGLIST *cur = NIL;
- IMAPLS_FETCH();
+ TSRMLS_FETCH();
if (strncmp(str, "[ALERT] ", 8) == 0) {
if (IMAPG(imap_alertstack) == NIL) {
{
STRINGLIST *cur=NIL;
FOBJECTLIST *ocur=NIL;
- IMAPLS_FETCH();
+ TSRMLS_FETCH();
if (IMAPG(folderlist_style) == FLIST_OBJECT) {
/* build up a the new array of objects */
{
STRINGLIST *cur=NIL;
FOBJECTLIST *ocur=NIL;
- IMAPLS_FETCH();
+ TSRMLS_FETCH();
if (IMAPG(folderlist_style) == FLIST_OBJECT) {
/* build the array of objects */
void mm_status(MAILSTREAM *stream, char *mailbox,MAILSTATUS *status)
{
- IMAPLS_FETCH();
+ TSRMLS_FETCH();
IMAPG(status_flags)=status->flags;
if (IMAPG(status_flags) & SA_MESSAGES) {
void mm_log(char *str, long errflg)
{
ERRORLIST *cur = NIL;
- IMAPLS_FETCH();
+ TSRMLS_FETCH();
/* Author: CJH */
if (errflg != NIL) { /* CJH: maybe put these into a more comprehensive log for debugging purposes? */
void mm_login(NETMBX *mb, char *user, char *pwd, long trial)
{
- IMAPLS_FETCH();
+ TSRMLS_FETCH();
if (*mb->user) {
strlcpy (user,mb->user, MAILTMPLEN);
#ifdef ZTS
-# define IMAPLS_D zend_imap_globals *imap_globals
-# define IMAPLS_DC , IMAPLS_D
-# define IMAPLS_C imap_globals
-# define IMAPLS_CC , IMAPLS_C
-# define IMAPG(v) (imap_globals->v)
-# define IMAPLS_FETCH() zend_imap_globals *imap_globals = ts_resource(imap_globals_id)
+# define IMAPG(v) TSRMG(imap_globals_id, zend_imap_globals *, v)
#else
-# define IMAPLS_D
-# define IMAPLS_DC
-# define IMAPLS_C
-# define IMAPLS_CC
# define IMAPG(v) (imap_globals.v)
-# define IMAPLS_FETCH()
#endif
#define phpext_imap_ptr imap_module_ptr
static void _close_ii_link(II_LINK *link)
{
IIAPI_DISCONNPARM disconnParm;
- IILS_FETCH();
+ TSRMLS_FETCH();
if(link->tranHandle && _rollback_transaction(link)) {
php_error(E_WARNING,"Ingres II: Unable to rollback transaction !!");
static void _close_ii_plink(zend_rsrc_list_entry *rsrc)
{
II_LINK *link = (II_LINK *)rsrc->ptr;
- IILS_FETCH();
+ TSRMLS_FETCH();
_close_ii_link(link);
IIG(num_persistent)--;
{
II_LINK *link = (II_LINK *)rsrc->ptr;
IIAPI_AUTOPARM autoParm;
- IILS_FETCH();
+ TSRMLS_FETCH();
if(link->autocommit) {
*/
static void php_ii_set_default_link(int id)
{
- IILS_FETCH();
+ TSRMLS_FETCH();
if (IIG(default_link)!=-1) {
zend_list_delete(IIG(default_link));
if none has been set, tries to open a new one with default
parameters
*/
-static int php_ii_get_default_link(INTERNAL_FUNCTION_PARAMETERS IILS_DC)
+static int php_ii_get_default_link(INTERNAL_FUNCTION_PARAMETERS TSRMLS_DC)
{
if (IIG(default_link)==-1) { /* no link opened yet, implicitly open one */
ht = 0;
*/
PHP_RINIT_FUNCTION(ii)
{
- IILS_FETCH();
-
IIG(default_link) = -1;
IIG(num_links) = IIG(num_persistent);
return SUCCESS;
*/
PHP_RSHUTDOWN_FUNCTION(ii)
{
- IILS_FETCH();
+ TSRMLS_FETCH();
if (IIG(default_link)!=-1) {
zend_list_delete(IIG(default_link));
PHP_MINFO_FUNCTION(ii)
{
char buf[32];
- IILS_FETCH();
+ TSRMLS_FETCH();
php_info_print_table_start();
php_info_print_table_header(2, "Ingres II Support", "enabled");
int hashed_details_length;
IIAPI_CONNPARM connParm;
II_LINK *link;
- IILS_FETCH();
- PLS_FETCH();
/* Setting db, user and pass according to sql_safe_mode, parameters and/or default values */
argc = ZEND_NUM_ARGS();
int argc;
int link_id = -1;
II_LINK *ii_link;
- IILS_FETCH();
argc = ZEND_NUM_ARGS();
if (argc > 1 || (argc && zend_get_parameters_ex(argc, &link) == FAILURE)){
II_LINK *ii_link;
IIAPI_QUERYPARM queryParm;
IIAPI_GETDESCRPARM getDescrParm;
- IILS_FETCH();
argc = ZEND_NUM_ARGS();
if (argc < 1 || argc > 2 || zend_get_parameters_ex(argc, &query, &link) == FAILURE){
}
if (argc < 2) {
- link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU IILS_CC);
+ link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
}
ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres II Link", le_ii_link, le_ii_plink);
int link_id = -1;
II_LINK *ii_link;
IIAPI_GETQINFOPARM getQInfoParm;
- IILS_FETCH();
argc = ZEND_NUM_ARGS();
if (argc > 1 || zend_get_parameters_ex(argc, &link) == FAILURE){
}
if (argc < 1) {
- link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU IILS_CC);
+ link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
}
ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres II Link", le_ii_link, le_ii_plink);
int argc;
int link_id = -1;
II_LINK *ii_link;
- IILS_FETCH();
argc = ZEND_NUM_ARGS();
if (argc > 1 || zend_get_parameters_ex(argc, &link) == FAILURE){
}
if (argc < 1) {
- link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU IILS_CC);
+ link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
}
ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres II Link", le_ii_link, le_ii_plink);
char *name, *fun_name;
int index;
II_LINK *ii_link;
- IILS_FETCH();
argc = ZEND_NUM_ARGS();
if (argc < 1 || argc > 2 || zend_get_parameters_ex(argc, &idx, &link) == FAILURE){
}
if (argc < 2) {
- link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU IILS_CC);
+ link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
}
ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres II Link", le_ii_link, le_ii_plink);
long value_long;
char *value_char_p;
int len, should_copy, correct_length;
- PLS_FETCH();
/* array initialization */
if (array_init(return_value)==FAILURE) {
int argc;
int link_id = -1;
II_LINK *ii_link;
- IILS_FETCH();
argc = ZEND_NUM_ARGS();
if (argc > 2 || zend_get_parameters_ex(argc, &result_type, &link) == FAILURE){
}
if (argc != 2) {
- link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU IILS_CC);
+ link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
}
if (argc != 0) {
int argc;
int link_id = -1;
II_LINK *ii_link;
- IILS_FETCH();
argc = ZEND_NUM_ARGS();
if (argc > 1 || zend_get_parameters_ex(argc, &link) == FAILURE){
}
if (argc != 1) {
- link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU IILS_CC);
+ link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
}
ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres II Link", le_ii_link, le_ii_plink);
int argc;
int link_id = -1;
II_LINK *ii_link;
- IILS_FETCH();
argc = ZEND_NUM_ARGS();
if (argc > 2 || zend_get_parameters_ex(argc, &result_type, &link) == FAILURE){
}
if (argc != 2) {
- link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU IILS_CC);
+ link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
}
if (argc != 0) {
int argc;
int link_id = -1;
II_LINK *ii_link;
- IILS_FETCH();
argc = ZEND_NUM_ARGS();
if (argc > 1 || (argc && zend_get_parameters_ex(argc, &link) == FAILURE)){
int link_id = -1;
II_LINK *ii_link;
IIAPI_COMMITPARM commitParm;
- IILS_FETCH();
argc = ZEND_NUM_ARGS();
if (argc > 1 || (argc && zend_get_parameters_ex(argc, &link) == FAILURE)){
int link_id = -1;
II_LINK *ii_link;
IIAPI_AUTOPARM autoParm;
- IILS_FETCH();
argc = ZEND_NUM_ARGS();
if (argc > 1 || (argc && zend_get_parameters_ex(argc, &link) == FAILURE)){
static int _rollback_transaction(II_LINK *link);
static void _close_ii_link(II_LINK *link);
static void _close_ii_plink(zend_rsrc_list_entry *link);
-static int php_ii_get_default_link(INTERNAL_FUNCTION_PARAMETERS IILS_DC);
+static int php_ii_get_default_link(INTERNAL_FUNCTION_PARAMETERS TSRMLS_DC);
static void php_ii_set_default_link(int id);
static void php_ii_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent);
static char *php_ii_field_name(II_LINK *ii_link, int index);
#define II_BOTH (II_ASSOC|II_NUM)
#ifdef ZTS
-#define IILS_D zend_ii_globals *ii_globals
-#define IILS_DC , IILS_D
-#define IILS_C ii_globals
-#define IILS_CC , IILS_C
-#define IIG(v) (ii_globals->v)
-#define IILS_FETCH() zend_ii_globals *ii_globals = ts_resource(ii_globals_id)
+#define IIG(v) TSRMG(ii_globals_id, zend_ii_globals *, v)
#else
-#define IILS_D
-#define IILS_DC
-#define IILS_C
-#define IILS_CC
#define IIG(v) (ii_globals.v)
-#define IILS_FETCH()
#endif
#else
int type;
void *resource = NULL;
ibase_tr_link *ib_trans;
- IBLS_FETCH();
IBDEBUG("Transaction or database link?");
if ((resource = zend_list_find(Z_LVAL_PP(link_id), &type))) {
Return error message */
PHP_FUNCTION(ibase_errmsg)
{
- IBLS_FETCH();
-
if (IBG(errmsg[0])) {
RETURN_STRING(IBG(errmsg),1);
}
{
char *s;
ISC_STATUS *statusp;
- IBLS_FETCH();
+ TSRMLS_FETCH();
s = IBG(errmsg);
statusp = IB_STATUS;
{
va_list ap;
int len;
- IBLS_FETCH();
+ TSRMLS_FETCH();
va_start(ap, msg);
len = vsnprintf(IBG(errmsg), MAX_ERRMSG - 1, msg, ap);
static void _php_ibase_commit_link(ibase_db_link *link)
{
int i;
- IBLS_FETCH();
+ TSRMLS_FETCH();
IBDEBUG("Checking transactions to close...");
if (link->trans[0] != NULL) { /* commit default */
static void _php_ibase_close_link(zend_rsrc_list_entry *rsrc)
{
ibase_db_link *link = (ibase_db_link *)rsrc->ptr;
- IBLS_FETCH();
+ TSRMLS_FETCH();
_php_ibase_commit_link(link);
IBDEBUG("Closing normal link...");
static void _php_ibase_close_plink(zend_rsrc_list_entry *rsrc)
{
ibase_db_link *link = (ibase_db_link *)rsrc->ptr;
- IBLS_FETCH();
+ TSRMLS_FETCH();
_php_ibase_commit_link(link);
IBDEBUG("Closing permanent link...");
static void _php_ibase_free_result(zend_rsrc_list_entry *rsrc)
{
ibase_result *ib_result = (ibase_result *)rsrc->ptr;
- IBLS_FETCH();
+ TSRMLS_FETCH();
IBDEBUG("Freeing result...");
if (ib_result){
/* {{{ _php_ibase_free_query() */
static void _php_ibase_free_query(ibase_query *ib_query)
{
- IBLS_FETCH();
+ TSRMLS_FETCH();
IBDEBUG("Freeing query...");
if (ib_query) {
static void _php_ibase_free_blob(zend_rsrc_list_entry *rsrc)
{
ibase_blob_handle *ib_blob = (ibase_blob_handle *)rsrc->ptr;
- IBLS_FETCH();
+ TSRMLS_FETCH();
if (ib_blob->bl_handle != NULL) { /* blob open*/
if (isc_cancel_blob(IB_STATUS, &ib_blob->bl_handle)) {
{
ibase_tr_link *ib_trans = (ibase_tr_link *)rsrc->ptr;
ibase_db_link *ib_link;
- IBLS_FETCH();
+ TSRMLS_FETCH();
ib_link = (ibase_db_link *) zend_fetch_resource(NULL, ib_trans->link_rsrc, "InterBase link", NULL, 2, le_link, le_plink);
STD_PHP_INI_ENTRY("ibase.timeformat", "%H:%M:%S", PHP_INI_ALL, OnUpdateString, cfg_timeformat, zend_ibase_globals, ibase_globals)
PHP_INI_END()
-static void php_ibase_init_globals(IBLS_D)
+static void php_ibase_init_globals(TSRMLS_D)
{
IBG(timestampformat) = NULL;
IBG(dateformat) = NULL;
PHP_MINIT_FUNCTION(ibase)
{
- IBLS_FETCH();
+ TSRMLS_FETCH();
ZEND_INIT_MODULE_GLOBALS(ibase, php_ibase_init_globals, NULL);
PHP_RINIT_FUNCTION(ibase)
{
- IBLS_FETCH();
-
IBG(default_link)= -1;
IBG(num_links) = IBG(num_persistent);
PHP_RSHUTDOWN_FUNCTION(ibase)
{
- IBLS_FETCH();
+ TSRMLS_FETCH();
if (IBG(timestampformat))
DL_FREE(IBG(timestampformat));
PHP_MINFO_FUNCTION(ibase)
{
char tmp[32];
- IBLS_FETCH();
+ TSRMLS_FETCH();
php_info_print_table_start();
php_info_print_table_row(2, "Interbase Support", "enabled");
{
char dpb_buffer[256], *dpb, *p;
int dpb_length, len;
- IBLS_FETCH();
+ TSRMLS_FETCH();
dpb = dpb_buffer;
char *hashed_details;
int hashed_details_length = 0;
ibase_db_link *ib_link = NULL;
- IBLS_FETCH();
- PLS_FETCH();
RESET_ERRMSG;
zval **link_arg;
ibase_db_link *ib_link;
int link_id;
- IBLS_FETCH();
RESET_ERRMSG;
int i, dim, ar_cnt, ar_length;
XSQLVAR *var;
- IBLS_FETCH();
+ TSRMLS_FETCH();
IB_ARRAY = NULL;
static int _php_ibase_alloc_query(ibase_query **ib_queryp, isc_db_handle link, isc_tr_handle trans, char *query, unsigned short dialect)
{
#define IB_QUERY (*ib_queryp)
- IBLS_FETCH();
+ TSRMLS_FETCH();
IB_QUERY = emalloc(sizeof(ibase_query));
IB_QUERY->link = link;
XSQLDA *in_sqlda = NULL, *out_sqlda = NULL;
BIND_BUF *bind_buf = NULL;
int rv = FAILURE;
- IBLS_FETCH();
+ TSRMLS_FETCH();
IB_RESULT = NULL;
int tpb_len = 0, argn, link_id, trans_n = 0, i;
ibase_db_link *ib_link;
ibase_tr_link *ib_trans;
- IBLS_FETCH();
RESET_ERRMSG;
/* open default transaction */
static int _php_ibase_def_trans(ibase_db_link * ib_link, int trans_n)
{
- IBLS_FETCH();
+ TSRMLS_FETCH();
if (trans_n == 0 && ib_link->trans[0] == NULL) {
if (isc_start_transaction(IB_STATUS, &ib_link->trans[0], 1, &ib_link->link, 0, NULL)) {
pval **link_trans_arg = NULL;
int link_id = 0, trans_n = 0, trans_id = 0;
ibase_db_link *ib_link;
- IBLS_FETCH();
RESET_ERRMSG;
ibase_db_link *ib_link;
ibase_query *ib_query;
ibase_result *ib_result;
- IBLS_FETCH();
RESET_ERRMSG;
static int _php_ibase_var_pval(pval *val, void *data, int type, int len, int scale, int flag)
{
char string_data[255];
- IBLS_FETCH();
- PLS_FETCH();
+ TSRMLS_FETCH();
switch(type & ~1) {
case SQL_VARYING:
int i, arr_cnt;
ibase_result *ib_result;
XSQLVAR *var;
- IBLS_FETCH();
RESET_ERRMSG;
{
zval **result_arg;
ibase_result *ib_result;
- IBLS_FETCH();
RESET_ERRMSG;
ibase_db_link *ib_link;
ibase_query *ib_query;
char *query;
- IBLS_FETCH();
RESET_ERRMSG;
pval ***args, **bind_args = NULL;
ibase_query *ib_query;
ibase_result *ib_result;
- IBLS_FETCH();
RESET_ERRMSG;
{
pval **query_arg;
ibase_query *ib_query;
- IBLS_FETCH();
RESET_ERRMSG;
pval ***args;
char *fmt = NULL;
int type = PHP_IBASE_TIMESTAMP;
- IBLS_FETCH();
RESET_ERRMSG; /* ??? */
{
pval **result;
ibase_result *ib_result;
- IBLS_FETCH();
RESET_ERRMSG;
char buf[30], *s;
int len;
XSQLVAR *var;
- IBLS_FETCH();
RESET_ERRMSG;
};
char bl_inf[sizeof(long)*8], *p;
- IBLS_FETCH();
+ TSRMLS_FETCH();
bl_info->max_segment = 0;
bl_info->num_segments = 0;
int trans_n = 0, trans_id = 0, link_id;
ibase_db_link *ib_link;
ibase_blob_handle *ib_blob;
- IBLS_FETCH();
RESET_ERRMSG;
{
pval *blob_arg;
ibase_blob_handle *ib_blob, *ib_blob_id;
- IBLS_FETCH();
RESET_ERRMSG;
{
pval *blob_arg,*string_arg;
ibase_blob_handle *ib_blob;
- IBLS_FETCH();
RESET_ERRMSG;
char *bl_data;
unsigned short max_len = 0, cur_len, seg_len;
ibase_blob_handle *ib_blob;
- IBLS_FETCH();
RESET_ERRMSG;
{
pval *blob_arg;
ibase_blob_handle *ib_blob;
- IBLS_FETCH();
RESET_ERRMSG;
pval *blob_arg, *result_var;
ibase_blob_handle *ib_blob_id;
IBASE_BLOBINFO bl_info;
- IBLS_FETCH();
RESET_ERRMSG;
char bl_data[IBASE_BLOB_SEG];
unsigned short seg_len;
ibase_blob_handle *ib_blob_id;
- IBLS_FETCH();
RESET_ERRMSG;
ibase_db_link *ib_link;
char bl_data[IBASE_BLOB_SEG]; /* FIXME? blob_seg_size parameter? */
FILE *fp;
- IBLS_FETCH();
void * what;
int type;
};
#ifdef ZTS
-#define IBLS_D zend_ibase_globals *ibase_globals
-#define IBLS_C ibase_globals
#define IBG(v) (ibase_globals->v)
-#define IBLS_FETCH() zend_ibase_globals *ibase_globals = ts_resource(ibase_globals_id)
+#define IBG(v) TSRMG(ibase_globals_id, zend_ibase_globals *, v)
#else
-#define IBLS_D
-#define IBLS_C
#define IBG(v) (ibase_globals.v)
-#define IBLS_FETCH()
#endif
#else
if (!classpath) classpath = getenv("CLASSPATH");
if (!libpath) {
- PLS_FETCH();
+ TSRMLS_FETCH();
libpath=PG(extension_dir);
}
static void _close_ldap_link(zend_rsrc_list_entry *rsrc)
{
LDAP *ld = (LDAP *)rsrc->ptr;
- LDAPLS_FETCH();
+ TSRMLS_FETCH();
ldap_unbind_s(ld);
LDAPG(num_links)--;
double SDKVersion;
#endif
- LDAPLS_FETCH();
-
#if HAVE_NSLDAP
/* Print version information */
SDKVersion = ldap_version( &ver );
/* char *hashed_details;
int hashed_details_length;*/
LDAP *ldap;
- LDAPLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 0:
int num_attribs = 0;
int i, errno;
int myargcount = ZEND_NUM_ARGS();
- LDAPLS_FETCH();
if (myargcount < 3 || myargcount > 8 || zend_get_parameters_ex(myargcount, &link, &base_dn, &filter, &attrs, &attrsonly, &sizelimit, &timelimit, &deref) == FAILURE) {
WRONG_PARAM_COUNT;
pval **link, **result;
LDAP *ldap;
LDAPMessage *ldap_result, *ldap_result_entry;
- LDAPLS_FETCH();
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &link, &result) == FAILURE) {
WRONG_PARAM_COUNT;
pval **link, **result_entry;
LDAP *ldap;
LDAPMessage *ldap_result_entry, *ldap_result_entry_next;
- LDAPLS_FETCH();
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &link, &result_entry) == FAILURE) {
WRONG_PARAM_COUNT;
LDAPMessage *ldap_result_entry;
BerElement *ber;
char *attribute;
- LDAPLS_FETCH();
if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &link, &result, &berp) == FAILURE) {
WRONG_PARAM_COUNT;
LDAP *ldap;
LDAPMessage *ldap_result;
LDAPMessage *ldap_result_entry;
- LDAPLS_FETCH();
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &link, &result) == FAILURE) {
WRONG_PARAM_COUNT;
pval **link, **result_entry;
LDAP *ldap;
LDAPMessage *ldap_result_entry, *ldap_result_entry_next;
- LDAPLS_FETCH();
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &link, &result_entry) == FAILURE) {
WRONG_PARAM_COUNT;
ZEND_END_MODULE_GLOBALS(ldap)
#ifdef ZTS
-# define LDAPLS_D zend_ldap_globals *ldap_globals
-# define LDAPLS_DC , LDAPLS_D
-# define LDAPLS_C ldap_globals
-# define LDAPLS_CC , LDAPLS_C
-# define LDAPG(v) (ldap_globals->v)
-# define LDAPLS_FETCH() zend_ldap_globals *ldap_globals = ts_resource(ldap_globals_id)
+# define LDAPG(v) TSRMG(ldap_globals_id, zend_ldap_globals *, v)
#else
-# define LDAPLS_D
-# define LDAPLS_DC
-# define LDAPLS_C
-# define LDAPLS_CC
# define LDAPG(v) (ldap_globals.v)
-# define LDAPLS_FETCH()
#endif
#ifdef ZTS
-#define MAILPARSEG(v) (mailparse_globals->v)
-#define MAILPARSELS_FETCH() zend_mailparse_globals *mailparse_globals = ts_resource(mailparse_globals_id)
+#define MAILPARSEG(v) TSRMG(mailparse_globals_id, zend_mailparse_globals *, v)
#else
#define MAILPARSEG(v) (mailparse_globals.v)
-#define MAILPARSELS_FETCH()
#endif
#endif
const char **charset_s)
{
const char *c;
- MAILPARSELS_FETCH();
+ TSRMLS_FETCH();
*content_type_s=GETINFO(p->content_type, "text/plain");
*content_transfer_encoding_s=GETINFO(p->content_transfer_encoding,
/* hasnon7bit: 8bit chars in this section or subsections */
const char *te;
int is8bitte;
- MAILPARSELS_FETCH();
+ TSRMLS_FETCH();
for (c=p->firstpart; c; c=c->next)
if (!c->isdummy)
static PHP_INI_MH(OnUpdate_mbstring_detect_order)
{
int *list, size;
- MBSTRLS_FETCH();
+ TSRMLS_FETCH();
if (php_mbstring_parse_encoding_list(new_value, new_value_length, &list, &size, 1)) {
if (MBSTRG(detect_order_list) != NULL) {
static PHP_INI_MH(OnUpdate_mbstring_http_input)
{
int *list, size;
- MBSTRLS_FETCH();
+ TSRMLS_FETCH();
if (php_mbstring_parse_encoding_list(new_value, new_value_length, &list, &size, 1)) {
if (MBSTRG(http_input_list) != NULL) {
static PHP_INI_MH(OnUpdate_mbstring_http_output)
{
enum mbfl_no_encoding no_encoding;
- MBSTRLS_FETCH();
+ TSRMLS_FETCH();
no_encoding = mbfl_name2no_encoding(new_value);
if (no_encoding != mbfl_no_encoding_invalid) {
static PHP_INI_MH(OnUpdate_mbstring_internal_encoding)
{
enum mbfl_no_encoding no_encoding;
- MBSTRLS_FETCH();
+ TSRMLS_FETCH();
no_encoding = mbfl_name2no_encoding(new_value);
if (no_encoding != mbfl_no_encoding_invalid) {
static PHP_INI_MH(OnUpdate_mbstring_substitute_character)
{
- MBSTRLS_FETCH();
+ TSRMLS_FETCH();
if (new_value != NULL) {
if (strcasecmp("none", new_value) == 0) {
PHP_MSHUTDOWN_FUNCTION(mbstring)
{
- MBSTRLS_FETCH();
+ TSRMLS_FETCH();
UNREGISTER_INI_ENTRIES();
if (MBSTRG(http_input_list)) {
PHP_RINIT_FUNCTION(mbstring)
{
int n, *list, *entry;
- MBSTRLS_FETCH();
MBSTRG(current_language) = MBSTRG(language);
MBSTRG(current_internal_encoding) = MBSTRG(internal_encoding);
PHP_RSHUTDOWN_FUNCTION(mbstring)
{
- MBSTRLS_FETCH();
+ TSRMLS_FETCH();
if (MBSTRG(current_detect_order_list) != NULL) {
efree(MBSTRG(current_detect_order_list));
pval **arg1;
char *name;
enum mbfl_no_language no_language;
- MBSTRLS_FETCH();
if (ZEND_NUM_ARGS() == 0) {
name = (char *)mbfl_no_language2name(MBSTRG(current_language));
pval **arg1;
char *name;
enum mbfl_no_encoding no_encoding;
- MBSTRLS_FETCH();
if (ZEND_NUM_ARGS() == 0) {
name = (char *)mbfl_no_encoding2name(MBSTRG(current_internal_encoding));
pval **arg1;
int result, retname, n, *entry;
char *name;
- MBSTRLS_FETCH();
retname = 1;
if (ZEND_NUM_ARGS() == 0) {
pval **arg1;
char *name;
enum mbfl_no_encoding no_encoding;
- MBSTRLS_FETCH();
if (ZEND_NUM_ARGS() == 0) {
name = (char *)mbfl_no_encoding2name(MBSTRG(current_http_output_encoding));
pval **arg1;
int n, size, *list, *entry;
char *name;
- MBSTRLS_FETCH();
if (ZEND_NUM_ARGS() == 0) {
if (array_init(return_value) == FAILURE) {
PHP_FUNCTION(mb_substitute_character)
{
pval **arg1;
- MBSTRLS_FETCH();
if (ZEND_NUM_ARGS() == 0) {
if (MBSTRG(current_filter_illegal_mode) == MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
pval **arg1;
enum mbfl_no_encoding no_encoding;
const char *name;
- MBSTRLS_FETCH();
if (ZEND_NUM_ARGS() == 1 && zend_get_parameters_ex(1, &arg1) != FAILURE) {
convert_to_string_ex(arg1);
#if defined(MBSTR_ENC_TRANS)
static void
-php_mbstr_encoding_handler(zval *arg, char *res, char *separator) {
-
+php_mbstr_encoding_handler(zval *arg, char *res, char *separator)
+{
char *var, *val;
char *strtok_buf = NULL, **val_list;
zval *array_ptr = (zval *) arg;
mbfl_string string, result, *ret;
mbfl_encoding_detector *identd;
mbfl_buffer_converter *convd;
- MBSTRLS_FETCH();
TSRMLS_FETCH();
- PLS_FETCH();
mbfl_string_init(&string);
mbfl_string_init(&result);
ret = mbfl_buffer_converter_feed_result(convd, &string, &result);
}
if (ret != NULL) {
- php_register_variable_safe(val_list[n], ret->val, ret->len, array_ptr TSRMLS_CC PLS_CC);
+ php_register_variable_safe(val_list[n], ret->val, ret->len, array_ptr TSRMLS_CC);
efree(ret->val);
} else {
- php_register_variable_safe(val_list[n], val_list[n+1], len_list[n+1], array_ptr TSRMLS_CC PLS_CC);
+ php_register_variable_safe(val_list[n], val_list[n+1], len_list[n+1], array_ptr TSRMLS_CC);
}
n+=2;
}
SAPI_POST_HANDLER_FUNC(php_mbstr_post_handler)
{
- MBSTRLS_FETCH();
+ TSRMLS_FETCH();
MBSTRG(http_input_identify_post) = mbfl_no_encoding_invalid;
}
/* http input processing */
-void mbstr_treat_data(int arg, char *str, zval* destArray TSRMLS_DC PLS_DC SLS_DC)
+void mbstr_treat_data(int arg, char *str, zval* destArray TSRMLS_DC)
{
char *res = NULL, *var, *val, *separator=NULL;
const char *c_var;
pval *array_ptr;
int free_buffer=0;
- MBSTRLS_FETCH();
switch (arg) {
case PARSE_POST:
}
if (arg==PARSE_POST) {
- sapi_handle_post(array_ptr SLS_CC);
+ sapi_handle_post(array_ptr TSRMLS_CC);
return;
}
mbfl_string string, resvar, resval;
mbfl_encoding_detector *identd;
mbfl_buffer_converter *convd;
- PLS_FETCH();
- MBSTRLS_FETCH();
track_vars_array = NULL;
argc = ZEND_NUM_ARGS();
}
n++;
/* add variable to symbol table */
- php_register_variable_safe(var, val, val_len, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable_safe(var, val, val_len, track_vars_array TSRMLS_CC);
mbfl_string_clear(&resvar);
mbfl_string_clear(&resval);
}
mbfl_string string, result, *ret;
const char *mimetype, *charset;
mbfl_memory_device device;
- SLS_FETCH();
- MBSTRLS_FETCH();
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg_string, &arg_status) == FAILURE) {
WRONG_PARAM_COUNT;
pval **arg1, **arg2;
int n;
mbfl_string string;
- MBSTRLS_FETCH();
n = ZEND_NUM_ARGS();
if ((n == 1 && zend_get_parameters_ex(1, &arg1) == FAILURE) ||
pval **arg1, **arg2, **arg3, **arg4;
int offset, n;
mbfl_string haystack, needle;
- MBSTRLS_FETCH();
mbfl_string_init(&haystack);
mbfl_string_init(&needle);
pval **arg1, **arg2, **arg3;
int n;
mbfl_string haystack, needle;
- MBSTRLS_FETCH();
mbfl_string_init(&haystack);
mbfl_string_init(&needle);
pval **arg1, **arg2, **arg3, **arg4;
int argc, from, len, mblen;
mbfl_string string, result, *ret;
- MBSTRLS_FETCH();
mbfl_string_init(&string);
string.no_language = MBSTRG(current_language);
pval **arg1, **arg2, **arg3, **arg4;
int argc, from, len;
mbfl_string string, result, *ret;
- MBSTRLS_FETCH();
mbfl_string_init(&string);
string.no_language = MBSTRG(current_language);
pval **arg1, **arg2;
int n;
mbfl_string string;
- MBSTRLS_FETCH();
n = ZEND_NUM_ARGS();
if ((n == 1 && zend_get_parameters_ex(1, &arg1) == FAILURE) ||
pval **arg1, **arg2, **arg3, **arg4, **arg5;
int from, width;
mbfl_string string, result, marker, *ret;
- MBSTRLS_FETCH();
mbfl_string_init(&string);
mbfl_string_init(&marker);
enum mbfl_no_encoding from_encoding, to_encoding;
mbfl_buffer_converter *convd;
int size, *list;
- MBSTRLS_FETCH();
if (ZEND_NUM_ARGS() == 2) {
if (zend_get_parameters_ex(2, &arg_str, &arg_new) == FAILURE) {
const char *ret;
enum mbfl_no_encoding *elist;
int size, *list;
- MBSTRLS_FETCH();
if (ZEND_NUM_ARGS() == 1) {
if (zend_get_parameters_ex(1, &arg_str) == FAILURE) {
enum mbfl_no_encoding charset, transenc;
mbfl_string string, result, *ret;
char *p, *linefeed;
- MBSTRLS_FETCH();
if (ZEND_NUM_ARGS() < 1 || ZEND_NUM_ARGS() > 4 || zend_get_parameters_array_ex(ZEND_NUM_ARGS(), argv) == FAILURE) {
WRONG_PARAM_COUNT;
{
pval **arg_str;
mbfl_string string, result, *ret;
- MBSTRLS_FETCH();
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg_str) == FAILURE) {
WRONG_PARAM_COUNT;
char *p;
mbfl_string string, result, *ret;
enum mbfl_no_encoding no_encoding;
- MBSTRLS_FETCH();
mbfl_string_init(&string);
string.no_language = MBSTRG(current_language);
int n, argc, stack_level, stack_max, *elist, elistsz;
char *name;
void *ptmp;
- MBSTRLS_FETCH();
argc = ZEND_NUM_ARGS();
if (argc < 3) {
int argc, i, *convmap, *mapelm, mapsize;
mbfl_string string, result, *ret;
enum mbfl_no_encoding no_encoding;
- MBSTRLS_FETCH();
argc = ZEND_NUM_ARGS();
if ((argc == 2 && zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) ||
body_enc; /* body transfar encoding */
mbfl_memory_device device; /* automatic allocateable buffer for additional header */
int err = 0;
- MBSTRLS_FETCH();
/* initialize */
mbfl_memory_device_init(&device, 0, 0);
#ifdef ZTS
-#define MBSTRLS_D zend_mbstring_globals *mbstring_globals
-#define MBSTRLS_DC , MBSTRLS_D
-#define MBSTRLS_C mbstring_globals
-#define MBSTRLS_CC , MBSTRLS_C
-#define MBSTRG(v) (mbstring_globals->v)
-#define MBSTRLS_FETCH() zend_mbstring_globals *mbstring_globals = ts_resource(mbstring_globals_id)
+#define MBSTRG(v) TSRMG(mbstring_globals_id, zend_mbstring_globals *, v)
#else
-#define MBSTRLS_D
-#define MBSTRLS_DC
-#define MBSTRLS_C
-#define MBSTRLS_CC
#define MBSTRG(v) (mbstring_globals.v)
-#define MBSTRLS_FETCH()
#endif
#else /* HAVE_MBSTRING */
int i, count;
smart_str tmp1 = {0};
smart_str tmp2 = {0};
- MCLS_FETCH();
modules = mcrypt_list_algorithms (MCG(algorithms_dir), &count);
if (count == 0) {
zval **cipher, **cipher_directory, **mode, **mode_directory;
MCRYPT td;
int argc;
- MCLS_FETCH();
argc = ZEND_NUM_ARGS();
MCRYPT_CHECK_PARAM_COUNT (4,4)
int max_key_size, key_size, iv_size;
MCRYPT td;
int argc;
- MCLS_FETCH();
argc = ZEND_NUM_ARGS();
MCRYPT_CHECK_PARAM_COUNT (3,3)
int argc;
unsigned char* data_s;
int block_size, data_size;
- MCLS_FETCH();
argc = ZEND_NUM_ARGS();
MCRYPT_CHECK_PARAM_COUNT (2,2)
int argc;
char* data_s;
int block_size, data_size;
- MCLS_FETCH();
argc = ZEND_NUM_ARGS();
MCRYPT_CHECK_PARAM_COUNT (2,2)
MCRYPT td;
int argc, i, count;
int *key_sizes;
- MCLS_FETCH();
argc = ZEND_NUM_ARGS();
MCRYPT_GET_TD_ARG
{
zval **mcryptind;
MCRYPT td;
- MCLS_FETCH();
MCRYPT_GET_TD_ARG
{
zval **mcryptind;
MCRYPT td;
- MCLS_FETCH();
MCRYPT_GET_TD_ARG
{
zval **mcryptind;
MCRYPT td;
- MCLS_FETCH();
MCRYPT_GET_TD_ARG
{
zval **mcryptind;
MCRYPT td;
- MCLS_FETCH();
MCRYPT_GET_TD_ARG
{
zval **mcryptind;
MCRYPT td;
- MCLS_FETCH();
MCRYPT_GET_TD_ARG
{
zval **mcryptind;
MCRYPT td;
- MCLS_FETCH();
MCRYPT_GET_TD_ARG
{
zval **mcryptind;
MCRYPT td;
- MCLS_FETCH();
MCRYPT_GET_TD_ARG
{
zval **mcryptind;
MCRYPT td;
- MCLS_FETCH();
MCRYPT_GET_TD_ARG
{
zval **mcryptind;
MCRYPT td;
- MCLS_FETCH();
MCRYPT_GET_TD_ARG
zval **mcryptind;
MCRYPT td;
char *name;
- MCLS_FETCH();
MCRYPT_GET_TD_ARG
zval **mcryptind;
MCRYPT td;
char *name;
- MCLS_FETCH();
MCRYPT_GET_TD_ARG
zval **arg1, **lib_dir;
char *lib_dir_s;
int argc;
- MCLS_FETCH();
argc = ZEND_NUM_ARGS();
zval **arg1, **lib_dir;
char *lib_dir_s;
int argc;
- MCLS_FETCH();
argc = ZEND_NUM_ARGS();
zval **arg1, **lib_dir;
char *lib_dir_s;
int argc;
- MCLS_FETCH();
argc = ZEND_NUM_ARGS();
zval **arg1, **lib_dir;
char *lib_dir_s;
int argc;
- MCLS_FETCH();
argc = ZEND_NUM_ARGS();
zval **arg1, **lib_dir;
char *lib_dir_s;
int argc;
- MCLS_FETCH();
argc = ZEND_NUM_ARGS();
zval **arg1, **lib_dir;
char *lib_dir_s;
int argc;
- MCLS_FETCH();
argc = ZEND_NUM_ARGS();
char *lib_dir_s;
int argc, i, count;
int *key_sizes;
- MCLS_FETCH();
argc = ZEND_NUM_ARGS();
char **modules;
char *lib_dir_s;
int i, count, argc;
- MCLS_FETCH();
argc = ZEND_NUM_ARGS();
MCRYPT_CHECK_PARAM_COUNT (0,1)
char *module_dir_string;
long key_size;
MCRYPT td;
- MCLS_FETCH();
MCRYPT_GET_INI
char *module_dir_string;
long key_size;
MCRYPT td;
- MCLS_FETCH();
MCRYPT_GET_INI
char *module_dir_string;
long key_size;
MCRYPT td;
- MCLS_FETCH();
MCRYPT_GET_INI
char *module_dir_string;
char *cipher_name;
MCRYPT td;
- MCLS_FETCH();
MCRYPT_GET_INI
char *key_s = NULL, *iv_s;
char *data_s;
MCRYPT td;
- MCLS_FETCH();
MCRYPT_GET_INI
ZEND_END_MODULE_GLOBALS(mcrypt)
#ifdef ZTS
-# define MCLS_D zend_mcrypt_globals *mcrypt_globals
-# define MCLS_DC , MCLS_D
-# define MCLS_C mcrypt_globals
-# define MCLS_CC , MCLS_C
-# define MCG(v) (mcrypt_globals->v)
-# define MCLS_FETCH() zend_mcrypt_globals *mcrypt_globals = ts_resource(mcrypt_globals_id)
+# define MCG(v) TSRMG(mcrypt_globals_id, zend_mcrypt_globals *, v)
#else
-# define MCLS_D
-# define MCLS_DC
-# define MCLS_C
-# define MCLS_CC
# define MCG(v) (mcrypt_globals.v)
-# define MCLS_FETCH()
#endif
#endif
m_query *msql_query;
m_row sql_row;
int field_offset=0;
- PLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 2:
m_query *msql_query;
int num_fields;
int i;
- PLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
/* error handler */
static int php_mssql_error_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, char *dberrstr, char *oserrstr)
{
- MSSQLLS_FETCH();
+ TSRMLS_FETCH();
+
if (severity >= MS_SQL_G(min_error_severity)) {
php_error(E_WARNING,"MS SQL error: %s (severity %d)", dberrstr, severity);
}
/* message handler */
static int php_mssql_message_handler(DBPROCESS *dbproc, DBINT msgno,int msgstate, int severity,char *msgtext,char *srvname, char *procname,DBUSMALLINT line)
{
- MSSQLLS_FETCH();
+ TSRMLS_FETCH();
+
if (severity >= MS_SQL_G(min_message_severity)) {
php_error(E_WARNING,"MS SQL message: %s (severity %d)", msgtext, severity);
}
static int _clean_invalid_results(list_entry *le)
{
- MSSQLLS_FETCH();
+ TSRMLS_FETCH();
+
if (le->type == le_result) {
mssql_link *mssql_ptr = ((mssql_result *) le->ptr)->mssql_ptr;
static void php_mssql_set_default_link(int id)
{
- MSSQLLS_FETCH();
+ TSRMLS_FETCH();
if (MS_SQL_G(default_link)!=-1) {
zend_list_delete(MS_SQL_G(default_link));
static void _close_mssql_link(zend_rsrc_list_entry *rsrc)
{
mssql_link *mssql_ptr = (mssql_link *)rsrc->ptr;
- MSSQLLS_FETCH();
TSRMLS_FETCH();
mssql_ptr->valid = 0;
static void _close_mssql_plink(zend_rsrc_list_entry *rsrc)
{
mssql_link *mssql_ptr = (mssql_link *)rsrc->ptr;
- MSSQLLS_FETCH();
+ TSRMLS_FETCH();
dbclose(mssql_ptr->link);
dbfreelogin(mssql_ptr->login);
PHP_RINIT_FUNCTION(mssql)
{
- MSSQLLS_FETCH();
-
MS_SQL_G(default_link) = -1;
MS_SQL_G(num_links) = MS_SQL_G(num_persistent);
MS_SQL_G(appname) = estrndup("PHP 4.0",7);
PHP_RSHUTDOWN_FUNCTION(mssql)
{
- MSSQLLS_FETCH();
+ TSRMLS_FETCH();
STR_FREE(MS_SQL_G(appname));
if (MS_SQL_G(server_message)) {
PHP_MINFO_FUNCTION(mssql)
{
char buf[32];
- MSSQLLS_FETCH();
+ TSRMLS_FETCH();
php_info_print_table_start();
php_info_print_table_header(2, "MSSQL Support", "enabled");
int hashed_details_length;
mssql_link mssql, *mssql_ptr;
char buffer[32];
- MSSQLLS_FETCH();
-/* PLS_FETCH(); */
switch(ZEND_NUM_ARGS()) {
case 0: /* defaults */
}
-static int php_mssql_get_default_link(INTERNAL_FUNCTION_PARAMETERS MSSQLLS_DC)
+static int php_mssql_get_default_link(INTERNAL_FUNCTION_PARAMETERS TSRMLS_DC)
{
if (MS_SQL_G(default_link)==-1) { /* no link opened yet, implicitly open one */
ht = 0;
zval **mssql_link_index=NULL;
int id;
mssql_link *mssql_ptr;
- MSSQLLS_FETCH();
-
switch (ZEND_NUM_ARGS()) {
case 0:
- id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MSSQLLS_CC);
+ id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
break;
case 1:
zval **db, **mssql_link_index;
int id;
mssql_link *mssql_ptr;
- MSSQLLS_FETCH();
-
switch(ZEND_NUM_ARGS()) {
case 1:
if (zend_get_parameters_ex(1, &db)==FAILURE) {
RETURN_FALSE;
}
- id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MSSQLLS_CC);
+ id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
break;
case 2:
int i, j = 0;
int *column_types;
char computed_buf[16];
- MSSQLLS_FETCH();
+ TSRMLS_FETCH();
column_types = (int *) emalloc(sizeof(int) * result->num_fields);
for (i=0; i<result->num_fields; i++) {
/* {{{ proto int mssql_fetch_batch(string result_index)
Returns the next batch of records */
-PHP_FUNCTION(mssql_fetch_batch) {
+PHP_FUNCTION(mssql_fetch_batch)
+{
zval **mssql_result_index;
mssql_result *result;
mssql_link *mssql_ptr;
- MSSQLLS_FETCH();
-
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &mssql_result_index)==FAILURE) {
WRONG_PARAM_COUNT;
mssql_result *result;
int id, num_fields;
int batchsize;
- MSSQLLS_FETCH();
batchsize = MS_SQL_G(batchsize);
switch(ZEND_NUM_ARGS()) {
if (zend_get_parameters_ex(1, &query)==FAILURE) {
RETURN_FALSE;
}
- id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MSSQLLS_CC);
+ id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
break;
case 2:
/* {{{ proto int mssql_rows_affected(int conn_id)
Returns the number of records affected by the query */
-PHP_FUNCTION(mssql_rows_affected) {
+PHP_FUNCTION(mssql_rows_affected)
+{
zval **mssql_link_index;
mssql_link *mssql_ptr;
- MSSQLLS_FETCH();
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &mssql_link_index)==FAILURE) {
WRONG_PARAM_COUNT;
{
zval **mssql_result_index;
mssql_result *result;
- MSSQLLS_FETCH();
-
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &mssql_result_index)==FAILURE) {
WRONG_PARAM_COUNT;
Gets the last message from the MS-SQL server */
PHP_FUNCTION(mssql_get_last_message)
{
- MSSQLLS_FETCH();
-
RETURN_STRING(MS_SQL_G(server_message),1);
}
{
zval **mssql_result_index;
mssql_result *result;
- MSSQLLS_FETCH();
-
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &mssql_result_index)==FAILURE) {
WRONG_PARAM_COUNT;
{
zval **mssql_result_index;
mssql_result *result;
- MSSQLLS_FETCH();
-
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &mssql_result_index)==FAILURE) {
WRONG_PARAM_COUNT;
zval **mssql_result_index, **resulttype = NULL;
mssql_result *result;
int i;
- MSSQLLS_FETCH();
- PLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
{
zval **mssql_result_index, **offset;
mssql_result *result;
- MSSQLLS_FETCH();
-
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &mssql_result_index, &offset)==FAILURE) {
WRONG_PARAM_COUNT;
zval **mssql_result_index, **offset;
int field_offset;
mssql_result *result;
- MSSQLLS_FETCH();
-
switch (ZEND_NUM_ARGS()) {
case 1:
zval **mssql_result_index, **offset;
int field_offset;
mssql_result *result;
- MSSQLLS_FETCH();
-
switch (ZEND_NUM_ARGS()) {
case 1:
zval **mssql_result_index, **offset;
int field_offset;
mssql_result *result;
- MSSQLLS_FETCH();
-
switch (ZEND_NUM_ARGS()) {
case 1:
zval **mssql_result_index, **offset;
int field_offset;
mssql_result *result;
- MSSQLLS_FETCH();
-
switch (ZEND_NUM_ARGS()) {
case 1:
zval **mssql_result_index, **offset;
int field_offset;
mssql_result *result;
- MSSQLLS_FETCH();
-
if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2, &mssql_result_index, &offset)==FAILURE) {
WRONG_PARAM_COUNT;
zval **row, **field, **mssql_result_index;
int field_offset=0;
mssql_result *result;
- MSSQLLS_FETCH();
-
if (ZEND_NUM_ARGS()!=3 || zend_get_parameters_ex(3, &mssql_result_index, &row, &field)==FAILURE) {
WRONG_PARAM_COUNT;
int retvalue;
mssql_result *result;
mssql_link *mssql_ptr;
- MSSQLLS_FETCH();
-
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &mssql_result_index)==FAILURE) {
WRONG_PARAM_COUNT;
PHP_FUNCTION(mssql_min_error_severity)
{
zval **severity;
- MSSQLLS_FETCH();
-
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &severity)==FAILURE) {
WRONG_PARAM_COUNT;
PHP_FUNCTION(mssql_min_message_severity)
{
zval **severity;
- MSSQLLS_FETCH();
-
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &severity)==FAILURE) {
WRONG_PARAM_COUNT;
mssql_link *mssql_ptr;
mssql_statement *statement;
int id;
- MSSQLLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 1:
if (zend_get_parameters_ex(1, &sp_name)==FAILURE) {
RETURN_FALSE;
}
- id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MSSQLLS_CC);
+ id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
CHECK_LINK(id);
break;
mssql_statement *statement;
mssql_bind bind,*bindp;
int id, status;
-
LPBYTE value;
- MSSQLLS_FETCH();
id=0;
status=0;
int batchsize;
int ac = ZEND_NUM_ARGS();
char *parameter;
- MSSQLLS_FETCH();
batchsize = MS_SQL_G(batchsize);
if (ac !=1 || zend_get_parameters_ex(1, &stmt)==FAILURE) {
int sf = 0;
char buffer[32+1];
char buffer2[36+1];
- MSSQLLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 1:
#ifdef ZTS
-# define MSSQLLS_D zend_mssql_globals *mssql_globals
-# define MSSQLLS_DC , MSSQLLS_D
-# define MSSQLLS_C mssql_globals
-# define MSSQLLS_CC , MSSQLLS_C
-# define MS_SQL_G(v) (mssql_globals->v)
-# define MSSQLLS_FETCH() zend_mssql_globals *mssql_globals = ts_resource(mssql_globals_id)
+# define MS_SQL_G(v) TSRMG(mssql_globals_id, zend_mssql_globals *, v)
#else
-# define MSSQLLS_D
-# define MSSQLLS_DC
-# define MSSQLLS_C
-# define MSSQLLS_CC
# define MS_SQL_G(v) (mssql_globals.v)
-# define MSSQLLS_FETCH()
#endif
#else
char *string = NULL;
_muscat_handle *handle;
int r;
- MUSCATLS_FETCH();
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &Muscat_handle_arg, &string_arg) == FAILURE){
WRONG_PARAM_COUNT;
zval **Muscat_handle_arg;
_muscat_handle *handle;
int r;
- MUSCATLS_FETCH();
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &Muscat_handle_arg) == FAILURE){
WRONG_PARAM_COUNT;
{
zval **muscat_handle_arg;
_muscat_handle *handle;
- MUSCATLS_FETCH();
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &muscat_handle_arg) == FAILURE){
WRONG_PARAM_COUNT;
*/
#ifdef ZTS
-#define MUSCATG(v) (muscat_globals->v)
-#define MUSCATLS_FETCH() php_muscat_globals *muscat_globals = ts_resource(muscat_globals_id)
+#define MUSCATG(v) TSRMG(muscat_globals_id, php_muscat_globals *, v)
#else
#define MUSCATG(v) (muscat_globals.v)
-#define MUSCATLS_FETCH()
#endif
#else
*/
static void php_mysql_set_default_link(int id)
{
- MySLS_FETCH();
+ TSRMLS_FETCH();
if (MySG(default_link)!=-1) {
zend_list_delete(MySG(default_link));
{
php_mysql_conn *link = (php_mysql_conn *)rsrc->ptr;
void (*handler) (int);
- MySLS_FETCH();
+ TSRMLS_FETCH();
handler = signal(SIGPIPE, SIG_IGN);
mysql_close(&link->conn);
{
php_mysql_conn *link = (php_mysql_conn *)rsrc->ptr;
void (*handler) (int);
- MySLS_FETCH();
+ TSRMLS_FETCH();
handler = signal(SIGPIPE, SIG_IGN);
mysql_close(&link->conn);
*/
static PHP_INI_MH(OnMySQLPort)
{
- MySLS_FETCH();
+ TSRMLS_FETCH();
if (new_value==NULL) { /* default port */
#ifndef PHP_WIN32
*/
PHP_RINIT_FUNCTION(mysql)
{
- MySLS_FETCH();
-
MySG(default_link)=-1;
MySG(num_links) = MySG(num_persistent);
/* Reset connect error/errno on every request */
*/
PHP_RSHUTDOWN_FUNCTION(mysql)
{
- MySLS_FETCH();
+ TSRMLS_FETCH();
if (MySG(connect_error)!=NULL) {
efree(MySG(connect_error));
}
PHP_MINFO_FUNCTION(mysql)
{
char buf[32];
- MySLS_FETCH();
+ TSRMLS_FETCH();
php_info_print_table_start();
php_info_print_table_header(2, "MySQL Support", "enabled");
void (*handler) (int);
zval **z_host=NULL, **z_user=NULL, **z_passwd=NULL;
zend_bool free_host=0;
- MySLS_FETCH();
- PLS_FETCH();
socket = MySG(default_socket);
/* {{{ php_mysql_get_default_link
*/
-static int php_mysql_get_default_link(INTERNAL_FUNCTION_PARAMETERS MySLS_DC)
+static int php_mysql_get_default_link(INTERNAL_FUNCTION_PARAMETERS)
{
if (MySG(default_link)==-1) { /* no link opened yet, implicitly open one */
ht = 0;
zval **mysql_link=NULL;
int id;
php_mysql_conn *mysql;
- MySLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 0:
zval **db, **mysql_link;
int id;
php_mysql_conn *mysql;
- MySLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 1:
if (zend_get_parameters_ex(1, &db)==FAILURE) {
RETURN_FALSE;
}
- id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC);
+ id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
break;
case 2:
zval **mysql_link;
int id;
php_mysql_conn *mysql;
- MySLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 0:
- id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC);
+ id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
break;
case 1:
zval **mysql_link;
int id;
php_mysql_conn *mysql;
- MySLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 0:
- id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC);
+ id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
break;
case 1:
zval **mysql_link;
int id;
php_mysql_conn *mysql;
- MySLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 0:
- id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC);
+ id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
break;
case 1:
zval **db, **mysql_link;
int id;
php_mysql_conn *mysql;
- MySLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 1:
if (zend_get_parameters_ex(1, &db)==FAILURE) {
RETURN_FALSE;
}
- id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC);
+ id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
break;
case 2:
zval **db, **mysql_link;
int id;
php_mysql_conn *mysql;
- MySLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 1:
if (zend_get_parameters_ex(1, &db)==FAILURE) {
RETURN_FALSE;
}
- id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC);
+ id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
break;
case 2:
{
php_mysql_conn *mysql;
MYSQL_RES *mysql_result;
- MySLS_FETCH();
+ TSRMLS_FETCH();
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, link_id, "MySQL-Link", le_link, le_plink);
{
zval **query, **mysql_link;
int id;
- MySLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 1:
if (zend_get_parameters_ex(1, &query)==FAILURE) {
RETURN_FALSE;
}
- id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC);
+ id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
break;
case 2:
{
zval **db, **query, **mysql_link;
int id;
- MySLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 2:
if (zend_get_parameters_ex(2, &db, &query)==FAILURE) {
RETURN_FALSE;
}
- id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC);
+ id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
break;
case 3:
int id;
php_mysql_conn *mysql;
MYSQL_RES *mysql_result;
- MySLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 0:
- id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC);
+ id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
break;
case 1:
int id;
php_mysql_conn *mysql;
MYSQL_RES *mysql_result;
- MySLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 1:
if (zend_get_parameters_ex(1, &db)==FAILURE) {
RETURN_FALSE;
}
- id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC);
+ id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
break;
case 2:
int id;
php_mysql_conn *mysql;
MYSQL_RES *mysql_result;
- MySLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 2:
if (zend_get_parameters_ex(2, &db, &table)==FAILURE) {
RETURN_FALSE;
}
- id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC);
+ id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
break;
case 3:
zval **mysql_link;
int id;
php_mysql_conn *mysql;
- MySLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 0:
zval **mysql_link;
int id;
php_mysql_conn *mysql;
- MySLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 0:
zval **mysql_link;
int id;
php_mysql_conn *mysql;
- MySLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 0:
zval **mysql_link;
int id;
php_mysql_conn *mysql;
- MySLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 0:
MYSQL_ROW sql_row;
mysql_row_length_type *sql_row_lengths;
int field_offset=0;
- PLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 2:
mysql_row_length_type *mysql_row_lengths;
int num_fields;
int i;
- PLS_FETCH();
if (ZEND_NUM_ARGS() > expected_args) {
WRONG_PARAM_COUNT;
ZEND_END_MODULE_GLOBALS(mysql)
#ifdef ZTS
-# define MySLS_D zend_mysql_globals *mysql_globals
-# define MySLS_DC , MySLS_D
-# define MySLS_C mysql_globals
-# define MySLS_CC , MySLS_C
-# define MySG(v) (mysql_globals->v)
-# define MySLS_FETCH() zend_mysql_globals *mysql_globals = ts_resource(mysql_globals_id)
+# define MySG(v) TSRMG(mysql_globals_id, zend_mysql_globals *, v)
#else
-# define MySLS_D
-# define MySLS_DC
-# define MySLS_C
-# define MySLS_CC
# define MySG(v) (mysql_globals.v)
-# define MySLS_FETCH()
#endif
/* }}} */
/* {{{ startup, shutdown and info functions */
-static void php_oci_init_globals(OCILS_D TSRMLS_DC)
+static void php_oci_init_globals(php_oci_globals *oci_globals_p TSRMLS_DC)
{
OCI(shutdown) = 0;
#ifdef ZTS
ts_allocate_id(&oci_globals_id, sizeof(php_oci_globals), (ts_allocate_ctor) php_oci_init_globals, NULL);
#else
- php_oci_init_globals(OCILS_C TSRMLS_CC);
+ php_oci_init_globals(&oci_globals TSRMLS_CC);
#endif
le_stmt = zend_register_list_destructors_ex(_oci_stmt_list_dtor, NULL, "oci8 statement", module_number);
PHP_RINIT_FUNCTION(oci)
{
- OCILS_FETCH();
-
/* XXX NYI
OCI(num_links) =
OCI(num_persistent);
PHP_MSHUTDOWN_FUNCTION(oci)
{
- OCILS_FETCH();
+ TSRMLS_FETCH();
OCI(shutdown) = 1;
static int oci_ping(oci_server *server)
{
char version[256];
- OCILS_FETCH();
+ TSRMLS_FETCH();
OCI(error) =
OCIServerVersion(server->pServer,
static void oci_debug(const char *format, ...)
{
- OCILS_FETCH();
+ TSRMLS_FETCH();
if (OCI(debug_mode)) {
char buffer[1024];
oci_new_desc(int type,oci_connection *connection)
{
oci_descriptor *descr;
- OCILS_FETCH();
+ TSRMLS_FETCH();
descr = emalloc(sizeof(oci_descriptor));
static oci_statement *oci_parse(oci_connection *connection, char *query, int len)
{
oci_statement *statement;
- OCILS_FETCH();
+ TSRMLS_FETCH();
statement = ecalloc(1,sizeof(oci_statement));
oci_session *session = 0, *psession = 0;
OCISvcCtx *svchp = 0;
char *hashed_details;
- OCILS_FETCH();
+ TSRMLS_FETCH();
/*
check if we already have this user authenticated
{
OCISvcCtx *svchp;
char *hashed_details;
- OCILS_FETCH();
+ TSRMLS_FETCH();
if (! session) {
return;
static oci_server *_oci_open_server(char *dbname,int persistent)
{
oci_server *server, *pserver = 0;
- OCILS_FETCH();
+ TSRMLS_FETCH();
/*
check if we already have this server open
{
char *dbname;
int oldopen;
- OCILS_FETCH();
+ TSRMLS_FETCH();
TSRMLS_FETCH();
oldopen = server->is_open;
oci_server *server = 0;
oci_session *session = 0;
oci_connection *connection = 0;
- OCILS_FETCH();
if (zend_get_parameters_ex(3, &userParam, &passParam, &dbParam) == SUCCESS) {
convert_to_string_ex(userParam);
PHP_FUNCTION(ociinternaldebug)
{
zval **arg;
- OCILS_FETCH();
if (zend_get_parameters_ex(1, &arg) == FAILURE) {
WRONG_PARAM_COUNT;
sword error = 0;
dvoid *errh = NULL;
- OCILS_FETCH();
-
if (zend_get_parameters_ex(1, &arg) == SUCCESS) {
statement = (oci_statement *) zend_fetch_resource(arg, -1, NULL, NULL, 1, le_stmt);
if (statement) {
int inx;
oci_collection *coll;
oci_connection *connection;
- OCILS_FETCH();
if ((id = getThis()) != 0) {
inx = _oci_get_ocicoll(id,&coll);
int inx;
double ndx;
- OCILS_FETCH();
-
if ((id = getThis()) != 0) {
if ((inx = _oci_get_ocicoll(id,&coll)) == 0) {
RETURN_FALSE;
int len;
double dnum;
- OCILS_FETCH();
-
if ((id = getThis()) != 0) {
if ((inx = _oci_get_ocicoll(id,&coll)) == 0) {
RETURN_FALSE;
oci_collection *coll,*from_coll;
int inx;
- OCILS_FETCH();
-
if ((id = getThis()) != 0) {
if ((inx = _oci_get_ocicoll(id,&coll)) == 0) {
RETURN_FALSE;
OCIDate dt;
double dnum;
- OCILS_FETCH();
-
if ((id = getThis()) != 0) {
if ((inx = _oci_get_ocicoll(id,&coll)) == 0) {
RETURN_FALSE;
sb4 sz;
int inx;
- OCILS_FETCH();
-
if ((id = getThis()) != 0) {
if ((inx = _oci_get_ocicoll(id,&coll)) == 0) {
RETURN_FALSE;
oci_collection *coll;
sb4 sz;
int inx;
- OCILS_FETCH();
if ((id = getThis()) != 0) {
if ((inx = _oci_get_ocicoll(id,&coll)) == 0) {
oci_collection *coll;
int inx;
- OCILS_FETCH();
-
if ((id = getThis()) != 0) {
if ((inx = _oci_get_ocicoll(id,&coll)) == 0) {
RETURN_FALSE;
oci_collection *coll;
int ac = ZEND_NUM_ARGS();
- OCILS_FETCH();
-
-
-
if (ac < 2 || ac > 3 || zend_get_parameters_ex(ac, &conn, &tdo, &schema) == FAILURE) {
WRONG_PARAM_COUNT;
}
#define OCI_PIECE_SIZE (64*1024)-1
#ifdef ZTS
-#define OCILS_D php_oci_globals *oci_globals
-#define OCILS_DC , OCILS_D
-#define OCILS_C oci_globals
-#define OCILS_CC , OCILS_C
-#define OCI(v) (oci_globals->v)
-#define OCILS_FETCH() php_oci_globals *oci_globals = ts_resource(oci_globals_id)
+#define OCI(v) TSRMG(oci_globals_id, php_oci_globals *, v)
#else
-#define OCILS_D
-#define OCILS_DC
-#define OCILS_C
-#define OCILS_CC
#define OCI(v) (oci_globals.v)
-#define OCILS_FETCH()
#endif
#else /* !HAVE_OCI8 */
{
odbc_connection *conn = (odbc_connection *)rsrc->ptr;
- ODBCLS_FETCH();
+ TSRMLS_FETCH();
safe_odbc_disconnect(conn->hdbc);
SQLFreeConnect(conn->hdbc);
static void _close_odbc_pconn(zend_rsrc_list_entry *rsrc)
{
odbc_connection *conn = (odbc_connection *)rsrc->ptr;
- ODBCLS_FETCH();
+ TSRMLS_FETCH();
safe_odbc_disconnect(conn->hdbc);
SQLFreeConnect(conn->hdbc);
PHP_INI_END()
#ifdef ZTS
-static void php_odbc_init_globals(php_odbc_globals *odbc_globals TSRMLS_DC)
+static void php_odbc_init_globals(php_odbc_globals *odbc_globals_p TSRMLS_DC)
{
ODBCG(num_persistent) = 0;
}
PHP_MINIT_FUNCTION(odbc)
{
- ODBCLS_D;
#ifdef SQLANY_BUG
ODBC_SQL_CONN_T foobar;
RETCODE rc;
#ifdef ZTS
ts_allocate_id(&odbc_globals_id, sizeof(php_odbc_globals), php_odbc_init_globals, NULL);
- odbc_globals = ts_resource(odbc_globals_id);
#else
ODBCG(num_persistent) = 0;
#endif
PHP_RINIT_FUNCTION(odbc)
{
- ODBCLS_FETCH();
-
ODBCG(defConn) = -1;
ODBCG(num_links) = ODBCG(num_persistent);
memset(ODBCG(laststate), '\0', 6);
PHP_MSHUTDOWN_FUNCTION(odbc)
{
- ODBCLS_FETCH();
+ TSRMLS_FETCH();
UNREGISTER_INI_ENTRIES();
return SUCCESS;
PHP_MINFO_FUNCTION(odbc)
{
char buf[32];
- ODBCLS_FETCH();
+ TSRMLS_FETCH();
php_info_print_table_start();
php_info_print_table_header(2, "ODBC Support", "enabled");
RETCODE rc;
ODBC_SQL_ENV_T henv;
ODBC_SQL_CONN_T conn;
- ODBCLS_FETCH();
+ TSRMLS_FETCH();
if (conn_resource) {
henv = conn_resource->henv;
{
odbc_result *result;
pval **pv_res, **pv_flag;
- ODBCLS_FETCH();
- PLS_FETCH();
if (zend_get_parameters_ex(2, &pv_res, &pv_flag) == FAILURE)
WRONG_PARAM_COUNT;
int i;
SWORD colnamelen; /* Not used */
SDWORD displaysize;
- ODBCLS_FETCH();
+ TSRMLS_FETCH();
result->values = (odbc_result_value *)
emalloc(sizeof(odbc_result_value)*result->numcols);
odbc_connection *conn;
RETCODE rc;
pval **pv_conn;
- ODBCLS_FETCH();
if (zend_get_parameters_ex(1, &pv_conn) == FAILURE) {
WRONG_PARAM_COUNT;
#ifdef HAVE_SQL_EXTENDED_FETCH
UDWORD scrollopts;
#endif
- ODBCLS_FETCH();
if (zend_get_parameters_ex(2, &pv_conn, &pv_query) == FAILURE) {
WRONG_PARAM_COUNT;
odbc_result *result;
int numArgs, i, ne;
RETCODE rc;
- ODBCLS_FETCH();
numArgs = ZEND_NUM_ARGS();
switch(numArgs) {
char *cursorname;
odbc_result *result;
RETCODE rc;
- ODBCLS_FETCH();
if (zend_get_parameters_ex(1, &pv_res) == FAILURE) {
WRONG_PARAM_COUNT;
SDWORD error; /* Not used */
char errormsg[255];
SWORD errormsgsize; /* Not used */
- ODBCLS_FETCH();
SQLError( result->conn_ptr->henv, result->conn_ptr->hdbc,
result->stmt, state, &error, errormsg,
}
/* }}} */
-int odbc_sqlconnect(odbc_connection **conn, char *db, char *uid, char *pwd, int cur_opt, int persistent ODBCLS_DC)
+int odbc_sqlconnect(odbc_connection **conn, char *db, char *uid, char *pwd, int cur_opt, int persistent TSRMLS_DC)
{
RETCODE rc;
odbc_connection *db_conn;
char *hashed_details;
int hashed_len, len, cur_opt;
- ODBCLS_FETCH();
- PLS_FETCH();
/* Now an optional 4th parameter specifying the cursor type
* defaulting to the cursors default
RETURN_FALSE;
}
- if (!odbc_sqlconnect(&db_conn, db, uid, pwd, cur_opt, 1 ODBCLS_CC)) {
+ if (!odbc_sqlconnect(&db_conn, db, uid, pwd, cur_opt, 1 TSRMLS_CC)) {
efree(hashed_details);
RETURN_FALSE;
}
RETURN_FALSE;
}
- if (!odbc_sqlconnect(&db_conn, db, uid, pwd, cur_opt, 0 ODBCLS_CC)) {
+ if (!odbc_sqlconnect(&db_conn, db, uid, pwd, cur_opt, 0 TSRMLS_CC)) {
efree(hashed_details);
RETURN_FALSE;
}
int type;
int is_pconn = 0;
int found_resource_type = le_conn;
- ODBCLS_FETCH();
if (zend_get_parameters_ex(1, &pv_conn) == FAILURE) {
WRONG_PARAM_COUNT;
strlcpy(ptr, conn->lasterrormsg, len+1);
}
} else {
- ODBCLS_FETCH();
-
if (mode == 0) {
strlcpy(ptr, ODBCG(laststate), len+1);
} else {
#define IS_SQL_BINARY(x) (x == SQL_BINARY || x == SQL_VARBINARY || x == SQL_LONGVARBINARY)
#ifdef ZTS
-# define ODBCLS_D php_odbc_globals *odbc_globals
-# define ODBCLS_DC , ODBCLS_D
-# define ODBCLS_C odbc_globals
-# define ODBCLS_CC , ODBCLS_C
-# define ODBCG(v) (odbc_globals->v)
-# define ODBCLS_FETCH() php_odbc_globals *odbc_globals = ts_resource(odbc_globals_id)
+# define ODBCG(v) TSRMG(odbc_globals_id, php_odbc_globals *, v)
#else
-# define ODBCLS_D
-# define ODBCLS_DC
-# define ODBCLS_C
-# define ODBCLS_CC
# define ODBCG(v) (odbc_globals.v)
-# define ODBCLS_FETCH()
extern ZEND_API php_odbc_globals odbc_globals;
#endif
static int _close_oraconn(zend_rsrc_list_entry *rsrc)
{
oraConnection *conn = (oraConnection *)rsrc->ptr;
- ORALS_FETCH();
+ TSRMLS_FETCH();
conn->open = 0;
static int _close_oracur(oraCursor *cur)
{
int i;
- ORALS_FETCH();
+ TSRMLS_FETCH();
if (cur){
if (cur->query){
/* {{{ php_ora_init_globals
*/
-static void php_ora_init_globals(ORALS_D TSRMLS_DC)
+static void php_ora_init_globals(php_ora_globals *ora_globals_p TSRMLS_DC)
{
if (cfg_get_long("oracle.allow_persistent",
&ORA(allow_persistent))
#ifdef ZTS
ts_allocate_id(&ora_globals_id, sizeof(php_ora_globals), (ts_allocate_ctor) php_ora_init_globals, NULL);
#else
- php_ora_init_globals(ORALS_C TSRMLS_CC);
+ php_ora_init_globals(&ora_globals TSRMLS_CC);
#endif
le_cursor = zend_register_list_destructors_ex(php_close_ora_cursor, NULL, "oracle cursor", module_number);
*/
PHP_RINIT_FUNCTION(oracle)
{
- ORALS_FETCH();
-
ORA(num_links) =
ORA(num_persistent);
/*
*/
PHP_MSHUTDOWN_FUNCTION(oracle)
{
- ORALS_FETCH();
+ TSRMLS_FETCH();
zend_hash_destroy(ORA(conns));
free(ORA(conns));
char *hashed_details;
int hashed_details_length;
oraConnection *db_conn;
- ORALS_FETCH();
if (zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
void *res;
int what;
int argc = ZEND_NUM_ARGS();
- ORALS_FETCH();
if (argc < 0 || argc >> 1 || zend_get_parameters_ex(argc, &arg) == FAILURE) {
WRONG_PARAM_COUNT;
void *res;
int what;
int argc = ZEND_NUM_ARGS();
- ORALS_FETCH();
if (argc < 0 || argc >> 1 || zend_get_parameters_ex(argc, &arg) == FAILURE) {
WRONG_PARAM_COUNT;
{
oraCursor *cursor;
oraConnection *db_conn;
- ORALS_FETCH();
+ TSRMLS_FETCH();
cursor = (oraCursor *) zend_fetch_resource(ind, -1, "Oracle-Cursor", NULL, 1, le_cursor);
if (! cursor) {
oraParam *param;
pval **pdata;
int i, len, plen;
-
TSRMLS_FETCH();
zend_hash_internal_pointer_reset(cursor->params);
#define phpext_oracle_ptr &oracle_module_entry
#ifdef ZTS
-#define ORALS_D php_ora_globals *ora_globals
-#define ORALS_DC , ORACLE_D
-#define ORALS_C ora_globals
-#define ORALS_CC , ORALS_C
-#define ORA(v) (ora_globals->v)
-#define ORALS_FETCH() php_ora_globals *ora_globals = ts_resource(ora_globals_id)
+#define ORA(v) TSRMG(ora_globals_id, php_ora_globals *, v)
#else
-#define ORALS_D
-#define ORALS_DC
-#define ORALS_C
-#define ORALS_CC
#define ORA(v) (ora_globals.v)
-#define ORALS_FETCH()
#endif
/* oparse flags */
#ifdef ZTS
-static void php_pcre_init_globals(php_pcre_globals *pcre_globals)
+static void php_pcre_init_globals(php_pcre_globals *pcre_globals TSRMLS_DC)
{
zend_hash_init(&PCRE_G(pcre_cache), 0, NULL, php_free_pcre_cache, 1);
}
int backref; /* Current backref */
char *compiled_string_description;
smart_str code = {0};
- CLS_FETCH();
TSRMLS_FETCH();
eval_str_end = eval_str + eval_str_len;
compiled_string_description = zend_make_compiled_string_description("regexp code");
/* Run the code */
- if (zend_eval_string(code.c, &retval, compiled_string_description CLS_CC TSRMLS_CC) == FAILURE) {
+ if (zend_eval_string(code.c, &retval, compiled_string_description TSRMLS_CC) == FAILURE) {
efree(compiled_string_description);
zend_error(E_ERROR, "Failed evaluating code:\n%s\n", code);
/* zend_error() does not return in this case */
#ifdef ZTS
#define PDFG(v) (pdf_globals->v)
-#define PDFLS_FETCH() php_pdf_globals *pdf_globals = ts_resource(pdf_globals_id)
+#define PDFG(v) TSRMG(pdf_globals_id, php_pdf_globals *, v)
#else
#define PDFG(v) (pdf_globals.v)
-#define PDFLS_FETCH()
#endif
PHP_RINIT_FUNCTION(pfpro)
{
- PFPROLS_FETCH();
-
PFPROG(initialized) = 0;
return SUCCESS;
PHP_RSHUTDOWN_FUNCTION(pfpro)
{
- PFPROLS_FETCH();
+ TSRMLS_FETCH();
if (PFPROG(initialized) == 1) {
pfproCleanup();
Initializes the Payflow Pro library */
PHP_FUNCTION(pfpro_init)
{
- PFPROLS_FETCH();
-
if (ZEND_NUM_ARGS() != 0) {
WRONG_PARAM_COUNT;
}
Shuts down the Payflow Pro library */
PHP_FUNCTION(pfpro_cleanup)
{
- PFPROLS_FETCH();
-
if (ZEND_NUM_ARGS() != 0) {
WRONG_PARAM_COUNT;
}
char *response;
#endif
- PFPROLS_FETCH();
-
if (ZEND_NUM_ARGS() < 1 || ZEND_NUM_ARGS() > 8) {
WRONG_PARAM_COUNT;
}
*sp1, *sp2,
*pdelim1="&", *pdelim2="=";
- PFPROLS_FETCH();
-
if (ZEND_NUM_ARGS() < 1 || ZEND_NUM_ARGS() > 8) {
WRONG_PARAM_COUNT;
}
} php_pfpro_globals;
#ifdef ZTS
-#define PFPROG(v) (pfpro_globals->v)
-#define PFPROLS_FETCH() php_pfpro_globals *pfpro_globals = ts_resource(gd_pfpro_id)
+#define PFPROG(v) TSRMG(gd_pfpro_id, php_pfpro_globals *, v)
#else
#define PFPROG(v) (pfpro_globals.v)
-#define PFPROLS_FETCH()
#endif
#else
*/
static void php_pgsql_set_default_link(int id)
{
- PGLS_FETCH();
+ TSRMLS_FETCH();
zend_list_addref(id);
static void _close_pgsql_link(zend_rsrc_list_entry *rsrc)
{
PGconn *link = (PGconn *)rsrc->ptr;
- PGLS_FETCH();
+ TSRMLS_FETCH();
PQfinish(link);
PGG(num_links)--;
static void _close_pgsql_plink(zend_rsrc_list_entry *rsrc)
{
PGconn *link = (PGconn *)rsrc->ptr;
- PGLS_FETCH();
+ TSRMLS_FETCH();
PQfinish(link);
PGG(num_persistent)--;
static void
_notice_handler(void *arg, const char *message)
{
- PGLS_FETCH();
+ TSRMLS_FETCH();
if (! PGG(ignore_notices)) {
php_log_err((char *) message);
static int _rollback_transactions(zend_rsrc_list_entry *rsrc)
{
PGconn *link;
- PGLS_FETCH();
+ TSRMLS_FETCH();
if (rsrc->type != le_plink)
return 0;
/* {{{ php_pgsql_init_globals
*/
-static void php_pgsql_init_globals(PGLS_D TSRMLS_DC)
+static void php_pgsql_init_globals(php_pgsql_globals *pgsql_globals_p TSRMLS_DC)
{
PGG(num_persistent) = 0;
PGG(ignore_notices) = 0;
#ifdef ZTS
ts_allocate_id(&pgsql_globals_id, sizeof(php_pgsql_globals), (ts_allocate_ctor) php_pgsql_init_globals, NULL);
#else
- php_pgsql_init_globals(PGLS_C TSRMLS_CC);
+ php_pgsql_init_globals(&pgsql_globals TSRMLS_CC);
#endif
REGISTER_INI_ENTRIES();
*/
PHP_RINIT_FUNCTION(pgsql)
{
- PGLS_FETCH();
-
PGG(default_link)=-1;
PGG(num_links) = PGG(num_persistent);
return SUCCESS;
PHP_MINFO_FUNCTION(pgsql)
{
char buf[32];
- PGLS_FETCH();
+ TSRMLS_FETCH();
php_info_print_table_start();
php_info_print_table_header(2, "PostgreSQL Support", "enabled");
char *hashed_details;
int hashed_details_length;
PGconn *pgsql;
- PGLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 1: { /* new style, using connection string */
*/
int php_pgsql_get_default_link(INTERNAL_FUNCTION_PARAMETERS)
{
- PGLS_FETCH();
-
if (PGG(default_link)==-1) { /* no link opened yet, implicitly open one */
ht = 0;
php_pgsql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0);
zval **pgsql_link = NULL;
int id;
PGconn *pgsql;
- PGLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 0:
zval **pgsql_link = NULL;
int id = -1;
PGconn *pgsql;
- PGLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 0:
PGresult *pgsql_result;
ExecStatusType status;
pgsql_result_handle *pg_result;
- PGLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 1:
int id = -1;
PGconn *pgsql;
int result = 0;
- PGLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 0:
int id = -1;
PGconn *pgsql;
int result = 0;
- PGLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 1:
Returns the last notice set by the backend */
PHP_FUNCTION(pg_last_notice)
{
- PGLS_FETCH();
-
if (PGG(last_notice) == NULL) {
RETURN_FALSE;
} else {
int i, num_fields, pgsql_row;
char *element, *field_name;
uint element_len;
- PLS_FETCH();
+ TSRMLS__FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
char *mode = "w";
int issock, socketd;
FILE *fp;
- PGLS_FETCH();
id = PGG(default_link);
zval **pgsql_link = NULL;
int id = -1;
PGconn *pgsql;
- PGLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 0:
PGconn *pgsql;
Oid pgsql_oid;
int id = -1;
- PGLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 0:
PGconn *pgsql;
Oid pgsql_oid;
int id = -1;
- PGLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 1:
int create=0;
char *mode_string=NULL;
pgLofp *pgsql_lofp;
- PGLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 2:
int id = -1;
PGconn *pgsql;
Oid oid;
- PLS_FETCH();
- PGLS_FETCH();
+ TSRMLS__FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
int id = -1;
Oid oid;
PGconn *pgsql;
- PGLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 2:
zval **encoding, **pgsql_link = NULL;
int id = -1;
PGconn *pgsql;
- PGLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 1:
zval **pgsql_link = NULL;
int id = -1;
PGconn *pgsql;
- PGLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 0:
#ifdef ZTS
-# define PGLS_D php_pgsql_globals *pgsql_globals
-# define PGLS_DC , PGLS_D
-# define PGLS_C pgsql_globals
-# define PGLS_CC , PGLS_C
-# define PGG(v) (pgsql_globals->v)
-# define PGLS_FETCH() php_pgsql_globals *pgsql_globals = ts_resource(pgsql_globals_id)
+# define PGG(v) TSRMG(pgsql_globals_id, php_pgsql_globals *, v)
#else
-# define PGLS_D
-# define PGLS_DC
-# define PGLS_C
-# define PGLS_CC
# define PGG(v) (pgsql_globals.v)
-# define PGLS_FETCH()
extern PHP_PGSQL_API php_pgsql_globals pgsql_globals;
#endif
+
#endif
#else
pval *path;
pval *mode;
int result;
- PLS_FETCH();
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters(ht, 2, &path, &mode) == FAILURE) {
WRONG_PARAM_COUNT;
zval *params[4];
int i;
char **matches = NULL;
- CLS_FETCH();
+ TSRMLS_FETCH();
params[0]=_readline_string_zval(_readline_completion);
params[1]=_readline_string_zval(text);
} php_recode_globals;
#ifdef ZTS
-# define ReSLS_D php_recode_globals *recode_globals
-# define ReSLS_DC , ReSLS_D
-# define ReSLS_C recode_globals
-# define ReSLS_CC , ReSLS_C
-# define ReSG(v) (recode_globals->v)
-# define ReSLS_FETCH() php_recode_globals *recode_globals = ts_resource(recode_globals_id)
+# define ReSG(v) TSRMG(recode_globals_id, php_recode_globals *, v)
#else
-# define ReSLS_D
-# define ReSLS_DC
-# define ReSLS_C
-# define ReSLS_CC
# define ReSG(v) (recode_globals.v)
-# define ReSLS_FETCH()
extern PHP_MYSQL_API php_recode_globals recode_globals;
#endif
PHP_MINIT_FUNCTION(recode)
{
- ReSLS_FETCH();
+ TSRMLS_FETCH();
+
ReSG(outer) = recode_new_outer(true);
if (ReSG(outer) == NULL)
return FAILURE;
PHP_MSHUTDOWN_FUNCTION(recode)
{
- ReSLS_FETCH();
+ TSRMLS_FETCH();
if (ReSG(outer))
recode_delete_outer(ReSG(outer));
PHP_MINFO_FUNCTION(recode)
{
- ReSLS_FETCH();
+ TSRMLS_FETCH();
php_info_print_table_start();
php_info_print_table_row(2, "Recode Support", "enabled");
pval **req;
bool success;
int r_len=0, r_alen =0;
-
- ReSLS_FETCH();
+
if (ZEND_NUM_ARGS() != 2
|| zend_get_parameters_ex(2, &req, &str) == FAILURE) {
WRONG_PARAM_COUNT;
FILE *in_fp, *out_fp;
int in_type, out_type;
- ReSLS_FETCH();
if (ZEND_NUM_ARGS() != 3
|| zend_get_parameters_ex(3, &req, &input, &output) == FAILURE) {
WRONG_PARAM_COUNT;
char *typelib_name_buffer;
char *strtok_buf = NULL;
int interactive;
- CLS_FETCH();
+ TSRMLS_FETCH();
interactive = CG(interactive);
if (!classpath) classpath = getenv("CLASSPATH");
if (!libpath) {
- PLS_FETCH();
+ TSRMLS_FETCH();
libpath=PG(extension_dir);
}
#ifdef ZTS
-#define SABLOTG(v) (sablot_globals->v)
-#define SABLOTLS_FETCH() php_sablot_globals *sablot_globals = ts_resource(sablot_globals_id)
-#define SABLOTG_HANDLE (*sablot_globals)
-#define SABLOTLS_C sablot_globals
-#define SABLOTLS_CC , SABLOTLS_C
-#define SABLOTLS_D php_sablot_globals *sablot_globals
-#define SABLOTLS_DC , SABLOTLS_D
+#define SABLOTG(v) TSRMG(sablot_globals_id, php_sablot_globals *, v)
#else
#define SABLOTG(v) (sablot_globals.v)
-#define SABLOTG_HANDLE sablot_globals
-#define SABLOTLS_FETCH()
-#define SABLOTLS_C
-#define SABLOTLS_CC
-#define SABLOTLS_D
-#define SABLOTLS_DC
#endif
#else
ZEND_GET_MODULE(sablot)
#endif
-static void php_sablot_init_globals(SABLOTLS_D TSRMLS_DC)
+static void php_sablot_init_globals(php_sablot_init_globals *sablot_init_globals_p TSRMLS_DC)
{
SABLOTG(processor) = NULL;
SABLOTG(errors) = NULL;
#ifdef ZTS
ts_allocate_id(&sablot_globals_id, sizeof(php_sablot_globals), (ts_allocate_ctor)php_sablot_init_globals, NULL);
#else
- php_sablot_init_globals(SABLOTLS_C TSRMLS_CC);
+ php_sablot_init_globals(&sablot_globals TSRMLS_CC);
#endif
le_sablot = zend_register_list_destructors_ex(_php_sablot_free_processor, NULL, "Sablotron XSLT", module_number);
PHP_MSHUTDOWN_FUNCTION(sablot)
{
- SABLOTLS_FETCH();
+ TSRMLS_FETCH();
+
if (SABLOTG(processor)) {
SablotUnregHandler(SABLOTG(processor), HLR_MESSAGE, NULL, NULL);
SablotDestroyProcessor(SABLOTG(processor));
PHP_RSHUTDOWN_FUNCTION(sablot)
{
- SABLOTLS_FETCH();
+ TSRMLS_FETCH();
SABLOT_FREE_ERROR_HANDLE(SABLOTG_HANDLE);
{
/* The name of the file to pass the output through */
zval **file;
-
- /* needed for the output transformation file name */
- SABLOTLS_FETCH();
-
+
if (ZEND_NUM_ARGS() != 1 ||
zend_get_parameters_ex(1, &file) == FAILURE) {
WRONG_PARAM_COUNT;
*buffer = NULL;
int ret = 0;
- /* Fetch both the output globals and the sablotron globals */
- OLS_FETCH();
- SABLOTLS_FETCH();
-
/**
* Make sure that we don't have more than one output buffer going on
* at the same time.
int argc = ZEND_NUM_ARGS(),
ret = 0;
-
- SABLOTLS_FETCH();
if (argc < 3 || argc > 6 ||
zend_get_parameters_ex(argc, &xslt_uri, &transform_uri, &result_uri, &xslt_params, &xslt_args, &result) == FAILURE) {
char *tRes = NULL;
int ret = 0,
argc = ZEND_NUM_ARGS();
- SABLOTLS_FETCH();
if (argc < 3 || argc > 4 ||
zend_get_parameters_ex(argc, &xslt, &input, &result, &base) == FAILURE) {
php_sablot *handle;
SablotHandle p;
int ret;
- SABLOTLS_FETCH();
ret = SablotCreateProcessor(&p);
*result = NULL;
int argc = ZEND_NUM_ARGS(),
ret = 0;
- SABLOTLS_FETCH();
if (argc < 3 || argc > 6 ||
zend_get_parameters_ex(argc, &xh, &xslt_file, &data_file, &xslt_result, &xslt_params, &xslt_args) == FAILURE) {
int ret = 0,
loglevel = 0,
argc = ZEND_NUM_ARGS();
- SABLOTLS_FETCH();
+ TSRMLS_FETCH();
if (argc < 2 || argc > 3 ||
zend_get_parameters_ex(argc, &xh, &logfile, &opt_loglevel) == FAILURE) {
zval **xh;
php_sablot *handle;
int ret;
- SABLOTLS_FETCH();
if (ZEND_NUM_ARGS() != 1 ||
zend_get_parameters_ex(1, &xh) == FAILURE) {
*rname = NULL;
int argc = ZEND_NUM_ARGS(),
ret = 0;
- SABLOTLS_FETCH();
if (argc < 1 || argc > 2 ||
zend_get_parameters_ex(argc, &xh, &result_name) == FAILURE) {
{
zval **xh;
php_sablot *handle;
- SABLOTLS_FETCH();
if (ZEND_NUM_ARGS() != 1 ||
zend_get_parameters_ex(1, &xh) == FAILURE) {
HashTable *handlers_list;
char *string_key = NULL;
ulong num_key;
- SABLOTLS_FETCH();
if (ZEND_NUM_ARGS() != 2 ||
HashTable *handlers_list;
char *string_key = NULL;
ulong num_key;
- SABLOTLS_FETCH();
if (ZEND_NUM_ARGS() != 2 ||
zend_get_parameters_ex(2, &xh, &handlers) == FAILURE) {
int ret = 0,
loglevel = 0,
argc = ZEND_NUM_ARGS();
- SABLOTLS_FETCH();
if (argc != 2 ||
zend_get_parameters_ex(argc, &xh, &encoding) == FAILURE) {
php_sablot *handle;
int argc = ZEND_NUM_ARGS(),
ret = 0;
- SABLOTLS_FETCH();
if (argc < 2 || argc > 3 ||
zend_get_parameters_ex(argc, &xh, &scheme, &base) == FAILURE) {
php_sablot *handle;
int serrno = 0,
argc = ZEND_NUM_ARGS();
- SABLOTLS_FETCH();
if (argc < 0 || argc > 1 ||
zend_get_parameters_ex(argc, &xh) == FAILURE) {
php_sablot *handle;
int argc = ZEND_NUM_ARGS();
- SABLOTLS_FETCH();
-
if (argc < 0 || argc > 1 ||
zend_get_parameters_ex(argc, &xh) == FAILURE) {
WRONG_PARAM_COUNT;
zval **arg1, **arg2;
php_sablot *handle;
int argc = ZEND_NUM_ARGS();
-
- SABLOTLS_FETCH();
if (argc > 2 || argc < 1 ||
zend_get_parameters_ex(argc, &arg1, &arg2) == FAILURE) {
idx,
len;
- SABLOTLS_FETCH();
+ TSRMLS_FETCH();
if (userData == NULL) {
SABLOT_FREE_ERROR_HANDLE(SABLOTG_HANDLE);
if (errorHandler) {
zval *retval;
- TSRMLS_FETCH();
MAKE_STD_ZVAL(retval);
static void _php_sablot_standard_error(php_sablot_error *errors, php_sablot_error errors_start, int code, int level)
{
char *errstr = NULL;
- SABLOTLS_FETCH();
+ TSRMLS_FETCH();
errors = errors_start.next;
while (errors) {
PHP_FUNCTION(session_write_close);
#ifdef ZTS
-#define PSLS_D php_ps_globals *ps_globals
-#define PSLS_DC , PSLS_D
-#define PSLS_C ps_globals
-#define PSLS_CC , PSLS_C
-#define PS(v) (ps_globals->v)
-#define PSLS_FETCH() php_ps_globals *ps_globals = ts_resource(ps_globals_id)
+#define PS(v) TSRMG(ps_globals_id, php_ps_globals *, v)
#else
-#define PSLS_D void
-#define PSLS_DC
-#define PSLS_C
-#define PSLS_CC
#define PS(v) (ps_globals.v)
-#define PSLS_FETCH()
#endif
-#define PS_SERIALIZER_ENCODE_ARGS char **newstr, int *newlen PSLS_DC
-#define PS_SERIALIZER_DECODE_ARGS const char *val, int vallen PSLS_DC
+#define PS_SERIALIZER_ENCODE_ARGS char **newstr, int *newlen TSRMLS_DC
+#define PS_SERIALIZER_DECODE_ARGS const char *val, int vallen TSRMLS_DC
typedef struct ps_serializer_struct {
const char *name;
#define session_adapt_flush(a) do { } while(0)
#endif
-void php_set_session_var(char *name, size_t namelen, zval *state_val,HashTable *var_hash PSLS_DC);
-int php_get_session_var(char *name, size_t namelen, zval ***state_var PLS_DC PSLS_DC TSRMLS_DC);
+void php_set_session_var(char *name, size_t namelen, zval *state_val,HashTable *var_hash TSRMLS_DC);
+int php_get_session_var(char *name, size_t namelen, zval ***state_var TSRMLS_DC);
int php_session_register_module(ps_module *);
char *key; \
ulong key_length; \
ulong num_key; \
- zval **struc; \
- TSRMLS_FETCH(); \
- PLS_FETCH()
+ zval **struc;
#define PS_ENCODE_LOOP(code) \
for (zend_hash_internal_pointer_reset(&PS(vars)); \
zend_hash_get_current_key_ex(&PS(vars), &key, &key_length, &num_key, 0, NULL) == HASH_KEY_IS_STRING; \
zend_hash_move_forward(&PS(vars))) { \
key_length--; \
- if (php_get_session_var(key, key_length, &struc PLS_CC PSLS_CC TSRMLS_CC) == SUCCESS) { \
+ if (php_get_session_var(key, key_length, &struc TSRMLS_CC) == SUCCESS) { \
code; \
} \
}
php_ps_globals ps_globals;
#endif
-static ps_module *_php_find_ps_module(char *name PSLS_DC);
-static const ps_serializer *_php_find_ps_serializer(char *name PSLS_DC);
+static ps_module *_php_find_ps_module(char *name TSRMLS_DC);
+static const ps_serializer *_php_find_ps_serializer(char *name TSRMLS_DC);
static PHP_INI_MH(OnUpdateSaveHandler)
{
- PSLS_FETCH();
+ TSRMLS_FETCH();
- PS(mod) = _php_find_ps_module(new_value PSLS_CC);
+ PS(mod) = _php_find_ps_module(new_value TSRMLS_CC);
if(!PS(mod)) {
php_error(E_ERROR,"Cannot find save handler %s",new_value);
}
static PHP_INI_MH(OnUpdateSerializer)
{
- PSLS_FETCH();
+ TSRMLS_FETCH();
- PS(serializer) = _php_find_ps_serializer(new_value PSLS_CC);
+ PS(serializer) = _php_find_ps_serializer(new_value TSRMLS_CC);
if(!PS(serializer)) {
php_error(E_ERROR,"Cannot find serialization handler %s",new_value);
}
PHP_RSHUTDOWN_FUNCTION(session);
PHP_MINFO_FUNCTION(session);
-static void php_rinit_session_globals(PSLS_D);
-static void php_rshutdown_session_globals(PSLS_D);
-static zend_bool php_session_destroy(PSLS_D);
+static void php_rinit_session_globals(TSRMLS_D);
+static void php_rshutdown_session_globals(TSRMLS_D);
+static zend_bool php_session_destroy(TSRMLS_D);
zend_module_entry session_module_entry = {
"session",
typedef struct {
char *name;
- void (*func)(PSLS_D);
+ void (*func)(TSRMLS_D);
} php_session_cache_limiter_t;
-#define CACHE_LIMITER_FUNC(name) static void _php_cache_limiter_##name(PSLS_D)
+#define CACHE_LIMITER_FUNC(name) static void _php_cache_limiter_##name(TSRMLS_D)
#define CACHE_LIMITER(name) { #name, _php_cache_limiter_##name },
#define ADD_COOKIE(a) sapi_add_header(a, strlen(a), 1);
#define MAX_STR 512
-void php_set_session_var(char *name, size_t namelen, zval *state_val,HashTable *var_hash PSLS_DC)
+void php_set_session_var(char *name, size_t namelen, zval *state_val,HashTable *var_hash TSRMLS_DC)
{
- PLS_FETCH();
- TSRMLS_FETCH();
if (PG(register_globals)) {
zval **old_symbol;
}
}
-int php_get_session_var(char *name, size_t namelen, zval ***state_var PLS_DC PSLS_DC TSRMLS_DC)
+int php_get_session_var(char *name, size_t namelen, zval ***state_var TSRMLS_DC)
{
HashTable *ht = &EG(symbol_table);
php_serialize_data_t var_hash;
PS_ENCODE_VARS;
+
buf = ecalloc(sizeof(*buf), 1);
Z_TYPE_P(buf) = IS_STRING;
buf->refcount++;
if (has_value) {
MAKE_STD_ZVAL(current);
if (php_var_unserialize(¤t, &p, endptr, &var_hash)) {
- php_set_session_var(name, namelen, current, &var_hash PSLS_CC);
+ php_set_session_var(name, namelen, current, &var_hash TSRMLS_CC);
}
zval_ptr_dtor(¤t);
}
if (has_value) {
MAKE_STD_ZVAL(current);
if (php_var_unserialize(¤t, &q, endptr, &var_hash)) {
- php_set_session_var(name, namelen, current, &var_hash PSLS_CC);
+ php_set_session_var(name, namelen, current, &var_hash TSRMLS_CC);
}
zval_ptr_dtor(¤t);
}
static void php_session_track_init(void)
{
zval **old_vars = NULL;
- PSLS_FETCH();
TSRMLS_FETCH();
if (zend_hash_find(&EG(symbol_table), "HTTP_SESSION_VARS", sizeof("HTTP_SESSION_VARS"), (void **)&old_vars) == SUCCESS && Z_TYPE_PP(old_vars) == IS_ARRAY) {
}
}
-static char *php_session_encode(int *newlen PSLS_DC)
+static char *php_session_encode(int *newlen TSRMLS_DC)
{
char *ret = NULL;
- if (PS(serializer)->encode(&ret, newlen PSLS_CC) == FAILURE)
+ if (PS(serializer)->encode(&ret, newlen TSRMLS_CC) == FAILURE)
ret = NULL;
return ret;
}
-static void php_session_decode(const char *val, int vallen PSLS_DC)
+static void php_session_decode(const char *val, int vallen TSRMLS_DC)
{
php_session_track_init();
- if (PS(serializer)->decode(val, vallen PSLS_CC) == FAILURE) {
- php_session_destroy(PSLS_C);
+ if (PS(serializer)->decode(val, vallen TSRMLS_CC) == FAILURE) {
+ php_session_destroy(TSRMLS_C);
php_error(E_WARNING, "Failed to decode session object. Session has been destroyed.");
}
}
static char hexconvtab[] = "0123456789abcdef";
-static char *_php_create_id(int *newlen PSLS_DC)
+static char *_php_create_id(int *newlen TSRMLS_DC)
{
PHP_MD5_CTX context;
unsigned char digest[16];
return estrdup(buf);
}
-static void php_session_initialize(PSLS_D)
+static void php_session_initialize(TSRMLS_D)
{
char *val;
int vallen;
return;
}
if (PS(mod)->read(&PS(mod_data), PS(id), &val, &vallen) == SUCCESS) {
- php_session_decode(val, vallen PSLS_CC);
+ php_session_decode(val, vallen TSRMLS_CC);
efree(val);
}
}
-static void php_session_save_current_state(PSLS_D)
+static void php_session_save_current_state(TSRMLS_D)
{
char *val;
int vallen;
ulong variable_len;
ulong num_key;
HashPosition pos;
- PLS_FETCH();
if (!PG(register_globals)) {
if (!PS(http_session_vars)) {
}
if (PS(mod_data)) {
- val = php_session_encode(&vallen PSLS_CC);
+ val = php_session_encode(&vallen TSRMLS_CC);
if (val) {
ret = PS(mod)->write(&PS(mod_data), PS(id), val, vallen);
efree(val);
const char *path;
struct stat sb;
char buf[MAX_STR + 1];
- SLS_FETCH();
+ TSRMLS_FETCH();
path = SG(request_info).path_translated;
if (path) {
{0}
};
-static int php_session_cache_limiter(PSLS_D)
+static int php_session_cache_limiter(TSRMLS_D)
{
php_session_cache_limiter_t *lim;
- SLS_FETCH();
if (SG(headers_sent)) {
char *output_start_filename = php_get_output_start_filename();
for (lim = php_session_cache_limiters; lim->name; lim++) {
if (!strcasecmp(lim->name, PS(cache_limiter))) {
- lim->func(PSLS_C);
+ lim->func(TSRMLS_C);
return (0);
}
}
#define COOKIE_DOMAIN "; domain="
#define COOKIE_SECURE "; secure"
-static void php_session_send_cookie(PSLS_D)
+static void php_session_send_cookie(TSRMLS_D)
{
smart_str ncookie = {0};
char *date_fmt = NULL;
- SLS_FETCH();
if (SG(headers_sent)) {
char *output_start_filename = php_get_output_start_filename();
sapi_add_header(ncookie.c, ncookie.len, 0);
}
-static ps_module *_php_find_ps_module(char *name PSLS_DC)
+static ps_module *_php_find_ps_module(char *name TSRMLS_DC)
{
ps_module *ret = NULL;
ps_module **mod;
return ret;
}
-static const ps_serializer *_php_find_ps_serializer(char *name PSLS_DC)
+static const ps_serializer *_php_find_ps_serializer(char *name TSRMLS_DC)
{
const ps_serializer *ret = NULL;
const ps_serializer *mod;
convert_to_string((*ppid)); \
PS(id) = estrndup(Z_STRVAL_PP(ppid), Z_STRLEN_PP(ppid))
-static void php_session_start(PSLS_D)
+static void php_session_start(TSRMLS_D)
{
pval **ppid;
pval **data;
int module_number = PS(module_number);
int nrand;
int lensess;
- TSRMLS_FETCH();
if (PS(session_status) != php_session_none)
return;
}
if (!PS(id))
- PS(id) = _php_create_id(NULL PSLS_CC);
+ PS(id) = _php_create_id(NULL TSRMLS_CC);
if (!PS(use_cookies) && send_cookie) {
define_sid = 1;
}
if (send_cookie)
- php_session_send_cookie(PSLS_C);
+ php_session_send_cookie(TSRMLS_C);
if (define_sid) {
PS(session_status)= php_session_active;
- php_session_cache_limiter(PSLS_C);
- php_session_initialize(PSLS_C);
+ php_session_cache_limiter(TSRMLS_C);
+ php_session_initialize(TSRMLS_C);
if (PS(mod_data) && PS(gc_probability) > 0) {
int nrdels = -1;
}
}
-static zend_bool php_session_destroy(PSLS_D)
+static zend_bool php_session_destroy(TSRMLS_D)
{
zend_bool retval = SUCCESS;
php_error(E_WARNING, "Session object destruction failed");
}
- php_rshutdown_session_globals(PSLS_C);
- php_rinit_session_globals(PSLS_C);
+ php_rshutdown_session_globals(TSRMLS_C);
+ php_rinit_session_globals(TSRMLS_C);
return retval;
}
PHP_FUNCTION(session_set_cookie_params)
{
zval **lifetime, **path, **domain, **secure;
- PSLS_FETCH();
if (!PS(use_cookies))
return;
Return the session cookie parameters */
PHP_FUNCTION(session_get_cookie_params)
{
- PSLS_FETCH();
-
if (ZEND_NUM_ARGS() != 0) {
WRONG_PARAM_COUNT;
}
pval **p_name;
int ac = ZEND_NUM_ARGS();
char *old;
- PSLS_FETCH();
old = estrdup(PS(session_name));
pval **p_name;
int ac = ZEND_NUM_ARGS();
char *old;
- PSLS_FETCH();
old = estrdup(PS(mod)->name);
ps_module *tempmod;
convert_to_string_ex(p_name);
- tempmod = _php_find_ps_module(Z_STRVAL_PP(p_name) PSLS_CC);
+ tempmod = _php_find_ps_module(Z_STRVAL_PP(p_name) TSRMLS_CC);
if (tempmod) {
if (PS(mod_data))
PS(mod)->close(&PS(mod_data));
zval **args[6];
int i;
ps_user *mdata;
- PSLS_FETCH();
if (ZEND_NUM_ARGS() != 6 || zend_get_parameters_array_ex(6, args) == FAILURE)
WRONG_PARAM_COUNT;
pval **p_name;
int ac = ZEND_NUM_ARGS();
char *old;
- PSLS_FETCH();
old = estrdup(PS(save_path));
pval **p_name;
int ac = ZEND_NUM_ARGS();
char *old = empty_string;
- PSLS_FETCH();
if (PS(id))
old = estrdup(PS(id));
pval **p_cache_limiter;
int ac = ZEND_NUM_ARGS();
char *old;
- PSLS_FETCH();
old = estrdup(PS(cache_limiter));
}
/* }}} */
-/* {{{ static void php_register_var(zval** entry PSLS_DC PLS_DC) */
-static void php_register_var(zval** entry PSLS_DC PLS_DC)
+/* {{{ static void php_register_var(zval** entry TSRMLS_DC) */
+static void php_register_var(zval** entry TSRMLS_DC)
{
zval **value;
zend_hash_internal_pointer_reset(Z_ARRVAL_PP(entry));
while (zend_hash_get_current_data(Z_ARRVAL_PP(entry), (void**)&value) == SUCCESS) {
- php_register_var(value PSLS_CC PLS_CC);
+ php_register_var(value TSRMLS_CC);
zend_hash_move_forward(Z_ARRVAL_PP(entry));
}
} else {
zval ***args;
int argc = ZEND_NUM_ARGS();
int i;
- PSLS_FETCH();
- PLS_FETCH();
if (argc <= 0)
RETURN_FALSE
}
if (PS(session_status) == php_session_none)
- php_session_start(PSLS_C);
+ php_session_start(TSRMLS_C);
for (i = 0; i < argc; i++) {
if (Z_TYPE_PP(args[i]) == IS_ARRAY)
SEPARATE_ZVAL(args[i]);
- php_register_var(args[i] PSLS_CC PLS_CC);
+ php_register_var(args[i] TSRMLS_CC);
}
efree(args);
{
pval **p_name;
int ac = ZEND_NUM_ARGS();
- PSLS_FETCH();
if (ac != 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE)
WRONG_PARAM_COUNT;
pval **p_name;
pval *p_var;
int ac = ZEND_NUM_ARGS();
- PSLS_FETCH();
if (ac != 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE)
WRONG_PARAM_COUNT;
{
int len;
char *enc;
- PSLS_FETCH();
- enc = php_session_encode(&len PSLS_CC);
+ enc = php_session_encode(&len TSRMLS_CC);
RETVAL_STRINGL(enc, len, 0);
}
/* }}} */
PHP_FUNCTION(session_decode)
{
pval **str;
- PSLS_FETCH();
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &str) == FAILURE)
WRONG_PARAM_COUNT;
convert_to_string_ex(str);
- php_session_decode(Z_STRVAL_PP(str), Z_STRLEN_PP(str) PSLS_CC);
+ php_session_decode(Z_STRVAL_PP(str), Z_STRLEN_PP(str) TSRMLS_CC);
}
/* }}} */
Begin session - reinitializes freezed variables, registers browsers etc */
PHP_FUNCTION(session_start)
{
- PSLS_FETCH();
-
- php_session_start(PSLS_C);
-
+ php_session_start(TSRMLS_C);
RETURN_TRUE;
}
/* }}} */
Destroy the current session and all data associated with it */
PHP_FUNCTION(session_destroy)
{
- PSLS_FETCH();
-
- if (php_session_destroy(PSLS_C) == SUCCESS) {
+ if (php_session_destroy(TSRMLS_C) == SUCCESS) {
RETURN_TRUE;
} else {
RETURN_FALSE;
#ifdef TRANS_SID
void session_adapt_uris(const char *src, size_t srclen, char **new, size_t *newlen)
{
- PSLS_FETCH();
+ TSRMLS_FETCH();
if (PS(define_sid) && (PS(session_status) == php_session_active))
*new = url_adapt_ext_ex(src, srclen, PS(session_name), PS(id), newlen);
void session_adapt_url(const char *url, size_t urllen, char **new, size_t *newlen)
{
- PSLS_FETCH();
+ TSRMLS_FETCH();
if (PS(define_sid) && (PS(session_status) == php_session_active))
*new = url_adapt_single_url(url, urllen, PS(session_name), PS(id), newlen);
zval **tmp;
char *variable;
ulong num_key;
- PSLS_FETCH();
if (PS(session_status) == php_session_none)
RETURN_FALSE;
}
/* }}} */
-static void php_rinit_session_globals(PSLS_D)
+static void php_rinit_session_globals(TSRMLS_D)
{
zend_hash_init(&PS(vars), 0, NULL, NULL, 0);
PS(define_sid) = 0;
PS(mod_data) = NULL;
}
-static void php_rshutdown_session_globals(PSLS_D)
+static void php_rshutdown_session_globals(TSRMLS_D)
{
if (PS(mod_data))
PS(mod)->close(&PS(mod_data));
PHP_RINIT_FUNCTION(session)
{
- PSLS_FETCH();
-
- php_rinit_session_globals(PSLS_C);
+ php_rinit_session_globals(TSRMLS_C);
if (PS(mod) == NULL) {
char *value;
value = zend_ini_string("session.save_handler", sizeof("session.save_handler"), 0);
if (value) {
- PS(mod) = _php_find_ps_module(value PSLS_CC);
+ PS(mod) = _php_find_ps_module(value TSRMLS_CC);
}
if (!PS(mod)) {
}
if (PS(auto_start)) {
- php_session_start(PSLS_C);
+ php_session_start(TSRMLS_C);
}
return SUCCESS;
}
-static void php_session_flush(PSLS_D)
+static void php_session_flush(TSRMLS_D)
{
if(PS(session_status)==php_session_active) {
- php_session_save_current_state(PSLS_C);
+ php_session_save_current_state(TSRMLS_C);
PS(session_status)=php_session_none;
}
}
PHP_FUNCTION(session_write_close)
{
- PSLS_FETCH();
- php_session_flush(PSLS_C);
+ php_session_flush(TSRMLS_C);
}
PHP_RSHUTDOWN_FUNCTION(session)
{
- PSLS_FETCH();
+ TSRMLS_FETCH();
- php_session_flush(PSLS_C);
- php_rshutdown_session_globals(PSLS_C);
+ php_session_flush(TSRMLS_C);
+ php_rshutdown_session_globals(TSRMLS_C);
return SUCCESS;
}
} php_shmop_globals;
#ifdef ZTS
-#define SHMOPG(v) (shmop_globals->v)
-#define SHMOPLS_FETCH() php_shmop_globals *shmop_globals = ts_resource(gd_shmop_id)
+#define SHMOPG(v) TSRMG(gd_shmop_id, php_shmop_globals *, v)
#else
#define SHMOPG(v) (shmop_globals.v)
-#define SHMOPLS_FETCH()
#endif
#else
static void set_compare_func(int sort_type)
{
- ARRAYLS_FETCH();
+ TSRMLS_FETCH();
switch (sort_type) {
case SORT_NUMERIC:
pval result;
pval first;
pval second;
- ARRAYLS_FETCH();
+ TSRMLS_FETCH();
f = *((Bucket **) a);
s = *((Bucket **) b);
pval result;
pval *first;
pval *second;
- ARRAYLS_FETCH();
+ TSRMLS_FETCH();
f = *((Bucket **) a);
s = *((Bucket **) b);
pval **args[2];
pval *retval_ptr;
TSRMLS_FETCH();
- BLS_FETCH();
f = *((Bucket **) a);
s = *((Bucket **) b);
pval **array;
pval **old_compare_func;
HashTable *target_hash;
- BLS_FETCH();
old_compare_func = BG(user_compare_func_name);
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &array, &BG(user_compare_func_name)) == FAILURE) {
pval **array;
pval **old_compare_func;
HashTable *target_hash;
- BLS_FETCH();
old_compare_func = BG(user_compare_func_name);
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &array, &BG(user_compare_func_name)) == FAILURE) {
pval retval;
int status;
TSRMLS_FETCH();
- BLS_FETCH();
args[0] = &key1;
args[1] = &key2;
pval **array;
pval **old_compare_func;
HashTable *target_hash;
- BLS_FETCH();
old_compare_func = BG(user_compare_func_name);
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &array, &BG(user_compare_func_name)) == FAILURE) {
ulong string_key_len;
ulong num_key;
HashPosition pos;
- BLS_FETCH();
TSRMLS_FETCH();
/* Allocate space for key */
/* {{{ proto int array_walk(array input, string funcname [, mixed userdata])
Apply a user function to every member of an array */
-PHP_FUNCTION(array_walk) {
+PHP_FUNCTION(array_walk)
+{
int argc;
zval **array,
**userdata = NULL,
**old_walk_func_name;
HashTable *target_hash;
- BLS_FETCH();
argc = ZEND_NUM_ARGS();
old_walk_func_name = BG(array_walk_func_name);
int r;
int result = 0;
zval temp;
- ARRAYLS_FETCH();
+ TSRMLS_FETCH();
r = 0;
do {
int sort_order = SORT_ASC;
int sort_type = SORT_REGULAR;
int i, k;
- ARRAYLS_FETCH();
/* Get the argument count and check it */
argc = ZEND_NUM_ARGS();
} php_assert_globals;
#ifdef ZTS
-#define ASSERTLS_D php_assert_globals *assert_globals
-#define ASSERTLS_DC , ASSERTLS_D
-#define ASSERTLS_C assert_globals
-#define ASSERTLS_CC , ASSERTLS_CC
-#define ASSERT(v) (assert_globals->v)
-#define ASSERTLS_FETCH() php_assert_globals *assert_globals = ts_resource(assert_globals_id)
+#define ASSERTG(v) TSRMG(assert_globals_id, php_assert_globals *, v)
int assert_globals_id;
#else
-#define ASSERTLS_D
-#define ASSERTLS_DC
-#define ASSERTLS_C
-#define ASSERTLS_CC
-#define ASSERT(v) (assert_globals.v)
-#define ASSERTLS_FETCH()
+#define ASSERTG(v) (assert_globals.v)
php_assert_globals assert_globals;
#endif
static PHP_INI_MH(OnChangeCallback)
{
- ASSERTLS_FETCH();
+ TSRMLS_FETCH();
- if (ASSERT(callback)) {
- zval_ptr_dtor(&ASSERT(callback));
+ if (ASSERTG(callback)) {
+ zval_ptr_dtor(&ASSERTG(callback));
} else {
- MAKE_STD_ZVAL(ASSERT(callback));
+ MAKE_STD_ZVAL(ASSERTG(callback));
}
if (new_value)
- ZVAL_STRINGL(ASSERT(callback),new_value,new_value_length,1)
+ ZVAL_STRINGL(ASSERTG(callback),new_value,new_value_length,1)
else
- ZVAL_EMPTY_STRING(ASSERT(callback))
+ ZVAL_EMPTY_STRING(ASSERTG(callback))
return SUCCESS;
}
STD_PHP_INI_ENTRY("assert.quiet_eval", "0", PHP_INI_ALL, OnUpdateInt, quiet_eval, php_assert_globals, assert_globals)
PHP_INI_END()
-static void php_assert_init_globals(ASSERTLS_D TSRMLS_DC)
+static void php_assert_init_globals(php_assert_globals *assert_globals_p TSRMLS_DC)
{
- ASSERT(callback) = NULL;
+ ASSERTG(callback) = NULL;
}
PHP_MINIT_FUNCTION(assert)
#ifdef ZTS
ts_allocate_id(&assert_globals_id, sizeof(php_assert_globals), (ts_allocate_ctor) php_assert_init_globals, NULL);
#else
- php_assert_init_globals(ASSERTLS_C TSRMLS_CC);
+ php_assert_init_globals(&assert_globals TSRMLS_CC);
#endif
REGISTER_INI_ENTRIES();
PHP_MSHUTDOWN_FUNCTION(assert)
{
- ASSERTLS_FETCH();
+ TSRMLS_FETCH();
- if (ASSERT(callback)) {
- zval_ptr_dtor(&ASSERT(callback));
+ if (ASSERTG(callback)) {
+ zval_ptr_dtor(&ASSERTG(callback));
}
return SUCCESS;
}
PHP_RSHUTDOWN_FUNCTION(assert)
{
- ASSERTLS_FETCH();
+ TSRMLS_FETCH();
- if (ASSERT(callback)) {
- zval_ptr_dtor(&ASSERT(callback));
- ASSERT(callback) = NULL;
+ if (ASSERTG(callback)) {
+ zval_ptr_dtor(&ASSERTG(callback));
+ ASSERTG(callback) = NULL;
}
return SUCCESS;
int val;
char *myeval = NULL;
char *compiled_string_description;
- CLS_FETCH();
- ASSERTLS_FETCH();
- if (! ASSERT(active)) {
+ if (! ASSERTG(active)) {
RETURN_TRUE;
}
myeval = Z_STRVAL_PP(assertion);
- if (ASSERT(quiet_eval)) {
+ if (ASSERTG(quiet_eval)) {
old_error_reporting = EG(error_reporting);
EG(error_reporting) = 0;
}
compiled_string_description = zend_make_compiled_string_description("assert code");
- if (zend_eval_string(myeval, &retval, compiled_string_description CLS_CC TSRMLS_CC) == FAILURE) {
+ if (zend_eval_string(myeval, &retval, compiled_string_description TSRMLS_CC) == FAILURE) {
efree(compiled_string_description);
zend_error(E_ERROR, "Failure evaluating code:\n%s\n", myeval);
/* zend_error() does not return in this case. */
}
efree(compiled_string_description);
- if (ASSERT(quiet_eval)) {
+ if (ASSERTG(quiet_eval)) {
EG(error_reporting) = old_error_reporting;
}
RETURN_TRUE;
}
- if (ASSERT(callback)) {
+ if (ASSERTG(callback)) {
zval *args[4];
zval *retval;
int i;
ZVAL_FALSE(retval);
/* XXX do we want to check for error here? */
- call_user_function(CG(function_table), NULL, ASSERT(callback), retval, 3, args);
+ call_user_function(CG(function_table), NULL, ASSERTG(callback), retval, 3, args);
for (i = 0; i <= 2; i++) {
zval_ptr_dtor(&(args[i]));
zval_ptr_dtor(&retval);
}
- if (ASSERT(warning)) {
+ if (ASSERTG(warning)) {
if (myeval) {
php_error(E_WARNING,"Assertion \"%s\" failed",myeval);
} else {
}
}
- if (ASSERT(bail)) {
+ if (ASSERTG(bail)) {
zend_bailout();
}
}
pval **what,**value;
int oldint;
int ac = ZEND_NUM_ARGS();
- ASSERTLS_FETCH();
if (ac < 1 || ac > 2 || zend_get_parameters_ex(ac, &what, &value) == FAILURE) {
WRONG_PARAM_COUNT;
switch ((*what)->value.lval) {
case ASSERT_ACTIVE:
- oldint = ASSERT(active);
+ oldint = ASSERTG(active);
if (ac == 2) {
convert_to_long_ex(value);
- ASSERT(active) = Z_LVAL_PP(value);
+ ASSERTG(active) = Z_LVAL_PP(value);
}
RETURN_LONG(oldint);
break;
case ASSERT_BAIL:
- oldint = ASSERT(bail);
+ oldint = ASSERTG(bail);
if (ac == 2) {
convert_to_long_ex(value);
- ASSERT(bail) = Z_LVAL_PP(value);
+ ASSERTG(bail) = Z_LVAL_PP(value);
}
RETURN_LONG(oldint);
break;
case ASSERT_QUIET_EVAL:
- oldint = ASSERT(quiet_eval);
+ oldint = ASSERTG(quiet_eval);
if (ac == 2) {
convert_to_long_ex(value);
- ASSERT(quiet_eval) = Z_LVAL_PP(value);
+ ASSERTG(quiet_eval) = Z_LVAL_PP(value);
}
RETURN_LONG(oldint);
break;
case ASSERT_WARNING:
- oldint = ASSERT(warning);
+ oldint = ASSERTG(warning);
if (ac == 2) {
convert_to_long_ex(value);
- ASSERT(warning) = Z_LVAL_PP(value);
+ ASSERTG(warning) = Z_LVAL_PP(value);
}
RETURN_LONG(oldint);
break;
case ASSERT_CALLBACK:
if (ac == 2) {
- if (ASSERT(callback)) {
- zval_ptr_dtor(&ASSERT(callback));
+ if (ASSERTG(callback)) {
+ zval_ptr_dtor(&ASSERTG(callback));
}
- ASSERT(callback) = *value;
+ ASSERTG(callback) = *value;
zval_add_ref(value);
}
RETURN_TRUE;
char *protected_vars, *protected_var;
char *token_buf;
int dummy=1;
- BLS_FETCH();
+ TSRMLS_FETCH();
protected_vars = estrndup(new_value, new_value_length);
zend_hash_clean(&BG(sm_protected_env_vars));
static PHP_INI_MH(OnUpdateSafeModeAllowedEnvVars)
{
- BLS_FETCH();
+ TSRMLS_FETCH();
if (BG(sm_allowed_env_vars)) {
free(BG(sm_allowed_env_vars));
void test_class_startup(void);
-static void basic_globals_ctor(BLS_D TSRMLS_DC)
+static void basic_globals_ctor(php_basic_globals *basic_globals_p TSRMLS_DC)
{
BG(next) = NULL;
BG(left) = -1;
#endif
}
-static void basic_globals_dtor(BLS_D TSRMLS_DC)
+static void basic_globals_dtor(php_basic_globals *basic_globals_p TSRMLS_DC)
{
zend_hash_destroy(&BG(sm_protected_env_vars));
if (BG(sm_allowed_env_vars)) {
PHP_MINIT_FUNCTION(basic)
{
- PLS_FETCH();
-
#ifdef ZTS
ts_allocate_id(&basic_globals_id, sizeof(php_basic_globals), (ts_allocate_ctor) basic_globals_ctor, (ts_allocate_dtor) basic_globals_dtor);
#else
- basic_globals_ctor(BLS_C TSRMLS_CC);
+ basic_globals_ctor(&basic_globals TSRMLS_CC);
#endif
REGISTER_LONG_CONSTANT("CONNECTION_ABORTED", PHP_CONNECTION_ABORTED, CONST_CS | CONST_PERSISTENT);
PHP_MSHUTDOWN_FUNCTION(basic)
{
- PLS_FETCH();
- BLS_FETCH();
TSRMLS_FETCH();
- basic_globals_dtor(BLS_C TSRMLS_CC);
#ifdef ZTS
ts_free_id(basic_globals_id);
+#else
+ basic_globals_dtor(&basic_globals TSRMLS_CC);
#endif
if(PG(allow_url_fopen)) {
PHP_RINIT_FUNCTION(basic)
{
- BLS_FETCH();
-
BG(strtok_string) = NULL;
BG(locale_string) = NULL;
BG(user_compare_func_name) = NULL;
PHP_RSHUTDOWN_FUNCTION(basic)
{
- BLS_FETCH();
+ TSRMLS_FETCH();
STR_FREE(BG(strtok_string));
BG(strtok_string) = NULL;
PHP_FUNCTION(putenv)
{
pval **str;
- BLS_FETCH();
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &str) == FAILURE) {
WRONG_PARAM_COUNT;
int ret;
char *p,**env;
putenv_entry pe;
- PLS_FETCH();
pe.putenv_string = estrndup(Z_STRVAL_PP(str),Z_STRLEN_PP(str));
pe.key = estrndup(Z_STRVAL_PP(str), Z_STRLEN_PP(str));
PHP_FUNCTION(set_magic_quotes_runtime)
{
pval **new_setting;
- PLS_FETCH();
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &new_setting)==FAILURE) {
RETURN_FALSE;
Get the current active configuration setting of magic_quotes_runtime */
PHP_FUNCTION(get_magic_quotes_runtime)
{
- PLS_FETCH();
-
RETURN_LONG(PG(magic_quotes_runtime));
}
/* }}} */
Get the current active configuration setting of magic_quotes_gpc */
PHP_FUNCTION(get_magic_quotes_gpc)
{
- PLS_FETCH();
-
RETURN_LONG(PG(magic_quotes_gpc));
}
/* }}} */
static void run_user_tick_functions(int tick_count)
{
- BLS_FETCH();
+ TSRMLS_FETCH();
zend_llist_apply(BG(user_tick_functions), (llist_apply_func_t)user_tick_function_call);
}
void php_call_shutdown_functions(void)
{
- BLS_FETCH();
TSRMLS_FETCH();
if (BG(user_shutdown_function_names)) zend_try {
{
php_shutdown_function_entry shutdown_function_entry;
int i;
- BLS_FETCH();
shutdown_function_entry.arg_count = ZEND_NUM_ARGS();
Returns true if client disconnected */
PHP_FUNCTION(connection_aborted)
{
- PLS_FETCH();
-
RETURN_LONG(PG(connection_status)&PHP_CONNECTION_ABORTED);
}
/* }}} */
Returns the connection status bitfield */
PHP_FUNCTION(connection_status)
{
- PLS_FETCH();
-
RETURN_LONG(PG(connection_status));
}
/* }}} */
{
pval **arg;
int old_setting;
- PLS_FETCH();
old_setting = PG(ignore_user_abort);
switch (ZEND_NUM_ARGS()) {
{
user_tick_function_entry tick_fe;
int i;
- BLS_FETCH();
tick_fe.arg_count = ZEND_NUM_ARGS();
if (tick_fe.arg_count < 1) {
{
zval **function;
user_tick_function_entry tick_fe;
- BLS_FETCH();
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(ZEND_NUM_ARGS(), &function)) {
WRONG_PARAM_COUNT;
PHP_FUNCTION(is_uploaded_file)
{
zval **path;
- SLS_FETCH();
if (!SG(rfc1867_uploaded_files)) {
RETURN_FALSE;
{
zval **path, **new_path;
zend_bool successful=0;
- SLS_FETCH();
- PLS_FETCH();
if (!SG(rfc1867_uploaded_files)) {
RETURN_FALSE;
static void php_ini_parser_cb_with_sections(zval *arg1, zval *arg2, int callback_type, zval *arr)
{
zval *element;
- BLS_FETCH();
+ TSRMLS_FETCH();
switch (callback_type) {
case ZEND_INI_PARSER_ENTRY: {
}
convert_to_boolean_ex(process_sections);
if (Z_BVAL_PP(process_sections)) {
- BLS_FETCH();
+ TSRMLS_FETCH();
BG(active_ini_file_section) = NULL;
ini_parser_cb = (zend_ini_parser_cb_t) php_ini_parser_cb_with_sections;
} php_basic_globals;
#ifdef ZTS
-#define BLS_D php_basic_globals *basic_globals
-#define BLS_DC , BLS_D
-#define BLS_C basic_globals
-#define BLS_CC , BLS_C
-#define BG(v) (basic_globals->v)
-#define BLS_FETCH() php_basic_globals *basic_globals = ts_resource(basic_globals_id)
+#define BG(v) TSRMG(basic_globals_id, php_basic_globals *, v)
extern int basic_globals_id;
#else
-#define BLS_D
-#define BLS_DC
-#define BLS_C
-#define BLS_CC
#define BG(v) (basic_globals.v)
-#define BLS_FETCH()
extern php_basic_globals basic_globals;
#endif
zval **agent_name,**agent;
zval *found_browser_entry,*tmp_copy;
char *lookup_browser_name;
- PLS_FETCH();
if (!INI_STR("browscap")) {
RETURN_FALSE;
{
struct tm *tm1, tmbuf;
char *str;
- PLS_FETCH();
+ TSRMLS_FETCH();
tm1 = php_gmtime_r(&t, &tmbuf);
str = emalloc(81);
} php_dir_globals;
#ifdef ZTS
-#define DIRG(v) (dir_globals->v)
-#define DIRLS_FETCH() php_dir_globals *dir_globals = ts_resource(dir_globals_id)
-#define DIRLS_D php_dir_globals *dir_globals
-#define DIRLS_DC , DIRLS_D
-#define DIRLS_C dir_globals
-#define DIRLS_CC , DIRLS_C
+#define DIRG(v) TSRMG(dir_globals_id, php_dir_globals *, v)
int dir_globals_id;
#else
#define DIRG(v) (dir_globals.v)
-#define DIRLS_FETCH()
-#define DIRLS_D
-#define DIRLS_DC
-#define DIRLS_C
-#define DIRLS_CC
php_dir_globals dir_globals;
#endif
};
-static void php_set_default_dir(int id DIRLS_DC)
+static void php_set_default_dir(int id TSRMLS_DC)
{
if (DIRG(default_dir)!=-1) {
zend_list_delete(DIRG(default_dir));
PHP_RINIT_FUNCTION(dir)
{
- DIRLS_FETCH();
-
DIRG(default_dir) = -1;
return SUCCESS;
}
{
pval **arg;
php_dir *dirp;
- DIRLS_FETCH();
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
WRONG_PARAM_COUNT;
dirp->id = zend_list_insert(dirp,le_dirp);
- php_set_default_dir(dirp->id DIRLS_CC);
+ php_set_default_dir(dirp->id TSRMLS_CC);
if (createobject) {
object_init_ex(return_value, dir_class_entry_ptr);
{
pval **id, **tmp, *myself;
php_dir *dirp;
- DIRLS_FETCH();
FETCH_DIRP();
zend_list_delete(dirp->id);
if (dirp->id == DIRG(default_dir)) {
- php_set_default_dir(-1 DIRLS_CC);
+ php_set_default_dir(-1 TSRMLS_CC);
}
}
{
pval **arg;
int ret;
- PLS_FETCH();
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
WRONG_PARAM_COUNT;
{
pval **id, **tmp, *myself;
php_dir *dirp;
- DIRLS_FETCH();
FETCH_DIRP();
php_dir *dirp;
char entry[sizeof(struct dirent)+MAXPATHLEN];
struct dirent *result = (struct dirent *)&entry; /* patch for libc5 readdir problems */
- DIRLS_FETCH();
FETCH_DIRP();
PHP_FUNCTION(dl)
{
pval **file;
- PLS_FETCH();
#ifdef ZTS
if (strcmp(sapi_module.name, "cgi")!=0) {
zend_module_entry *(*get_module)(void);
int error_type;
char *extension_dir;
- PLS_FETCH();
TSRMLS_FETCH();
-
if (type==MODULE_PERSISTENT) {
/* Use the configuration hash directly, the INI mechanism is not yet initialized */
if (cfg_get_string("extension_dir", &extension_dir)==FAILURE) {
#if PHP_SIGCHILD
void (*sig_handler)();
#endif
- PLS_FETCH();
- FLS_FETCH();
+ TSRMLS_FETCH();
buf = (char*) emalloc(EXEC_INPUT_BUF);
if (!buf) {
int readbytes,total_readbytes=0,allocated_space;
pval **cmd;
char *ret;
- PLS_FETCH();
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1,&cmd)==FAILURE) {
WRONG_PARAM_COUNT;
static void _file_popen_dtor(zend_rsrc_list_entry *rsrc)
{
FILE *pipe = (FILE *)rsrc->ptr;
- FLS_FETCH();
+ TSRMLS_FETCH();
FG(pclose_ret) = pclose(pipe);
}
}
-static void file_globals_ctor(FLS_D TSRMLS_DC)
+static void file_globals_ctor(php_file_globals *file_globals_p TSRMLS_DC)
{
zend_hash_init(&FG(ht_fsock_keys), 0, NULL, NULL, 1);
zend_hash_init(&FG(ht_fsock_socks), 0, NULL, (void (*)(void *))php_msock_destroy, 1);
}
-static void file_globals_dtor(FLS_D TSRMLS_DC)
+static void file_globals_dtor(php_file_globals *file_globals_p TSRMLS_DC)
{
zend_hash_destroy(&FG(ht_fsock_socks));
zend_hash_destroy(&FG(ht_fsock_keys));
- php_cleanup_sockbuf(1 FLS_CC);
+ php_cleanup_sockbuf(1 TSRMLS_CC);
}
#ifdef ZTS
ts_allocate_id(&file_globals_id, sizeof(php_file_globals), (ts_allocate_ctor) file_globals_ctor, (ts_allocate_dtor) file_globals_dtor);
#else
- file_globals_ctor(FLS_C TSRMLS_CC);
+ file_globals_ctor(&file_globals TSRMLS_CC);
#endif
REGISTER_LONG_CONSTANT("SEEK_SET", SEEK_SET, CONST_CS | CONST_PERSISTENT);
PHP_MSHUTDOWN_FUNCTION(file)
{
#ifndef ZTS
- FLS_FETCH();
TSRMLS_FETCH();
- file_globals_dtor(FLS_C TSRMLS_CC);
+ file_globals_dtor(&file_globals TSRMLS_CC);
#endif
return SUCCESS;
}
char *name=NULL, *value=NULL, *temp=NULL;
php_meta_tags_token tok, tok_last;
php_meta_tags_data md;
- PLS_FETCH();
/* check args */
switch (ARG_COUNT(ht)) {
int issock=0, socketd=0;
int target_len, len;
zend_bool reached_eof=0;
- PLS_FETCH();
/* check args */
switch (ARG_COUNT(ht)) {
int *sock;
int use_include_path = 0;
int issock=0, socketd=0;
- FLS_FETCH();
switch(ARG_COUNT(ht)) {
case 2:
FILE *fp;
char *p,*tmp = NULL;
char *b, buf[1024];
- PLS_FETCH();
if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
{
pval **arg1;
void *what;
- FLS_FETCH();
if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
int issock=0;
int socketd=0;
void *what;
- PLS_FETCH();
if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
void *what;
char *allowed_tags=NULL;
int allowed_tags_len=0;
- FLS_FETCH();
switch(ARG_COUNT(ht)) {
case 2:
int issock=0;
int socketd=0;
void *what;
- PLS_FETCH();
switch (ARG_COUNT(ht)) {
case 2:
pval **arg1, **arg2;
int ret;
mode_t mode;
- PLS_FETCH();
if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
{
pval **arg1;
int ret;
- PLS_FETCH();
if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
len = sbuf.st_size - off;
p = mmap(0, len, PROT_READ, MAP_SHARED, fd, off);
if (p != (void *) MAP_FAILED) {
- BLS_FETCH();
+ TSRMLS_FETCH();
+
BG(mmap_file) = p;
BG(mmap_len) = len;
PHPWRITE(p, len);
pval **old_arg, **new_arg;
char *old_name, *new_name;
int ret;
- PLS_FETCH();
if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &old_arg, &new_arg) == FAILURE) {
WRONG_PARAM_COUNT;
{
pval **filename;
int ret;
- PLS_FETCH();
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) {
WRONG_PARAM_COUNT;
PHP_FUNCTION(copy)
{
pval **source, **target;
- PLS_FETCH();
if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &source, &target) == FAILURE) {
WRONG_PARAM_COUNT;
int issock=0;
int socketd=0;
void *what;
- PLS_FETCH();
if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
} php_file_globals;
#ifdef ZTS
-#define FLS_D php_file_globals *file_globals
-#define FLS_DC , FLS_D
-#define FLS_C file_globals
-#define FLS_CC , FLS_C
-#define FG(v) (file_globals->v)
-#define FLS_FETCH() php_file_globals *file_globals = ts_resource(file_globals_id)
+#define FG(v) TSRMG(file_globals_id, php_file_globals *, v)
extern int file_globals_id;
#else
-#define FLS_D void
-#define FLS_DC
-#define FLS_C
-#define FLS_CC
#define FG(v) (file_globals.v)
-#define FLS_FETCH()
extern php_file_globals file_globals;
#endif
PHP_RINIT_FUNCTION(filestat)
{
- BLS_FETCH();
-
BG(CurrentStatFile)=NULL;
BG(CurrentStatLength)=0;
return SUCCESS;
PHP_RSHUTDOWN_FUNCTION(filestat)
{
- BLS_FETCH();
+ TSRMLS_FETCH();
if (BG(CurrentStatFile)) {
efree (BG(CurrentStatFile));
gid_t gid;
struct group *gr=NULL;
int ret;
- PLS_FETCH();
if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2,&filename,&group)==FAILURE) {
WRONG_PARAM_COUNT;
int ret;
uid_t uid;
struct passwd *pw = NULL;
- PLS_FETCH();
if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2,&filename,&user)==FAILURE) {
WRONG_PARAM_COUNT;
pval **filename, **mode;
int ret;
mode_t imode;
- PLS_FETCH();
if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2,&filename,&mode)==FAILURE) {
WRONG_PARAM_COUNT;
FILE *file;
struct utimbuf *newtime = NULL;
int ac = ZEND_NUM_ARGS();
- PLS_FETCH();
if (ac == 1 && zend_get_parameters_ex(1,&filename) != FAILURE) {
#ifndef HAVE_UTIME_NULL
Clear file stat cache */
PHP_FUNCTION(clearstatcache)
{
- BLS_FETCH();
-
if (BG(CurrentStatFile)) {
efree(BG(CurrentStatFile));
BG(CurrentStatFile) = NULL;
int rmask=S_IROTH,wmask=S_IWOTH,xmask=S_IXOTH; /* access rights defaults to other */
char *stat_sb_names[13]={"dev","ino","mode","nlink","uid","gid","rdev",
"size","atime","mtime","ctime","blksize","blocks"};
- BLS_FETCH();
+ TSRMLS_FETCH();
stat_sb = &BG(sb);
PHPAPI int php_is_persistent_sock(int sock)
{
char *key;
- FLS_FETCH();
+ TSRMLS_FETCH();
if (zend_hash_find(&FG(ht_fsock_socks), (char *) &sock, sizeof(sock),
(void **) &key) == SUCCESS) {
unsigned short portno;
unsigned long conv;
char *key = NULL;
- FLS_FETCH();
if (arg_count > 5 || arg_count < 2 || zend_get_parameters_array_ex(arg_count,args)==FAILURE) {
CLOSE_SOCK(1);
FG(phpsockbuf) = sock->next; \
pefree(sock, sock->persistent)
-PHPAPI void php_cleanup_sockbuf(int persistent FLS_DC)
+PHPAPI void php_cleanup_sockbuf(int persistent TSRMLS_DC)
{
php_sockbuf *now, *next;
#define WRITEPTR(sock) ((sock)->readbuf + (sock)->writepos)
#define SOCK_FIND(sock,socket) \
php_sockbuf *sock; \
- FLS_FETCH(); \
- sock = php_sockfind(socket FLS_CC); \
- if(!sock) sock = php_sockcreate(socket FLS_CC)
+ TSRMLS_FETCH(); \
+ sock = php_sockfind(socket TSRMLS_CC); \
+ if(!sock) sock = php_sockcreate(socket TSRMLS_CC)
-static php_sockbuf *php_sockfind(int socket FLS_DC)
+static php_sockbuf *php_sockfind(int socket TSRMLS_DC)
{
php_sockbuf *buf = NULL, *tmp;
return buf;
}
-static php_sockbuf *php_sockcreate(int socket FLS_DC)
+static php_sockbuf *php_sockcreate(int socket TSRMLS_DC)
{
php_sockbuf *sock;
int persistent = php_is_persistent_sock(socket);
PHPAPI size_t php_sock_set_def_chunk_size(size_t size)
{
size_t old;
- FLS_FETCH();
+ TSRMLS_FETCH();
old = FG(def_chunk_size);
{
int ret = 0;
php_sockbuf *sock;
- FLS_FETCH();
+ TSRMLS_FETCH();
- sock = php_sockfind(socket FLS_CC);
+ sock = php_sockfind(socket TSRMLS_CC);
if(sock) {
ret = 1;
SOCK_DESTROY(sock);
{
int ret = 0;
php_sockbuf *sock;
- FLS_FETCH();
+ TSRMLS_FETCH();
- sock = php_sockfind(socket FLS_CC);
+ sock = php_sockfind(socket TSRMLS_CC);
if(sock) {
if(!sock->persistent) {
SOCK_CLOSE(sock->socket);
PHP_RSHUTDOWN_FUNCTION(fsock)
{
- FLS_FETCH();
+ TSRMLS_FETCH();
- php_cleanup_sockbuf(0 FLS_CC);
+ php_cleanup_sockbuf(0 TSRMLS_CC);
return SUCCESS;
}
/* }}} */
PHPAPI int php_sock_close(int socket);
PHPAPI size_t php_sock_set_def_chunk_size(size_t size);
PHPAPI void php_msock_destroy(int *data);
-PHPAPI void php_cleanup_sockbuf(int persistent FLS_DC);
+PHPAPI void php_cleanup_sockbuf(int persistent TSRMLS_DC);
PHPAPI struct php_sockbuf *php_get_socket(int socket);
PHPAPI int php_header()
{
- SLS_FETCH();
+ TSRMLS_FETCH();
if (sapi_send_headers()==FAILURE || SG(request_info).headers_only) {
return 0; /* don't allow output */
pval **arg[6];
int arg_count;
zval **z_name=NULL, **z_value=NULL, **z_path=NULL, **z_domain=NULL;
- SLS_FETCH();
arg_count = ZEND_NUM_ARGS();
if (arg_count < 1 || arg_count > 6 || zend_get_parameters_array_ex(arg_count, arg) == FAILURE) {
Return true if headers have already been sent, false otherwise */
PHP_FUNCTION(headers_sent)
{
- SLS_FETCH();
-
if (SG(headers_sent)) {
RETURN_TRUE;
} else {
zval *response_header;
char *http_header_line;
int http_header_line_length, http_header_line_size;
+ TSRMLS_FETCH();
resource = php_url_parse((char *) path);
if (resource == NULL) {
php_url_free(resource);
if (location[0] != '\0') {
zval **response_header_new, *entry, **entryp;
- TSRMLS_FETCH();
fp = php_fopen_url_wrap_http(location, mode, options, issock, socketd, opened_path);
if (zend_hash_find(EG(active_symbol_table), "http_response_header", sizeof("http_response_header"), (void **) &response_header_new) == SUCCESS) {
*issock = 1;
out:
{
- TSRMLS_FETCH();
ZEND_SET_SYMBOL(EG(active_symbol_table), "http_response_header", response_header);
}
return (fp);
/* {{{ php_create_incomplete_class
*/
-zend_class_entry *php_create_incomplete_class(BLS_D)
+zend_class_entry *php_create_incomplete_class(TSRMLS_D)
{
zend_class_entry incomplete_class;
time_t the_time;
struct tm *ta, tmbuf;
TSRMLS_FETCH();
- SLS_FETCH();
the_time = time(NULL);
ta = php_localtime_r(&the_time, &tmbuf);
{
php_int32 q;
php_int32 z;
- LCGLS_FETCH();
+ TSRMLS_FETCH();
MODMULT(53668,40014,12211,2147483563L, LCG(s1));
MODMULT(52774,40692,3791, 2147483399L, LCG(s2));
return z * 4.656613e-10;
}
-static void lcg_init_globals(LCGLS_D TSRMLS_DC)
+static void lcg_init_globals(php_lcg_globals *lcg_globals_p TSRMLS_DC)
{
LCG(s1) = 1;
#ifdef ZTS
PHP_RINIT_FUNCTION(lcg)
{
if (!php_lcg_initialized) {
- lcg_init_globals();
+ lcg_init_globals(&lcg_globals TSRMLS_CC);
php_lcg_initialized = 1;
}
return SUCCESS;
{
pval **topath, **frompath;
int ret;
- PLS_FETCH();
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &topath, &frompath) == FAILURE) {
WRONG_PARAM_COUNT;
{
pval **topath, **frompath;
int ret;
- PLS_FETCH();
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &topath, &frompath) == FAILURE) {
WRONG_PARAM_COUNT;
pval **argv[5];
char *to=NULL, *message=NULL, *headers=NULL, *subject=NULL, *extra_cmd=NULL;
int argc;
- PLS_FETCH();
argc = ZEND_NUM_ARGS();
if (argc < 3 || argc > 5 || zend_get_parameters_array_ex(argc, argv) == FAILURE) {
/* {{{ php_statpage
*/
-static void php_statpage(BLS_D)
+static void php_statpage(TSRMLS_D)
{
struct stat *pstat;
*/
long php_getuid(void)
{
- BLS_FETCH();
+ TSRMLS_FETCH();
- php_statpage(BLS_C);
+ php_statpage(TSRMLS_C);
return (BG(page_uid));
}
/* }}} */
long php_getgid(void)
{
- BLS_FETCH();
+ TSRMLS_FETCH();
- php_statpage(BLS_C);
+ php_statpage(TSRMLS_C);
return (BG(page_gid));
}
Get the inode of the current script being parsed */
PHP_FUNCTION(getmyinode)
{
- BLS_FETCH();
-
- php_statpage(BLS_C);
+ php_statpage(TSRMLS_C);
if (BG(page_inode) < 0) {
RETURN_FALSE;
} else {
Get time of last page modification */
PHP_FUNCTION(getlastmod)
{
- BLS_FETCH();
-
- php_statpage(BLS_C);
+ php_statpage(TSRMLS_C);
if (BG(page_mtime) < 0) {
RETURN_FALSE;
} else {
} php_array_globals;
#ifdef ZTS
-#define ARRAYLS_D php_array_globals *array_globals
-#define ARRAYLS_DC , ARRAYLS_D
-#define ARRAYLS_C array_globals
-#define ARRAYLS_CC , ARRAYLS_C
-#define ARRAYG(v) (array_globals->v)
-#define ARRAYLS_FETCH() php_array_globals *array_globals = ts_resource(array_globals_id)
+#define ARRAYG(v) TSRMG(array_globals_id, php_array_globals *, v)
extern int array_globals_id;
#else
-#define ARRAYLS_D
-#define ARRAYLS_DC
-#define ARRAYLS_C
-#define ARRAYLS_CC
#define ARRAYG(v) (array_globals.v)
-#define ARRAYLS_FETCH()
extern php_array_globals array_globals;
#endif
BG(incomplete_class)
#define PHP_IC_ENTRY_READ \
- (PHP_IC_ENTRY ? PHP_IC_ENTRY : php_create_incomplete_class(BLS_C))
+ (PHP_IC_ENTRY ? PHP_IC_ENTRY : php_create_incomplete_class(TSRMLS_C))
#define PHP_SET_CLASS_ATTRIBUTES(struc) \
extern "C" {
#endif
-zend_class_entry *php_create_incomplete_class(BLS_D);
+zend_class_entry *php_create_incomplete_class(TSRMLS_D);
char *php_lookup_class_name(zval *object, size_t *nlen, zend_bool del);
void php_store_class_name(zval *object, const char *name, size_t len);
#ifdef ZTS
PHP_MINIT_FUNCTION(lcg);
-#define LCGLS_D php_lcg_globals *lcg_globals
-#define LCG(v) (lcg_globals->v)
-#define LCGLS_FETCH() php_lcg_globals *lcg_globals = ts_resource(lcg_globals_id)
+#define LCG(v) TSRMG(lcg_globals_id, php_lcg_globals *, v)
#else
PHP_RINIT_FUNCTION(lcg);
-#define LCGLS_D void
#define LCG(v) (lcg_globals.v)
-#define LCGLS_FETCH()
#endif
#endif
/* {{{ seedMT
*/
-static void seedMT(php_uint32 seed BLS_DC)
+static void seedMT(php_uint32 seed TSRMLS_DC)
{
/*
We initialize state[0..(N-1)] via the generator
}
/* }}} */
-static php_uint32 reloadMT(BLS_D)
+static php_uint32 reloadMT(TSRMLS_D)
{
register php_uint32 *p0=BG(state), *p2=BG(state)+2, *pM=BG(state)+M, s0, s1;
register int j;
if(BG(left) < -1)
- seedMT(4357U BLS_CC);
+ seedMT(4357U TSRMLS_CC);
BG(left)=N-1, BG(next)=BG(state)+1;
static inline php_uint32 randomMT(void)
{
php_uint32 y;
- BLS_FETCH();
+ TSRMLS_FETCH();
if(--BG(left) < 0)
- return(reloadMT(BLS_C));
+ return(reloadMT(TSRMLS_C));
y = *BG(next)++;
y ^= (y >> 11);
PHP_FUNCTION(mt_srand)
{
pval **arg;
- BLS_FETCH();
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_long_ex(arg);
- seedMT((*arg)->value.lval BLS_CC);
+ seedMT((*arg)->value.lval TSRMLS_CC);
}
/* }}} */
int r = 0;
int patlen = strlen(pattern);
reg_cache *rc = NULL;
- REGLS_FETCH();
+ TSRMLS_FETCH();
if(zend_hash_find(®(ht_rc), (char *) pattern, patlen+1, (void **) &rc) == FAILURE ||
rc->cflags != cflags) {
PHP_MSHUTDOWN_FUNCTION(regex)
{
- REGLS_FETCH();
+ TSRMLS_FETCH();
zend_hash_destroy(®(ht_rc));
return SUCCESS;
#ifdef ZTS
-#define REGLS_D php_reg_globals *reg_globals
-#define REGLS_DC , REGLS_D
-#define REGLS_C reg_globals
-#define REGLS_CC , REGLS_C
-#define REG(v) (reg_globals->v)
-#define REGLS_FETCH() php_reg_globals *reg_globals = ts_resource(reg_globals_id)
+#define REG(v) TSRMG(reg_globals_id, php_reg_globals *, v)
#else
-#define REGLS_D
-#define REGLS_DC
-#define REGLS_C
-#define REGLS_CC
#define REG(v) (reg_globals.v)
-#define REGLS_FETCH()
#endif
#endif /* REG_H */
char *token = NULL, *tokp=NULL;
char *first = NULL;
int argc;
- BLS_FETCH();
argc = ZEND_NUM_ARGS();
char *s, *t;
int l;
char escape_char='\\';
- PLS_FETCH();
+ TSRMLS_FETCH();
if (PG(magic_quotes_sybase)) {
escape_char='\'';
{
extern int sys_nerr;
extern char *sys_errlist[];
- BLS_FETCH();
+ TSRMLS_FETCH();
if ((unsigned int)errnum < sys_nerr) return(sys_errlist[errnum]);
(void)sprintf(BG(str_ebuf), "Unknown error: %d", errnum);
char *source,*target;
char *end;
char c;
- PLS_FETCH();
+ TSRMLS_FETCH();
if (!str) {
*new_length = 0;
zval *category, *locale;
int cat;
char *loc, *retval;
- BLS_FETCH();
if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2, &pcategory, &plocale)==FAILURE)
WRONG_PARAM_COUNT;
char *res = NULL;
int argCount;
int old_rg;
-
- PLS_FETCH();
- SLS_FETCH();
argCount = ARG_COUNT(ht);
if(argCount < 1 || argCount > 2 || zend_get_parameters_ex(argCount, &arg, &arrayArg) == FAILURE) {
old_rg = PG(register_globals);
if(argCount == 1) {
PG(register_globals) = 1;
- php_treat_data(PARSE_STRING, res, NULL TSRMLS_CC PLS_CC SLS_CC);
+ php_treat_data(PARSE_STRING, res, NULL TSRMLS_CC);
} else {
PG(register_globals) = 0;
/* Clear out the array that was passed in. */
zval_dtor(*arrayArg);
array_init(*arrayArg);
- php_treat_data(PARSE_STRING, res, *arrayArg TSRMLS_CC PLS_CC SLS_CC);
+ php_treat_data(PARSE_STRING, res, *arrayArg TSRMLS_CC);
}
PG(register_globals) = old_rg;
}
#include "basic_functions.h"
#include "php_ext_syslog.h"
-static void start_syslog(BLS_D);
+static void start_syslog(TSRMLS_D);
/* {{{ PHP_MINIT_FUNCTION
*/
PHP_RINIT_FUNCTION(syslog)
{
- BLS_FETCH();
-
if (INI_INT("define_syslog_variables")) {
- start_syslog(BLS_C);
+ start_syslog(TSRMLS_C);
} else {
BG(syslog_started)=0;
}
PHP_RSHUTDOWN_FUNCTION(syslog)
{
- BLS_FETCH();
+ TSRMLS_FETCH();
if (BG(syslog_device)) {
efree(BG(syslog_device));
/* {{{ start_syslog
*/
-static void start_syslog(BLS_D)
+static void start_syslog(TSRMLS_D)
{
- TSRMLS_FETCH();
-
/* error levels */
SET_VAR_LONG("LOG_EMERG", LOG_EMERG); /* system unusable */
SET_VAR_LONG("LOG_ALERT", LOG_ALERT); /* immediate action required */
Initializes all syslog-related variables */
PHP_FUNCTION(define_syslog_variables)
{
- BLS_FETCH();
-
if (!BG(syslog_started)) {
- start_syslog(BLS_C);
+ start_syslog(TSRMLS_C);
}
}
/* }}} */
PHP_FUNCTION(openlog)
{
pval **ident, **option, **facility;
- BLS_FETCH();
if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &ident, &option, &facility) == FAILURE) {
WRONG_PARAM_COUNT;
Close connection to system logger */
PHP_FUNCTION(closelog)
{
- BLS_FETCH();
-
closelog();
if (BG(syslog_device)) {
efree(BG(syslog_device));
static char *url_attr_addon(const char *tag,const char *attr,const char *val,const char *buf)
{
int flag = 0;
- PLS_FETCH();
+ TSRMLS_FETCH();
if(!strcasecmp(tag,"a") && !strcasecmp(attr,"href")) {
flag = 1;
{
char *out,*outp;
int maxl,n;
- BLS_FETCH();
+ TSRMLS_FETCH();
if(src==NULL) {
US.state=STATE_NORMAL;
char *key;
char *lasts;
char *tmp;
- BLS_FETCH();
+ TSRMLS_FETCH();
ctx = &BG(url_adapt_state_ex);
#undef YYLIMIT
#undef YYMARKER
-static inline void tag_arg(url_adapt_state_ex_t *ctx, char quote PLS_DC)
+static inline void tag_arg(url_adapt_state_ex_t *ctx, char quote TSRMLS_DC)
{
char f = 0;
#define YYMARKER q
#define STATE ctx->state
-#define STD_PARA url_adapt_state_ex_t *ctx, char *start, char *YYCURSOR PLS_DC
-#define STD_ARGS ctx, start, xp PLS_CC
+#define STD_PARA url_adapt_state_ex_t *ctx, char *start, char *YYCURSOR TSRMLS_DC
+#define STD_ARGS ctx, start, xp TSRMLS_CC
static inline void passthru(STD_PARA)
{
static inline void handle_val(STD_PARA, char quotes, char type)
{
smart_str_setl(&ctx->val, start + quotes, YYCURSOR - start - quotes * 2);
- tag_arg(ctx, type PLS_CC);
+ tag_arg(ctx, type TSRMLS_CC);
}
#ifdef SCANNER_DEBUG
char *xp;
char *start;
int rest;
- PLS_FETCH();
+ TSRMLS_FETCH();
smart_str_appendl(&ctx->buf, newdata, newlen);
{
char *ret = NULL;
url_adapt_state_ex_t *ctx;
- BLS_FETCH();
+ TSRMLS_FETCH();
ctx = &BG(url_adapt_state_ex);
smart_str buf = {0};
smart_str sname = {0};
smart_str sval = {0};
- PLS_FETCH();
+ TSRMLS_FETCH();
smart_str_setl(&surl, url, urllen);
smart_str_sets(&sname, name);
{
char *ret;
url_adapt_state_ex_t *ctx;
- BLS_FETCH();
+ TSRMLS_FETCH();
ctx = &BG(url_adapt_state_ex);
PHP_RINIT_FUNCTION(url_scanner)
{
url_adapt_state_ex_t *ctx;
- BLS_FETCH();
ctx = &BG(url_adapt_state_ex);
PHP_RSHUTDOWN_FUNCTION(url_scanner)
{
url_adapt_state_ex_t *ctx;
- BLS_FETCH();
+ TSRMLS_FETCH();
ctx = &BG(url_adapt_state_ex);
PHP_MINIT_FUNCTION(url_scanner)
{
url_adapt_state_ex_t *ctx;
- BLS_FETCH();
+ //TSRMLS_FETCH();
ctx = &BG(url_adapt_state_ex);
PHP_MSHUTDOWN_FUNCTION(url_scanner)
{
- BLS_FETCH();
+ TSRMLS_FETCH();
UNREGISTER_INI_ENTRIES();
zend_hash_destroy(BG(url_adapt_state_ex).tags);
char *key;
char *lasts;
char *tmp;
- BLS_FETCH();
+ TSRMLS_FETCH();
ctx = &BG(url_adapt_state_ex);
#undef YYLIMIT
#undef YYMARKER
-static inline void tag_arg(url_adapt_state_ex_t *ctx, char quote PLS_DC)
+static inline void tag_arg(url_adapt_state_ex_t *ctx, char quote TSRMLS_DC)
{
char f = 0;
#define YYMARKER q
#define STATE ctx->state
-#define STD_PARA url_adapt_state_ex_t *ctx, char *start, char *YYCURSOR PLS_DC
-#define STD_ARGS ctx, start, xp PLS_CC
+#define STD_PARA url_adapt_state_ex_t *ctx, char *start, char *YYCURSOR TSRMLS_DC
+#define STD_ARGS ctx, start, xp TSRMLS_CC
static inline void passthru(STD_PARA)
{
static inline void handle_val(STD_PARA, char quotes, char type)
{
smart_str_setl(&ctx->val, start + quotes, YYCURSOR - start - quotes * 2);
- tag_arg(ctx, type PLS_CC);
+ tag_arg(ctx, type TSRMLS_CC);
}
#ifdef SCANNER_DEBUG
char *xp;
char *start;
int rest;
- PLS_FETCH();
+ TSRMLS_FETCH();
smart_str_appendl(&ctx->buf, newdata, newlen);
{
char *ret = NULL;
url_adapt_state_ex_t *ctx;
- BLS_FETCH();
+ TSRMLS_FETCH();
ctx = &BG(url_adapt_state_ex);
smart_str buf = {0};
smart_str sname = {0};
smart_str sval = {0};
- PLS_FETCH();
+ TSRMLS_FETCH();
smart_str_setl(&surl, url, urllen);
smart_str_sets(&sname, name);
{
char *ret;
url_adapt_state_ex_t *ctx;
- BLS_FETCH();
+ TSRMLS_FETCH();
ctx = &BG(url_adapt_state_ex);
PHP_RINIT_FUNCTION(url_scanner)
{
url_adapt_state_ex_t *ctx;
- BLS_FETCH();
+ TSRMLS_FETCH();
ctx = &BG(url_adapt_state_ex);
PHP_RSHUTDOWN_FUNCTION(url_scanner)
{
url_adapt_state_ex_t *ctx;
- BLS_FETCH();
+ TSRMLS_FETCH();
ctx = &BG(url_adapt_state_ex);
PHP_MINIT_FUNCTION(url_scanner)
{
url_adapt_state_ex_t *ctx;
- BLS_FETCH();
+ TSRMLS_FETCH();
ctx = &BG(url_adapt_state_ex);
PHP_MSHUTDOWN_FUNCTION(url_scanner)
{
- BLS_FETCH();
+ TSRMLS_FETCH();
UNREGISTER_INI_ENTRIES();
zend_hash_destroy(BG(url_adapt_state_ex).tags);
int i;
ulong *var_already;
HashTable *myht;
- BLS_FETCH();
+ TSRMLS_FETCH();
if(var_hash != NULL && php_add_var_hash(var_hash,*struc,(void *)&var_already) == FAILURE && (*struc)->is_ref) {
slen = sprintf(s,"R:%ld;",*var_already);
return;
case IS_DOUBLE: {
- TSRMLS_FETCH();
slen = sprintf(s, "d:%.*G;",(int) EG(precision), Z_DVAL_PP(struc));
STR_CAT(buf, s, slen);
}
zval *fname;
int res;
PHP_CLASS_ATTRIBUTES;
- CLS_FETCH();
MAKE_STD_ZVAL(fname);
ZVAL_STRING(fname,"__sleep",1);
ulong id;
HashTable *myht;
zval **rval_ref;
-
TSRMLS_FETCH();
- BLS_FETCH();
if (var_hash && **p != 'R') { /* references aren't counted by serializer! */
zend_hash_next_index_insert(var_hash, rval, sizeof(*rval), NULL);
if ((*rval)->type == IS_OBJECT) {
zval *retval_ptr = NULL;
zval *fname;
- CLS_FETCH();
MAKE_STD_ZVAL(fname);
ZVAL_STRING(fname,"__wakeup",1);
ZEND_END_MODULE_GLOBALS(swf)
#ifdef ZTS
-#define SWFLS_D zend_swf_globals *swf_globals
-#define SWFG(v) (swf_globals->v)
-#define SWFLS_FETCH() zend_swf_globals *swf_globals = ts_resource(swf_globals_id)
+#define SWFG(v) TSRMG(swf_globals_id, zend_swf_globals *, v)
#else
-#define SWFLS_D
#define SWFG(v) (swf_globals.v)
-#define SWFLS_FETCH()
#endif
#else
*/
PHP_RINIT_FUNCTION(swf)
{
- SWFLS_FETCH();
SWFG(use_file) = 0;
-
return SUCCESS;
}
/* }}} */
zval **name, **sizeX, **sizeY, **frameRate, **r, **g, **b;
char *na, *tmpna;
zend_bool free_na;
- SWFLS_FETCH();
if (ZEND_NUM_ARGS() != 7 ||
zend_get_parameters_ex(7, &name, &sizeX, &sizeY, &frameRate, &r, &g, &b) == FAILURE) {
Close a Shockwave flash file that was opened with swf_openfile */
PHP_FUNCTION(swf_closefile)
{
- SWFLS_FETCH();
-
swf_closefile();
if (!SWFG(use_file)) {
int blocks_initialized=1;
int i,j;
int *column_types;
- PLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 1:
static int _clean_invalid_results(list_entry *le)
{
- SybCtLS_FETCH();
+ TSRMLS_FETCH();
if (le->type == le_result) {
sybase_link *sybase_ptr = ((sybase_result *) le->ptr)->sybase_ptr;
sybase_link *sybase_ptr = (sybase_link *)rsrc->ptr;
CS_INT con_status;
TSRMLS_FETCH();
- SybCtLS_FETCH();
sybase_ptr->valid = 0;
{
sybase_link *sybase_ptr = (sybase_link *)rsrc->ptr;
CS_INT con_status;
- SybCtLS_FETCH();
+ TSRMLS_FETCH();
/* Persistent connections may have been closed before a failed
* reopen attempt.
static CS_RETCODE CS_PUBLIC _client_message_handler(CS_CONTEXT *context, CS_CONNECTION *connection, CS_CLIENTMSG *errmsg)
{
- SybCtLS_FETCH();
+ TSRMLS_FETCH();
if (CS_SEVERITY(errmsg->msgnumber) >= SybCtG(min_client_severity)) {
php_error(E_WARNING, "Sybase: Client message: %s (severity %d)", errmsg->msgstring, CS_SEVERITY(errmsg->msgnumber));
static CS_RETCODE CS_PUBLIC _server_message_handler(CS_CONTEXT *context, CS_CONNECTION *connection, CS_SERVERMSG *srvmsg)
{
- SybCtLS_FETCH();
+ TSRMLS_FETCH();
if (srvmsg->severity >= SybCtG(min_server_severity)) {
php_error(E_WARNING, "Sybase: Server message: %s (severity %d, procedure %s)",
PHP_RINIT_FUNCTION(sybase)
{
- SybCtLS_FETCH();
-
SybCtG(default_link)=-1;
SybCtG(num_links) = SybCtG(num_persistent);
SybCtG(appname) = estrndup("PHP 4.0", 7);
PHP_RSHUTDOWN_FUNCTION(sybase)
{
- SybCtLS_FETCH();
+ TSRMLS_FETCH();
efree(SybCtG(appname));
STR_FREE(SybCtG(server_message));
static int php_sybase_do_connect_internal(sybase_link *sybase, char *host, char *user, char *passwd, char *charset)
{
CS_LOCALE *tmp_locale;
-
- SybCtLS_FETCH();
+ TSRMLS_FETCH();
/* set a CS_CONNECTION record */
if (ct_con_alloc(SybCtG(context), &sybase->connection)!=CS_SUCCEED) {
char *hashed_details;
int hashed_details_length;
sybase_link *sybase_ptr;
- SybCtLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 0: /* defaults */
static int php_sybase_get_default_link(INTERNAL_FUNCTION_PARAMETERS)
{
- SybCtLS_FETCH();
-
if (SybCtG(default_link)==-1) { /* no link opened yet, implicitly open one */
ht = 0;
php_sybase_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
pval *sybase_link_index = 0;
int id;
sybase_link *sybase_ptr;
- SybCtLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 0:
CS_RETCODE retcode;
CS_INT restype;
int failure=0;
- SybCtLS_FETCH();
+ TSRMLS_FETCH();
/* Fail if we already marked this connection dead. */
int id;
char *cmdbuf;
sybase_link *sybase_ptr;
- SybCtLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 1:
CS_DATAFMT *datafmt;
int i, j, retcode;
int blocks_initialized=1;
- SybCtLS_FETCH();
+ TSRMLS_FETCH();
/* The following is more or less the equivalent of mysql_store_result().
* fetch all rows from the server into the row buffer, thus:
Q_SUCCESS, /* Success but no results. */
Q_FAILURE, /* Failure, no results. */
} status;
- SybCtLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 1:
{
pval *sybase_result_index;
sybase_result *result;
- SybCtLS_FETCH();
if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &sybase_result_index)==FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto string sybase_get_last_message(void)
Returns the last message from server (over min_message_severity) */
PHP_FUNCTION(sybase_get_last_message)
-{
- SybCtLS_FETCH();
-
+{
RETURN_STRING(SybCtG(server_message),1);
}
/* }}} */
{
pval *sybase_result_index;
sybase_result *result;
- SybCtLS_FETCH();
if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &sybase_result_index)==FAILURE) {
WRONG_PARAM_COUNT;
{
pval *sybase_result_index;
sybase_result *result;
- SybCtLS_FETCH();
+ TSRMLS_FETCH();
if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &sybase_result_index)==FAILURE) {
WRONG_PARAM_COUNT;
int i;
sybase_result *result;
pval *field_content;
- SybCtLS_FETCH();
+ TSRMLS_FETCH();
if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &sybase_result_index)==FAILURE) {
WRONG_PARAM_COUNT;
sybase_result *result;
int i;
pval *tmp;
- PLS_FETCH();
- SybCtLS_FETCH();
+ TSRMLS_FETCH();
+ TSRMLS_FETCH();
if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &sybase_result_index)==FAILURE) {
WRONG_PARAM_COUNT;
{
pval *sybase_result_index,*offset;
sybase_result *result;
- SybCtLS_FETCH();
+ TSRMLS_FETCH();
if (ZEND_NUM_ARGS()!=2 || getParameters(ht, 2, &sybase_result_index, &offset)==FAILURE) {
WRONG_PARAM_COUNT;
pval *sybase_result_index,*offset;
int field_offset;
sybase_result *result;
- SybCtLS_FETCH();
+ TSRMLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 1:
pval *sybase_result_index,*offset;
int field_offset;
sybase_result *result;
- SybCtLS_FETCH();
+ TSRMLS_FETCH();
if (ZEND_NUM_ARGS()!=2 || getParameters(ht, 2, &sybase_result_index, &offset)==FAILURE) {
WRONG_PARAM_COUNT;
pval *row, *field, *sybase_result_index;
int field_offset=0;
sybase_result *result;
- SybCtLS_FETCH();
+ TSRMLS_FETCH();
if (ZEND_NUM_ARGS()!=3 || getParameters(ht, 3, &sybase_result_index, &row, &field)==FAILURE) {
WRONG_PARAM_COUNT;
pval *sybase_link_index;
sybase_link *sybase_ptr;
int id;
- SybCtLS_FETCH();
+ TSRMLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 0:
PHP_MINFO_FUNCTION(sybase)
{
char buf[32];
- SybCtLS_FETCH();
+ TSRMLS_FETCH();
php_info_print_table_start();
php_info_print_table_header(2, "Sybase_CT Support", "enabled" );
PHP_FUNCTION(sybase_min_client_severity)
{
pval *severity;
- SybCtLS_FETCH();
if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &severity)==FAILURE) {
WRONG_PARAM_COUNT;
PHP_FUNCTION(sybase_min_server_severity)
{
pval *severity;
- SybCtLS_FETCH();
if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &severity)==FAILURE) {
WRONG_PARAM_COUNT;
#ifdef ZTS
-# define SybCtLS_D zend_sybase_globals *sybase_globals
-# define SybCtLS_DC , SybCtLS_D
-# define SybCtLS_C sybase_globals
-# define SybCtLS_CC , SybCtLS_C
-# define SybCtG(v) (sybase_globals->v)
-# define SybCtLS_FETCH() zend_sybase_globals *sybase_globals = ts_resource(sybase_globals_id)
+# define SybCtG(v) TSRMG(sybase_globals_id, zend_sybase_globals *, v)
#else
-# define SybCtLS_D
-# define SybCtLS_DC
-# define SybCtLS_C
-# define SybCtLS_CC
# define SybCtG(v) (sybase_globals.v)
-# define SybCtLS_FETCH()
#endif
#else
PHP_RINIT_FUNCTION(vpopmail)
{
- VPOPMAILLS_FETCH();
-
VPOPMAILG(vpopmail_open) = 0;
VPOPMAILG(vpopmail_errno) = 0;
PHP_RSHUTDOWN_FUNCTION(vpopmail)
{
- VPOPMAILLS_FETCH();
+ TSRMLS_FETCH();
if (VPOPMAILG(vpopmail_open) != 0) {
vclose();
convert_to_long_ex(uid);
convert_to_long_ex(gid);
- VPOPMAILLS_FETCH();
VPOPMAILG(vpopmail_open) = 1;
retval = vadddomain(Z_STRVAL_PP(domain),
convert_to_string_ex(domain);
- VPOPMAILLS_FETCH();
VPOPMAILG(vpopmail_open) = 1;
retval = vdeldomain(Z_STRVAL_PP(domain));
php_strtolower(Z_STRVAL_PP(domain), Z_STRLEN_PP(domain));
php_strtolower(Z_STRVAL_PP(aliasdomain), Z_STRLEN_PP(aliasdomain));
- VPOPMAILLS_FETCH();
+ TSRMLS_FETCH();
VPOPMAILG(vpopmail_open) = 1;
tmpstr = vget_assign(Z_STRVAL_PP(domain), Dir, 156, &uid, &gid);
/* {{{ proto bool vpopmail_add_domain_ex(string domain, string passwd [, string quota [, string bounce [, bool apop]]])
Add a new virtual domain */
-PHP_FUNCTION(vpopmail_add_domain_ex) {
+PHP_FUNCTION(vpopmail_add_domain_ex)
+{
zval **domain, **passwd, **quota, **bounce, **apop;
int retval,len=0,argc=ZEND_NUM_ARGS(),is_bounce_email;
int fr_bounce=0,fr_quota=0;
WRONG_PARAM_COUNT;
}
- VPOPMAILLS_FETCH();
-
switch (argc) {
case 5:
convert_to_long_ex(apop);
WRONG_PARAM_COUNT;
}
- VPOPMAILLS_FETCH();
-
convert_to_string_ex(domain);
escdomain=php_escape_shell_cmd(Z_STRVAL_PP(domain));
WRONG_PARAM_COUNT;
}
- VPOPMAILLS_FETCH();
-
convert_to_string_ex(olddomain);
convert_to_string_ex(newdomain);
escnewdomain=php_escape_shell_cmd(Z_STRVAL_PP(newdomain));
convert_to_string_ex(password);
}
- VPOPMAILLS_FETCH();
VPOPMAILG(vpopmail_open) = 1;
retval = vadduser(Z_STRVAL_PP(user),
convert_to_string_ex(user);
convert_to_string_ex(domain);
- VPOPMAILLS_FETCH();
VPOPMAILG(vpopmail_open) = 1;
retval = vdeluser(Z_STRVAL_PP(user),
convert_to_string_ex(domain);
convert_to_string_ex(password);
- VPOPMAILLS_FETCH();
VPOPMAILG(vpopmail_open) = 1;
retval = vpasswd(Z_STRVAL_PP(user),
convert_to_string_ex(domain);
convert_to_string_ex(quota);
- VPOPMAILLS_FETCH();
VPOPMAILG(vpopmail_open) = 1;
retval = vsetuserquota(Z_STRVAL_PP(user),
convert_to_string_ex(domain);
convert_to_string_ex(password);
- VPOPMAILLS_FETCH();
VPOPMAILG(vpopmail_open) = 1;
VPOPMAILG(vpopmail_errno) = 0;
convert_to_string_ex(domain);
convert_to_string_ex(alias);
- VPOPMAILLS_FETCH();
VPOPMAILG(vpopmail_open) = 1;
retval = valias_insert(Z_STRVAL_PP(user),
convert_to_string_ex(user);
convert_to_string_ex(domain);
- VPOPMAILLS_FETCH();
VPOPMAILG(vpopmail_open) = 1;
retval = valias_delete(Z_STRVAL_PP(user), Z_STRVAL_PP(domain));
convert_to_string_ex(domain);
- VPOPMAILLS_FETCH();
VPOPMAILG(vpopmail_open) = 1;
retval = valias_delete_domain(Z_STRVAL_PP(domain));
convert_to_string_ex(alias);
convert_to_string_ex(domain);
- VPOPMAILLS_FETCH();
VPOPMAILG(vpopmail_open) = 1;
if (array_init(return_value)!=SUCCESS) {
convert_to_string_ex(domain);
- VPOPMAILLS_FETCH();
VPOPMAILG(vpopmail_open) = 1;
if (array_init(return_value)!=SUCCESS) {
if (ZEND_NUM_ARGS() != 0)
WRONG_PARAM_COUNT;
- VPOPMAILLS_FETCH();
-
RETURN_STRING(verror(VPOPMAILG(vpopmail_errno)),1);
}
/* }}} */
ZEND_END_MODULE_GLOBALS(vpopmail)
#ifdef ZTS
-#define VPOPMAILG(v) (vpopmail_globals->v)
-#define VPOPMAILLS_FETCH() php_vpopmail_globals *vpopmail_globals = ts_resource(gd_vpopmail_id)
+#define VPOPMAILG(v) TSRMG(gd_vpopmail_id, php_vpopmail_globals *, v)
#else
#define VPOPMAILG(v) (vpopmail_globals.v)
-#define VPOPMAILLS_FETCH()
#endif
#else
key = tmp;
/* fallthru */
case HASH_KEY_IS_STRING:
- php_set_session_var(key, key_length-1, *ent, NULL PSLS_CC);
+ php_set_session_var(key, key_length-1, *ent, NULL TSRMLS_CC);
PS_ADD_VAR(key);
}
}
char *key;
ulong idx;
char tmp_buf[WDDX_BUF_LEN];
- CLS_FETCH();
- BLS_FETCH();
+ TSRMLS_FETCH();
MAKE_STD_ZVAL(fname);
ZVAL_STRING(fname, "__sleep", 1);
zend_str_tolower(Z_STRVAL_P(ent1->data), Z_STRLEN_P(ent1->data));
if (zend_hash_find(EG(class_table), Z_STRVAL_P(ent1->data),
Z_STRLEN_P(ent1->data)+1, (void **) &ce)==FAILURE) {
- BLS_FETCH();
-
incomplete_class = 1;
ce = PHP_IC_ENTRY_READ;
}
#define phpext_xml_ptr xml_module_ptr
#ifdef ZTS
-#define XMLLS_D php_xml_globals *xml_globals
-#define XMLLS_DC , PSLS_D
-#define XMLLS_C xml_globals
-#define XMLLS_CC , XMLLS_C
-#define XML(v) (xml_globals->v)
-#define XMLLS_FETCH() php_xml_globals *xml_globals = ts_resource(xml_globals_id)
+#define XML(v) TSRMG(xml_globals_id, php_xml_globals *, v)
#else
-#define XMLLS_D
-#define XMLLS_DC
-#define XMLLS_C
-#define XMLLS_CC
#define XML(v) (xml_globals.v)
-#define XMLLS_FETCH()
#endif
#endif /* PHP_XML_H */
#ifdef ZTS
-static void php_xml_init_globals(php_xml_globals *xml_globals TSRMLS_DC)
+static void php_xml_init_globals(php_xml_globals *xml_globals_p TSRMLS_DC)
{
XML(default_encoding) = "ISO-8859-1";
}
zval **encodingArg;
XML_Char *encoding;
char thisfunc[] = "xml_parser_create";
- XMLLS_FETCH();
argc = ZEND_NUM_ARGS();
zval **encodingArg, **sepArg;
XML_Char *encoding, *sep;
char thisfunc[] = "xml_parser_create";
- XMLLS_FETCH();
argc = ZEND_NUM_ARGS();
} php_yp_globals;
#ifdef ZTS
-#define YPLS_D php_yp_globals *yp_globals
-#define YPLS_DC , YPLS_D
-#define YPLS_C yp_globals
-#define YPLS_CC , YPLS_C
-#define YP(v) (yp_globals->v)
-#define YPLS_FETCH() php_yp_globals *yp_globals = ts_resource(yp_globals_id)
+#define YG(v) TSRMG(yp_globals_id, php_yp_globals *, v)
#else
-#define YPLS_D
-#define YPLS_DC
-#define YPLS_C
-#define YPLS_CC
#define YP(v) (yp_globals.v)
-#define YPLS_FETCH()
#endif
#else
/* {{{ proto string yp_get_default_domain(void)
Returns the domain or false */
-PHP_FUNCTION(yp_get_default_domain) {
+PHP_FUNCTION(yp_get_default_domain)
+{
char *outdomain;
- YPLS_FETCH();
if(YP(error) = yp_get_default_domain(&outdomain)) {
php_error(E_WARNING, yperr_string (YP(error)));
/* {{{ proto int yp_order(string domain, string map)
Returns the order number or false */
-PHP_FUNCTION(yp_order) {
+PHP_FUNCTION(yp_order)
+{
pval **domain, **map;
#if SOLARIS_YP
int outval;
#endif
- YPLS_FETCH();
-
if((ZEND_NUM_ARGS() != 2) || zend_get_parameters_ex(2,&domain,&map) == FAILURE) {
WRONG_PARAM_COUNT;
}
/* {{{ proto string yp_master(string domain, string map)
Returns the machine name of the master */
-PHP_FUNCTION(yp_master) {
+PHP_FUNCTION(yp_master)
+{
pval **domain, **map;
char *outname;
- YPLS_FETCH();
if((ZEND_NUM_ARGS() != 2) || zend_get_parameters_ex(2,&domain,&map) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto string yp_match(string domain, string map, string key)
Returns the matched line or false */
-PHP_FUNCTION(yp_match) {
+PHP_FUNCTION(yp_match)
+{
pval **domain, **map, **key;
char *outval;
int outvallen;
- YPLS_FETCH();
if((ZEND_NUM_ARGS() != 3) || zend_get_parameters_ex(3,&domain,&map,&key) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto array yp_first(string domain, string map)
Returns the first key as array with $var[$key] and the the line as the value */
-PHP_FUNCTION(yp_first) {
+PHP_FUNCTION(yp_first)
+{
pval **domain, **map;
char *outval, *outkey;
int outvallen, outkeylen;
- YPLS_FETCH();
if((ZEND_NUM_ARGS() != 2) || zend_get_parameters_ex(2,&domain,&map) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ proto array yp_next(string domain, string map, string key)
Returns an array with $var[$key] and the the line as the value */
-PHP_FUNCTION(yp_next) {
+PHP_FUNCTION(yp_next)
+{
pval **domain, **map, **key;
char *outval, *outkey;
int outvallen, outkeylen;
- YPLS_FETCH();
if((ZEND_NUM_ARGS() != 3) || zend_get_parameters_ex(3,&domain,&map,&key) == FAILURE) {
WRONG_PARAM_COUNT;
zval *status, *key, *value;
zval **args [3];
zval *retval;
- CLS_FETCH();
+ TSRMLS_FETCH();
args[0] = &status;
args[1] = &key;
/* {{{ proto void yp_all(string domain, string map, string callback)
Traverse the map and call a function on each entry */
-PHP_FUNCTION(yp_all) {
+PHP_FUNCTION(yp_all)
+{
pval **domain, **map, **php_callback;
struct ypall_callback callback;
if (err != YPERR_NOMORE)
{
- YPLS_FETCH();
+ TSRMLS_FETCH();
+
YP(error) = err;
php_error(E_WARNING, yperr_string (err));
}
/* {{{ proto int yp_errno()
Returns the error code from the last call or 0 if no error occured */
-PHP_FUNCTION(yp_errno) {
- YPLS_FETCH();
-
+PHP_FUNCTION(yp_errno)
+{
if((ZEND_NUM_ARGS() != 0)) {
WRONG_PARAM_COUNT;
}
PHP_RINIT_FUNCTION(yp)
{
- YPLS_FETCH();
YP(error) = 0;
}
#ifdef ZTS
-#define ZLIBLS_D php_zlib_globals *zlib_globals
-#define ZLIBLS_DC , ZLIBLS_D
-#define ZLIBLS_C zlib_globals
-#define ZLIBLS_CC , ZLIBLS_C
#define ZLIBG(v) (zlib_globals->v)
-#define ZLIBLS_FETCH() php_zlib_globals *zlib_globals = ts_resource(zlib_globals_id)
+#define ZLIBG(v) TSRMG(zlib_globals_id, zend_zlib_globals *, v)
#else
-#define ZLIBLS_D
-#define ZLIBLS_DC
-#define ZLIBLS_C
-#define ZLIBLS_CC
#define ZLIBG(v) (zlib_globals.v)
-#define ZLIBLS_FETCH()
#endif
#define phpext_zlib_ptr zlib_module_ptr
#ifdef ZTS
/* {{{ php_zlib_init_globals
*/
-static void php_zlib_init_globals(ZLIBLS_D TSRMLS_DC)
+static void php_zlib_init_globals(php_zlib_globals *zlib_globals_p TSRMLS_DC)
{
- ZLIBG(gzgetss_state) = 0;
+ ZLIBG(gzgetss_state) = 0;
}
/* }}} */
#endif
*/
PHP_MINIT_FUNCTION(zlib)
{
- PLS_FETCH();
+ TSRMLS_FETCH();
#ifdef ZTS
ts_allocate_id(&zlib_globals_id, sizeof(php_zlib_globals), (ts_allocate_ctor) php_zlib_init_globals, NULL);
*/
PHP_RINIT_FUNCTION(zlib)
{
- ZLIBLS_FETCH();
-
ZLIBG(ob_gzhandler_status) = 0;
switch (ZLIBG(output_compression)) {
case 0:
PHP_MSHUTDOWN_FUNCTION(zlib)
{
#if HAVE_FOPENCOOKIE
- PLS_FETCH();
+ TSRMLS_FETCH();
if(PG(allow_url_fopen)) {
php_unregister_url_wrapper("zlib");
char *slashed, buf[8192];
register int i=0;
int use_include_path = 0;
- PLS_FETCH();
/* check args */
switch (ZEND_NUM_ARGS()) {
gzFile *zp;
char *p;
int use_include_path = 0;
- ZLIBLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 2:
gzFile *zp;
int len;
char *buf;
- PLS_FETCH();
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
char *buf;
char *allowed_tags=NULL;
int allowed_tags_len=0;
- ZLIBLS_FETCH();
switch(ZEND_NUM_ARGS()) {
case 2:
gzFile *zp;
int ret;
int num_bytes;
- PLS_FETCH();
switch (ZEND_NUM_ARGS()) {
case 2:
pval **arg1, **arg2;
gzFile *zp;
int len;
- PLS_FETCH();
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ php_do_deflate
*/
-static int php_do_deflate(uint str_length, Bytef **p_buffer, uint *p_buffer_len, zend_bool do_start, zend_bool do_end ZLIBLS_DC)
+static int php_do_deflate(uint str_length, Bytef **p_buffer, uint *p_buffer_len, zend_bool do_start, zend_bool do_end TSRMLS_DC)
{
Bytef *buffer;
uInt prev_outlen, outlen;
int php_deflate_string(const char *str, uint str_length, char **newstr, uint *new_length, int coding, zend_bool do_start, zend_bool do_end)
{
int err;
- ZLIBLS_FETCH();
+ TSRMLS_FETCH();
ZLIBG(compression_coding) = coding;
ZLIBG(crc) = crc32(ZLIBG(crc), (const Bytef *) str, str_length);
}
- err = php_do_deflate(str_length, (Bytef **) newstr, new_length, do_start, do_end ZLIBLS_CC);
+ err = php_do_deflate(str_length, (Bytef **) newstr, new_length, do_start, do_end TSRMLS_CC);
/* TODO: error handling (err may be Z_STREAM_ERROR, Z_BUF_ERROR, ?) */
if (do_start) {
zval **data, **a_encoding;
zend_bool return_original=0;
zend_bool do_start, do_end;
- ZLIBLS_FETCH();
if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2, &zv_string, &zv_mode)==FAILURE) {
ZEND_WRONG_PARAM_COUNT();
static void php_gzip_output_handler(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode)
{
zend_bool do_start, do_end;
- ZLIBLS_FETCH();
+ TSRMLS_FETCH();
do_start = (mode & PHP_OUTPUT_HANDLER_START ? 1 : 0);
do_end = (mode & PHP_OUTPUT_HANDLER_END ? 1 : 0);
{
zval **a_encoding, **data;
TSRMLS_FETCH();
- ZLIBLS_FETCH();
if (zend_hash_find(&EG(symbol_table), "HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS"), (void **) &data)==FAILURE
|| Z_TYPE_PP(data)!=IS_ARRAY
static void sapi_globals_ctor(sapi_globals_struct *sapi_globals TSRMLS_DC)
{
- memset(sapi_globals,0,sizeof(*sapi_globals));
+ memset(sapi_globals, 0, sizeof(*sapi_globals));
}
/* True globals (no need for thread safety) */
}
-SAPI_API void sapi_handle_post(void *arg SLS_DC)
+SAPI_API void sapi_handle_post(void *arg TSRMLS_DC)
{
if (SG(request_info).post_entry && SG(request_info).content_type_dup) {
- SG(request_info).post_entry->post_handler(SG(request_info).content_type_dup, arg SLS_CC);
+ SG(request_info).post_entry->post_handler(SG(request_info).content_type_dup, arg TSRMLS_CC);
if (SG(request_info).post_data) {
efree(SG(request_info).post_data);
SG(request_info).post_data = NULL;
}
}
-static void sapi_read_post_data(SLS_D)
+static void sapi_read_post_data(TSRMLS_D)
{
sapi_post_entry *post_entry;
uint content_type_length = strlen(SG(request_info).content_type);
char *content_type = estrndup(SG(request_info).content_type, content_type_length);
char *p;
char oldchar=0;
- void (*post_reader_func)(SLS_D);
- PLS_FETCH();
+ void (*post_reader_func)(TSRMLS_D);
/* dedicated implementation for increased performance:
if (oldchar) {
*(p-1) = oldchar;
}
- post_reader_func(SLS_C);
+ post_reader_func(TSRMLS_C);
SG(request_info).content_type_dup = content_type;
if(PG(always_populate_raw_post_data) && sapi_module.default_post_reader) {
- sapi_module.default_post_reader(SLS_C);
+ sapi_module.default_post_reader(TSRMLS_C);
}
}
SG(request_info).post_data = emalloc(allocated_bytes);
for (;;) {
- read_bytes = sapi_module.read_post(SG(request_info).post_data+SG(read_post_bytes), SAPI_POST_BLOCK_SIZE SLS_CC);
+ read_bytes = sapi_module.read_post(SG(request_info).post_data+SG(read_post_bytes), SAPI_POST_BLOCK_SIZE TSRMLS_CC);
if (read_bytes<=0) {
break;
}
}
-SAPI_API char *sapi_get_default_content_type(SLS_D)
+SAPI_API char *sapi_get_default_content_type(TSRMLS_D)
{
char *mimetype, *charset, *content_type;
}
-SAPI_API void sapi_get_default_content_type_header(sapi_header_struct *default_header SLS_DC)
+SAPI_API void sapi_get_default_content_type_header(sapi_header_struct *default_header TSRMLS_DC)
{
- char *default_content_type = sapi_get_default_content_type(SLS_C);
+ char *default_content_type = sapi_get_default_content_type(TSRMLS_C);
int default_content_type_len = strlen(default_content_type);
default_header->header_len = (sizeof("Content-type: ")-1) + default_content_type_len;
* unchanged, 0 is returned.
*
*/
-SAPI_API size_t sapi_apply_default_charset(char **mimetype, size_t len SLS_DC)
+SAPI_API size_t sapi_apply_default_charset(char **mimetype, size_t len TSRMLS_DC)
{
char *charset, *newtype;
size_t newlen;
/*
* Called from php_request_startup() for every request.
*/
-SAPI_API void sapi_activate(SLS_D)
+SAPI_API void sapi_activate(TSRMLS_D)
{
zend_llist_init(&SG(sapi_headers).headers, sizeof(sapi_header_struct), (void (*)(void *)) sapi_free_header, 0);
SG(sapi_headers).send_default_content_type = 1;
sapi_module.sapi_error(E_WARNING, "No content-type in POST request");
SG(request_info).content_type_dup = NULL;
} else {
- sapi_read_post_data(SLS_C);
+ sapi_read_post_data(TSRMLS_C);
}
} else {
SG(request_info).content_type_dup = NULL;
}
- SG(request_info).cookie_data = sapi_module.read_cookies(SLS_C);
+ SG(request_info).cookie_data = sapi_module.read_cookies(TSRMLS_C);
if (sapi_module.activate) {
- sapi_module.activate(SLS_C);
+ sapi_module.activate(TSRMLS_C);
}
}
}
-SAPI_API void sapi_deactivate(SLS_D)
+SAPI_API void sapi_deactivate(TSRMLS_D)
{
zend_llist_destroy(&SG(sapi_headers).headers);
if (SG(request_info).post_data) {
efree(SG(request_info).current_user);
}
if (sapi_module.deactivate) {
- sapi_module.deactivate(SLS_C);
+ sapi_module.deactivate(TSRMLS_C);
}
if (SG(rfc1867_uploaded_files)) {
- destroy_uploaded_files_hash(SLS_C);
+ destroy_uploaded_files_hash(TSRMLS_C);
}
}
-SAPI_API void sapi_initialize_empty_request(SLS_D)
+SAPI_API void sapi_initialize_empty_request(TSRMLS_D)
{
SG(server_context) = NULL;
SG(request_info).request_method = NULL;
int retval, free_header = 0;
sapi_header_struct sapi_header;
char *colon_offset;
- SLS_FETCH();
+ TSRMLS_FETCH();
if (SG(headers_sent) && !SG(request_info).no_headers) {
char *output_start_filename = php_get_output_start_filename();
ptr++;
}
mimetype = estrdup(ptr);
- newlen = sapi_apply_default_charset(&mimetype, len SLS_CC);
+ newlen = sapi_apply_default_charset(&mimetype, len TSRMLS_CC);
if (newlen != 0) {
newlen += sizeof("Content-type: ");
newheader = emalloc(newlen);
}
if (sapi_module.header_handler) {
- retval = sapi_module.header_handler(&sapi_header, &SG(sapi_headers) SLS_CC);
+ retval = sapi_module.header_handler(&sapi_header, &SG(sapi_headers) TSRMLS_CC);
} else {
retval = SAPI_HEADER_ADD;
}
{
int retval;
int ret = FAILURE;
- SLS_FETCH();
+ TSRMLS_FETCH();
if (SG(headers_sent) || SG(request_info).no_headers) {
return SUCCESS;
SG(headers_sent) = 1;
if (sapi_module.send_headers) {
- retval = sapi_module.send_headers(&SG(sapi_headers) SLS_CC);
+ retval = sapi_module.send_headers(&SG(sapi_headers) TSRMLS_CC);
} else {
retval = SAPI_HEADER_DO_SEND;
}
if(SG(sapi_headers).send_default_content_type) {
sapi_header_struct default_header;
- sapi_get_default_content_type_header(&default_header SLS_CC);
+ sapi_get_default_content_type_header(&default_header TSRMLS_CC);
sapi_module.send_header(&default_header, SG(server_context));
sapi_free_header(&default_header);
}
}
-SAPI_API int sapi_register_default_post_reader(void (*default_post_reader)(SLS_D))
+SAPI_API int sapi_register_default_post_reader(void (*default_post_reader)(TSRMLS_D))
{
sapi_module.default_post_reader = default_post_reader;
return SUCCESS;
SAPI_API int sapi_flush()
{
if (sapi_module.flush) {
- SLS_FETCH();
+ TSRMLS_FETCH();
sapi_module.flush(SG(server_context));
return SUCCESS;
SAPI_API struct stat *sapi_get_stat()
{
- SLS_FETCH();
+ TSRMLS_FETCH();
if (sapi_module.get_stat) {
- return sapi_module.get_stat(SLS_C);
+ return sapi_module.get_stat(TSRMLS_C);
} else {
if (!SG(request_info).path_translated || (VCWD_STAT(SG(request_info).path_translated, &SG(global_stat))==-1)) {
return NULL;
SAPI_API char *sapi_getenv(char *name, size_t name_len)
{
if (sapi_module.getenv) {
- SLS_FETCH();
+ TSRMLS_FETCH();
- return sapi_module.getenv(name, name_len SLS_CC);
+ return sapi_module.getenv(name, name_len TSRMLS_CC);
} else {
return NULL;
}
#ifdef ZTS
-# define SLS_D sapi_globals_struct *sapi_globals
-# define SLS_DC , SLS_D
-# define SLS_C sapi_globals
-# define SLS_CC , SLS_C
-# define SG(v) (sapi_globals->v)
-# define SLS_FETCH() sapi_globals_struct *sapi_globals = ts_resource(sapi_globals_id)
+# define SG(v) TSRMG(sapi_globals_id, sapi_globals_struct *, v)
SAPI_API extern int sapi_globals_id;
#else
-# define SLS_D void
-# define SLS_DC
-# define SLS_C
-# define SLS_CC
# define SG(v) (sapi_globals.v)
-# define SLS_FETCH()
extern SAPI_API sapi_globals_struct sapi_globals;
#endif
SAPI_API void sapi_startup(sapi_module_struct *sf);
SAPI_API void sapi_shutdown(void);
-SAPI_API void sapi_activate(SLS_D);
-SAPI_API void sapi_deactivate(SLS_D);
-SAPI_API void sapi_initialize_empty_request(SLS_D);
+SAPI_API void sapi_activate(TSRMLS_D);
+SAPI_API void sapi_deactivate(TSRMLS_D);
+SAPI_API void sapi_initialize_empty_request(TSRMLS_D);
SAPI_API int sapi_add_header_ex(char *header_line, uint header_line_len, zend_bool duplicate, zend_bool replace);
#define sapi_add_header(header_line, header_line_len, duplicate) \
sapi_add_header_ex((header_line), (header_line_len), (duplicate), 1)
SAPI_API int sapi_send_headers(void);
SAPI_API void sapi_free_header(sapi_header_struct *sapi_header);
-SAPI_API void sapi_handle_post(void *arg SLS_DC);
+SAPI_API void sapi_handle_post(void *arg TSRMLS_DC);
SAPI_API int sapi_register_post_entries(sapi_post_entry *post_entry);
SAPI_API int sapi_register_post_entry(sapi_post_entry *post_entry);
SAPI_API void sapi_unregister_post_entry(sapi_post_entry *post_entry);
-SAPI_API int sapi_register_default_post_reader(void (*default_post_reader)(SLS_D));
+SAPI_API int sapi_register_default_post_reader(void (*default_post_reader)(TSRMLS_D));
SAPI_API int sapi_flush(void);
SAPI_API struct stat *sapi_get_stat(void);
SAPI_API char *sapi_getenv(char *name, size_t name_len);
-SAPI_API char *sapi_get_default_content_type(SLS_D);
-SAPI_API void sapi_get_default_content_type_header(sapi_header_struct *default_header SLS_DC);
-SAPI_API size_t sapi_apply_default_charset(char **mimetype, size_t len SLS_DC);
+SAPI_API char *sapi_get_default_content_type(TSRMLS_D);
+SAPI_API void sapi_get_default_content_type_header(sapi_header_struct *default_header TSRMLS_DC);
+SAPI_API size_t sapi_apply_default_charset(char **mimetype, size_t len TSRMLS_DC);
struct _sapi_module_struct {
char *name;
int (*startup)(struct _sapi_module_struct *sapi_module);
int (*shutdown)(struct _sapi_module_struct *sapi_module);
- int (*activate)(SLS_D);
- int (*deactivate)(SLS_D);
+ int (*activate)(TSRMLS_D);
+ int (*deactivate)(TSRMLS_D);
int (*ub_write)(const char *str, unsigned int str_length);
void (*flush)(void *server_context);
- struct stat *(*get_stat)(SLS_D);
- char *(*getenv)(char *name, size_t name_len SLS_DC);
+ struct stat *(*get_stat)(TSRMLS_D);
+ char *(*getenv)(char *name, size_t name_len TSRMLS_DC);
void (*sapi_error)(int type, const char *error_msg, ...);
- int (*header_handler)(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers SLS_DC);
- int (*send_headers)(sapi_headers_struct *sapi_headers SLS_DC);
+ int (*header_handler)(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers TSRMLS_DC);
+ int (*send_headers)(sapi_headers_struct *sapi_headers TSRMLS_DC);
void (*send_header)(sapi_header_struct *sapi_header, void *server_context);
- int (*read_post)(char *buffer, uint count_bytes SLS_DC);
- char *(*read_cookies)(SLS_D);
+ int (*read_post)(char *buffer, uint count_bytes TSRMLS_DC);
+ char *(*read_cookies)(TSRMLS_D);
- void (*register_server_variables)(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC);
+ void (*register_server_variables)(zval *track_vars_array TSRMLS_DC);
void (*log_message)(char *message);
char *php_ini_path_override;
void (*block_interruptions)(void);
void (*unblock_interruptions)(void);
- void (*default_post_reader)(SLS_D);
+ void (*default_post_reader)(TSRMLS_D);
};
struct _sapi_post_entry {
char *content_type;
uint content_type_len;
- void (*post_reader)(SLS_D);
- void (*post_handler)(char *content_type_dup, void *arg SLS_DC);
+ void (*post_reader)(TSRMLS_D);
+ void (*post_handler)(char *content_type_dup, void *arg TSRMLS_DC);
};
/* header_handler() constants */
#define SAPI_DEFAULT_CHARSET ""
#define SAPI_PHP_VERSION_HEADER "X-Powered-By: PHP/" PHP_VERSION
-#define SAPI_POST_READER_FUNC(post_reader) SAPI_API void post_reader(SLS_D)
-#define SAPI_POST_HANDLER_FUNC(post_handler) SAPI_API void post_handler(char *content_type_dup, void *arg SLS_DC)
+#define SAPI_POST_READER_FUNC(post_reader) SAPI_API void post_reader(TSRMLS_D)
+#define SAPI_POST_HANDLER_FUNC(post_handler) SAPI_API void post_handler(char *content_type_dup, void *arg TSRMLS_DC)
SAPI_POST_READER_FUNC(sapi_read_standard_form_data);
SAPI_POST_READER_FUNC(php_default_post_reader);
*/
PHPAPI int php_register_url_wrapper(char *protocol, FILE * (*wrapper)(char *path, char *mode, int options, int *issock, int *socketd, char **opened_path))
{
- PLS_FETCH();
+ TSRMLS_FETCH();
if(PG(allow_url_fopen)) {
return zend_hash_add(&fopen_url_wrappers_hash, protocol, strlen(protocol), &wrapper, sizeof(wrapper), NULL);
*/
PHPAPI int php_unregister_url_wrapper(char *protocol)
{
- PLS_FETCH();
+ TSRMLS_FETCH();
if(PG(allow_url_fopen)) {
return zend_hash_del(&fopen_url_wrappers_hash, protocol, strlen(protocol));
*/
int php_init_fopen_wrappers(void)
{
- PLS_FETCH();
+ TSRMLS_FETCH();
if(PG(allow_url_fopen))
return zend_hash_init(&fopen_url_wrappers_hash, 0, NULL, NULL, 1);
*/
int php_shutdown_fopen_wrappers(void)
{
- PLS_FETCH();
+ TSRMLS_FETCH();
if(PG(allow_url_fopen)) {
zend_hash_destroy(&fopen_url_wrappers_hash);
When open_basedir is NULL, always return 0
*/
-PHPAPI int php_check_specific_open_basedir(char *basedir, char *path PLS_DC)
+PHPAPI int php_check_specific_open_basedir(char *basedir, char *path TSRMLS_DC)
{
char resolved_name[MAXPATHLEN];
char resolved_basedir[MAXPATHLEN];
char local_open_basedir[MAXPATHLEN];
int local_open_basedir_pos;
- SLS_FETCH();
/* Special case basedir==".": Use script-directory */
if ((strcmp(basedir, ".") == 0) &&
*/
PHPAPI int php_check_open_basedir(char *path)
{
- PLS_FETCH();
+ TSRMLS_FETCH();
/* Only check when open_basedir is available */
if (PG(open_basedir) && *PG(open_basedir)) {
end++;
}
- if (php_check_specific_open_basedir(ptr, path PLS_CC) == 0) {
+ if (php_check_specific_open_basedir(ptr, path TSRMLS_CC) == 0) {
efree(pathbuf);
return 0;
}
*/
PHPAPI FILE *php_fopen_wrapper(char *path, char *mode, int options, int *issock, int *socketd, char **opened_path)
{
- PLS_FETCH();
+ TSRMLS_FETCH();
if(!path) return NULL;
if(!*path) return NULL;
struct stat st;
char *path_info, *filename;
int length;
- PLS_FETCH();
- SLS_FETCH();
+ TSRMLS_FETCH();
filename = SG(request_info).path_translated;
path_info = SG(request_info).request_uri;
int filename_length;
int safe_mode_include_dir_length;
int exec_fname_length;
- PLS_FETCH();
TSRMLS_FETCH();
if (opened_path) {
}
if (!protocol || !strncasecmp(protocol, "file",n)){
- PLS_FETCH();
+ TSRMLS_FETCH();
*issock = 0;
PHPAPI char *expand_filepath(const char *filepath, char *real_path);
PHPAPI int php_check_open_basedir(char *path);
-PHPAPI int php_check_specific_open_basedir(char *basedir, char *path PLS_DC);
+PHPAPI int php_check_specific_open_basedir(char *basedir, char *path TSRMLS_DC);
PHPAPI FILE *php_fopen_with_path(char *filename, char *mode, char *path, char **opened_path);
PHPAPI int core_globals_id;
#endif
-static void php_build_argv(char *s, zval *track_vars_array TSRMLS_DC PLS_DC);
+static void php_build_argv(char *s, zval *track_vars_array TSRMLS_DC);
#define SAFE_FILENAME(f) ((f)?(f):"-")
char error_time_str[128];
struct tm tmbuf;
time_t error_time;
- PLS_FETCH();
+ TSRMLS_FETCH();
/* Try to use the specified logging location. */
if (PG(error_log) != NULL) {
char buffer[1024];
int buffer_len;
TSRMLS_FETCH();
- PLS_FETCH();
buffer_len = vsnprintf(buffer, sizeof(buffer)-1, format, args);
buffer[sizeof(buffer)-1]=0;
PHP_FUNCTION(set_time_limit)
{
zval **new_timeout;
- PLS_FETCH();
if (PG(safe_mode)) {
php_error(E_WARNING, "Cannot set time limit in safe mode");
{
switch (message) {
case ZMSG_FAILED_INCLUDE_FOPEN: {
- PLS_FETCH();
+ TSRMLS_FETCH();
php_error(E_WARNING, "Failed opening '%s' for inclusion (include_path='%s')", php_strip_url_passwd((char *) data), STR_PRINT(PG(include_path)));
}
break;
case ZMSG_FAILED_REQUIRE_FOPEN: {
- PLS_FETCH();
+ TSRMLS_FETCH();
php_error(E_COMPILE_ERROR, "Failed opening required '%s' (include_path='%s')", php_strip_url_passwd((char *) data), STR_PRINT(PG(include_path)));
}
if (EG(error_reporting)&E_WARNING) {
#if ZEND_DEBUG
char memory_leak_buf[512];
- SLS_FETCH();
+ TSRMLS_FETCH();
if (message==ZMSG_MEMORY_LEAK_DETECTED) {
zend_mem_header *t = (zend_mem_header *) data;
struct tm *ta, tmbuf;
time_t curtime;
char *datetime_str, asctimebuf[52];
- SLS_FETCH();
+ TSRMLS_FETCH();
time(&curtime);
ta = php_localtime_r(&curtime, &tmbuf);
/* }}} */
#endif
-static int php_hash_environment(TSRMLS_D SLS_DC PLS_DC);
+static int php_hash_environment(TSRMLS_D);
/* {{{ php_request_startup
*/
-int php_request_startup(CLS_D TSRMLS_DC PLS_DC SLS_DC)
+int php_request_startup(TSRMLS_D)
{
int retval = SUCCESS;
PG(header_is_being_sent) = 0;
PG(connection_status) = PHP_CONNECTION_NORMAL;
- zend_activate(CLS_C TSRMLS_CC);
- sapi_activate(SLS_C);
+ zend_activate(TSRMLS_C);
+ sapi_activate(TSRMLS_C);
zend_set_timeout(EG(timeout_seconds));
/* We turn this off in php_execute_script() */
/* PG(during_request_startup) = 0; */
- php_hash_environment(TSRMLS_C SLS_CC PLS_CC);
+ php_hash_environment(TSRMLS_C);
zend_activate_modules();
PG(modules_activated)=1;
} zend_catch {
*/
void php_request_shutdown(void *dummy)
{
- CLS_FETCH();
TSRMLS_FETCH();
- SLS_FETCH();
- PLS_FETCH();
zend_try {
php_end_ob_buffers((zend_bool)(SG(request_info).headers_only?0:1));
zend_deactivate_modules();
}
- zend_deactivate(CLS_C TSRMLS_CC);
+ zend_deactivate(TSRMLS_C);
zend_try {
- sapi_deactivate(SLS_C);
+ sapi_deactivate(TSRMLS_C);
} zend_end_try();
zend_try {
#ifdef ZTS
zend_executor_globals *executor_globals;
void ***tsrm_ls;
+
php_core_globals *core_globals;
sapi_globals_struct *sapi_globals = ts_resource(sapi_globals_id);
#endif
php_os=PHP_OS;
#endif
- sapi_initialize_empty_request(SLS_C);
- sapi_activate(SLS_C);
+#ifdef ZTS
+ tsrm_ls = ts_resource(0);
+#endif
+
+ sapi_initialize_empty_request(TSRMLS_C);
+ sapi_activate(TSRMLS_C);
if (module_initialized) {
return SUCCESS;
#ifdef ZTS
executor_globals = ts_resource(executor_globals_id);
- tsrm_ls = ts_resource(0);
ts_allocate_id(&core_globals_id, sizeof(php_core_globals), (ts_allocate_ctor) core_globals_ctor, NULL);
core_globals = ts_resource(core_globals_id);
#endif
REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_PATH", PHP_CONFIG_FILE_PATH, sizeof(PHP_CONFIG_FILE_PATH)-1, CONST_PERSISTENT | CONST_CS);
php_output_register_constants();
- if (php_startup_ticks(PLS_C) == FAILURE) {
+ if (php_startup_ticks(TSRMLS_C) == FAILURE) {
php_printf("Unable to start PHP ticks\n");
return FAILURE;
}
/* */
module_initialized = 1;
- sapi_deactivate(SLS_C);
+ sapi_deactivate(TSRMLS_C);
/* we're done */
return SUCCESS;
void php_module_shutdown()
{
int module_number=0; /* for UNREGISTER_INI_ENTRIES() */
- PLS_FETCH();
+ TSRMLS_FETCH();
if (!module_initialized) {
return;
WSACleanup();
#endif
- php_shutdown_ticks(PLS_C);
+ php_shutdown_ticks(TSRMLS_C);
sapi_flush();
zend_shutdown();
/* {{{ php_register_server_variables
*/
-static inline void php_register_server_variables(TSRMLS_D SLS_DC PLS_DC)
+static inline void php_register_server_variables(TSRMLS_D)
{
zval *array_ptr=NULL;
/* Server variables */
if (sapi_module.register_server_variables) {
- sapi_module.register_server_variables(array_ptr TSRMLS_CC SLS_CC PLS_CC);
+ sapi_module.register_server_variables(array_ptr TSRMLS_CC);
}
/* argv/argc support */
if (PG(register_argc_argv)) {
- php_build_argv(SG(request_info).query_string, array_ptr TSRMLS_CC PLS_CC);
+ php_build_argv(SG(request_info).query_string, array_ptr TSRMLS_CC);
}
/* PHP Authentication support */
if (SG(request_info).auth_user) {
- php_register_variable("PHP_AUTH_USER", SG(request_info).auth_user, array_ptr TSRMLS_CC PLS_CC);
+ php_register_variable("PHP_AUTH_USER", SG(request_info).auth_user, array_ptr TSRMLS_CC);
}
if (SG(request_info).auth_password) {
- php_register_variable("PHP_AUTH_PW", SG(request_info).auth_password, array_ptr TSRMLS_CC PLS_CC);
+ php_register_variable("PHP_AUTH_PW", SG(request_info).auth_password, array_ptr TSRMLS_CC);
}
}
/* }}} */
/* {{{ php_hash_environment
*/
-static int php_hash_environment(TSRMLS_D SLS_DC PLS_DC)
+static int php_hash_environment(TSRMLS_D)
{
char *p;
unsigned char _gpc_flags[3] = {0,0,0};
ALLOC_ZVAL(PG(http_globals)[TRACK_VARS_ENV]);
array_init(PG(http_globals)[TRACK_VARS_ENV]);
INIT_PZVAL(PG(http_globals)[TRACK_VARS_ENV]);
- php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC PLS_CC);
+ php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC);
}
while(p && *p) {
case 'p':
case 'P':
if (!_gpc_flags[0] && !SG(headers_sent) && SG(request_info).request_method && !strcasecmp(SG(request_info).request_method, "POST")) {
- php_treat_data(PARSE_POST, NULL, NULL TSRMLS_CC PLS_CC SLS_CC); /* POST Data */
+ php_treat_data(PARSE_POST, NULL, NULL TSRMLS_CC); /* POST Data */
_gpc_flags[0]=1;
}
break;
case 'c':
case 'C':
if (!_gpc_flags[1]) {
- php_treat_data(PARSE_COOKIE, NULL, NULL TSRMLS_CC PLS_CC SLS_CC); /* Cookie Data */
+ php_treat_data(PARSE_COOKIE, NULL, NULL TSRMLS_CC); /* Cookie Data */
_gpc_flags[1]=1;
}
break;
case 'g':
case 'G':
if (!_gpc_flags[2]) {
- php_treat_data(PARSE_GET, NULL, NULL TSRMLS_CC PLS_CC SLS_CC); /* GET Data */
+ php_treat_data(PARSE_GET, NULL, NULL TSRMLS_CC); /* GET Data */
_gpc_flags[2]=1;
}
break;
ALLOC_ZVAL(PG(http_globals)[TRACK_VARS_ENV]);
array_init(PG(http_globals)[TRACK_VARS_ENV]);
INIT_PZVAL(PG(http_globals)[TRACK_VARS_ENV]);
- php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC PLS_CC);
+ php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC);
} else {
php_error(E_WARNING, "Unsupported 'e' element (environment) used in gpc_order - use variables_order instead");
}
break;
case 's':
case 'S':
- php_register_server_variables(TSRMLS_C SLS_CC PLS_CC);
+ php_register_server_variables(TSRMLS_C);
break;
}
}
if (!have_variables_order) {
- php_register_server_variables(TSRMLS_C SLS_CC PLS_CC);
+ php_register_server_variables(TSRMLS_C);
}
for (i=0; i<6; i++) {
/* {{{ php_build_argv
*/
-static void php_build_argv(char *s, zval *track_vars_array TSRMLS_DC PLS_DC)
+static void php_build_argv(char *s, zval *track_vars_array TSRMLS_DC)
{
pval *arr, *argc, *tmp;
int count = 0;
/* {{{ php_handle_special_queries
*/
-PHPAPI int php_handle_special_queries(SLS_D PLS_DC)
+PHPAPI int php_handle_special_queries(TSRMLS_D)
{
if (SG(request_info).query_string && SG(request_info).query_string[0]=='='
&& PG(expose_php)) {
/* {{{ php_execute_script
*/
-PHPAPI int php_execute_script(zend_file_handle *primary_file CLS_DC TSRMLS_DC PLS_DC)
+PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
{
zend_file_handle *prepend_file_p, *append_file_p;
zend_file_handle prepend_file, append_file;
char *old_cwd;
- SLS_FETCH();
EG(exit_status) = 0;
- if (php_handle_special_queries(SLS_C PLS_CC)) {
+ if (php_handle_special_queries(TSRMLS_C)) {
return 0;
}
#define OLD_CWD_SIZE 4096
} else {
append_file_p = NULL;
}
- zend_execute_scripts(ZEND_REQUIRE CLS_CC TSRMLS_CC, 3, prepend_file_p, primary_file, append_file_p);
+ zend_execute_scripts(ZEND_REQUIRE TSRMLS_CC, 3, prepend_file_p, primary_file, append_file_p);
} zend_end_try();
if (old_cwd[0] != '\0') {
*/
PHPAPI void php_handle_aborted_connection(void)
{
- PLS_FETCH();
+ TSRMLS_FETCH();
PG(connection_status) = PHP_CONNECTION_ABORTED;
php_output_set_status(0);
/* {{{ php_handle_auth_data
*/
-PHPAPI int php_handle_auth_data(const char *auth SLS_DC)
+PHPAPI int php_handle_auth_data(const char *auth TSRMLS_DC)
{
int ret = -1;
/* {{{ php_lint_script
*/
-PHPAPI int php_lint_script(zend_file_handle *file CLS_DC TSRMLS_DC PLS_DC)
+PHPAPI int php_lint_script(zend_file_handle *file TSRMLS_DC)
{
zend_op_array *op_array;
zend_try {
- op_array = zend_compile_file(file, ZEND_INCLUDE CLS_CC);
- zend_destroy_file_handle(file CLS_CC);
+ op_array = zend_compile_file(file, ZEND_INCLUDE TSRMLS_CC);
+ zend_destroy_file_handle(file TSRMLS_CC);
if (op_array) {
destroy_op_array(op_array);
}
-static void php_output_init_globals(OLS_D TSRMLS_DC)
+static void php_output_init_globals(php_output_globals *output_globals_p TSRMLS_DC)
{
OG(php_body_write) = php_default_output_func;
OG(php_header_write) = php_default_output_func;
#ifdef ZTS
ts_allocate_id(&output_globals_id, sizeof(php_output_globals), (ts_allocate_ctor) php_output_init_globals, NULL);
#else
- php_output_init_globals(OLS_C TSRMLS_CC);
+ php_output_init_globals(&output_globals TSRMLS_CC);
#endif
}
PHPAPI void php_output_activate(void)
{
- OLS_FETCH();
+ TSRMLS_FETCH();
OG(php_body_write) = php_ub_body_write;
OG(php_header_write) = sapi_module.ub_write;
PHPAPI void php_output_set_status(zend_bool status)
{
- OLS_FETCH();
+ TSRMLS_FETCH();
OG(disable_output) = !status;
}
PHPAPI int php_body_write(const char *str, uint str_length)
{
- OLS_FETCH();
+ TSRMLS_FETCH();
return OG(php_body_write)(str, str_length);
}
PHPAPI int php_header_write(const char *str, uint str_length)
{
- OLS_FETCH();
+ TSRMLS_FETCH();
if (OG(disable_output)) {
return 0;
} else {
* Start output buffering */
PHPAPI int php_start_ob_buffer(zval *output_handler, uint chunk_size)
{
- OLS_FETCH();
+ TSRMLS_FETCH();
if (OG(ob_lock)) {
return FAILURE;
char *to_be_destroyed_buffer;
char *to_be_destroyed_handled_output[2] = { 0, 0 };
int status;
- SLS_FETCH();
- OLS_FETCH();
+ TSRMLS_FETCH();
if (OG(ob_nesting_level)==0) {
return;
zval **params[2];
zval *orig_buffer;
zval *z_status;
- CLS_FETCH();
+ TSRMLS_FETCH();
ALLOC_INIT_ZVAL(orig_buffer);
ZVAL_STRINGL(orig_buffer,OG(active_ob_buffer).buffer,OG(active_ob_buffer).text_length,0);
* End output buffering (all buffers) */
PHPAPI void php_end_ob_buffers(zend_bool send_buffer)
{
- OLS_FETCH();
- BLS_FETCH();
+ TSRMLS_FETCH();
while (OG(ob_nesting_level)!=0) {
php_end_ob_buffer(send_buffer, 0);
*/
PHPAPI void php_start_implicit_flush()
{
- OLS_FETCH();
+ TSRMLS_FETCH();
php_end_ob_buffer(1, 0); /* Switch out of output buffering if we're in it */
OG(implicit_flush)=1;
*/
PHPAPI void php_end_implicit_flush()
{
- OLS_FETCH();
+ TSRMLS_FETCH();
OG(implicit_flush)=0;
}
*/
PHPAPI void php_ob_set_internal_handler(php_output_handler_func_t internal_output_handler, uint buffer_size)
{
- OLS_FETCH();
+ TSRMLS_FETCH();
if (OG(ob_nesting_level)==0) {
return;
*/
static inline void php_ob_allocate(void)
{
- OLS_FETCH();
+ TSRMLS_FETCH();
if (OG(active_ob_buffer).size<OG(active_ob_buffer).text_length) {
while (OG(active_ob_buffer).size <= OG(active_ob_buffer).text_length) {
*/
static void php_ob_init(uint initial_size, uint block_size, zval *output_handler, uint chunk_size)
{
- OLS_FETCH();
+ TSRMLS_FETCH();
if (OG(ob_nesting_level)>0) {
if (OG(ob_nesting_level)==1) { /* initialize stack */
{
char *target;
int original_ob_text_length;
- OLS_FETCH();
+ TSRMLS_FETCH();
original_ob_text_length=OG(active_ob_buffer).text_length;
OG(active_ob_buffer).text_length = OG(active_ob_buffer).text_length + text_length;
static void php_ob_prepend(const char *text, uint text_length)
{
char *p, *start;
- OLS_FETCH();
+ TSRMLS_FETCH();
OG(active_ob_buffer).text_length += text_length;
php_ob_allocate();
* Return the current output buffer */
int php_ob_get_buffer(pval *p)
{
- OLS_FETCH();
+ TSRMLS_FETCH();
if (OG(ob_nesting_level)==0) {
return FAILURE;
* Return the size of the current output buffer */
int php_ob_get_length(pval *p)
{
- OLS_FETCH();
+ TSRMLS_FETCH();
if (OG(ob_nesting_level) == 0) {
return FAILURE;
char *newstr = NULL;
size_t new_length=0;
int result;
- OLS_FETCH();
- BLS_FETCH();
+ TSRMLS_FETCH();
if (OG(disable_output)) {
return 0;
static int php_ub_body_write(const char *str, uint str_length)
{
int result = 0;
- SLS_FETCH();
- OLS_FETCH();
+ TSRMLS_FETCH();
if (SG(request_info).headers_only) {
php_header();
}
if (php_header()) {
if (zend_is_compiling()) {
- CLS_FETCH();
+ TSRMLS_FETCH();
- OG(output_start_filename) = zend_get_compiled_filename(CLS_C);
- OG(output_start_lineno) = zend_get_compiled_lineno(CLS_C);
+ OG(output_start_filename) = zend_get_compiled_filename(TSRMLS_C);
+ OG(output_start_lineno) = zend_get_compiled_lineno(TSRMLS_C);
} else if (zend_is_executing()) {
TSRMLS_FETCH();
break;
}
if (php_start_ob_buffer(output_handler, chunk_size)==FAILURE) {
- SLS_FETCH();
- OLS_FETCH();
+ TSRMLS_FETCH();
if (SG(headers_sent) && !SG(request_info).headers_only) {
OG(php_body_write) = php_ub_body_write_no_header;
PHPAPI char *php_get_output_start_filename()
{
- OLS_FETCH();
+ TSRMLS_FETCH();
return OG(output_start_filename);
}
PHPAPI int php_get_output_start_lineno()
{
- OLS_FETCH();
+ TSRMLS_FETCH();
return OG(output_start_lineno);
}
SAPI_POST_READER_FUNC(php_default_post_reader)
{
char *data;
- TSRMLS_FETCH();
- if(!SG(request_info).post_data) sapi_read_standard_form_data(SLS_C);
+ if(!SG(request_info).post_data) sapi_read_standard_form_data(TSRMLS_C);
data = estrndup(SG(request_info).post_data,SG(request_info).post_data_length);
SET_VAR_STRINGL("HTTP_RAW_POST_DATA", data, SG(request_info).post_data_length);
}
typedef struct _php_core_globals php_core_globals;
#ifdef ZTS
-# define PLS_D php_core_globals *core_globals
-# define PLS_DC , PLS_D
-# define PLS_C core_globals
-# define PLS_CC , PLS_C
-# define PG(v) (core_globals->v)
-# define PLS_FETCH() php_core_globals *core_globals = ts_resource(core_globals_id)
+# define PG(v) TSRMG(core_globals_id, php_core_globals *, v)
extern PHPAPI int core_globals_id;
#else
-# define PLS_D
-# define PLS_DC
-# define PLS_C
-# define PLS_CC
# define PG(v) (core_globals.v)
-# define PLS_FETCH()
extern ZEND_API struct _php_core_globals core_globals;
#endif
char *open_basedir;
int free_ini_search_path=0;
zend_file_handle fh;
- PLS_FETCH();
+ TSRMLS_FETCH();
if (zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t) pvalue_config_destructor, 1)==FAILURE) {
return FAILURE;
#include "php_globals.h"
#include "SAPI.h"
-PHPAPI int php_request_startup(CLS_D TSRMLS_DC PLS_DC SLS_DC);
+PHPAPI int php_request_startup(TSRMLS_D);
PHPAPI void php_request_shutdown(void *dummy);
PHPAPI void php_request_shutdown_for_exec(void *dummy);
PHPAPI int php_module_startup(sapi_module_struct *sf);
PHPAPI int php_startup_extensions(zend_module_entry **ptr, int count);
-PHPAPI int php_execute_script(zend_file_handle *primary_file CLS_DC TSRMLS_DC PLS_DC);
-PHPAPI int php_handle_special_queries(SLS_D PLS_DC);
-PHPAPI int php_lint_script(zend_file_handle *file CLS_DC TSRMLS_DC PLS_DC);
+PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC);
+PHPAPI int php_handle_special_queries(TSRMLS_D);
+PHPAPI int php_lint_script(zend_file_handle *file TSRMLS_DC);
PHPAPI void php_handle_aborted_connection(void);
-PHPAPI int php_handle_auth_data(const char *auth SLS_DC);
+PHPAPI int php_handle_auth_data(const char *auth TSRMLS_DC);
extern void php_call_shutdown_functions(void);
#ifdef ZTS
-#define OLS_D php_output_globals *output_globals
-#define OLS_C output_globals
-#define OG(v) (output_globals->v)
-#define OLS_FETCH() php_output_globals *output_globals = ts_resource(output_globals_id)
+#define OG(v) TSRMG(output_globals_id, php_output_globals *, v)
ZEND_API extern int output_globals_id;
#else
-#define OLS_D void
-#define OLS_C
#define OG(v) (output_globals.v)
-#define OLS_FETCH()
ZEND_API extern php_output_globals output_globals;
#endif
#include "php.h"
#include "php_ticks.h"
-int php_startup_ticks(PLS_D)
+int php_startup_ticks(TSRMLS_D)
{
zend_llist_init(&PG(tick_functions), sizeof(void(*)(int)), NULL, 1);
return SUCCESS;
}
-void php_shutdown_ticks(PLS_D)
+void php_shutdown_ticks(TSRMLS_D)
{
zend_llist_destroy(&PG(tick_functions));
}
PHPAPI void php_add_tick_function(void (*func)(int))
{
- PLS_FETCH();
+ TSRMLS_FETCH();
zend_llist_add_element(&PG(tick_functions), (void *)&func);
}
PHPAPI void php_remove_tick_function(void (*func)(int))
{
- PLS_FETCH();
+ TSRMLS_FETCH();
zend_llist_del_element(&PG(tick_functions), func,
(int(*)(void*,void*))php_compare_tick_functions);
void php_run_ticks(int count)
{
- PLS_FETCH();
+ TSRMLS_FETCH();
zend_llist_apply_with_argument(&PG(tick_functions), (void(*)(void*,void*))php_tick_iterator, &count);
}
#ifndef PHP_TICKS_H
#define PHP_TICKS_H
-int php_startup_ticks(PLS_D);
-void php_shutdown_ticks(PLS_D);
+int php_startup_ticks(TSRMLS_D);
+void php_shutdown_ticks(TSRMLS_D);
void php_run_ticks(int count);
PHPAPI void php_add_tick_function(void (*func)(int));
PHPAPI void php_remove_tick_function(void (*func)(int));
#include "zend_globals.h"
-PHPAPI void php_register_variable(char *var, char *strval, zval *track_vars_array TSRMLS_DC PLS_DC)
+PHPAPI void php_register_variable(char *var, char *strval, zval *track_vars_array TSRMLS_DC)
{
- php_register_variable_safe(var, strval, strlen(strval), track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable_safe(var, strval, strlen(strval), track_vars_array TSRMLS_CC);
}
/* binary-safe version */
-PHPAPI void php_register_variable_safe(char *var, char *strval, int str_len, zval *track_vars_array TSRMLS_DC PLS_DC)
+PHPAPI void php_register_variable_safe(char *var, char *strval, int str_len, zval *track_vars_array TSRMLS_DC)
{
zval new_entry;
}
new_entry.type = IS_STRING;
- php_register_variable_ex(var, &new_entry, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable_ex(var, &new_entry, track_vars_array TSRMLS_CC);
}
-PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_array TSRMLS_DC PLS_DC)
+PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_array TSRMLS_DC)
{
char *p = NULL;
char *ip; /* index pointer */
char *var, *val;
char *strtok_buf = NULL;
zval *array_ptr = (zval *) arg;
- TSRMLS_FETCH();
- PLS_FETCH();
var = php_strtok_r(SG(request_info).post_data, "&", &strtok_buf);
*val++ = '\0';
php_url_decode(var, strlen(var));
val_len = php_url_decode(val, strlen(val));
- php_register_variable_safe(var, val, val_len, array_ptr TSRMLS_CC PLS_CC);
+ php_register_variable_safe(var, val, val_len, array_ptr TSRMLS_CC);
}
var = php_strtok_r(NULL, "&", &strtok_buf);
}
}
-void php_treat_data(int arg, char *str, zval* destArray TSRMLS_DC PLS_DC SLS_DC)
+void php_treat_data(int arg, char *str, zval* destArray TSRMLS_DC)
{
char *res = NULL, *var, *val, *separator=NULL;
const char *c_var;
}
if (arg==PARSE_POST) {
- sapi_handle_post(array_ptr SLS_CC);
+ sapi_handle_post(array_ptr TSRMLS_CC);
return;
}
*val++ = '\0';
php_url_decode(var, strlen(var));
val_len = php_url_decode(val, strlen(val));
- php_register_variable_safe(var, val, val_len, array_ptr TSRMLS_CC PLS_CC);
+ php_register_variable_safe(var, val, val_len, array_ptr TSRMLS_CC);
}
var = php_strtok_r(NULL, separator, &strtok_buf);
}
}
-void php_import_environment_variables(zval *array_ptr TSRMLS_DC PLS_DC)
+void php_import_environment_variables(zval *array_ptr TSRMLS_DC)
{
char **env, *p, *t;
continue;
}
t = estrndup(*env, p - *env);
- php_register_variable(t, p+1, array_ptr TSRMLS_CC PLS_CC);
+ php_register_variable(t, p+1, array_ptr TSRMLS_CC);
efree(t);
}
}
#define PARSE_COOKIE 2
#define PARSE_STRING 3
-void php_treat_data(int arg, char *str, zval* destArray TSRMLS_DC PLS_DC SLS_DC);
-PHPAPI void php_import_environment_variables(zval *array_ptr TSRMLS_DC PLS_DC);
-PHPAPI void php_register_variable(char *var, char *val, pval *track_vars_array TSRMLS_DC PLS_DC);
+void php_treat_data(int arg, char *str, zval* destArray TSRMLS_DC);
+PHPAPI void php_import_environment_variables(zval *array_ptr TSRMLS_DC);
+PHPAPI void php_register_variable(char *var, char *val, pval *track_vars_array TSRMLS_DC);
/* binary-safe version */
-PHPAPI void php_register_variable_safe(char *var, char *val, int val_len, pval *track_vars_array TSRMLS_DC PLS_DC);
-PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_array TSRMLS_DC PLS_DC);
+PHPAPI void php_register_variable_safe(char *var, char *val, int val_len, pval *track_vars_array TSRMLS_DC);
+PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_array TSRMLS_DC);
#endif /* PHP_VARIABLES_H */
/* The longest property name we use in an uploaded file array */
#define MAX_SIZE_OF_INDEX sizeof("[tmp_name]")
-static void add_protected_variable(char *varname PLS_DC)
+static void add_protected_variable(char *varname TSRMLS_DC)
{
int dummy=1;
}
-static zend_bool is_protected_variable(char *varname PLS_DC)
+static zend_bool is_protected_variable(char *varname TSRMLS_DC)
{
return zend_hash_exists(&PG(rfc1867_protected_variables), varname, strlen(varname)+1);
}
-static void safe_php_register_variable(char *var, char *strval, zval *track_vars_array, zend_bool override_protection TSRMLS_DC PLS_DC)
+static void safe_php_register_variable(char *var, char *strval, zval *track_vars_array, zend_bool override_protection TSRMLS_DC)
{
- if (override_protection || !is_protected_variable(var PLS_CC)) {
- php_register_variable(var, strval, track_vars_array TSRMLS_CC PLS_CC);
+ if (override_protection || !is_protected_variable(var TSRMLS_CC)) {
+ php_register_variable(var, strval, track_vars_array TSRMLS_CC);
}
}
-static void safe_php_register_variable_ex(char *var, zval *val, pval *track_vars_array, zend_bool override_protection TSRMLS_DC PLS_DC)
+static void safe_php_register_variable_ex(char *var, zval *val, pval *track_vars_array, zend_bool override_protection TSRMLS_DC)
{
- if (override_protection || !is_protected_variable(var PLS_CC)) {
- php_register_variable_ex(var, val, track_vars_array TSRMLS_CC PLS_CC);
+ if (override_protection || !is_protected_variable(var TSRMLS_CC)) {
+ php_register_variable_ex(var, val, track_vars_array TSRMLS_CC);
}
}
-static void register_http_post_files_variable(char *strvar, char *val, zval *http_post_files, zend_bool override_protection TSRMLS_DC PLS_DC)
+static void register_http_post_files_variable(char *strvar, char *val, zval *http_post_files, zend_bool override_protection TSRMLS_DC)
{
int register_globals = PG(register_globals);
PG(register_globals) = 0;
- safe_php_register_variable(strvar, val, http_post_files, override_protection TSRMLS_CC PLS_CC);
+ safe_php_register_variable(strvar, val, http_post_files, override_protection TSRMLS_CC);
PG(register_globals) = register_globals;
}
-static void register_http_post_files_variable_ex(char *var, zval *val, zval *http_post_files, zend_bool override_protection TSRMLS_DC PLS_DC)
+static void register_http_post_files_variable_ex(char *var, zval *val, zval *http_post_files, zend_bool override_protection TSRMLS_DC)
{
int register_globals = PG(register_globals);
PG(register_globals) = 0;
- safe_php_register_variable_ex(var, val, http_post_files, override_protection TSRMLS_CC PLS_CC);
+ safe_php_register_variable_ex(var, val, http_post_files, override_protection TSRMLS_CC);
PG(register_globals) = register_globals;
}
}
-void destroy_uploaded_files_hash(SLS_D)
+void destroy_uploaded_files_hash(TSRMLS_D)
{
zend_hash_apply(SG(rfc1867_uploaded_files), (apply_func_t) unlink_filename);
zend_hash_destroy(SG(rfc1867_uploaded_files));
/*
* Split raw mime stream up into appropriate components
*/
-static void php_mime_split(char *buf, int cnt, char *boundary, zval *array_ptr SLS_DC PLS_DC)
+static void php_mime_split(char *buf, int cnt, char *boundary, zval *array_ptr TSRMLS_DC)
{
char *ptr, *loc, *loc2, *loc3, *s, *name, *filename, *u, *temp_filename;
int len, state = 0, Done = 0, rem, urem;
zval *http_post_files=NULL;
zend_bool upload_successful;
zend_bool magic_quotes_gpc;
- TSRMLS_FETCH();
zend_hash_init(&PG(rfc1867_protected_variables), 5, NULL, NULL, 0);
}
s = strrchr(filenamebuf, '\\');
if (s && s > filenamebuf) {
- safe_php_register_variable(lbuf, s+1, NULL, 0 TSRMLS_CC PLS_CC);
+ safe_php_register_variable(lbuf, s+1, NULL, 0 TSRMLS_CC);
} else {
- safe_php_register_variable(lbuf, filenamebuf, NULL, 0 TSRMLS_CC PLS_CC);
+ safe_php_register_variable(lbuf, filenamebuf, NULL, 0 TSRMLS_CC);
}
/* Add $foo[name] */
sprintf(lbuf, "%s[name]", namebuf);
}
if (s && s > filenamebuf) {
- register_http_post_files_variable(lbuf, s+1, http_post_files, 0 TSRMLS_CC PLS_CC);
+ register_http_post_files_variable(lbuf, s+1, http_post_files, 0 TSRMLS_CC);
} else {
- register_http_post_files_variable(lbuf, filenamebuf, http_post_files, 0 TSRMLS_CC PLS_CC);
+ register_http_post_files_variable(lbuf, filenamebuf, http_post_files, 0 TSRMLS_CC);
}
state = 3;
} else {
sprintf(lbuf, "%s_type", namebuf);
}
- safe_php_register_variable(lbuf, s, NULL, 0 TSRMLS_CC PLS_CC);
+ safe_php_register_variable(lbuf, s, NULL, 0 TSRMLS_CC);
/* Add $foo[type] */
if (is_arr_upload) {
} else {
sprintf(lbuf, "%s[type]", namebuf);
}
- register_http_post_files_variable(lbuf, s, http_post_files, 0 TSRMLS_CC PLS_CC);
+ register_http_post_files_variable(lbuf, s, http_post_files, 0 TSRMLS_CC);
if(*s != '\0') {
*(loc2 - 1) = '\n';
}
/* Check to make sure we are not overwriting special file
* upload variables */
- safe_php_register_variable(namebuf, ptr, array_ptr, 0 TSRMLS_CC PLS_CC);
+ safe_php_register_variable(namebuf, ptr, array_ptr, 0 TSRMLS_CC);
/* And a little kludge to pick out special MAX_FILE_SIZE */
itype = php_check_ident_type(namebuf);
upload_successful = 1;
}
fclose(fp);
- add_protected_variable(namebuf PLS_CC);
+ add_protected_variable(namebuf TSRMLS_CC);
if (!upload_successful) {
if(temp_filename) {
unlink(temp_filename);
magic_quotes_gpc = PG(magic_quotes_gpc);
PG(magic_quotes_gpc) = 0;
- safe_php_register_variable(namebuf, temp_filename, NULL, 1 TSRMLS_CC PLS_CC);
+ safe_php_register_variable(namebuf, temp_filename, NULL, 1 TSRMLS_CC);
/* Add $foo[tmp_name] */
if(is_arr_upload) {
sprintf(lbuf, "%s[tmp_name][%s]", abuf, arr_index);
} else {
sprintf(lbuf, "%s[tmp_name]", namebuf);
}
- add_protected_variable(lbuf PLS_CC);
- register_http_post_files_variable(lbuf, temp_filename, http_post_files, 1 TSRMLS_CC PLS_CC);
+ add_protected_variable(lbuf TSRMLS_CC);
+ register_http_post_files_variable(lbuf, temp_filename, http_post_files, 1 TSRMLS_CC);
PG(magic_quotes_gpc) = magic_quotes_gpc;
{
} else {
sprintf(lbuf, "%s_size", namebuf);
}
- safe_php_register_variable_ex(lbuf, &file_size, NULL, 0 TSRMLS_CC PLS_CC);
+ safe_php_register_variable_ex(lbuf, &file_size, NULL, 0 TSRMLS_CC);
/* Add $foo[size] */
if(is_arr_upload) {
} else {
sprintf(lbuf, "%s[size]", namebuf);
}
- register_http_post_files_variable_ex(lbuf, &file_size, http_post_files, 0 TSRMLS_CC PLS_CC);
+ register_http_post_files_variable_ex(lbuf, &file_size, http_post_files, 0 TSRMLS_CC);
}
state = 0;
rem -= (loc - ptr);
char *boundary;
uint boundary_len;
zval *array_ptr = (zval *) arg;
- PLS_FETCH();
if (!PG(file_uploads)) {
php_error(E_WARNING, "File uploads are disabled");
}
if (SG(request_info).post_data) {
- php_mime_split(SG(request_info).post_data, SG(request_info).post_data_length, boundary, array_ptr SLS_CC PLS_CC);
+ php_mime_split(SG(request_info).post_data, SG(request_info).post_data_length, boundary, array_ptr TSRMLS_CC);
}
}
#define FILE_UPLOAD_INPUT_BUFFER_SIZE 8192
-void destroy_uploaded_files_hash(SLS_D);
+void destroy_uploaded_files_hash(TSRMLS_D);
#endif /* RFC1867_H */
long uid=0L, gid=0L, duid=0L, dgid=0L;
char path[MAXPATHLEN];
char *s;
- PLS_FETCH();
+ TSRMLS_FETCH();
if (!filename) {
return 0; /* path must be provided */
} else if (PG(safe_mode_gid) && dgid == php_getgid()) {
return 1;
} else {
- SLS_FETCH();
+ TSRMLS_FETCH();
if (SG(rfc1867_uploaded_files)) {
if (zend_hash_exists(SG(rfc1867_uploaded_files), (char *) filename, strlen(filename)+1)) {
{
struct passwd *pwd;
struct stat *pstat;
- SLS_FETCH();
+ TSRMLS_FETCH();
if (SG(request_info).current_user) {
return SG(request_info).current_user;
int Ns_ModuleVersion = 1;
-#define NSLS_D ns_globals_struct *ns_context
-#define NSLS_DC , NSLS_D
-#define NSLS_C ns_context
-#define NSLS_CC , NSLS_C
-#define NSG(v) (ns_context->v)
-#define NSLS_FETCH() ns_globals_struct *ns_context = ts_resource(ns_globals_id)
+#define NSG(v) TSRMG(ns_globals_id, ns_globals_struct *, v)
/* php_ns_context is per-server (thus only once at all) */
{
int n;
uint sent = 0;
- NSLS_FETCH();
+ TSRMLS_FETCH();
while (str_length > 0) {
n = Ns_ConnWrite(NSG(conn), (void *) str, str_length);
*/
static int
-php_ns_sapi_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers SLS_DC)
+php_ns_sapi_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers)
{
char *header_name, *header_content;
char *p;
- NSLS_FETCH();
+ TSRMLS_FETCH();
header_name = sapi_header->header;
header_content = p = strchr(header_name, ':');
*/
static int
-php_ns_sapi_send_headers(sapi_headers_struct *sapi_headers SLS_DC)
+php_ns_sapi_send_headers(sapi_headers_struct *sapi_headers)
{
- NSLS_FETCH();
+ TSRMLS_FETCH();
if(SG(sapi_headers).send_default_content_type) {
Ns_ConnSetRequiredHeaders(NSG(conn), "text/html", 0);
*/
static int
-php_ns_sapi_read_post(char *buf, uint count_bytes SLS_DC)
+php_ns_sapi_read_post(char *buf, uint count_bytes)
{
uint max_read;
uint total_read = 0;
- NSLS_FETCH();
+ TSRMLS_FETCH();
max_read = MIN(NSG(data_avail), count_bytes);
*/
static char *
-php_ns_sapi_read_cookies(SLS_D)
+php_ns_sapi_read_cookies()
{
int i;
char *http_cookie = NULL;
- NSLS_FETCH();
+ TSRMLS_FETCH();
i = Ns_SetIFind(NSG(conn->headers), "cookie");
if(i != -1) {
char buf[512];
int uptime = Ns_InfoUptime();
int i;
- NSLS_FETCH();
+ TSRMLS_FETCH();
php_info_print_table_start();
php_info_print_table_row(2, "SAPI module version", "$Id$");
PHP_FUNCTION(getallheaders)
{
int i;
- NSLS_FETCH();
+ TSRMLS_FETCH();
if (array_init(return_value) == FAILURE) {
RETURN_FALSE;
*/
#define ADD_STRINGX(name,buf) \
- php_register_variable(name, buf, track_vars_array TSRMLS_CC PLS_CC)
+ php_register_variable(name, buf, track_vars_array TSRMLS_CC)
#define ADD_STRING(name) \
ADD_STRINGX(name, buf)
static void
-php_ns_sapi_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
+php_ns_sapi_register_variables(zval *track_vars_array TSRMLS_DC)
{
int i;
char buf[NS_BUF_SIZE + 1];
char *tmp;
- NSLS_FETCH();
+ TSRMLS_FETCH();
for(i = 0; i < Ns_SetSize(NSG(conn->headers)); i++) {
char *key = Ns_SetKey(NSG(conn->headers), i);
*/
static int
-php_ns_module_main(NSLS_D SLS_DC)
+php_ns_module_main(TSRMLS_D)
{
zend_file_handle file_handle;
- CLS_FETCH();
TSRMLS_FETCH();
- PLS_FETCH();
+ TSRMLS_FETCH();
file_handle.type = ZEND_HANDLE_FILENAME;
file_handle.filename = SG(request_info).path_translated;
file_handle.opened_path = NULL;
php_ns_config(global_context, 0);
- if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == FAILURE) {
+ if (php_request_startup(TSRMLS_C) == FAILURE) {
return NS_ERROR;
}
- php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
+ php_execute_script(&file_handle TSRMLS_CC);
php_request_shutdown(NULL);
return NS_OK;
*/
static void
-php_ns_request_ctor(NSLS_D SLS_DC)
+php_ns_request_ctor(TSRMLS_D)
{
char *server;
Ns_DString ds;
*/
static void
-php_ns_request_dtor(NSLS_D SLS_DC)
+php_ns_request_dtor(TSRMLS_D)
{
free(SG(request_info).path_translated);
if (SG(request_info).query_string)
php_ns_request_handler(void *context, Ns_Conn *conn)
{
int status = NS_OK;
- SLS_FETCH();
- NSLS_FETCH();
+ TSRMLS_FETCH();
NSG(conn) = conn;
SG(server_context) = global_context;
- php_ns_request_ctor(NSLS_C SLS_CC);
+ php_ns_request_ctor(TSRMLS_C);
- status = php_ns_module_main(NSLS_C SLS_CC);
+ status = php_ns_module_main(TSRMLS_C);
- php_ns_request_dtor(NSLS_C SLS_CC);
+ php_ns_request_dtor(TSRMLS_C);
return status;
}
/* {{{ Prototypes
*/
-int apache_php_module_main(request_rec *r, int display_source_mode CLS_DC TSRMLS_DC PLS_DC SLS_DC);
+int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC);
void php_save_umask(void);
void php_restore_umask(void);
-int sapi_apache_read_post(char *buffer, uint count_bytes SLS_DC);
-char *sapi_apache_read_cookies(SLS_D);
-int sapi_apache_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers SLS_DC);
-int sapi_apache_send_headers(sapi_headers_struct *sapi_headers SLS_DC);
+int sapi_apache_read_post(char *buffer, uint count_bytes TSRMLS_DC);
+char *sapi_apache_read_cookies(TSRMLS_D);
+int sapi_apache_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers TSRMLS_DC);
+int sapi_apache_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC);
static int send_php(request_rec *r, int display_source_mode, char *filename);
static int send_parsed_php(request_rec * r);
static int send_parsed_php_source(request_rec * r);
static int sapi_apache_ub_write(const char *str, uint str_length)
{
int ret=0;
- SLS_FETCH();
+ TSRMLS_FETCH();
if (SG(server_context)) {
ret = rwrite(str, str_length, (request_rec *) SG(server_context));
/* {{{ sapi_apache_read_post
*/
-int sapi_apache_read_post(char *buffer, uint count_bytes SLS_DC)
+int sapi_apache_read_post(char *buffer, uint count_bytes TSRMLS_DC)
{
uint total_read_bytes=0, read_bytes;
request_rec *r = (request_rec *) SG(server_context);
/* {{{ sapi_apache_read_cookies
*/
-char *sapi_apache_read_cookies(SLS_D)
+char *sapi_apache_read_cookies(TSRMLS_D)
{
return (char *) table_get(((request_rec *) SG(server_context))->subprocess_env, "HTTP_COOKIE");
}
/* {{{ sapi_apache_header_handler
*/
-int sapi_apache_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers SLS_DC)
+int sapi_apache_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers TSRMLS_DC)
{
char *header_name, *header_content, *p;
request_rec *r = (request_rec *) SG(server_context);
/* {{{ sapi_apache_send_headers
*/
-int sapi_apache_send_headers(sapi_headers_struct *sapi_headers SLS_DC)
+int sapi_apache_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
{
if(SG(server_context) == NULL) { /* server_context is not here anymore */
return SAPI_HEADER_SEND_FAILED;
/* {{{ sapi_apache_register_server_variables
*/
-static void sapi_apache_register_server_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
+static void sapi_apache_register_server_variables(zval *track_vars_array TSRMLS_DC)
{
register int i;
array_header *arr = table_elts(((request_rec *) SG(server_context))->subprocess_env);
} else {
val = empty_string;
}
- php_register_variable(elts[i].key, val, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable(elts[i].key, val, track_vars_array TSRMLS_CC);
}
/* If PATH_TRANSLATED doesn't exist, copy it from SCRIPT_FILENAME */
if (symbol_table
&& !zend_hash_exists(symbol_table, "PATH_TRANSLATED", sizeof("PATH_TRANSLATED"))
&& zend_hash_find(symbol_table, "SCRIPT_FILENAME", sizeof("SCRIPT_FILENAME"), (void **) &path_translated)==SUCCESS) {
- php_register_variable("PATH_TRANSLATED", Z_STRVAL_PP(path_translated), track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("PATH_TRANSLATED", Z_STRVAL_PP(path_translated), track_vars_array TSRMLS_CC);
}
- php_register_variable("PHP_SELF", ((request_rec *) SG(server_context))->uri, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("PHP_SELF", ((request_rec *) SG(server_context))->uri, track_vars_array TSRMLS_CC);
}
/* }}} */
*/
static void php_apache_log_message(char *message)
{
- SLS_FETCH();
+ TSRMLS_FETCH();
if (SG(server_context)) {
#if MODULE_MAGIC_NUMBER >= 19970831
*/
static void php_apache_request_shutdown(void *dummy)
{
- SLS_FETCH();
- APLS_FETCH();
+ TSRMLS_FETCH();
+ TSRMLS_FETCH();
php_output_set_status(0);
SG(server_context) = NULL; /* The server context (request) is invalid by the time run_cleanups() is called */
/* {{{ php_apache_sapi_activate
*/
-static int php_apache_sapi_activate(SLS_D)
+static int php_apache_sapi_activate(TSRMLS_D)
{
request_rec *r = (request_rec *) SG(server_context);
- APLS_FETCH();
+ TSRMLS_FETCH();
/*
* For the Apache module version, this bit of code registers a cleanup
/* {{{ php_apache_get_stat
*/
-static struct stat *php_apache_get_stat(SLS_D)
+static struct stat *php_apache_get_stat(TSRMLS_D)
{
return &((request_rec *) SG(server_context))->finfo;
}
/* {{{ php_apache_getenv
*/
-static char *php_apache_getenv(char *name, size_t name_len SLS_DC)
+static char *php_apache_getenv(char *name, size_t name_len TSRMLS_DC)
{
return (char *) table_get(((request_rec *) SG(server_context))->subprocess_env, name);
}
/* {{{ init_request_info
*/
-static void init_request_info(SLS_D)
+static void init_request_info(TSRMLS_D)
{
request_rec *r = ((request_rec *) SG(server_context));
char *content_length = (char *) table_get(r->subprocess_env, "CONTENT_LENGTH");
/* {{{ php_apache_get_default_mimetype
*/
-static char *php_apache_get_default_mimetype(request_rec *r SLS_DC)
+static char *php_apache_get_default_mimetype(request_rec *r TSRMLS_DC)
{
char *mimetype;
/* Assume output will be of the default MIME type. Individual
scripts may change this later. */
char *tmpmimetype;
- tmpmimetype = sapi_get_default_content_type(SLS_C);
+ tmpmimetype = sapi_get_default_content_type(TSRMLS_C);
mimetype = pstrdup(r->pool, tmpmimetype);
efree(tmpmimetype);
} else {
{
int retval;
HashTable *per_dir_conf;
- SLS_FETCH();
TSRMLS_FETCH();
- CLS_FETCH();
- PLS_FETCH();
- APLS_FETCH();
+ TSRMLS_FETCH();
+ TSRMLS_FETCH();
if (AP(in_request)) {
zend_file_handle fh;
fh.opened_path = NULL;
fh.free_filename = 0;
fh.type = ZEND_HANDLE_FILENAME;
- zend_execute_scripts(ZEND_INCLUDE CLS_CC TSRMLS_CC, 1, &fh);
+ zend_execute_scripts(ZEND_INCLUDE TSRMLS_CC, 1, &fh);
return OK;
}
* directive, then decline to handle this request
*/
if (!AP(engine)) {
- r->content_type = php_apache_get_default_mimetype(r SLS_CC);
+ r->content_type = php_apache_get_default_mimetype(r TSRMLS_CC);
r->allowed |= (1 << METHODS) - 1;
zend_try {
zend_ini_deactivate(TSRMLS_C);
}
/* Assume output will be of the default MIME type. Individual
scripts may change this later in the request. */
- r->content_type = php_apache_get_default_mimetype(r SLS_CC);
+ r->content_type = php_apache_get_default_mimetype(r TSRMLS_CC);
/* Init timeout */
hard_timeout("send", r);
add_common_vars(r);
add_cgi_vars(r);
- init_request_info(SLS_C);
- apache_php_module_main(r, display_source_mode CLS_CC TSRMLS_CC PLS_CC SLS_CC);
+ init_request_info(TSRMLS_C);
+ apache_php_module_main(r, display_source_mode TSRMLS_CC);
/* Done, restore umask, turn off timeout, close file and return */
php_restore_umask();
}
#if MODULE_MAGIC_NUMBER >= 19980527
{
- PLS_FETCH();
+ TSRMLS_FETCH();
if (PG(expose_php)) {
ap_add_version_component("PHP/" PHP_VERSION);
}
#ifdef ZTS
extern int php_apache_info_id;
-#define APLS_D php_apache_info_struct *apache_globals
-#define AP(v) (apache_globals->v)
-#define APLS_FETCH() APLS_D = ts_resource(php_apache_info_id)
+#define AP(v) TSRMG(alloc_globals_id, php_apache_info_struct *, v)
#else
extern php_apache_info_struct php_apache_info;
-#define APLS_D
#define AP(v) (php_apache_info.v)
-#define APLS_FETCH()
#endif
-static void php_apache_globals_ctor(php_apache_info_struct *apache_globals TSRMLS_DC)
+static void php_apache_globals_ctor(php_apache_info_struct *apache_globals_p TSRMLS_DC)
{
apache_globals->in_request = 0;
}
PHP_FUNCTION(apache_child_terminate)
{
#ifndef MULTITHREAD
- APLS_FETCH();
- SLS_FETCH();
+ ATSRMLS_FETCH();
+ TSRMLS_FETCH();
if (AP(terminate_child)) {
ap_child_terminate( ((request_rec *)SG(server_context)) );
pval **arg_name,**arg_val;
char *note_val;
int arg_count = ARG_COUNT(ht);
- SLS_FETCH();
+ TSRMLS_FETCH();
if (arg_count<1 || arg_count>2 ||
zend_get_parameters_ex(arg_count,&arg_name,&arg_val) ==FAILURE ) {
extern char *user_name;
extern gid_t group_id;
extern int max_requests_per_child;
- SLS_FETCH();
+ TSRMLS_FETCH();
serv = ((request_rec *) SG(server_context))->server;
array_header *arr;
table_entry *elts;
request_rec *r;
- SLS_FETCH();
+ TSRMLS_FETCH();
r = ((request_rec *) SG(server_context));
arr = table_elts(r->subprocess_env);
table_entry *env;
int i;
request_rec *r;
- SLS_FETCH();
+ TSRMLS_FETCH();
r = ((request_rec *) SG(server_context));
SECTION("HTTP Headers Information");
{
pval **filename;
request_rec *rr = NULL;
- SLS_FETCH();
+ TSRMLS_FETCH();
if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1,&filename) == FAILURE) {
WRONG_PARAM_COUNT;
array_header *env_arr;
table_entry *tenv;
int i;
- SLS_FETCH();
- PLS_FETCH();
+ TSRMLS_FETCH();
+ TSRMLS_FETCH();
if (array_init(return_value) == FAILURE) {
RETURN_FALSE;
{
pval **filename;
request_rec *rr=NULL;
- SLS_FETCH();
+ TSRMLS_FETCH();
if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1,&filename) == FAILURE) {
WRONG_PARAM_COUNT;
{
pval **filename;
request_rec *rr=NULL;
- SLS_FETCH();
+ TSRMLS_FETCH();
if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1,&filename) == FAILURE) {
WRONG_PARAM_COUNT;
/* {{{ apache_php_module_main
*/
-int apache_php_module_main(request_rec *r, int display_source_mode CLS_DC TSRMLS_DC PLS_DC SLS_DC)
+int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC TSRMLS_DC)
{
zend_file_handle file_handle;
- APLS_FETCH();
+ TSRMLS_FETCH();
- if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == FAILURE) {
+ if (php_request_startup(TSRMLS_C) == FAILURE) {
return FAILURE;
}
/* sending a file handle to another dll is not working
file_handle.opened_path = NULL;
file_handle.free_filename = 0;
- (void) php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
+ (void) php_execute_script(&file_handle TSRMLS_CC);
}
AP(in_request) = 0;
{
zval **p1;
php_struct *ctx;
- SLS_FETCH();
+ TSRMLS_FETCH();
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &p1) == FAILURE)
return NULL;
php_struct *ctx;
apr_array_header_t *arr;
char *key, *val;
- SLS_FETCH();
+ TSRMLS_FETCH();
if (array_init(return_value) == FAILURE) {
RETURN_FALSE;
apr_bucket_brigade *bb;
php_struct *ctx;
uint now;
- SLS_FETCH();
+ TSRMLS_FETCH();
ctx = SG(server_context);
}
static int
-php_apache_sapi_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers SLS_DC)
+php_apache_sapi_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers TSRMLS_DC)
{
php_struct *ctx = SG(server_context);
char *val;
}
static int
-php_apache_sapi_send_headers(sapi_headers_struct *sapi_headers SLS_DC)
+php_apache_sapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
{
php_struct *ctx = SG(server_context);
}
static int
-php_apache_sapi_read_post(char *buf, uint count_bytes SLS_DC)
+php_apache_sapi_read_post(char *buf, uint count_bytes TSRMLS_DC)
{
int n;
int to_read;
}
static char *
-php_apache_sapi_read_cookies(SLS_D)
+php_apache_sapi_read_cookies(TSRMLS_D)
{
php_struct *ctx = SG(server_context);
const char *http_cookie;
}
static void
-php_apache_sapi_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
+php_apache_sapi_register_variables(zval *track_vars_array TSRMLS_DC TSRMLS_DC TSRMLS_DC)
{
php_struct *ctx = SG(server_context);
apr_array_header_t *arr = apr_table_elts(ctx->f->r->subprocess_env);
APR_ARRAY_FOREACH_OPEN(arr, key, val)
if (!val) val = empty_string;
- php_register_variable(key, val, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable(key, val, track_vars_array TSRMLS_CC);
APR_ARRAY_FOREACH_CLOSE()
- php_register_variable("PHP_SELF", ctx->f->r->uri, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("PHP_SELF", ctx->f->r->uri, track_vars_array TSRMLS_CC);
}
static void
static void php_apache_sapi_log_message(char *msg)
{
php_struct *ctx;
- SLS_FETCH();
+ TSRMLS_FETCH();
ctx = SG(server_context);
const char *str;
apr_ssize_t n;
apr_status_t rv;
- SLS_FETCH();
+ TSRMLS_FETCH();
ctx = SG(server_context);
return APR_SUCCESS;
}
-static void php_apache_request_ctor(ap_filter_t *f, php_struct *ctx SLS_DC)
+static void php_apache_request_ctor(ap_filter_t *f, php_struct *ctx TSRMLS_DC)
{
char *content_type;
const char *auth;
- CLS_FETCH();
TSRMLS_FETCH();
- PLS_FETCH();
+ TSRMLS_FETCH();
PG(during_request_startup) = 0;
SG(sapi_headers).http_response_code = 200;
SG(request_info).request_method = f->r->method;
SG(request_info).request_uri = safe_strdup(f->r->uri);
f->r->no_local_copy = 1;
- content_type = sapi_get_default_content_type(SLS_C);
+ content_type = sapi_get_default_content_type(TSRMLS_C);
f->r->content_type = apr_pstrdup(f->r->pool, content_type);
SG(request_info).post_data = ctx->post_data;
SG(request_info).post_data_length = ctx->post_len;
apr_table_unset(f->r->headers_out, "ETag");
apr_table_unset(f->r->headers_in, "Connection");
auth = apr_table_get(f->r->headers_in, "Authorization");
- php_handle_auth_data(auth SLS_CC);
+ php_handle_auth_data(auth TSRMLS_CC);
- php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC);
+ php_request_startup(TSRMLS_C);
}
-static void php_apache_request_dtor(ap_filter_t *f SLS_DC)
+static void php_apache_request_dtor(ap_filter_t *f TSRMLS_DC)
{
php_request_shutdown(NULL);
php_struct *ctx;
apr_bucket *b;
void *conf = ap_get_module_config(f->r->per_dir_config, &php4_module);
- SLS_FETCH();
+ TSRMLS_FETCH();
ctx = SG(server_context);
INIT_CTX;
ctx->state++;
- php_apache_request_ctor(f, ctx SLS_CC);
+ php_apache_request_ctor(f, ctx TSRMLS_CC);
}
/* moves all buckets from bb to ctx->bb */
if (ctx->state == 1 && APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(ctx->bb))) {
zend_file_handle zfd;
apr_bucket *eos;
- CLS_FETCH();
TSRMLS_FETCH();
- PLS_FETCH();
+ TSRMLS_FETCH();
/* We want to execute only one script per request.
* A bug in Apache or other filters could cause us
ctx->state = 2;
/* Handle phpinfo/phpcredits/built-in images */
- if (!php_handle_special_queries(SLS_C PLS_CC)) {
+ if (!php_handle_special_queries(TSRMLS_C)) {
b = APR_BRIGADE_FIRST(ctx->bb);
zfd.free_filename = 0;
zfd.opened_path = NULL;
- php_execute_script(&zfd CLS_CC TSRMLS_CC PLS_CC);
+ php_execute_script(&zfd TSRMLS_CC);
} else {
#define NO_DATA "The PHP Filter did not receive suitable input data"
}
}
- php_apache_request_dtor(f SLS_CC);
+ php_apache_request_dtor(f TSRMLS_CC);
SG(server_context) = 0;
/* Pass EOS bucket to next filter to signal end of request */
struct pike_string *filename;
int my_fd;
int written;
- SLS_D;
+ TSRMLS_D;
} php_caudium_request;
void pike_module_init(void);
void pike_module_exit(void);
-static void free_struct(SLS_D);
+static void free_struct(TSRMLS_D);
void f_php_caudium_request_handler(INT32 args);
/* Defines to get to the data supplied when the script is started. */
php_caudium_low_ub_write(const char *str, uint str_length) {
int sent_bytes = 0;
struct pike_string *to_write = NULL;
- PLS_FETCH();
+ TSRMLS_FETCH();
GET_THIS();
if(!MY_FD_OBJ->prog) {
PG(connection_status) = PHP_CONNECTION_ABORTED;
static int
php_caudium_sapi_ub_write(const char *str, uint str_length)
{
- PLS_FETCH();
+ TSRMLS_FETCH();
GET_THIS();
int sent_bytes = 0, fd = MY_FD;
if(fd)
*/
static int
php_caudium_sapi_header_handler(sapi_header_struct *sapi_header,
- sapi_headers_struct *sapi_headers SLS_DC)
+ sapi_headers_struct *sapi_headers TSRMLS_DC)
{
char *header_name, *header_content, *p;
header_name = sapi_header->header;
*/
INLINE static int
-php_caudium_low_send_headers(sapi_headers_struct *sapi_headers SLS_DC)
+php_caudium_low_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
{
- PLS_FETCH();
+ TSRMLS_FETCH();
struct pike_string *ind;
struct svalue *s_headermap;
GET_THIS();
}
static int
-php_caudium_sapi_send_headers(sapi_headers_struct *sapi_headers SLS_DC)
+php_caudium_sapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
{
int res = 0;
- THREAD_SAFE_RUN(res = php_caudium_low_send_headers(sapi_headers SLS_CC), "send headers");
+ THREAD_SAFE_RUN(res = php_caudium_low_send_headers(sapi_headers TSRMLS_CC), "send headers");
return res;
}
{
uint total_read = 0;
GET_THIS();
- PLS_FETCH();
+ TSRMLS_FETCH();
if(!MY_FD_OBJ->prog)
{
}
static int
-php_caudium_sapi_read_post(char *buf, uint count_bytes SLS_DC)
+php_caudium_sapi_read_post(char *buf, uint count_bytes TSRMLS_DC)
{
uint total_read = 0;
THREAD_SAFE_RUN(total_read = php_caudium_low_read_post(buf, count_bytes), "read post");
*/
static char *
-php_caudium_sapi_read_cookies(SLS_D)
+php_caudium_sapi_read_cookies(TSRMLS_D)
{
char *cookies;
cookies = lookup_string_header("HTTP_COOKIE", NULL);
};
-INLINE static void low_sapi_caudium_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
+INLINE static void low_sapi_caudium_register_variables(zval *track_vars_array TSRMLS_DC TSRMLS_DC TSRMLS_DC)
{
char *tmp;
php_register_variable("PHP_SELF", SG(request_info).request_uri,
- track_vars_array TSRMLS_CC PLS_CC);
+ track_vars_array TSRMLS_CC);
php_register_variable("GATEWAY_INTERFACE", "CGI/1.1",
- track_vars_array TSRMLS_CC PLS_CC);
+ track_vars_array TSRMLS_CC);
php_register_variable("REQUEST_METHOD",
(char *) SG(request_info).request_method,
- track_vars_array TSRMLS_CC PLS_CC);
+ track_vars_array TSRMLS_CC);
php_register_variable("REQUEST_URI", SG(request_info).request_uri,
- track_vars_array TSRMLS_CC PLS_CC);
+ track_vars_array TSRMLS_CC);
php_register_variable("PATH_TRANSLATED", SG(request_info).path_translated,
- track_vars_array TSRMLS_CC PLS_CC);
+ track_vars_array TSRMLS_CC);
if( (tmp = lookup_string_header("SERVER_NAME", NULL)) != NULL)
- php_register_variable("SERVER_NAME", tmp, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("SERVER_NAME", tmp, track_vars_array TSRMLS_CC);
if( (tmp = lookup_string_header("SERVER_PORT", NULL)) != NULL)
- php_register_variable("SERVER_PORT", tmp, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("SERVER_PORT", tmp, track_vars_array TSRMLS_CC);
if( (tmp = lookup_string_header("SERVER_PROTOCOL", NULL)) != NULL)
- php_register_variable("SERVER_PROTOCOL", tmp, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("SERVER_PROTOCOL", tmp, track_vars_array TSRMLS_CC);
if( (tmp = lookup_string_header("SCRIPT_NAME", NULL)) != NULL)
- php_register_variable("SCRIPT_NAME", tmp, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("SCRIPT_NAME", tmp, track_vars_array TSRMLS_CC);
if( (tmp = lookup_string_header("SCRIPT_FILENAME", NULL)) != NULL)
- php_register_variable("SCRIPT_FILENAME", tmp, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("SCRIPT_FILENAME", tmp, track_vars_array TSRMLS_CC);
if( (tmp = lookup_string_header("REMOTE_ADDR", NULL)) != NULL)
- php_register_variable("REMOTE_ADDR", tmp, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("REMOTE_ADDR", tmp, track_vars_array TSRMLS_CC);
if( (tmp = lookup_string_header("REMOTE_PORT", NULL)) != NULL)
- php_register_variable("REMOTE_PORT", tmp, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("REMOTE_PORT", tmp, track_vars_array TSRMLS_CC);
if( (tmp = lookup_string_header("DOCUMENT_ROOT", NULL)) != NULL)
- php_register_variable("DOCUMENT_ROOT", tmp, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("DOCUMENT_ROOT", tmp, track_vars_array TSRMLS_CC);
if( (tmp = lookup_string_header("HTTP_CONNECTION", NULL)) != NULL)
- php_register_variable("HTTP_CONNECTION", tmp, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("HTTP_CONNECTION", tmp, track_vars_array TSRMLS_CC);
if( (tmp = lookup_string_header("HTTP_USER_AGENT", NULL)) != NULL)
- php_register_variable("HTTP_USER_AGENT", tmp, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("HTTP_USER_AGENT", tmp, track_vars_array TSRMLS_CC);
if( (tmp = lookup_string_header("DOCUMENT_ROOT", NULL)) != NULL)
- php_register_variable("DOCUMENT_ROOT", tmp, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("DOCUMENT_ROOT", tmp, track_vars_array TSRMLS_CC);
if( (tmp = lookup_string_header("QUERY_STRING", "")) != NULL)
- php_register_variable("QUERY_STRING", tmp, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("QUERY_STRING", tmp, track_vars_array TSRMLS_CC);
if( (tmp = lookup_string_header("REMOTE_USER", NULL)) != NULL)
- php_register_variable("REMOTE_USER", tmp, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("REMOTE_USER", tmp, track_vars_array TSRMLS_CC);
if( (tmp = lookup_string_header("REMOTE_PASSWORD", NULL)) != NULL)
- php_register_variable("REMOTE_PASSWORD", tmp, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("REMOTE_PASSWORD", tmp, track_vars_array TSRMLS_CC);
}
-static void sapi_caudium_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
+static void sapi_caudium_register_variables(zval *track_vars_array TSRMLS_DC TSRMLS_DC TSRMLS_DC)
{
- THREAD_SAFE_RUN(low_sapi_caudium_register_variables(track_vars_array TSRMLS_CC SLS_CC PLS_CC), "register_variables");
+ THREAD_SAFE_RUN(low_sapi_caudium_register_variables(track_vars_array TSRMLS_CC TSRMLS_CC TSRMLS_CC), "register_variables");
}
/* this structure is static (as in "it does not change") */
* with a number of variables. HTTP_* variables are created for
* the HTTP header data, so that a script can access these.
*/
-static void php_caudium_hash_environment(CLS_D TSRMLS_DC PLS_DC SLS_DC)
+static void php_caudium_hash_environment(TSRMLS_D)
{
int i;
char buf[512];
struct thread_state *state;
extern struct program *thread_id_prog;
#endif
- SLS_FETCH();
- CLS_FETCH();
- PLS_FETCH();
+ TSRMLS_FETCH();
+ TSRMLS_FETCH();
TSRMLS_FETCH();
GET_THIS();
THIS->filename = ureq->filename;
}
/* Let PHP4 handle the deconding of the AUTH */
- php_handle_auth_data(lookup_string_header("HTTP_AUTHORIZATION", NULL), SLS_C);
+ php_handle_auth_data(lookup_string_header("HTTP_AUTHORIZATION", NULL), TSRMLS_C);
/* Swap out this thread and release the interpreter lock to allow
* Pike threads to run. We wait since the above would otherwise require
* a lot of unlock/lock.
file_handle.free_filename = 0;
THIS->written = 0;
- res = php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC);
+ res = php_request_startup(TSRMLS_C);
if(res == FAILURE) {
THREAD_SAFE_RUN({
apply_svalue(&THIS->done_cb, 0);
pop_stack();
- free_struct(SLS_C);
+ free_struct(TSRMLS_C);
}, "Negative run response");
} else {
- THREAD_SAFE_RUN(php_caudium_hash_environment(CLS_C TSRMLS_CC PLS_CC SLS_CC),
+ THREAD_SAFE_RUN(php_caudium_hash_environment(TSRMLS_C),
"environment hashing");
- php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
+ php_execute_script(&file_handle TSRMLS_CC);
php_request_shutdown(NULL);
THREAD_SAFE_RUN({
push_int(THIS->written);
apply_svalue(&THIS->done_cb, 1);
pop_stack();
- free_struct(SLS_C);
+ free_struct(TSRMLS_C);
}, "positive run response");
}
pop_n_elems(args);
}
-static void free_struct(SLS_D)
+static void free_struct(TSRMLS_D)
{
GET_THIS();
if(THIS->request_data) free_mapping(THIS->request_data);
}
-static int sapi_cgi_read_post(char *buffer, uint count_bytes SLS_DC)
+static int sapi_cgi_read_post(char *buffer, uint count_bytes TSRMLS_DC)
{
uint read_bytes=0, tmp_read_bytes;
}
-static char *sapi_cgi_read_cookies(SLS_D)
+static char *sapi_cgi_read_cookies(TSRMLS_D)
{
return getenv("HTTP_COOKIE");
}
-static void sapi_cgi_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
+static void sapi_cgi_register_variables(zval *track_vars_array TSRMLS_DC)
{
/* In CGI mode, we consider the environment to be a part of the server
* variables
*/
- php_import_environment_variables(track_vars_array TSRMLS_CC PLS_CC);
+ php_import_environment_variables(track_vars_array TSRMLS_CC);
/* Build the special-case PHP_SELF variable for the CGI version */
- php_register_variable("PHP_SELF", (SG(request_info).request_uri ? SG(request_info).request_uri:""), track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("PHP_SELF", (SG(request_info).request_uri ? SG(request_info).request_uri:""), track_vars_array TSRMLS_CC);
}
}
}
-static int sapi_cgi_deactivate(SLS_D)
+static int sapi_cgi_deactivate(TSRMLS_D)
{
fflush(stdout);
if(SG(request_info).argv0) {
/* {{{ init_request_info
*/
-static void init_request_info(SLS_D)
+static void init_request_info(TSRMLS_D)
{
char *content_length = getenv("CONTENT_LENGTH");
char *content_type = getenv("CONTENT_TYPE");
/* The CGI RFC allows servers to pass on unvalidated Authorization data */
auth = getenv("HTTP_AUTHORIZATION");
- php_handle_auth_data(auth SLS_CC);
+ php_handle_auth_data(auth TSRMLS_CC);
}
/* }}} */
{
char *var, *val;
TSRMLS_FETCH();
- PLS_FETCH();
var = *arg;
val = strchr(var, '=');
printf("No value specified for variable '%s'\n", var);
} else {
*val++ = '\0';
- php_register_variable(var, val, NULL TSRMLS_CC PLS_CC);
+ php_register_variable(var, val, NULL TSRMLS_CC);
}
efree(*arg);
}
ap_php_optarg = orig_optarg;
}
- init_request_info(SLS_C);
+ init_request_info(TSRMLS_C);
SG(server_context) = (void *) 1; /* avoid server_context==NULL checks */
CG(extended_info) = 0;
break;
case 'i': /* php info & quit */
- if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC)==FAILURE) {
+ if (php_request_startup(TSRMLS_C)==FAILURE) {
php_module_shutdown();
return FAILURE;
}
case 'v': /* show php version & quit */
no_headers = 1;
- if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC)==FAILURE) {
+ if (php_request_startup(TSRMLS_C)==FAILURE) {
php_module_shutdown();
return FAILURE;
}
SG(request_info).path_translated = script_file;
}
- if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC)==FAILURE) {
+ if (php_request_startup(TSRMLS_C)==FAILURE) {
php_module_shutdown();
return FAILURE;
}
switch (behavior) {
case PHP_MODE_STANDARD:
- exit_status = php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
+ exit_status = php_execute_script(&file_handle TSRMLS_CC);
break;
case PHP_MODE_LINT:
PG(during_request_startup) = 0;
- exit_status = php_lint_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
+ exit_status = php_lint_script(&file_handle TSRMLS_CC);
if (exit_status==SUCCESS) {
zend_printf("No syntax errors detected in %s\n", file_handle.filename);
} else {
{
zend_syntax_highlighter_ini syntax_highlighter_ini;
- if (open_file_for_scanning(&file_handle CLS_CC)==SUCCESS) {
+ if (open_file_for_scanning(&file_handle TSRMLS_CC)==SUCCESS) {
php_get_highlight_struct(&syntax_highlighter_ini);
zend_highlight(&syntax_highlighter_ini);
fclose(file_handle.handle.fp);
#if 0
/* Zeev might want to do something with this one day */
case PHP_MODE_INDENT:
- open_file_for_scanning(&file_handle CLS_CC);
+ open_file_for_scanning(&file_handle TSRMLS_CC);
zend_indent();
fclose(file_handle.handle.fp);
return SUCCESS;
#include <signal.h>
#endif
-#define TLS_D
-#define TLS_DC
-#define TLS_C
-#define TLS_CC
-#define TLS_FETCH()
-
-
FCGX_Stream *in, *out, *err;
FCGX_ParamArray envp;
char *path_info = NULL;
FCGX_PutStr( "\r\n", 2, out );
}
-static int sapi_fastcgi_read_post(char *buffer, uint count_bytes SLS_DC)
+static int sapi_fastcgi_read_post(char *buffer, uint count_bytes TSRMLS_DC)
{
size_t read_bytes = 0, tmp;
int c;
char *pos = buffer;
- TLS_FETCH();
+ TSRMLS_FETCH();
while( count_bytes ) {
c = FCGX_GetStr( pos, count_bytes, in );
return read_bytes;
}
-static char *sapi_fastcgi_read_cookies(SLS_D)
+static char *sapi_fastcgi_read_cookies(TSRMLS_D)
{
return getenv( "HTTP_COOKIE" );
}
-static void sapi_fastcgi_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
+static void sapi_fastcgi_register_variables(zval *track_vars_array TSRMLS_DC TSRMLS_DC TSRMLS_DC)
{
char *self = getenv("REQUEST_URI");
char *ptr = strchr( self, '?' );
/* strip query string off this */
if ( ptr ) *ptr = 0;
- php_register_variable( "PHP_SELF", getenv("REQUEST_URI"), track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable( "PHP_SELF", getenv("REQUEST_URI"), track_vars_array TSRMLS_CC);
if ( ptr ) *ptr = '?';
}
STANDARD_SAPI_MODULE_PROPERTIES
};
-static void fastcgi_module_main(TLS_D SLS_DC)
+static void fastcgi_module_main(TSRMLS_D TSRMLS_DC)
{
zend_file_handle file_handle;
- CLS_FETCH();
TSRMLS_FETCH();
- PLS_FETCH();
+ TSRMLS_FETCH();
file_handle.type = ZEND_HANDLE_FILENAME;
file_handle.filename = SG(request_info).path_translated;
file_handle.free_filename = 0;
file_handle.opened_path = NULL;
- if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == SUCCESS) {
- php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
+ if (php_request_startup(TSRMLS_C) == SUCCESS) {
+ php_execute_script(&file_handle TSRMLS_CC);
php_request_shutdown(NULL);
}
}
-static void init_request_info( SLS_D )
+static void init_request_info( TSRMLS_D )
{
char *content_length = getenv("CONTENT_LENGTH");
char *content_type = getenv( "CONTENT_TYPE" );
#ifdef DEBUG_FASTCGI
fprintf( stderr, "Authorization: %s\n", auth );
#endif
- php_handle_auth_data(auth SLS_CC);
+ php_handle_auth_data(auth TSRMLS_CC);
}
cgi_env, (cgi_env_size+1)*sizeof(char *) );
environ = merge_env;
- init_request_info( TLS_C SLS_CC );
+ init_request_info(TSRMLS_C);
SG(server_context) = (void *) 1; /* avoid server_context==NULL checks */
CG(extended_info) = 0;
SG(request_info).argv0 = argv0;
zend_llist_init(&global_vars, sizeof(char *), NULL, 0);
- fastcgi_module_main( TLS_C SLS_CC );
+ fastcgi_module_main(TSRMLS_C);
if( path_info ) {
free( path_info );
path_info = NULL;
};
char ***server_variable_names;
LPEXTENSION_CONTROL_BLOCK lpECB;
- SLS_FETCH();
+ TSRMLS_FETCH();
lpECB = (LPEXTENSION_CONTROL_BLOCK) SG(server_context);
{
DWORD num_bytes = str_length;
LPEXTENSION_CONTROL_BLOCK ecb;
- SLS_FETCH();
+ TSRMLS_FETCH();
ecb = (LPEXTENSION_CONTROL_BLOCK) SG(server_context);
if (ecb->WriteClient(ecb->ConnID, (char *) str, &num_bytes, HSE_IO_SYNC ) == FALSE) {
}
-static int sapi_isapi_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers SLS_DC)
+static int sapi_isapi_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers TSRMLS_DC)
{
return SAPI_HEADER_ADD;
}
}
-static int sapi_isapi_send_headers(sapi_headers_struct *sapi_headers SLS_DC)
+static int sapi_isapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
{
uint total_length = 2; /* account for the trailing \r\n */
char *combined_headers, *combined_headers_ptr;
HSE_SEND_HEADER_EX_INFO header_info;
char status_buf[MAX_STATUS_LENGTH];
sapi_header_struct default_content_type;
- PLS_FETCH();
+ TSRMLS_FETCH();
/* Obtain headers length */
if (SG(sapi_headers).send_default_content_type) {
- sapi_get_default_content_type_header(&default_content_type SLS_CC);
+ sapi_get_default_content_type_header(&default_content_type TSRMLS_CC);
accumulate_header_length(&default_content_type, (void *) &total_length);
}
zend_llist_apply_with_argument(&SG(sapi_headers).headers, (void (*)(void *, void *)) accumulate_header_length, (void *) &total_length);
-static int sapi_isapi_read_post(char *buffer, uint count_bytes SLS_DC)
+static int sapi_isapi_read_post(char *buffer, uint count_bytes TSRMLS_DC)
{
LPEXTENSION_CONTROL_BLOCK lpECB = (LPEXTENSION_CONTROL_BLOCK) SG(server_context);
DWORD read_from_buf=0;
}
-static char *sapi_isapi_read_cookies(SLS_D)
+static char *sapi_isapi_read_cookies(TSRMLS_D)
{
LPEXTENSION_CONTROL_BLOCK lpECB = (LPEXTENSION_CONTROL_BLOCK) SG(server_context);
char variable_buf[ISAPI_SERVER_VAR_BUF_SIZE];
#ifdef WITH_ZEUS
-static void sapi_isapi_register_zeus_ssl_variables(LPEXTENSION_CONTROL_BLOCK lpECB, zval *track_vars_array TSRMLS_DC PLS_DC)
+static void sapi_isapi_register_zeus_ssl_variables(LPEXTENSION_CONTROL_BLOCK lpECB, zval *track_vars_array TSRMLS_DC)
{
char static_variable_buf[ISAPI_SERVER_VAR_BUF_SIZE];
DWORD variable_len = ISAPI_SERVER_VAR_BUF_SIZE;
if( lpECB->GetServerVariable( lpECB->ConnID, "SSL_CLIENT_ST", static_variable_buf, &variable_len ) && static_variable_buf[0] ) {
strcat( static_cons_buf, static_variable_buf );
}
- php_register_variable( "SSL_CLIENT_DN", static_cons_buf, track_vars_array TSRMLS_CC PLS_CC );
+ php_register_variable( "SSL_CLIENT_DN", static_cons_buf, track_vars_array TSRMLS_CC );
strcpy( static_cons_buf, "/C=" );
variable_len = ISAPI_SERVER_VAR_BUF_SIZE;
if( lpECB->GetServerVariable( lpECB->ConnID, "SSL_CLIENT_I_ST", static_variable_buf, &variable_len ) && static_variable_buf[0] ) {
strcat( static_cons_buf, static_variable_buf );
}
- php_register_variable( "SSL_CLIENT_I_DN", static_cons_buf, track_vars_array TSRMLS_CC PLS_CC );
+ php_register_variable( "SSL_CLIENT_I_DN", static_cons_buf, track_vars_array TSRMLS_CC );
}
-static void sapi_isapi_register_zeus_variables(LPEXTENSION_CONTROL_BLOCK lpECB, zval *track_vars_array TSRMLS_DC PLS_DC)
+static void sapi_isapi_register_zeus_variables(LPEXTENSION_CONTROL_BLOCK lpECB, zval *track_vars_array TSRMLS_DC)
{
char static_variable_buf[ISAPI_SERVER_VAR_BUF_SIZE];
DWORD variable_len = ISAPI_SERVER_VAR_BUF_SIZE;
if ( lpECB->GetServerVariable(lpECB->ConnID, "PATH_INFO", static_variable_buf, &variable_len) && static_variable_buf[0] ) {
/* PHP_SELF is just PATH_INFO */
- php_register_variable( "PHP_SELF", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC );
+ php_register_variable( "PHP_SELF", static_variable_buf, track_vars_array TSRMLS_CC );
/* Chop off filename to get just the 'real' PATH_INFO' */
pathinfo_len = variable_len - scriptname_len;
- php_register_variable( "PATH_INFO", static_variable_buf + scriptname_len - 1, track_vars_array TSRMLS_CC PLS_CC );
+ php_register_variable( "PATH_INFO", static_variable_buf + scriptname_len - 1, track_vars_array TSRMLS_CC );
/* append query string to give url... extra byte for '?' */
if ( strlen(lpECB->lpszQueryString) + variable_len + 1 < ISAPI_SERVER_VAR_BUF_SIZE ) {
/* append query string only if it is present... */
static_variable_buf[ variable_len - 1 ] = '?';
strcpy( static_variable_buf + variable_len, lpECB->lpszQueryString );
}
- php_register_variable( "URL", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC );
- php_register_variable( "REQUEST_URI", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC );
+ php_register_variable( "URL", static_variable_buf, track_vars_array TSRMLS_CC );
+ php_register_variable( "REQUEST_URI", static_variable_buf, track_vars_array TSRMLS_CC );
}
}
variable_len = ISAPI_SERVER_VAR_BUF_SIZE;
if ( lpECB->GetServerVariable(lpECB->ConnID, "PATH_TRANSLATED", static_variable_buf, &variable_len) && static_variable_buf[0] ) {
static_variable_buf[ variable_len - pathinfo_len - 1 ] = '\0';
- php_register_variable( "PATH_TRANSLATED", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC );
+ php_register_variable( "PATH_TRANSLATED", static_variable_buf, track_vars_array TSRMLS_CC );
}
/* Bring in the AUTHENTICATION stuff as needed */
variable_len = ISAPI_SERVER_VAR_BUF_SIZE;
if ( lpECB->GetServerVariable(lpECB->ConnID, "AUTH_USER", static_variable_buf, &variable_len) && static_variable_buf[0] ) {
- php_register_variable( "PHP_AUTH_USER", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC );
+ php_register_variable( "PHP_AUTH_USER", static_variable_buf, track_vars_array TSRMLS_CC );
}
variable_len = ISAPI_SERVER_VAR_BUF_SIZE;
if ( lpECB->GetServerVariable(lpECB->ConnID, "AUTH_PASSWORD", static_variable_buf, &variable_len) && static_variable_buf[0] ) {
- php_register_variable( "PHP_AUTH_PW", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC );
+ php_register_variable( "PHP_AUTH_PW", static_variable_buf, track_vars_array TSRMLS_CC );
}
variable_len = ISAPI_SERVER_VAR_BUF_SIZE;
if ( lpECB->GetServerVariable(lpECB->ConnID, "AUTH_TYPE", static_variable_buf, &variable_len) && static_variable_buf[0] ) {
- php_register_variable( "PHP_AUTH_TYPE", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC );
+ php_register_variable( "PHP_AUTH_TYPE", static_variable_buf, track_vars_array TSRMLS_CC );
}
/* And now, for the SSL variables (if applicable) */
variable_len = ISAPI_SERVER_VAR_BUF_SIZE;
if ( lpECB->GetServerVariable(lpECB->ConnID, "CERT_COOKIE", static_variable_buf, &variable_len) && static_variable_buf[0] ) {
- sapi_isapi_register_zeus_ssl_variables( lpECB, track_vars_array TSRMLS_CC PLS_CC );
+ sapi_isapi_register_zeus_ssl_variables( lpECB, track_vars_array TSRMLS_CC );
}
/* Copy some of the variables we need to meet Apache specs */
variable_len = ISAPI_SERVER_VAR_BUF_SIZE;
if ( lpECB->GetServerVariable(lpECB->ConnID, "SERVER_SOFTWARE", static_variable_buf, &variable_len) && static_variable_buf[0] ) {
- php_register_variable( "SERVER_SIGNATURE", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC );
+ php_register_variable( "SERVER_SIGNATURE", static_variable_buf, track_vars_array TSRMLS_CC );
}
}
#endif
-static void sapi_isapi_register_server_variables2(char **server_variables, LPEXTENSION_CONTROL_BLOCK lpECB, zval *track_vars_array, char **recorded_values TSRMLS_DC PLS_DC)
+static void sapi_isapi_register_server_variables2(char **server_variables, LPEXTENSION_CONTROL_BLOCK lpECB, zval *track_vars_array, char **recorded_values TSRMLS_DC)
{
char **p=server_variables;
DWORD variable_len;
variable_len = ISAPI_SERVER_VAR_BUF_SIZE;
if (lpECB->GetServerVariable(lpECB->ConnID, *p, static_variable_buf, &variable_len)
&& static_variable_buf[0]) {
- php_register_variable(*p, static_variable_buf, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable(*p, static_variable_buf, track_vars_array TSRMLS_CC);
if (recorded_values) {
recorded_values[p-server_variables] = estrndup(static_variable_buf, variable_len);
}
variable_buf = (char *) emalloc(variable_len);
if (lpECB->GetServerVariable(lpECB->ConnID, *p, variable_buf, &variable_len)
&& variable_buf[0]) {
- php_register_variable(*p, variable_buf, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable(*p, variable_buf, track_vars_array TSRMLS_CC);
}
if (recorded_values) {
recorded_values[p-server_variables] = variable_buf;
}
-static void sapi_isapi_register_server_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
+static void sapi_isapi_register_server_variables(zval *track_vars_array TSRMLS_DC TSRMLS_DC TSRMLS_DC)
{
DWORD variable_len = ISAPI_SERVER_VAR_BUF_SIZE;
char *variable;
/* Register the special ISAPI variables */
memset(isapi_special_server_variables, 0, sizeof(isapi_special_server_variables));
- sapi_isapi_register_server_variables2(isapi_special_server_variable_names, lpECB, track_vars_array, isapi_special_server_variables TSRMLS_CC PLS_CC);
+ sapi_isapi_register_server_variables2(isapi_special_server_variable_names, lpECB, track_vars_array, isapi_special_server_variables TSRMLS_CC);
if (SG(request_info).cookie_data) {
- php_register_variable("HTTP_COOKIE", SG(request_info).cookie_data, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("HTTP_COOKIE", SG(request_info).cookie_data, track_vars_array TSRMLS_CC);
}
/* Register the standard ISAPI variables */
- sapi_isapi_register_server_variables2(isapi_server_variable_names, lpECB, track_vars_array, NULL TSRMLS_CC PLS_CC);
+ sapi_isapi_register_server_variables2(isapi_server_variable_names, lpECB, track_vars_array, NULL TSRMLS_CC);
if (isapi_special_server_variables[SPECIAL_VAR_HTTPS]
&& atoi(isapi_special_server_variables[SPECIAL_VAR_HTTPS])) {
/* Register SSL ISAPI variables */
- sapi_isapi_register_server_variables2(isapi_secure_server_variable_names, lpECB, track_vars_array, NULL TSRMLS_CC PLS_CC);
+ sapi_isapi_register_server_variables2(isapi_secure_server_variable_names, lpECB, track_vars_array, NULL TSRMLS_CC);
}
if (isapi_special_server_variables[SPECIAL_VAR_HTTPS]) {
#ifdef WITH_ZEUS
- sapi_isapi_register_zeus_variables(lpECB, track_vars_array TSRMLS_CC PLS_CC);
+ sapi_isapi_register_zeus_variables(lpECB, track_vars_array TSRMLS_CC);
#endif
/* PHP_SELF support */
if (isapi_special_server_variables[SPECIAL_VAR_PHP_SELF]) {
- php_register_variable("PHP_SELF", isapi_special_server_variables[SPECIAL_VAR_PHP_SELF], track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("PHP_SELF", isapi_special_server_variables[SPECIAL_VAR_PHP_SELF], track_vars_array TSRMLS_CC);
efree(isapi_special_server_variables[SPECIAL_VAR_PHP_SELF]);
}
value++;
}
*colon = 0;
- php_register_variable(variable, value, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable(variable, value, track_vars_array TSRMLS_CC);
*colon = ':';
}
variable = php_strtok_r(NULL, "\r\n", &strtok_buf);
if (humi.lpszPath[path_len-2] == '\\') {
humi.lpszPath[path_len-2] = 0;
}
- php_register_variable("DOCUMENT_ROOT", humi.lpszPath, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("DOCUMENT_ROOT", humi.lpszPath, track_vars_array TSRMLS_CC);
}
}
#endif
DWORD WINAPI HttpFilterProc(PHTTP_FILTER_CONTEXT pfc, DWORD notificationType, LPVOID pvNotification)
{
- SLS_FETCH();
+ TSRMLS_FETCH();
switch (notificationType) {
case SF_NOTIFY_PREPROC_HEADERS:
}
-static void php_isapi_report_exception(char *message, int message_len SLS_DC)
+static void php_isapi_report_exception(char *message, int message_len TSRMLS_DC)
{
if (!SG(headers_sent)) {
HSE_SEND_HEADER_EX_INFO header_info;
{
zend_file_handle file_handle;
zend_bool stack_overflown=0;
- SLS_FETCH();
- CLS_FETCH();
TSRMLS_FETCH();
- PLS_FETCH();
+ TSRMLS_FETCH();
+ TSRMLS_FETCH();
#ifdef PHP_ENABLE_SEH
LPEXCEPTION_POINTERS e;
#endif
file_handle.type = ZEND_HANDLE_FILENAME;
file_handle.opened_path = NULL;
- php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC);
- php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
+ php_request_startup(TSRMLS_C);
+ php_execute_script(&file_handle TSRMLS_CC);
if (SG(request_info).cookie_data) {
efree(SG(request_info).cookie_data);
}
CG(unclean_shutdown)=1;
_snprintf(buf,sizeof(buf)-1,"PHP has encountered a Stack overflow");
- php_isapi_report_exception(buf, strlen(buf) SLS_CC);
+ php_isapi_report_exception(buf, strlen(buf) TSRMLS_CC);
} else if (_exception_code()==EXCEPTION_ACCESS_VIOLATION) {
_snprintf(buf,sizeof(buf)-1,"PHP has encountered an Access Violation at %p",e->ExceptionRecord->ExceptionAddress);
- php_isapi_report_exception(buf, strlen(buf) SLS_CC);
+ php_isapi_report_exception(buf, strlen(buf) TSRMLS_CC);
my_endthread();
} else {
_snprintf(buf,sizeof(buf)-1,"PHP has encountered an Unhandled Exception Code %d at %p",e->ExceptionRecord->ExceptionCode , e->ExceptionRecord->ExceptionAddress);
- php_isapi_report_exception(buf, strlen(buf) SLS_CC);
+ php_isapi_report_exception(buf, strlen(buf) TSRMLS_CC);
my_endthread();
}
#endif
int retval;
nsapi_request_context *rc;
- SLS_FETCH();
+ TSRMLS_FETCH();
rc = (nsapi_request_context *)SG(server_context);
retval = net_write(rc->sn->csd, (char *)str, str_length);
if (retval == IO_ERROR /*-1*/ || retval == IO_EOF /*0*/)
}
static void
-sapi_nsapi_register_server_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
+sapi_nsapi_register_server_variables(zval *track_vars_array TSRMLS_DC SLS_DC TSRMLS_DC)
{
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
size_t i;
for (i = 0; i < nsapi_reqpb_size; i++) {
value = pblock_findval(nsapi_reqpb[i].nsapi_eq, rc->rq->reqpb);
if (value) {
- php_register_variable( (char *)nsapi_reqpb[i].env_var, value, track_vars_array TSRMLS_CC PLS_CC );
+ php_register_variable( (char *)nsapi_reqpb[i].env_var, value, track_vars_array TSRMLS_CC );
}
}
for (i = 0; i < nsapi_headers_size; i++) {
value = pblock_findval(nsapi_headers[i].nsapi_eq, rc->rq->headers);
if (value) {
- php_register_variable( (char *)nsapi_headers[i].env_var, value, track_vars_array TSRMLS_CC PLS_CC );
+ php_register_variable( (char *)nsapi_headers[i].env_var, value, track_vars_array TSRMLS_CC );
}
}
for (i = 0; i < nsapi_vars_size; i++) {
value = pblock_findval(nsapi_vars[i].nsapi_eq, rc->rq->vars);
if (value) {
- php_register_variable( (char *)nsapi_vars[i].env_var, value, track_vars_array TSRMLS_CC PLS_CC );
+ php_register_variable( (char *)nsapi_vars[i].env_var, value, track_vars_array TSRMLS_CC );
}
}
for (i = 0; i < nsapi_client_size; i++) {
value = pblock_findval(nsapi_client[i].nsapi_eq, rc->sn->client);
if (value) {
- php_register_variable( (char *)nsapi_client[i].env_var, value, track_vars_array TSRMLS_CC PLS_CC );
+ php_register_variable( (char *)nsapi_client[i].env_var, value, track_vars_array TSRMLS_CC );
}
}
value = session_dns(rc->sn);
if (value) {
- php_register_variable("REMOTE_HOST", value, track_vars_array TSRMLS_CC PLS_CC );
+ php_register_variable("REMOTE_HOST", value, track_vars_array TSRMLS_CC );
}
sprintf(buf, "%d", conf_getglobals()->Vport);
- php_register_variable("SERVER_PORT", buf, track_vars_array TSRMLS_CC PLS_CC );
- php_register_variable("SERVER_NAME", util_hostname(), track_vars_array TSRMLS_CC PLS_CC );
- php_register_variable("SERVER_URL", http_uri2url("", ""), track_vars_array TSRMLS_CC PLS_CC );
- php_register_variable("HTTPS", (security_active ? "ON" : "OFF"), track_vars_array TSRMLS_CC PLS_CC );
-/* php_register_variable("SERVER_SOFTWARE", MAGNUS_VERSION_STRING, track_vars_array TSRMLS_CC PLS_CC ); */
+ php_register_variable("SERVER_PORT", buf, track_vars_array TSRMLS_CC );
+ php_register_variable("SERVER_NAME", util_hostname(), track_vars_array TSRMLS_CC );
+ php_register_variable("SERVER_URL", http_uri2url("", ""), track_vars_array TSRMLS_CC );
+ php_register_variable("HTTPS", (security_active ? "ON" : "OFF"), track_vars_array TSRMLS_CC );
+/* php_register_variable("SERVER_SOFTWARE", MAGNUS_VERSION_STRING, track_vars_array TSRMLS_CC ); */
/*
* Special PHP_SELF variable.
*/
value = pblock_findval("uri", rc->rq->reqpb);
if ( value != NULL ) {
- php_register_variable("PHP_SELF", value, track_vars_array TSRMLS_CC PLS_CC );
+ php_register_variable("PHP_SELF", value, track_vars_array TSRMLS_CC );
}
}
static void
nsapi_log_message(char *message)
{
- SLS_FETCH();
+ TSRMLS_FETCH();
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
log_error(LOG_INFORM, "PHP_log_message", rc->sn, rc->rq,
"%s", message);
{
int result;
zend_file_handle file_handle;
-
- CLS_FETCH();
TSRMLS_FETCH();
- PLS_FETCH();
+ TSRMLS_FETCH();
- if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == FAILURE) {
+ if (php_request_startup(TSRMLS_C) == FAILURE) {
return FAILURE;
}
"Parsing [%s]", SG(request_info).path_translated);
#endif
- php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
+ php_execute_script(&file_handle TSRMLS_CC);
php_request_shutdown(NULL);
#if defined(NSAPI_DEBUG)
int retval;
nsapi_request_context *request_context;
- SLS_FETCH();
+ TSRMLS_FETCH();
request_context = (nsapi_request_context *)MALLOC(sizeof(nsapi_request_context));
request_context->pb = pb;
static int ph_globals_id;
-#define PHLS_D phttpd_globals_struct *ph_context
-#define PHLS_DC , PHLS_D
-#define PHLS_C ph_context
-#define PHLS_CC , PHLS_C
-#define PHG(v) (ph_context->v)
-#define PHLS_FETCH() phttpd_globals_struct *ph_context = ts_resource(ph_globals_id)
+#define PHG(v) TSRMG(ph_globals_id, phttpd_globals_struct *, v)
static int
php_phttpd_startup(sapi_module_struct *sapi_module)
php_phttpd_sapi_ub_write(const char *str, uint str_length)
{
int sent_bytes;
- PHLS_FETCH();
+ TSRMLS_FETCH();
sent_bytes = fd_write(PHG(cip)->fd,str,str_length);
}
static int
-php_phttpd_sapi_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers SLS_DC)
+php_phttpd_sapi_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers TSRMLS_DC)
{
char *header_name, *header_content;
char *p;
- PHLS_FETCH();
+ TSRMLS_FETCH();
http_sendheaders(PHG(cip)->fd,PHG(cip), SG(sapi_headers).http_response_code, NULL);
}
static int
-php_phttpd_sapi_send_headers(sapi_headers_struct *sapi_headers SLS_DC)
+php_phttpd_sapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
{
- PHLS_FETCH();
+ TSRMLS_FETCH();
if (SG(sapi_headers).send_default_content_type) {
fd_printf(PHG(cip)->fd,"Content-Type: text/html\n");
}
static char *
-php_phttpd_sapi_read_cookies(SLS_D)
+php_phttpd_sapi_read_cookies(TSRMLS_D)
{
/*
int i;
char *http_cookie = NULL;
- NSLS_FETCH();
+ NTSRMLS_FETCH();
i = Ns_SetIFind(NSG(conn->headers), "cookie");
if(i != -1) {
}
static int
-php_phttpd_sapi_read_post(char *buf, uint count_bytes SLS_DC)
+php_phttpd_sapi_read_post(char *buf, uint count_bytes TSRMLS_DC)
{
/*
uint max_read;
uint total_read = 0;
- NSLS_FETCH();
+ NTSRMLS_FETCH();
max_read = MIN(NSG(data_avail), count_bytes);
};
static void
-php_phttpd_request_ctor(PHLS_D SLS_DC)
+php_phttpd_request_ctor(TSRMLS_D TSRMLS_DC)
{
memset(&SG(request_info),0,sizeof(sapi_globals_struct)); /* pfusch! */
}
static void
-php_phttpd_request_dtor(PHLS_D SLS_DC)
+php_phttpd_request_dtor(TSRMLS_D TSRMLS_DC)
{
free(SG(request_info).path_translated);
}
-int php_doit(PHLS_D SLS_DC)
+int php_doit(TSRMLS_D TSRMLS_DC)
{
struct stat sb;
zend_file_handle file_handle;
struct httpinfo *hip = PHG(cip)->hip;
-
- CLS_FETCH();
TSRMLS_FETCH();
- PLS_FETCH();
+ TSRMLS_FETCH();
- if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == FAILURE) {
+ if (php_request_startup(TSRMLS_C) == FAILURE) {
return -1;
}
file_handle.free_filename = 0;
/*
- php_phttpd_hash_environment(PHLS_C CLS_CC TSRMLS_CC PLS_CC SLS_CC);
+ php_phttpd_hash_environment(TSRMLS_C);
*/
- php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
+ php_execute_script(&file_handle TSRMLS_CC);
php_request_shutdown(NULL);
return SG(sapi_headers).http_response_code;
{
struct httpinfo *hip = cip->hip;
int status;
- PHLS_FETCH();
- SLS_FETCH();
+ TSRMLS_FETCH();
+ TSRMLS_FETCH();
if (strcasecmp(hip->method, "GET") == 0 ||
strcasecmp(hip->method, "HEAD") == 0 ||
strcasecmp(hip->method, "POST") == 0) {
PHG(cip) = cip;
- php_phttpd_request_ctor(PHLS_C SLS_CC);
- status = php_doit(PHLS_C SLS_CC);
- php_phttpd_request_dtor(PHLS_C SLS_CC);
+ php_phttpd_request_ctor(TSRMLS_C);
+ status = php_doit(TSRMLS_C);
+ php_phttpd_request_dtor(TSRMLS_C);
return status;
} else {
char variable_buf[PI3WEB_SERVER_VAR_BUF_SIZE];
DWORD variable_len;
LPCONTROL_BLOCK lpCB;
- SLS_FETCH();
+ TSRMLS_FETCH();
lpCB = (LPCONTROL_BLOCK) SG(server_context);
{
DWORD num_bytes = str_length;
LPCONTROL_BLOCK cb;
- SLS_FETCH();
+ TSRMLS_FETCH();
cb = (LPCONTROL_BLOCK) SG(server_context);
}
-static int sapi_pi3web_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers SLS_DC)
+static int sapi_pi3web_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers TSRMLS_DC)
{
return SAPI_HEADER_ADD;
}
}
-static int sapi_pi3web_send_headers(sapi_headers_struct *sapi_headers SLS_DC)
+static int sapi_pi3web_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
{
uint total_length = 2; /* account for the trailing \r\n */
char *combined_headers, *combined_headers_ptr;
LPCONTROL_BLOCK lpCB = (LPCONTROL_BLOCK) SG(server_context);
sapi_header_struct default_content_type;
- PLS_FETCH();
+ TSRMLS_FETCH();
if ( !IWasLoaded ) return SAPI_HEADER_SENT_SUCCESSFULLY;
if (SG(sapi_headers).send_default_content_type) {
- sapi_get_default_content_type_header(&default_content_type SLS_CC);
+ sapi_get_default_content_type_header(&default_content_type TSRMLS_CC);
accumulate_header_length(&default_content_type, (void *) &total_length);
}
zend_llist_apply_with_argument(&SG(sapi_headers).headers, (void (*)(void *, void *)) accumulate_header_length, (void *) &total_length);
}
-static int sapi_pi3web_read_post(char *buffer, uint count_bytes SLS_DC)
+static int sapi_pi3web_read_post(char *buffer, uint count_bytes TSRMLS_DC)
{
LPCONTROL_BLOCK lpCB = (LPCONTROL_BLOCK) SG(server_context);
DWORD read_from_buf=0;
}
-static char *sapi_pi3web_read_cookies(SLS_D)
+static char *sapi_pi3web_read_cookies(TSRMLS_D)
{
LPCONTROL_BLOCK lpCB = (LPCONTROL_BLOCK) SG(server_context);
char variable_buf[PI3WEB_SERVER_VAR_BUF_SIZE];
SG(sapi_headers).http_response_code = 200;
}
-static void hash_pi3web_variables(TSRMLS_D SLS_DC)
+static void hash_pi3web_variables(TSRMLS_D TSRMLS_DC)
{
char static_variable_buf[PI3WEB_SERVER_VAR_BUF_SIZE];
char *variable_buf;
zend_file_handle file_handle;
char *header_line;
int iRet = PIAPI_COMPLETED;
- SLS_FETCH();
- CLS_FETCH();
TSRMLS_FETCH();
- PLS_FETCH();
+ TSRMLS_FETCH();
+ TSRMLS_FETCH();
zend_try {
file_handle.filename = lpCB->lpszFileName;
CG(extended_info) = 0;
init_request_info(sapi_globals, lpCB);
- php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC);
+ php_request_startup(TSRMLS_C);
- hash_pi3web_variables(TSRMLS_C SLS_CC);
+ hash_pi3web_variables(TSRMLS_C);
switch ( lpCB->dwBehavior ) {
case PHP_MODE_STANDARD:
- iRet = ( php_execute_script( &file_handle CLS_CC TSRMLS_CC PLS_CC ) == SUCCESS ) ?
+ iRet = ( php_execute_script( &file_handle TSRMLS_CC ) == SUCCESS ) ?
PIAPI_COMPLETED : PIAPI_ERROR;
break;
case PHP_MODE_HIGHLIGHT: {
zend_syntax_highlighter_ini syntax_highlighter_ini;
- if ( open_file_for_scanning( &file_handle CLS_CC ) == SUCCESS )
+ if ( open_file_for_scanning( &file_handle TSRMLS_CC ) == SUCCESS )
{
php_get_highlight_struct( &syntax_highlighter_ini );
zend_highlight( &syntax_highlighter_ini );
case PHP_MODE_INDENT:
header_line = (char *)estrdup("Content-Type: text/plain");
sapi_add_header_ex(header_line, strlen(header_line), 1, 1);
- if ( open_file_for_scanning( &file_handle CLS_CC ) == SUCCESS )
+ if ( open_file_for_scanning( &file_handle TSRMLS_CC ) == SUCCESS )
{
zend_indent();
}
efree(header_line);
break;
case PHP_MODE_LINT:
- iRet = (php_lint_script(&file_handle CLS_CC TSRMLS_CC PLS_CC) == SUCCESS) ?
+ iRet = (php_lint_script(&file_handle TSRMLS_CC) == SUCCESS) ?
PIAPI_COMPLETED : PIAPI_ERROR;
break;
default:
int sent_bytes = 0;
struct pike_string *to_write = NULL;
#ifdef ZTS
- PLS_FETCH();
+ TSRMLS_FETCH();
#endif
#ifdef ROXEN_USE_ZTS
GET_THIS();
php_roxen_sapi_ub_write(const char *str, uint str_length)
{
#ifdef ZTS
- PLS_FETCH();
+ TSRMLS_FETCH();
#endif
#ifdef ROXEN_USE_ZTS
GET_THIS();
*/
static int
php_roxen_sapi_header_handler(sapi_header_struct *sapi_header,
- sapi_headers_struct *sapi_headers SLS_DC)
+ sapi_headers_struct *sapi_headers TSRMLS_DC)
{
char *header_name, *header_content, *p;
header_name = sapi_header->header;
*/
static int
-php_roxen_low_send_headers(sapi_headers_struct *sapi_headers SLS_DC)
+php_roxen_low_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
{
#ifdef ZTS
- PLS_FETCH();
+ TSRMLS_FETCH();
#endif
struct pike_string *ind;
struct svalue *s_headermap;
}
static int
-php_roxen_sapi_send_headers(sapi_headers_struct *sapi_headers SLS_DC)
+php_roxen_sapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
{
int res = 0;
- THREAD_SAFE_RUN(res = php_roxen_low_send_headers(sapi_headers SLS_CC), "send headers");
+ THREAD_SAFE_RUN(res = php_roxen_low_send_headers(sapi_headers TSRMLS_CC), "send headers");
return res;
}
GET_THIS();
#endif
#ifdef ZTS
- PLS_FETCH();
+ TSRMLS_FETCH();
#endif
if(!MY_FD_OBJ->prog)
}
static int
-php_roxen_sapi_read_post(char *buf, uint count_bytes SLS_DC)
+php_roxen_sapi_read_post(char *buf, uint count_bytes TSRMLS_DC)
{
uint total_read = 0;
THREAD_SAFE_RUN(total_read = php_roxen_low_read_post(buf, count_bytes), "read post");
*/
static char *
-php_roxen_sapi_read_cookies(SLS_D)
+php_roxen_sapi_read_cookies(TSRMLS_D)
{
char *cookies;
cookies = lookup_string_header("HTTP_COOKIE", NULL);
&pval, sizeof(zval *), NULL)
static void
-php_roxen_hash_environment(CLS_D TSRMLS_DC PLS_DC SLS_DC)
+php_roxen_hash_environment(TSRMLS_D)
{
int i;
char buf[512];
* "executes" the script
*/
-static int php_roxen_module_main(SLS_D)
+static int php_roxen_module_main(TSRMLS_D)
{
int res, len;
char *dir;
zend_file_handle file_handle;
#ifdef ZTS
- CLS_FETCH();
- PLS_FETCH();
+ TSRMLS_FETCH();
TSRMLS_FETCH();
#ifdef ROXEN_USE_ZTS
GET_THIS();
file_handle.opened_path = NULL;
THREADS_ALLOW();
- res = php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC);
+ res = php_request_startup(TSRMLS_C);
THREADS_DISALLOW();
if(res == FAILURE) {
return 0;
}
- php_roxen_hash_environment(CLS_C TSRMLS_CC PLS_CC SLS_CC);
+ php_roxen_hash_environment(TSRMLS_C);
THREADS_ALLOW();
- php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
+ php_execute_script(&file_handle TSRMLS_CC);
php_request_shutdown(NULL);
THREADS_DISALLOW();
return 1;
struct svalue *done_callback, *raw_fd;
struct pike_string *script, *ind;
int status = 1;
- SLS_FETCH();
+ TSRMLS_FETCH();
#ifdef ROXEN_USE_ZTS
GET_THIS();
#endif
} else
THIS->my_fd = 0;
- status = php_roxen_module_main(SLS_C);
+ status = php_roxen_module_main(TSRMLS_C);
current_thread = -1;
apply_svalue(done_callback, 0);
static int sapi_servlet_ub_write(const char *str, uint str_length)
{
- SLS_FETCH();
+ TSRMLS_FETCH();
if (!SG(server_context)) {
fprintf(stderr, str);
return 0;
static void sapi_servlet_send_header(sapi_header_struct *sapi_header, void *server_context)
{
- SLS_FETCH();
+ TSRMLS_FETCH();
if (!sapi_header) return;
if (!SG(server_context)) return;
}
-static int sapi_servlet_read_post(char *buffer, uint count_bytes SLS_DC)
+static int sapi_servlet_read_post(char *buffer, uint count_bytes TSRMLS_DC)
{
if (count_bytes == 0) {
return 0;
}
-static char *sapi_servlet_read_cookies(SLS_D)
+static char *sapi_servlet_read_cookies(TSRMLS_D)
{
JNIEnv *jenv = ((servlet_request*)SG(server_context))->jenv;
jobject servlet = ((servlet_request*)SG(server_context))->servlet;
#ifndef VIRTUAL_DIR
char cwd[MAXPATHLEN];
#endif
- SLS_FETCH();
- PLS_FETCH();
- CLS_FETCH();
+ TSRMLS_FETCH();
+ TSRMLS_FETCH();
TSRMLS_FETCH();
zend_try {
SG(sapi_headers).http_response_code = 200;
SG(request_info).content_length = contentLength;
SG(request_info).auth_password = NULL;
- if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC)==FAILURE) {
+ if (php_request_startup(TSRMLS_C)==FAILURE) {
ThrowServletException(jenv,"request startup failure");
return;
}
if (display_source_mode) {
zend_syntax_highlighter_ini syntax_highlighter_ini;
- if (open_file_for_scanning(&file_handle CLS_CC)==SUCCESS) {
+ if (open_file_for_scanning(&file_handle TSRMLS_CC)==SUCCESS) {
php_get_highlight_struct(&syntax_highlighter_ini);
sapi_send_headers();
zend_highlight(&syntax_highlighter_ini);
}
} else {
- php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
+ php_execute_script(&file_handle TSRMLS_CC);
php_header(); /* Make sure headers have been sent */
}
#ifdef ZTS
static int thttpd_globals_id;
-#define TLS_D php_thttpd_globals *thttpd_context
-#define TLS_DC , TLS_D
-#define TLS_C thttpd_context
-#define TLS_CC , thttpd_context
+#define TSRMLS_D php_thttpd_globals *thttpd_context
+#define TSRMLS_DC , TSRMLS_D
+#define TSRMLS_C thttpd_context
+#define TSRMLS_CC , thttpd_context
#define TG(v) (thttpd_context->v)
-#define TLS_FETCH() TLS_D = ts_resource(thttpd_globals_id)
+#define TSRMLS_FETCH() TSRMLS_D = ts_resource(thttpd_globals_id)
#else
static php_thttpd_globals thttpd_globals;
-#define TLS_D
-#define TLS_DC
-#define TLS_C
-#define TLS_CC
+#define TSRMLS_D
+#define TSRMLS_DC
+#define TSRMLS_C
+#define TSRMLS_CC
#define TG(v) (thttpd_globals.v)
-#define TLS_FETCH()
+#define TSRMLS_FETCH()
#endif
static int sapi_thttpd_ub_write(const char *str, uint str_length)
{
int n;
uint sent = 0;
- TLS_FETCH();
+ TSRMLS_FETCH();
while (str_length > 0) {
n = send(TG(hc)->conn_fd, str, str_length, 0);
#define COMBINE_HEADERS 30
-static int sapi_thttpd_send_headers(sapi_headers_struct *sapi_headers SLS_DC)
+static int sapi_thttpd_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
{
char buf[1024];
struct iovec vec[COMBINE_HEADERS];
zend_llist_position pos;
sapi_header_struct *h;
size_t len;
- TLS_FETCH();
+ TSRMLS_FETCH();
if (!SG(sapi_headers).http_status_line) {
snprintf(buf, 1023, "HTTP/1.0 %d Something\r\n", SG(sapi_headers).http_response_code);
return SAPI_HEADER_SENT_SUCCESSFULLY;
}
-static int sapi_thttpd_read_post(char *buffer, uint count_bytes SLS_DC)
+static int sapi_thttpd_read_post(char *buffer, uint count_bytes TSRMLS_DC)
{
size_t read_bytes = 0, tmp;
int c;
- TLS_FETCH();
+ TSRMLS_FETCH();
/* to understand this, read cgi_interpose_input() in libhttpd.c */
c = TG(hc)->read_idx - TG(hc)->checked_idx;
return read_bytes;
}
-static char *sapi_thttpd_read_cookies(SLS_D)
+static char *sapi_thttpd_read_cookies(TSRMLS_D)
{
- TLS_FETCH();
+ TSRMLS_FETCH();
return TG(hc)->cookie;
}
#define BUF_SIZE 512
#define ADD_STRING(name) \
- php_register_variable(name, buf, track_vars_array TSRMLS_CC PLS_CC)
+ php_register_variable(name, buf, track_vars_array TSRMLS_CC)
-static void sapi_thttpd_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
+static void sapi_thttpd_register_variables(zval *track_vars_array TSRMLS_DC TSRMLS_DC TSRMLS_DC)
{
char buf[BUF_SIZE + 1];
char *p;
- TLS_FETCH();
+ TSRMLS_FETCH();
- php_register_variable("PHP_SELF", SG(request_info).request_uri, track_vars_array TSRMLS_CC PLS_CC);
- php_register_variable("SERVER_SOFTWARE", SERVER_SOFTWARE, track_vars_array TSRMLS_CC PLS_CC);
- php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array TSRMLS_CC PLS_CC);
- php_register_variable("REQUEST_METHOD", (char *) SG(request_info).request_method, track_vars_array TSRMLS_CC PLS_CC);
- php_register_variable("REQUEST_URI", SG(request_info).request_uri, track_vars_array TSRMLS_CC PLS_CC);
- php_register_variable("PATH_TRANSLATED", SG(request_info).path_translated, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("PHP_SELF", SG(request_info).request_uri, track_vars_array TSRMLS_CC);
+ php_register_variable("SERVER_SOFTWARE", SERVER_SOFTWARE, track_vars_array TSRMLS_CC);
+ php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array TSRMLS_CC);
+ php_register_variable("REQUEST_METHOD", (char *) SG(request_info).request_method, track_vars_array TSRMLS_CC);
+ php_register_variable("REQUEST_URI", SG(request_info).request_uri, track_vars_array TSRMLS_CC);
+ php_register_variable("PATH_TRANSLATED", SG(request_info).path_translated, track_vars_array TSRMLS_CC);
p = inet_ntoa(TG(hc)->client_addr.sa_in.sin_addr);
/* string representation of IPs are never larger than 512 bytes */
#define CONDADD(name, field) \
if (TG(hc)->field[0]) { \
- php_register_variable(#name, TG(hc)->field, track_vars_array TSRMLS_CC PLS_CC); \
+ php_register_variable(#name, TG(hc)->field, track_vars_array TSRMLS_CC); \
}
CONDADD(HTTP_REFERER, referer);
}
if (TG(hc)->authorization[0])
- php_register_variable("AUTH_TYPE", "Basic", track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("AUTH_TYPE", "Basic", track_vars_array TSRMLS_CC);
}
static sapi_module_struct thttpd_sapi_module = {
STANDARD_SAPI_MODULE_PROPERTIES
};
-static void thttpd_module_main(TLS_D SLS_DC)
+static void thttpd_module_main(TSRMLS_D TSRMLS_DC)
{
zend_file_handle file_handle;
- CLS_FETCH();
TSRMLS_FETCH();
- PLS_FETCH();
+ TSRMLS_FETCH();
file_handle.type = ZEND_HANDLE_FILENAME;
file_handle.filename = SG(request_info).path_translated;
file_handle.free_filename = 0;
file_handle.opened_path = NULL;
- if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == FAILURE) {
+ if (php_request_startup(TSRMLS_C) == FAILURE) {
return;
}
- php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
+ php_execute_script(&file_handle TSRMLS_CC);
php_request_shutdown(NULL);
}
-static void thttpd_request_ctor(TLS_D SLS_DC)
+static void thttpd_request_ctor(TSRMLS_D TSRMLS_DC)
{
int offset;
smart_str s = {0};
SG(request_info).content_type = TG(hc)->contenttype;
SG(request_info).content_length = TG(hc)->contentlength;
- php_handle_auth_data(TG(hc)->authorization SLS_CC);
+ php_handle_auth_data(TG(hc)->authorization TSRMLS_CC);
TG(post_off) = TG(hc)->read_idx - TG(hc)->checked_idx;
}
}
-static void thttpd_request_dtor(TLS_D SLS_DC)
+static void thttpd_request_dtor(TSRMLS_D TSRMLS_DC)
{
if (SG(request_info).query_string)
free(SG(request_info).query_string);
tsrm_mutex_unlock(qr_lock);
}
-static off_t thttpd_real_php_request(httpd_conn *hc TLS_DC SLS_DC);
+static off_t thttpd_real_php_request(httpd_conn *hc TSRMLS_DC TSRMLS_DC);
static void *worker_thread(void *dummy)
{
int do_work = 50;
httpd_conn *hc;
- SLS_FETCH();
- TLS_FETCH();
+ TSRMLS_FETCH();
+ TSRMLS_FETCH();
while (do_work) {
hc = dequeue_request();
thread_atomic_dec(nr_free_threads);
- thttpd_real_php_request(hc TLS_CC SLS_CC);
+ thttpd_real_php_request(hc TSRMLS_CC TSRMLS_CC);
shutdown(hc->conn_fd, 0);
destroy_conn(hc);
free(hc);
#endif
-static off_t thttpd_real_php_request(httpd_conn *hc TLS_DC SLS_DC)
+static off_t thttpd_real_php_request(httpd_conn *hc TSRMLS_DC TSRMLS_DC)
{
TG(hc) = hc;
hc->bytes_sent = 0;
- thttpd_request_ctor(TLS_C SLS_CC);
+ thttpd_request_ctor(TSRMLS_C);
- thttpd_module_main(TLS_C SLS_CC);
+ thttpd_module_main(TSRMLS_C);
- thttpd_request_dtor(TLS_C SLS_CC);
+ thttpd_request_dtor(TSRMLS_C);
return 0;
}
#ifdef ZTS
queue_request(hc);
#else
- SLS_FETCH();
- TLS_FETCH();
- return thttpd_real_php_request(hc TLS_CC SLS_CC);
+ TSRMLS_FETCH();
+ TSRMLS_FETCH();
+ return thttpd_real_php_request(hc TSRMLS_CC TSRMLS_CC);
#endif
}
void thttpd_register_on_close(void (*arg)(int))
{
- TLS_FETCH();
+ TSRMLS_FETCH();
TG(on_close) = arg;
}
void thttpd_closed_conn(int fd)
{
- TLS_FETCH();
+ TSRMLS_FETCH();
if (TG(on_close)) TG(on_close)(fd);
}
int thttpd_get_fd(void)
{
- TLS_FETCH();
+ TSRMLS_FETCH();
return TG(hc)->conn_fd;
}
void thttpd_set_dont_close(void)
{
- TLS_FETCH();
+ TSRMLS_FETCH();
TG(hc)->file_address = (char *) 1;
}
sapi_startup(&thttpd_sapi_module);
thttpd_sapi_module.startup(&thttpd_sapi_module);
{
- SLS_FETCH();
+ TSRMLS_FETCH();
SG(server_context) = (void *) 1;
}
}
void thttpd_php_shutdown(void)
{
- SLS_FETCH();
+ TSRMLS_FETCH();
if (SG(server_context) != NULL) {
thttpd_sapi_module.shutdown(&thttpd_sapi_module);
static php_tux_globals tux_globals;
-#define TLS_D
-#define TLS_DC
-#define TLS_C
-#define TLS_CC
#define TG(v) (tux_globals.v)
-#define TLS_FETCH()
static int sapi_tux_ub_write(const char *str, uint str_length)
{
int n;
uint sent = 0;
- TLS_FETCH();
+ TSRMLS_FETCH();
/* combine headers and body */
if (TG(number_vec)) {
return sent;
}
-static int sapi_tux_send_headers(sapi_headers_struct *sapi_headers SLS_DC)
+static int sapi_tux_send_headers(sapi_headers_struct *sapi_headers)
{
char buf[1024];
struct iovec *vec;
size_t len;
char *status_line;
int locate_cl;
- TLS_FETCH();
+ TSRMLS_FETCH();
max_headers = 30;
snprintf(buf, 1023, "HTTP/1.1 %d NA\r\n", SG(sapi_headers).http_response_code);
return SAPI_HEADER_SENT_SUCCESSFULLY;
}
-static int sapi_tux_read_post(char *buffer, uint count_bytes SLS_DC)
+static int sapi_tux_read_post(char *buffer, uint count_bytes)
{
#if 0
int amount = 0;
- TLS_FETCH();
+ TSRMLS_FETCH();
TG(req)->objectlen = count_bytes;
TG(req)->object_addr = buffer;
#endif
}
-static char *sapi_tux_read_cookies(SLS_D)
+static char *sapi_tux_read_cookies(void)
{
- TLS_FETCH();
+ TSRMLS_FETCH();
return TG(req)->cookies;
}
#define BUF_SIZE 512
#define ADD_STRING(name) \
- php_register_variable(name, buf, track_vars_array TSRMLS_CC PLS_CC)
+ php_register_variable(name, buf, track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()CC)
-static void sapi_tux_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
+static void sapi_tux_register_variables(zval *track_vars_array TSRMLS_DC)
{
char buf[BUF_SIZE + 1];
char *p;
- TLS_FETCH();
+ TSRMLS_FETCH();
sprintf(buf, "Server: %s", TUXAPI_version);
sapi_add_header_ex(buf, strlen(buf), 1, 0);
- php_register_variable("PHP_SELF", SG(request_info).request_uri, track_vars_array TSRMLS_CC PLS_CC);
- php_register_variable("SERVER_SOFTWARE", TUXAPI_version, track_vars_array TSRMLS_CC PLS_CC);
- php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array TSRMLS_CC PLS_CC);
- php_register_variable("REQUEST_METHOD", (char *) SG(request_info).request_method, track_vars_array TSRMLS_CC PLS_CC);
- php_register_variable("DOCUMENT_ROOT", TUXAPI_docroot, track_vars_array TSRMLS_CC PLS_CC);
- php_register_variable("SERVER_NAME", TUXAPI_servername, track_vars_array TSRMLS_CC PLS_CC);
- php_register_variable("REQUEST_URI", SG(request_info).request_uri, track_vars_array TSRMLS_CC PLS_CC);
- php_register_variable("PATH_TRANSLATED", SG(request_info).path_translated, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("PHP_SELF", SG(request_info).request_uri, track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()CC);
+ php_register_variable("SERVER_SOFTWARE", TUXAPI_version, track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()CC);
+ php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()CC);
+ php_register_variable("REQUEST_METHOD", (char *) SG(request_info).request_method, track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()CC);
+ php_register_variable("DOCUMENT_ROOT", TUXAPI_docroot, track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()CC);
+ php_register_variable("SERVER_NAME", TUXAPI_servername, track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()CC);
+ php_register_variable("REQUEST_URI", SG(request_info).request_uri, track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()CC);
+ php_register_variable("PATH_TRANSLATED", SG(request_info).path_translated, track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()CC);
p = inet_ntoa(TG(req)->client_host);
/* string representation of IPs are never larger than 512 bytes */
#define CONDADD(name, field) \
if (TG(req)->field[0]) { \
- php_register_variable(#name, TG(req)->field, track_vars_array TSRMLS_CC PLS_C); \
+ php_register_variable(#name, TG(req)->field, track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()C); \
}
CONDADD(HTTP_REFERER, referer);
#if 0
if (TG(hc)->authorization[0])
- php_register_variable("AUTH_TYPE", "Basic", track_vars_array TSRMLS_CC PLS_C);
+ php_register_variable("AUTH_TYPE", "Basic", track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()C);
#endif
}
STANDARD_SAPI_MODULE_PROPERTIES
};
-static void tux_module_main(TLS_D SLS_DC)
+static void tux_module_main(TSRMLS_D)
{
zend_file_handle file_handle;
- CLS_FETCH();
- TSRMLS_FETCH();
- PLS_FETCH();
+ TSRMLS_FETCH()FETCH();
+ TSRMLS_FETCH()FETCH();
file_handle.type = ZEND_HANDLE_FILENAME;
file_handle.filename = SG(request_info).path_translated;
file_handle.free_filename = 0;
file_handle.opened_path = NULL;
- if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == FAILURE) {
+ if (php_request_startup(TSRMLS_C) == FAILURE) {
return;
}
- php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
+ php_execute_script(&file_handle TSRMLS_FETCH()CC TSRMLS_FETCH()CC);
php_request_shutdown(NULL);
}
-static void tux_request_ctor(TLS_D SLS_DC)
+static void tux_request_ctor(TSRMLS_D)
{
char buf[1024];
int offset;
SG(request_info).content_length = 0; // TG(req)->contentlength;
#if 0
- php_handle_auth_data(TG(hc)->authorization SLS_CC);
+ php_handle_auth_data(TG(hc)->authorization TSRMLS_CC);
#endif
}
-static void tux_request_dtor(TLS_D SLS_DC)
+static void tux_request_dtor(TSRMLS_D)
{
if (TG(header_vec))
free(TG(header_vec));
int TUXAPI_handle_events(user_req_t *req)
{
- SLS_FETCH();
- TLS_FETCH();
+ TSRMLS_FETCH();
if (req->event == PHP_TUX_BACKGROUND_CONN) {
tux_closed_conn(req->sock);
TG(req) = req;
TG(tux_action) = TUX_ACTION_FINISH_CLOSE_REQ;
- tux_request_ctor(TLS_C SLS_CC);
+ tux_request_ctor(TSRMLS_C);
- tux_module_main(TLS_C SLS_CC);
+ tux_module_main(TSRMLS_C);
- tux_request_dtor(TLS_C SLS_CC);
+ tux_request_dtor(TSRMLS_C);
return tux(TG(tux_action), req);
}
void tux_closed_conn(int fd)
{
- TLS_FETCH();
+ TSRMLS_FETCH();
if (TG(on_close)) TG(on_close)(fd);
}
int tux_get_fd(void)
{
- TLS_FETCH();
+ TSRMLS_FETCH();
return TG(req)->sock;
}
void tux_set_dont_close(void)
{
- TLS_FETCH();
+ TSRMLS_FETCH();
TG(req)->event = PHP_TUX_BACKGROUND_CONN;
tux(TUX_ACTION_POSTPONE_REQ, TG(req));
# PROP Ignore_Export_Lib 0\r
# PROP Target_Dir ""\r
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\Zend" /I "..\regex\\" /I "..\..\bindlib_w32" /I "..\TSRM" /D "DEBUG" /D "_DEBUG" /D "_CONSOLE" /D ZEND_DEBUG=1 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /FR /FD /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\Zend" /I "..\regex\\" /I "..\..\bindlib_w32" /I "..\TSRM" /D "DEBUG" /D "_DEBUG" /D "_CONSOLE" /D "MSVC5" /D "PHP_WIN32" /D ZEND_DEBUG=1 /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /FD /c\r
# SUBTRACT CPP /YX\r
# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
# ADD RSC /l 0x409 /i "c:\include" /d "_DEBUG"\r
# PROP Ignore_Export_Lib 0\r
# PROP Target_Dir ""\r
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /I "..\TSRM" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=1 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /FR /YX /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /I "..\TSRM" /I "..\ext\xml\expat" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D "MSVC5" /D "PHP_WIN32" /D ZEND_DEBUG=1 /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c\r
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
# ADD BASE RSC /l 0x40d /d "_DEBUG"\r
# PROP Ignore_Export_Lib 0\r
# PROP Target_Dir ""\r
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /I "..\TSRM" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLL_EXPORTS" /D "PHP_EXPORTS" /D "SAPI_EXPORTS" /D "LIBZEND_EXPORTS" /D ZEND_DEBUG=0 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /I "..\TSRM" /I "..\ext\xml\expat" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLL_EXPORTS" /D "PHP_EXPORTS" /D "SAPI_EXPORTS" /D "LIBZEND_EXPORTS" /D ZEND_DEBUG=0 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c\r
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
# ADD BASE RSC /l 0x40d /d "NDEBUG"\r
# PROP Ignore_Export_Lib 0\r
# PROP Target_Dir ""\r
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex" /I "..\bindlib_w32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D ZEND_DEBUG=0 /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex" /I "..\bindlib_w32" /I "main" /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /I "..\TSRM" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex" /I "..\bindlib_w32" /I "main" /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /I "..\TSRM" /I "..\ext\xml\expat" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c\r
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
# ADD BASE RSC /l 0x40d /d "NDEBUG"\r
# End Source File\r
# Begin Source File\r
\r
-SOURCE=..\ext\standard\output.c\r
+SOURCE=..\main\output.c\r
# End Source File\r
# Begin Source File\r
\r
# Begin Group "Scanners"\r
\r
# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\standard\url_scanner_ex.re\r
+# End Source File\r
# End Group\r
# Begin Group "Text Files"\r
\r
projects / php / commitdiff