← Back to branch summary

~clint-fewbar/ubuntu/precise/php5/php5-5.4-merge

« back to all changes in this revision

Viewing changes to ext/json/json.c

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-02-22 09:46:37 UTC
  • mfrom: (1.1.20) (0.3.18 sid)
  • Revision ID: package-import@ubuntu.com-20110222094637-nlu2tvb7oqgaarl0
Tags: 5.3.5-1ubuntu1
* Merge from debian/unstable. Remaining changes:
 - debian/control:
    * Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe.
    * Dropped libmysqlclient15-dev, build against mysql 5.1.
    * Dropped libcurl-dev not in the archive.
    * Suggest php5-suhosin rather than recommends.
    * Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions 
      already in universe.
    * Dropped libonig-dev and libqgdbm since its in universe. (will be re-added in lucid+1)
    * Dropped locales-all.
  - modulelist: Drop imap, interbase, sybase, and mcrypt.
  - debian/rules:
    * Dropped building of mcrypt, imap, and interbase.
    * Install apport hook for php5.
    * stop mysql instance on clean just in case we failed in tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/json/json.c
16
16
  +----------------------------------------------------------------------+
17
17
*/
18
18
 
19
 
/* $Id: json.c 301028 2010-07-06 17:01:30Z scottmac $ */
 
19
/* $Id: json.c 303350 2010-09-14 03:46:28Z aharvey $ */
20
20
 
21
21
#ifdef HAVE_CONFIG_H
22
22
#include "config.h"
505
505
        }
506
506
 
507
507
        if (depth <= 0) {
508
 
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Depth must greater than zero");
 
508
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Depth must be greater than zero");
509
509
                efree(utf16);
510
510
                RETURN_NULL();
511
511
        }