Changeset 1255 for branches/3.0


Ignore:
Timestamp:
2013-05-28T04:09:21+02:00 (2 years ago)
Author:
moo
Message:

merge from trunk

Location:
branches/3.0
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/3.0

  • branches/3.0/ChangeLog

    r1252 r1255  
    44 * fixes #303: tablesort.js not found in Diagnosis and Coverager
    55 * fixes #297: segv on startup under sparc, ini setting overflow
    6  * fixes #296: Multiple instances of the same software causes PHP "cannot redeclare class" errors when readonly_protection is not in use
     6 * fixes #296: (PHP5.4+ only bug), racecondition Multiple instances of the same software causes PHP "cannot redeclare class" errors when readonly_protection is not in use
    77 * fixes #301: refix locking impl
    88 * fixes #307: compatible with Zend Debugger which requires to be installed after Zend Extension Manager
  • branches/3.0/NEWS

    r1252 r1255  
    22========
    33 * bug fixes
    4  * "cannot redeclare class" errors is now gone. Can also be avoid by using readonly_protection (unavailable with /dev/zero).
     4 * (PHP5.4+ only bug) random "cannot redeclare class" errors is now gone. Can also be avoid by using readonly_protection (unavailable with /dev/zero).
    55 * fixes SEGV with Zend Debugger
    66
  • branches/3.0/xcache/xc_const_string.c

    r1095 r1255  
    6666#elif defined(ZEND_ENGINE_2_4)
    6767#   include "xc_const_string_opcodes_php5.4.h"
    68 #elif defined(ZEND_ENGINE_2_3)
     68#elif defined(ZEND_ENGINE_2_2)
    6969#   include "xc_const_string_opcodes_php5.3.h"
    7070#elif defined(ZEND_ENGINE_2_1)
Note: See TracChangeset for help on using the changeset viewer.